From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E0DD1C07D9 for ; Mon, 10 Mar 2025 07:04:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741590290; cv=none; b=Fi+fyWMloS0jsW8/Zc/F+2O/8BUlErPjOiRmaJN/bX9aFMjzj8umeWBvA+8IHhNts4ox5sWEc7LZegJM9p4Qa1B+QaDzwfF7tF9kth9WTeJx8G2KvrP8JcDjdxfylrCoLCPJ9KGE+j7iX9Sl5/Ny2CRKJbCz27BJA9ZL/0OK8RU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741590290; c=relaxed/simple; bh=eSw/Sz1ql/4UPcLEbJRVUH0uYPxF2xmC0A18fnAZuI4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=IckVc/0ULZI+Uc/b9L7NsgXZRrDLh1SqfqmUSuCMRnREumbGizOMrOcbRBLWnq5TE+tdROpIAu64haclWb4qwWozcC3jY7baYKXHf/A5XlhlmBTefpvZvvbI+V8/GIfVl3XuFds47CyLC4TUB9CMdVbvt3uyuVE83HIJNQ6dDr0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com; spf=pass smtp.mailfrom=daynix.com; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b=QZRBYT7/; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=daynix.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.b="QZRBYT7/" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2234e4b079cso65467415ad.1 for ; Mon, 10 Mar 2025 00:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1741590288; x=1742195088; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Z4zUjmNxjokxBeO8EjZH90AMO+cgLdiVs95Lgo++StE=; b=QZRBYT7/pUx1N5WjjIh58q+/IinjLV3aq0UR9zGCTNxVna0gfBnE9gUO8W4GuVM9KA aXu0TGNLBTvShFK8ky5kFa+mBCVnbzcSPm6vG9pdeZNO3EyOZ4DBu0fksbpXqnIhuwNL xEsrLyqVKi+jnkBwXgx5FsdLc7LEKJkinZtQGEHh9kZd3bkFzQI+gKlwnuQEg5BQkvkX HxCDTgg0yUZJOLlF8ic1Bi2VoU4YMXRfO9wYbI5HdOdHcSk6mPFQ+UqIAtysplhtjrP8 XVw77g1RD0BBt3zcQosaTS1XIvITQ01qguj0TkwT+IoPolx2Hr1pDl6gbOH9qtQMrkr2 DbLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741590288; x=1742195088; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z4zUjmNxjokxBeO8EjZH90AMO+cgLdiVs95Lgo++StE=; b=vVWgPf4yO0XAPDSpNf47zqw2mv/ihfXkk+HvQeiIAJZaak5ROV1cW7hRZUzhiKkPE+ XHNnBiGRELL3DICbZ3QeMBZvVCfWLYLm8+1jZC7ESj1UWJ6BBGMUscy+OrTQjJFjEHR8 cahlvbvlZdjau2uKWGmedwiiScdFTFXgr2OTH3qslC9XAHsiZcDbeAmye2HlZdmj18Yf 0QdPI3+gxD5E0Kjv4Uh0NCCV7cHZFRDCEhnJpTxc1DPz9Ux8pJ+7jkUhSLrRYJJVxthf j41LCiJj7tgoDvBJUyoyTN9XcVV+cMYaxFOwp3Jxe3UUAE03fNPCMc7BQFSDRMj/0+ZV 2Jww== X-Forwarded-Encrypted: i=1; AJvYcCUMZXrAvfWL7pZUb4gvrz7C5g4uHpqIOtcC7JT9JR0LW7FrVIfiwRJSemwBpkhgoxFX9bqLB9+7c4eyyTo=@vger.kernel.org X-Gm-Message-State: AOJu0Yxdv+f9J1T7cLEQGUeUKCbAxFD2OxwRlY830Q/M3nRw5I3G3e/P mNsH9d3ORMnszfaUT1HYouu7/O/Zhs2g5lmzxX/2ykVgVpqc4Oo7OxKqE6iaY8w= X-Gm-Gg: ASbGnctema+USIivCn6IoJbWpSDC5CPmw5TZLQ3MvnAYq4ZLbQ+0QNxoe2eLiLvA7E+ GkeIFu5SIM9LCUxftplj5OgM3OSkg7+vf7zJXiXNqltiC81sg5OKSWjq/9GjULatFkmh+2Odot2 KqJtDlMC2CKrbgRop/ivz6FAOENTWDJ6UeU9QxLaeLrzzPWnowH+iSgjtSv27x1wnlFI80fs+Yd mE6RtGTcEyIEZXoVLYmOebu+dVB10F9qFhpwhrMQYLrNKzZLl0cHkVo5UXvadayPNsD8p7tKzc5 3czJFmy3V7n2aEtkSgiLSHURfSkEYhOkNDP06he9+dK18eEYs+ZURPDejA== X-Google-Smtp-Source: AGHT+IFkDjhIOqYcqagzT94jgytjjwhSIQTT2o6zqPzPIQtmCm+lioqyAyJhjHPUINzm2ba//BDswA== X-Received: by 2002:a17:902:ea07:b0:224:a79:5fe4 with SMTP id d9443c01a7336-2242888681cmr196310675ad.2.1741590288383; Mon, 10 Mar 2025 00:04:48 -0700 (PDT) Received: from [157.82.205.237] ([157.82.205.237]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22410a7f93esm70081685ad.142.2025.03.10.00.04.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Mar 2025 00:04:48 -0700 (PDT) Message-ID: <2e550452-a716-4c3f-9d5a-3882d2c9912a@daynix.com> Date: Mon, 10 Mar 2025 16:04:43 +0900 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next v9 6/6] vhost/net: Support VIRTIO_NET_F_HASH_REPORT To: Jason Wang Cc: Jonathan Corbet , Willem de Bruijn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "Michael S. Tsirkin" , Xuan Zhuo , Shuah Khan , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kselftest@vger.kernel.org, Yuri Benditovich , Andrew Melnychenko , Stephen Hemminger , gur.stavi@huawei.com, Lei Yang , Simon Horman References: <20250307-rss-v9-0-df76624025eb@daynix.com> <20250307-rss-v9-6-df76624025eb@daynix.com> Content-Language: en-US From: Akihiko Odaki In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025/03/10 13:43, Jason Wang wrote: > On Fri, Mar 7, 2025 at 7:02 PM Akihiko Odaki wrote: >> >> VIRTIO_NET_F_HASH_REPORT allows to report hash values calculated on the >> host. When VHOST_NET_F_VIRTIO_NET_HDR is employed, it will report no >> hash values (i.e., the hash_report member is always set to >> VIRTIO_NET_HASH_REPORT_NONE). Otherwise, the values reported by the >> underlying socket will be reported. >> >> VIRTIO_NET_F_HASH_REPORT requires VIRTIO_F_VERSION_1. >> >> Signed-off-by: Akihiko Odaki >> Tested-by: Lei Yang >> --- >> drivers/vhost/net.c | 49 +++++++++++++++++++++++++++++-------------------- >> 1 file changed, 29 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c >> index b9b9e9d40951856d881d77ac74331d914473cd56..16b241b44f89820a42c302f3586ea6bb5e0d4289 100644 >> --- a/drivers/vhost/net.c >> +++ b/drivers/vhost/net.c >> @@ -73,6 +73,7 @@ enum { >> VHOST_NET_FEATURES = VHOST_FEATURES | >> (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) | >> (1ULL << VIRTIO_NET_F_MRG_RXBUF) | >> + (1ULL << VIRTIO_NET_F_HASH_REPORT) | >> (1ULL << VIRTIO_F_ACCESS_PLATFORM) | >> (1ULL << VIRTIO_F_RING_RESET) >> }; >> @@ -1097,9 +1098,11 @@ static void handle_rx(struct vhost_net *net) >> .msg_controllen = 0, >> .msg_flags = MSG_DONTWAIT, >> }; >> - struct virtio_net_hdr hdr = { >> - .flags = 0, >> - .gso_type = VIRTIO_NET_HDR_GSO_NONE >> + struct virtio_net_hdr_v1_hash hdr = { >> + .hdr = { >> + .flags = 0, >> + .gso_type = VIRTIO_NET_HDR_GSO_NONE >> + } >> }; >> size_t total_len = 0; >> int err, mergeable; >> @@ -1110,7 +1113,6 @@ static void handle_rx(struct vhost_net *net) >> bool set_num_buffers; >> struct socket *sock; >> struct iov_iter fixup; >> - __virtio16 num_buffers; >> int recv_pkts = 0; >> >> mutex_lock_nested(&vq->mutex, VHOST_NET_VQ_RX); >> @@ -1191,30 +1193,30 @@ static void handle_rx(struct vhost_net *net) >> vhost_discard_vq_desc(vq, headcount); >> continue; >> } >> + hdr.hdr.num_buffers = cpu_to_vhost16(vq, headcount); >> /* Supply virtio_net_hdr if VHOST_NET_F_VIRTIO_NET_HDR */ >> if (unlikely(vhost_hlen)) { >> - if (copy_to_iter(&hdr, sizeof(hdr), >> - &fixup) != sizeof(hdr)) { >> + if (copy_to_iter(&hdr, vhost_hlen, >> + &fixup) != vhost_hlen) { >> vq_err(vq, "Unable to write vnet_hdr " >> "at addr %p\n", vq->iov->iov_base); >> goto out; > > Is this an "issue" specific to RSS/HASH? If it's not, we need a separate patch. > > Honestly, I'm not sure if it's too late to fix this. There is nothing wrong with the current implementation. The current implementation fills the header with zero except num_buffers, which it fills some real value. This functionality is working fine with VIRTIO_NET_F_MRG_RXBUF and VIRTIO_F_VERSION_1, which change the header size. Now I'm adding VIRTIO_NET_F_HASH_REPORT and it adds the hash_report field, which also needs to be initialized with zero, so I'm making sure vhost_net will also initialize it. Regards, Akihiko Odaki > > Others look fine. > > Thanks >