From nobody Thu Oct 9 01:16:30 2025 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 EA248182D0; Sat, 21 Jun 2025 14:51:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750517491; cv=none; b=XrDBgTAXIvFGLfpEa2MgGaQYsjKPsfC/dDExGXIkxeYm02Me5GYrj9G05fsIp2BlYip68lgilWTscC9jwd5TByNKO/q7MhA6iaLQjnR9lV2Zn0qhjwZSCJ4WnwvUrpupBgZVXvPTfz2cmJIHGEw4cVk0t86aaxuJ2J9P9CtSCQs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750517491; c=relaxed/simple; bh=WUV9Kwec4xAVLQG+1Bo69YOw+1iyc2NdSdFVT9fP7Bo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rCg3ufI2H+JHvyz0CfkufxcN1+95sEZkpHFav31DCr1JfwYJlsWJ93XADTQ/hGfZ2xE0Cfe590kJRtkyB+j7exjO1C2Euhhd6TTbMROya3+SAbSD/thpZApTjHaModvd17qr98/Vyolc2PYoCjQ8eMrVtwU4bjyiGRXUmiC0yIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D2J/hVPz; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D2J/hVPz" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7399a2dc13fso3149747b3a.2; Sat, 21 Jun 2025 07:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750517489; x=1751122289; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=up6zSBk/y+q3zd8AI4YQGat3uz9aOy8LOrfGnCsBQQ0=; b=D2J/hVPz8hEazDVR4Yqnynvp9juErC8Ras664nP21ohwhYnFFFjr+3Bmgi5l8rFp+j f2o/yIoq+qHaIKubjrMmWyZyd9iL9qMuksbLtfytDB1VVcEy6PvzskX3rDHALUUQKWrJ ArR/tNfTNbS3k8YHZ3WzdFXUGEBNNAixfpDYedwVfysZ0FPqyPzfxyyRZjAIqKTs46ja d72XByf/pC96OmzIBTx5oReGWoF0htWPz3KVzYhl4u6du0Ko8MTUhZv341mUiJniORUK ZBDYAIvgrWsxpRi1KPyxKBWuyaEFFso7EP8odcgkQT3ODYqX7Fy+lE6KoyBcjH/7R+ed lbpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750517489; x=1751122289; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=up6zSBk/y+q3zd8AI4YQGat3uz9aOy8LOrfGnCsBQQ0=; b=AnLfD0mjFskciYh1yf/YCQ1OPRhM9/VTTl2FB/mGbRPwIhelCOgIhYXvbGxnHtYQqh SRVwnfVvAGuLt8awo1s89sVg0oULunYFR/bjBZJJ5XqCHHLpW7sGVNcFAnawLw5iJ4QF PBR9hDmoxlZW0H52/WdrnEKoKLS6hWkerKg04vx8pkntn0cE3auAI0ZU8oZMbMoolWVJ XYRD0udGQ0uXVEqJNRT30IV0q0Z2CIs//5DlENuEOJFp6cBz6zsfl95pwzIcNPZ/6xga zvzoA+UK7oPL/++1efdgvSrVfW7pSKLVQ36FO7kESrhh2t0+ExzD6lWoKtCcO5JFHF0b QRCA== X-Forwarded-Encrypted: i=1; AJvYcCULogvBp+9crIYNkIVe9kcbQdt0CNh5Fd3HIdEHPt/6DCMIPg/7bal/MVOds7Ke6NyKpPlcEsBNdrMYZBJs@vger.kernel.org, AJvYcCWZEyqrodzoumXlo4rT6v3axxOEbE26Dvfz4HGgCNAwmW6xryJ7XACsdhRJzxJvZGl9UoI=@vger.kernel.org X-Gm-Message-State: AOJu0YzaIokptC2a6LFIPZ0sQjcJnOYqb+NsLW6X5IoDIviWUO3F5rrl BY1JgG20SXBNpP722sqDqwSK53a+KVxhw81E73wOyEm/NjHiyucRtaj9UIFM01iQ X-Gm-Gg: ASbGnctCzARBSso20Vi4tDwHsXGAceKFm9uXn5dEtfigb5Z0PxDOnB/SWmz6KE7VVk/ CSXrmqpld4SuFJJi33TC1hEvAgyjGc0SG51NX5NI2zqt84Of8uU53NHq1/px+JRDj9zHOArto52 GoACMhMmPQugY4PbzsajyIHxd38u47mk45E8VwGotke/650GBJRnY7L8btgieFNVZHtxQuqLUeV x9Be/ELqlk93egCvOBJRo/rIFwjOb7Es60vCpHZdxgZubntPMiRnc/+eruRvfQxobuWin7V8+SS UxTSD/fmaxV5+VQGmQln6GCmc9ZTzE5aoTV2ZtryETT0lJOdvR1YtgCMkTDZ0NXDsIZ/9J7Igrh y/g== X-Google-Smtp-Source: AGHT+IETi27TeBNcP7Wim+YmhsbCm01nbJd/oUEKhx0FHnAVaswF5F4Iuv0tVHyJ0xkSdH1X0Q0tzw== X-Received: by 2002:a05:6a00:3e0b:b0:747:bd28:1ca1 with SMTP id d2e1a72fcca58-7490d663700mr11428892b3a.3.1750517488811; Sat, 21 Jun 2025 07:51:28 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:fea9:d2f2:6451:ed3b]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7490a46acf4sm4493490b3a.11.2025.06.21.07.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jun 2025 07:51:28 -0700 (PDT) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH net v2 1/2] virtio-net: xsk: rx: fix the frame's length check Date: Sat, 21 Jun 2025 21:49:51 +0700 Message-ID: <20250621144952.32469-2-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250621144952.32469-1-minhquangbui99@gmail.com> References: <20250621144952.32469-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When calling buf_to_xdp, the len argument is the frame data's length without virtio header's length (vi->hdr_len). We check that len with xsk_pool_get_rx_frame_size() + vi->hdr_len to ensure the provided len does not larger than the allocated chunk size. The additional vi->hdr_len is because in virtnet_add_recvbuf_xsk, we use part of XDP_PACKET_HEADROOM for virtio header and ask the vhost to start placing data from hard_start + XDP_PACKET_HEADROOM - vi->hdr_len not hard_start + XDP_PACKET_HEADROOM But the first buffer has virtio_header, so the maximum frame's length in the first buffer can only be xsk_pool_get_rx_frame_size() not xsk_pool_get_rx_frame_size() + vi->hdr_len like in the current check. This commit adds an additional argument to buf_to_xdp differentiate between the first buffer and other ones to correctly calculate the maximum frame's length. Fixes: a4e7ba702701 ("virtio_net: xsk: rx: support recv small mode") Signed-off-by: Bui Quang Minh Reviewed-by: Xuan Zhuo --- drivers/net/virtio_net.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index e53ba600605a..1eb237cd5d0b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1127,15 +1127,29 @@ static void check_sq_full_and_disable(struct virtne= t_info *vi, } } =20 +/* Note that @len is the length of received data without virtio header */ static struct xdp_buff *buf_to_xdp(struct virtnet_info *vi, - struct receive_queue *rq, void *buf, u32 len) + struct receive_queue *rq, void *buf, + u32 len, bool first_buf) { struct xdp_buff *xdp; u32 bufsize; =20 xdp =3D (struct xdp_buff *)buf; =20 - bufsize =3D xsk_pool_get_rx_frame_size(rq->xsk_pool) + vi->hdr_len; + /* In virtnet_add_recvbuf_xsk, we use part of XDP_PACKET_HEADROOM for + * virtio header and ask the vhost to fill data from + * hard_start + XDP_PACKET_HEADROOM - vi->hdr_len + * The first buffer has virtio header so the remaining region for frame + * data is + * xsk_pool_get_rx_frame_size() + * While other buffers than the first one do not have virtio header, so + * the maximum frame data's length can be + * xsk_pool_get_rx_frame_size() + vi->hdr_len + */ + bufsize =3D xsk_pool_get_rx_frame_size(rq->xsk_pool); + if (!first_buf) + bufsize +=3D vi->hdr_len; =20 if (unlikely(len > bufsize)) { pr_debug("%s: rx error: len %u exceeds truesize %u\n", @@ -1260,7 +1274,7 @@ static int xsk_append_merge_buffer(struct virtnet_inf= o *vi, =20 u64_stats_add(&stats->bytes, len); =20 - xdp =3D buf_to_xdp(vi, rq, buf, len); + xdp =3D buf_to_xdp(vi, rq, buf, len, false); if (!xdp) goto err; =20 @@ -1358,7 +1372,7 @@ static void virtnet_receive_xsk_buf(struct virtnet_in= fo *vi, struct receive_queu =20 u64_stats_add(&stats->bytes, len); =20 - xdp =3D buf_to_xdp(vi, rq, buf, len); + xdp =3D buf_to_xdp(vi, rq, buf, len, true); if (!xdp) return; =20 --=20 2.43.0 From nobody Thu Oct 9 01:16:30 2025 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 790FA182D0; Sat, 21 Jun 2025 14:51:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750517498; cv=none; b=Z2aBvun6ZY5ihUfbswZwHvg/dqAPckQoFw0RpX6QFoTeUpenUznPF8Eh6CWg/9j1oswsNIF9Fm7PjjZKZ27gBZ63PDUXICg8gohXj/7M1YTO3o0ypoxQ4R4J5EFr+0TIVaCmHOFzv2Jm3lTeQHGRvuNFNMQ7dR7Gq8M8Z/ElJTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750517498; c=relaxed/simple; bh=VDC/H4qxrgNISEN09Sz7jFYSr9ya7/eF+9EuVS1vC2U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XvlzTdLj2k/YW8klvws794kqR1FQ/rb0jpQXoBw7H0H6XZmJSSNM8RZs4hCb8Wlk3J0NAoYrxa+2uePtrbP47EzJ/j93NjxJKgwfjbEaw2K3GWEu0L8AjGUnKBjId2aLJZyX7mkFoHbvVp9Q4uokYGeVXBOfQS6jQf53qD04YIE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=l4qBwOgA; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="l4qBwOgA" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-749248d06faso429045b3a.2; Sat, 21 Jun 2025 07:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750517496; x=1751122296; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tsT1ZEXEOUtY1kEret+DIBmKa+OK0aPjmFKUZJqZ22A=; b=l4qBwOgAAHeneMx+QxfHef+t9FYq4nM6PlxzYBcO7SVL+BRmmnc0SNdu77h/phNw33 I9DHxwmNaTWaOsuSKaaOg2jVH1//tOBPd90bcidSFOX0ARI9baWwBZ7TD0Gn/m8e1xbE ZwgucNmISj6ZFgLC9KjYRadD4vg/XQ91eONuksl5l3uFQgIti1TBK4GobqkfdAuRMsW3 Pmq8kW50ZFD1PXqgX6N7M5eefnTZ5TdiHsi2qGxMk4JsL0wm5XkxkGl7SUErmJcp8TTL 0zoPkiqd2ZkmfkXKsmge3VJXJJLkVbJH+rDv+UWodY0vs2xcXsgtig8xM+lrRVJoBDbh WBww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750517496; x=1751122296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tsT1ZEXEOUtY1kEret+DIBmKa+OK0aPjmFKUZJqZ22A=; b=Zxbx/Ec+Y+yXexQqgenTaTRaj8WwACJmNSERf3fFwuqc0KIR7OOnxn3mlJdpwDsAoA SqPdZOkMsqYpQX5Vrx/k9/jh3r/2G5r9ywcmjQcqHJvIQbpxTrYo+YFJ8BBMKx1u22+m bJ5xdYrAx6UUSzqvow2kaEvNNHJWxz2r2qwKwjc72Rsz3f2Vr9nigKXUuvwTplwA3t7a vqLQIrTSni6Op6vPZxDMR3MdZsUr6L78bvM2LEsIat6e8ayJFKSlW2b0SVJZHuGX1ZQ9 snQg/MZl8BCE9Q07RqWkkQhXqLDjy4Y+O02C2xTQORylIdTJTcJhhrIVBdIsx3zA96nD i2Qw== X-Forwarded-Encrypted: i=1; AJvYcCUqJ+sEHCS7g1VybNkRGtb5gl2rQCRV5hIdDiyj3xNzNQxlASLXJBErmMiJhvAnZATJVJ1xYqa2p9jD2U+2@vger.kernel.org, AJvYcCV78C3R9ovXZiEK2p1a7HwBGBJCemoWXlIpvLZjYzAOdzkmPno1slqgPvFDOT/va2UdDSc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3EDfCxRx/INrOMeThKn3ZW+Q/f+jUMSdmnSQhvWumm9HsJYXm SbNzL4gsffPnvHXNaLYLtYVZ58de9IE1QPDgfem3UtyuDClTvCDUDJBnowdi2+mr X-Gm-Gg: ASbGncvKoQLc09/dCXV8APZ/s012Rby1JenKLv6AOWthsgmD/NbcE7ikp9YDQMDHaWB c6g49uqlwWhOWpCsHOyXMKs2QPyD3w8b/QG6RGAAcM7LG4INefFLpg+PF8rrSjijcOfWuvI1+iz Kx+Rgh9VzGeYuGqYabo3apdAU0FJBIIA5C2YQ/umRXJifyGl5bV/zDLFRqrqExlXgb1aty1GnLl DFHZThi1S9caudxa9JpZX7sA97r89YTKRIN+XAK9+YC7GuEE7UNjZS7czL9G1btjtrPZwhUwp3C VaGuH3+g+sTjxTt3Qvp4ZN0502VvlWfnUdWQJzXrKpl0qOkyIP/4jlu2FYuQwMhm4Dy5DjVYFrM VJw== X-Google-Smtp-Source: AGHT+IGDRfF/7GW0dG2asaXRVeS7I9SgZa3EowVkxZsXFjdDSpZWb6U65gMCd7WwyOg7LN/dQrCCAg== X-Received: by 2002:a05:6a00:4612:b0:746:3040:4da2 with SMTP id d2e1a72fcca58-7490d51ba3emr10478119b3a.8.1750517496374; Sat, 21 Jun 2025 07:51:36 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:fea9:d2f2:6451:ed3b]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7490a46acf4sm4493490b3a.11.2025.06.21.07.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Jun 2025 07:51:35 -0700 (PDT) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH net v2 2/2] virtio-net: xsk: rx: move the xdp->data adjustment to buf_to_xdp() Date: Sat, 21 Jun 2025 21:49:52 +0700 Message-ID: <20250621144952.32469-3-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250621144952.32469-1-minhquangbui99@gmail.com> References: <20250621144952.32469-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit does not do any functional changes. It moves xdp->data adjustment for buffer other than first buffer to buf_to_xdp() helper so that the xdp_buff adjustment does not scatter over different functions. Signed-off-by: Bui Quang Minh Reviewed-by: Xuan Zhuo --- drivers/net/virtio_net.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 1eb237cd5d0b..4e942ea1bfa3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1159,7 +1159,19 @@ static struct xdp_buff *buf_to_xdp(struct virtnet_in= fo *vi, return NULL; } =20 - xsk_buff_set_size(xdp, len); + if (first_buf) { + xsk_buff_set_size(xdp, len); + } else { + /* This is the same as xsk_buff_set_size but with the adjusted + * xdp->data. + */ + xdp->data =3D xdp->data_hard_start + XDP_PACKET_HEADROOM; + xdp->data -=3D vi->hdr_len; + xdp->data_meta =3D xdp->data; + xdp->data_end =3D xdp->data + len; + xdp->flags =3D 0; + } + xsk_buff_dma_sync_for_cpu(xdp); =20 return xdp; @@ -1284,7 +1296,7 @@ static int xsk_append_merge_buffer(struct virtnet_inf= o *vi, goto err; } =20 - memcpy(buf, xdp->data - vi->hdr_len, len); + memcpy(buf, xdp->data, len); =20 xsk_buff_free(xdp); =20 --=20 2.43.0