From nobody Wed Oct 8 10:02:27 2025 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 9F15B28C868; Mon, 30 Jun 2025 14:43:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751294585; cv=none; b=D3wwmdacUwSSFsfnnwlghDnowiI5aTxs8SOpTyiFnJlKtIe+hEZzV30kwkZwwh5oatuMwY7a0JaAKG5QFuv7omZ7dOnafLaZKm1xJ2TCF9NFkG39dy//Phl6dyBAQmNjQaFpzqGKdv/E4rVSoKMkMWAU6T/X6c8i3JQxiKICcYc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751294585; c=relaxed/simple; bh=aJBZLRK2AtKTR7exY7C4jH9FsFz8pTE7CY5s0ADk6xI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dgyggPLmCgZxaK84EGD1Ld3Uro8bun3DozZNN9x6MOCpucBrlmEFI9CsSPynLZMYBA2Fs1JDldqjQh+oekbq3NmONFqFsNmTZKPkZB6n54mXNvOJdAUi7KxXW+5VBnq+nn0quJSej2aGdgD4hx1jnTM/w/cxeQIfRZoJ+emU9XE= 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=k3wsnbxQ; arc=none smtp.client-ip=209.85.216.47 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="k3wsnbxQ" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-313a188174fso4480921a91.1; Mon, 30 Jun 2025 07:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751294582; x=1751899382; 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=n69gDXxPGfgIU+wPEIeigImTRma77DzYZ7Ve67R5PNg=; b=k3wsnbxQhfH147uPEQ4IpjPytY2Twf66KS3rigfbaodTHKorJ5J55DPj0e+ekgQt+A K7WPClQBMuafpx0PxNHFHGxFT+HmYyhDE5Qd8893VGsDhJKYLNULIWDcNBTAnOndyBSj 9g6g8YMFUYs7Nz98FcYW0CdwMFQeGGzPmpQiwfCNk6ZWb9gSd9dIiBVKdzPckHX6a9dT Bxdk7eG+fI9CznJaY0m1NhLUaMeXSW/SThgipnNo9mphh/92Mva/E10ln7d3Zc+Xoo95 zGrVuZPLrr3JPNJDaPW+T1YIngr+DxxwcBPufQp5f9jbggqT9fPOsJ3lGeBTTmIj+mCC i9UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751294582; x=1751899382; 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=n69gDXxPGfgIU+wPEIeigImTRma77DzYZ7Ve67R5PNg=; b=o41L/BiUteQueazmlXqUlPoAoKZ6hgg45OJtMa/irf+9g6D7r5PZL3ZGtr3Oi8Yh+0 oPQn7Wexj1xv8O03x1T1pdohCqTwVlgUE3ikzHlsU3l98lxNeg3aJozBl4jL6e5kJ3+F IbqzODWCP8Jm09+Iz1faGvzvgir4+AfZOljfB6z7/ZDAU6DQlUP23x85ttjO96+LlX5f YwGcImDDtnVkBTD99549qqwMUkBPpnQtFLXyxkdJI/KLzXUm+9m63T1obpnsaHi0oKqv jRaCB7KpcV+SV8oDsltzqCVPx0WNuaYPlb8v5BVhMqiNaZ5mYASxHL2GgOjyB6u8oxsS aIFg== X-Forwarded-Encrypted: i=1; AJvYcCUMgmlUee0G+nmk51qaudyim6FoDHNPT75t8m3uZ9UTLxdOPu5XAt2d9l8qfaE7vj+Ai3Y=@vger.kernel.org, AJvYcCVHWkbGr8p6wl5Ut8CXMXDUXx2/1Ajft23PYcV9Hdcm97qBiUnrzS6PFM2VJd0YwGkaTUixQ/IT2TMHvkDr@vger.kernel.org X-Gm-Message-State: AOJu0YxGHXdJj4IshmJ9Ri2AXqNVwGBha8uxG+t0ksRlSHRYajeEmC3j T2yjAd1iKyzY4A+sQ5PTf4wtME3VrZ5M1OAwTaGsurwUQuekfd9ObOm8tTe/8Q== X-Gm-Gg: ASbGncuK53lCazCxAo6wrS7Zb5xEzK7Nb4GG2XuyZutKgcfIs1MjAH7fsd+KSlTCl4P syrW0k/2JbcjWyfSRpeyb0cdZWLJi64nwNBKH/H5qvt0wTt7wFgPIMaQ6SO2cHDWdSw6oj2zGiv yPOwcLpRYGhUy/JDKRWiiyvww1L7w0d4w2kec6+Ts4Evp25R3mvQTwn+T1c4oBHo2o9RUECif5O opuwxBaRpnWSqmhBoVzOah6W6tbRObN4cVgve6D08AWtz3x838lymikNczs00AsBceBdbjp/CHE yh97N+C2+4p7GQwqzyk920VmWHL3bQFU/4zdoK9DkJhRTdS5s8ZbRtIjUP7c1J5ted2vzcwX1hv V X-Google-Smtp-Source: AGHT+IEBKjYr3kuohCQjY0CglzvBmQzIq01EIwspNpePjbfFFbP1AgODBoDwnck1jrdGsXqUo51EbA== X-Received: by 2002:a17:90b:1b0c:b0:30e:3737:7c87 with SMTP id 98e67ed59e1d1-318c91117a0mr17987244a91.5.1751294582368; Mon, 30 Jun 2025 07:43:02 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:2f51:de71:60e:eca9]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-318c13a270csm9170017a91.16.2025.06.30.07.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jun 2025 07:43:01 -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 v2 3/3] virtio-net: use the check_mergeable_len helper Date: Mon, 30 Jun 2025 21:42:12 +0700 Message-ID: <20250630144212.48471-4-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250630144212.48471-1-minhquangbui99@gmail.com> References: <20250630144212.48471-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" Replace the current repeated code to check received length in mergeable mode with the new check_mergeable_len helper. Signed-off-by: Bui Quang Minh Acked-by: Jason Wang --- drivers/net/virtio_net.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 535a4534c27f..ecd3f46deb5d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2156,7 +2156,6 @@ static int virtnet_build_xdp_buff_mrg(struct net_devi= ce *dev, struct virtnet_rq_stats *stats) { struct virtio_net_hdr_mrg_rxbuf *hdr =3D buf; - unsigned int headroom, tailroom, room; struct skb_shared_info *shinfo; unsigned int xdp_frags_truesz =3D 0; unsigned int truesize; @@ -2202,20 +2201,14 @@ static int virtnet_build_xdp_buff_mrg(struct net_de= vice *dev, page =3D virt_to_head_page(buf); offset =3D buf - page_address(page); =20 - truesize =3D mergeable_ctx_to_truesize(ctx); - headroom =3D mergeable_ctx_to_headroom(ctx); - tailroom =3D headroom ? sizeof(struct skb_shared_info) : 0; - room =3D SKB_DATA_ALIGN(headroom + tailroom); - - xdp_frags_truesz +=3D truesize; - if (unlikely(len > truesize - room)) { + if (check_mergeable_len(dev, ctx, len)) { put_page(page); - pr_debug("%s: rx error: len %u exceeds truesize %lu\n", - dev->name, len, (unsigned long)(truesize - room)); - DEV_STATS_INC(dev, rx_length_errors); goto err; } =20 + truesize =3D mergeable_ctx_to_truesize(ctx); + xdp_frags_truesz +=3D truesize; + frag =3D &shinfo->frags[shinfo->nr_frags++]; skb_frag_fill_page_desc(frag, page, offset, len); if (page_is_pfmemalloc(page)) @@ -2429,18 +2422,12 @@ static struct sk_buff *receive_mergeable(struct net= _device *dev, struct sk_buff *head_skb, *curr_skb; unsigned int truesize =3D mergeable_ctx_to_truesize(ctx); unsigned int headroom =3D mergeable_ctx_to_headroom(ctx); - unsigned int tailroom =3D headroom ? sizeof(struct skb_shared_info) : 0; - unsigned int room =3D SKB_DATA_ALIGN(headroom + tailroom); =20 head_skb =3D NULL; u64_stats_add(&stats->bytes, len - vi->hdr_len); =20 - if (unlikely(len > truesize - room)) { - pr_debug("%s: rx error: len %u exceeds truesize %lu\n", - dev->name, len, (unsigned long)(truesize - room)); - DEV_STATS_INC(dev, rx_length_errors); + if (check_mergeable_len(dev, ctx, len)) goto err_skb; - } =20 if (unlikely(vi->xdp_enabled)) { struct bpf_prog *xdp_prog; @@ -2475,17 +2462,10 @@ static struct sk_buff *receive_mergeable(struct net= _device *dev, u64_stats_add(&stats->bytes, len); page =3D virt_to_head_page(buf); =20 - truesize =3D mergeable_ctx_to_truesize(ctx); - headroom =3D mergeable_ctx_to_headroom(ctx); - tailroom =3D headroom ? sizeof(struct skb_shared_info) : 0; - room =3D SKB_DATA_ALIGN(headroom + tailroom); - if (unlikely(len > truesize - room)) { - pr_debug("%s: rx error: len %u exceeds truesize %lu\n", - dev->name, len, (unsigned long)(truesize - room)); - DEV_STATS_INC(dev, rx_length_errors); + if (check_mergeable_len(dev, ctx, len)) goto err_skb; - } =20 + truesize =3D mergeable_ctx_to_truesize(ctx); curr_skb =3D virtnet_skb_append_frag(head_skb, curr_skb, page, buf, len, truesize); if (!curr_skb) --=20 2.43.0