From nobody Wed Oct 8 08:19:18 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 A1CCA28DB5D; Mon, 30 Jun 2025 15:13:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751296425; cv=none; b=NRe3aBKBNlgKV4GUXaOp0XvJXTQ4Xnn1IsCUN/gZWKIPKGLaa9p5SDZOKLFc5lE0lFeccEBf/KGt3RCfaAH/bmh5B9mRvMSsxYLDwlZUmaEVBj02Be/qnFPeNADXZDiNiUjK8w/IF9tZJus8upfEKS4gjzUd1B6QZD8qAs/NRIw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751296425; c=relaxed/simple; bh=QgfXPfEJ1ko6gJfEVqi+dqAvLBbkYxXvmPhxmO6U4cs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lJMe4XoK9YRgYzgkmTZH50oWVz8chWTYatzp0ngsDCSPoWBeuaxJlLZSPqAchJG4Ftqyuy+MEpktmDP9Qn9JsbgoigZ+gqkNLH3HsSPCr7Q4wte5fKbaSu1Hbk7/4RHegms5x841Wvh+hKxW9qsjpSw8KvCyOsPEnhlu8Cux+HY= 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=Fyn/i9ku; arc=none smtp.client-ip=209.85.210.178 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="Fyn/i9ku" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-74af4af04fdso3287708b3a.1; Mon, 30 Jun 2025 08:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751296422; x=1751901222; 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=zgTzel6BYyrjmaJOOevkqrQDDDC9SFFWPVaFYPAwVp0=; b=Fyn/i9ku1CCY2CtFZAKudA2cbseOmEE8hnJj+aAY3RI/ZctniZQLVGyy2n73lS3h6l FcdJlPUHQTZDoOYn5/phfQ0X3YRO5++JrY95DIGK7NjhuMDYAOBgo/HGmqbrp4CphnNp BsOCYYefJa4bjyZPASo+gUrfHoVOQX/Ugp1M2u8Ut6BE8DcNZky/lcNdIEcEYRKT2D5F ak+f7Z+xoz5gyNXy/+jDBeazv28w7tBnOAvGwJuMw4yNwMkIervvnMge8d8suHYyUy6m 3ogMkE5AE6f76Y9hK9t6e9v/38nsLLVzClnyIie6WMgVboB2nR0xYSVFij7gX6rMic9L HpPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751296422; x=1751901222; 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=zgTzel6BYyrjmaJOOevkqrQDDDC9SFFWPVaFYPAwVp0=; b=MYWTDyBAYA2cAbVxIDiLq/sG5M2/9UqbZ9jYVcb2Kl1gC/CMZtAnHYbihnUZ2XW05w 3EpxL0VxrFPyjblwwbGcZbsEXupvsDJcmcB3eE5nGvemie9ZBZoN1Nm2snZ1SP40w7V/ kBmbAjobjXe3TPkpoEiGufr9PQOmdEYlzpthlZh4DZ7vW6ufCMAtDyOmVtgCZlcdTKvg STONRFFF+GtWpND1DMqBbAn+pXfCPJBfqEXhHNhVYEgZgp6ZlX1MwVRW60Va201Swjn6 1ctGfHhAivfZQuNFLNLxIuhtKR+Doh7yrZGCDCdAEDvLsH/jJZ1bBcL4W99UowORgj8Y KKwg== X-Forwarded-Encrypted: i=1; AJvYcCUVwa2RBEvrZkCjYvasfYtxRjd5a54pr9X+hiRcsnGlQ/1WQxinJURl+3SlOvIu3U9d7ysWxUZpg6ehGiD6@vger.kernel.org, AJvYcCUlrCDpK17JaUdTXAnqkC/jRSN9vn/Wf98Cs3I9ByxOBnreUY+EZpqY47Uoa7D8JkPoAR9Fnz8V@vger.kernel.org, AJvYcCVGkzcFHHFHBvMmRQvW3wnJ7lQsz7ylFhemMFl2fUrML00IF78QzkQv44xjg6KQNtHrg08=@vger.kernel.org X-Gm-Message-State: AOJu0Yzp1XT8bOSw7boSAX9rJ/ON6FSPaHI9y9aYRvtaDBWg/cQUKBAG 7QJZ2MOCtAWUflN/YNUR8l8DxZBc9yyPbGrtM4gyCDb3pFJPbR0ObYyoJfFH7Q== X-Gm-Gg: ASbGnctJa2LOTe9jOEwsqhxFmGQV+KCQA8vI9qYdDxjj9SzrnZ9F9zgfbiL3GryKMwO vBK8HhCgNpmABNmyed+pUg4pSiBbi2O0xwZlwZC1PiAb4pCp+qUu5hqZQKx5E+wjwNhz9HzoEIt EJdbZ1KgPu1fl5p8NE8reRTSD6ykJPL/r/JpQYwkit1qFOhUJvD2OsGzdPSsFK/40jqAnXBS3u5 kNpRZfysvJXqOjmsu5M44tqZNDvQ1QP7DnnhyFtO6mdRgphc/UMfY4SCqfjO71ZZ2vCUZujODw4 WB2HvWrqTg7L7iayJYqRQU7oxsmT60ZidMS7Tx47G7ltAowZwBslD8OQ/9iQaOV7TVOAgR+/Bun 2 X-Google-Smtp-Source: AGHT+IEsch+5tINjufS1E+TUAD5+k5BuyuOB3ndZxmFnJHJrghU2JPMJl3gnOuaCh+K3vDh16HFMEA== X-Received: by 2002:a05:6a21:6e03:b0:21e:2b2c:8f4f with SMTP id adf61e73a8af0-2208d067850mr31572821637.7.1751296422446; Mon, 30 Jun 2025 08:13:42 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:2f51:de71:60e:eca9]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-b34e31bea17sm8323340a12.46.2025.06.30.08.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 08:13:42 -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 , Stanislav Fomichev , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh , stable@vger.kernel.org Subject: [PATCH net v3 1/2] virtio-net: xsk: rx: fix the frame's length check Date: Mon, 30 Jun 2025 22:13:14 +0700 Message-ID: <20250630151315.86722-2-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250630151315.86722-1-minhquangbui99@gmail.com> References: <20250630151315.86722-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. Cc: stable@vger.kernel.org Reviewed-by: Xuan Zhuo Fixes: a4e7ba702701 ("virtio_net: xsk: rx: support recv small mode") Signed-off-by: Bui Quang Minh --- 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 Wed Oct 8 08:19:18 2025 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (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 51AF828F933; Mon, 30 Jun 2025 15:13:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751296430; cv=none; b=ejlVdcf/EzAiTgbqcfNNY4QjknUN0qRqWhHQHifNrof4MFseOySa8SEzFbyruJYBPah1yoGZdpw31BNMCU+Jw6aSHUzPNj8rPp1S91pnUXYmv4OzAUMx/4NN/YR0hg3C/OqN1YgVDQGLkwVviDcaQBIBOF10GhorORomrDU+Tg0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751296430; c=relaxed/simple; bh=5mv+oGmYUQBg1ezZ8QQ1je1GKPmssv38hlgDpbVe09k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PXwI1IwCEH60WYScMXI489ZeVKkRCa2vFfhOS1WhfcmtM082Snie6tgmJWseLdZYdwaVc28+aDWWFi4pBoCGv9WUiRdIW3y2//icj+nhI1KST9KgB0KBx2Vmvb/Unvk6vg7Z3dGRodFm1omtCp/gsMhs2VxKJzQZG/SuiX1er14= 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=GjSQD0HL; arc=none smtp.client-ip=209.85.215.170 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="GjSQD0HL" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-b2fca9dc5f8so4379998a12.1; Mon, 30 Jun 2025 08:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751296428; x=1751901228; 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=pBu2Oaefb1JPmcr5RSg3Hzf1URtJFkgOjV7eKQ6deWg=; b=GjSQD0HLv6u5xa4kxo/1YwRh+bRYdWrLRydS5f5l4Z1Yd7NrDKGZmvtFMv347b2GQV 618tSDmfdf2q7xWJHgw5U5MD4kvQzFPnlQMFadOwoINfI/n2w/RxeKGRcHrtjQDK95tQ 8A3MiGAEUiyHaXmA7ornQlaW7mH8FrzEPWwia21NopyTZMz+qa5I1ziuZX/puMNVi1l1 US/AHT0XN6XkStpcNSzrj3MfktdGw7R11zn6srg79F2MSOXN8v8gN00tC4S+aU6lrqX8 QSyskTvow5CclUUVlKi6AlWmta3qTnoijch59NeIxxWQejT9rwBdD6nJSpJ2Dd6qMoLn vhKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751296428; x=1751901228; 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=pBu2Oaefb1JPmcr5RSg3Hzf1URtJFkgOjV7eKQ6deWg=; b=cNC4bAG22TFKeTWeYiW1K+QA8wzdNNpMEEBuLXyw8STEpOGLL48stKg1hkwotb9DFY rUiphuoOZdzRqcGyqHuGGjMdmk9piIm0xcikrxVL0uGiqDNlkJUmmZS6kDiXvVj/SJBK KpM1Ec6M9DOsjGumUvsecAIe59mDnyfOCnuuAfS6UfTncIPEDqqGtzuIhX9rZDsNruN5 KkDEnV6ghgQ/csQJmtta0iy348igteJ/HTX81czFC6guAyNYBSZfG0sF6a2wxQVCI3cT uE1iN/b/tOPolgg/CAmp7MUpo3Dxo91pYyweNHZqUuopHGWD15Mh7gojkPFvYBy7gc+F lJow== X-Forwarded-Encrypted: i=1; AJvYcCW+hsSVQjejxZ72oIus8dd0NGSTlFqilXblEQ2ZA09FuAnYfCC9beEscMtoSUGler+DdnOLVj7BI3RP7D2q@vger.kernel.org, AJvYcCXFAskeeJDaTVQGo56OJVicoA9mWqfyD/4DNi7CNK5/AVYTfRGWqkZQ+84lpI/vmE4JWdg=@vger.kernel.org X-Gm-Message-State: AOJu0Yztm7ETFcIthsNuGeufAv1qfceeTroA3FRl7YPrOmHRpXd864n1 w2fX9+BxftQKgWetdS71CUv3NvtRyAN3/bQRwr23Lu5t58T07197+S/Pmeu7FQ== X-Gm-Gg: ASbGnctXtvuabppnsMGfOD5SzPd0ME054cMTlG6aN0WucULbk/BHjg1Fw7h3L6UYX2L 2eWvTlttK/seHk9NIS7ysA03r5PArxs5RHVKRpbjFZmMpoNz5in2/r7LVuyLG400xsIearnc15y iG/aYDqHoX8weLSFBmCH/+y/+0YljKWEM5bfnWpt3/oX5b15LbuDiP5STBetGMf1lQ84ckkKvmE +jxCfifnxJJqbC2gwiH53HEn56k0uHj6SgcBMmxEd7x4840IyhIsUZ8p1KanzpQLetC46dk7oGg N1ALLzczPDQbUWLScY4VcK5e0fnq1Q+F4PSHM6V2A/Wp7GrlhwIME3RxSr5Ikec8aJvCUOVk6R+ 9 X-Google-Smtp-Source: AGHT+IFwWEbLrxuNpGb6xkKNMp0XC0hNjgZ5eIlHaLzs3SUtzwOhDuKMakpxMq7cSzD+BMZJOw3BQw== X-Received: by 2002:a05:6a21:393:b0:21f:39c9:2122 with SMTP id adf61e73a8af0-220a12a6789mr23026011637.2.1751296428201; Mon, 30 Jun 2025 08:13:48 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:2f51:de71:60e:eca9]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-b34e31bea17sm8323340a12.46.2025.06.30.08.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 08:13:47 -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 , Stanislav Fomichev , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH net v3 2/2] virtio-net: xsk: rx: move the xdp->data adjustment to buf_to_xdp() Date: Mon, 30 Jun 2025 22:13:15 +0700 Message-ID: <20250630151315.86722-3-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250630151315.86722-1-minhquangbui99@gmail.com> References: <20250630151315.86722-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 --- drivers/net/virtio_net.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 1eb237cd5d0b..58876d1e1344 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1159,7 +1159,14 @@ 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 { + xdp_prepare_buff(xdp, xdp->data_hard_start, + XDP_PACKET_HEADROOM - vi->hdr_len, len, 1); + xdp->flags =3D 0; + } + xsk_buff_dma_sync_for_cpu(xdp); =20 return xdp; @@ -1284,7 +1291,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