From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 A762C346A05 for ; Wed, 5 Nov 2025 20:19:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762373996; cv=none; b=W5+06ym4wdCR29b8IphmH6bsaTAD2uc0Zjlenf9P7/TbPTv6idXnYLWIQjHDm+g4X5OlCzN3cn4Yb8IX88CZDxf5MCJyPp7driud0t/rxuKyFpt6HdsMf0Q5nRvSObbJsS6VIxs0RInwQkysY0nCLjomCGbibxHmRtGMzVqY3Kw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762373996; c=relaxed/simple; bh=dg/CQiJ9SH+N8WLjJ8P6Yi5KMCvTXCf9lbKxGs0ohNA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qbl+CRHlysxbGoDavW2rAEBt5LvwdZSUqskTy7Jn4ndpz9c15h1SnJFykPMdJnU55Q49FaRPAUlSUWi9vJ7yrv4/YhdLT/5M1XNNi9RZ3BhHGCixuQ18WjyuMOc4zURkFzvhFpHnm3CiGVDVPAkS+LfGwihBuZv99Un8oje8sss= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=av/s3W2l; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="av/s3W2l" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-b5a8184144dso29056866b.1 for ; Wed, 05 Nov 2025 12:19:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1762373993; x=1762978793; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mXk2q4ALXb4iHS81FjGOoDSTFyJQhG/HclBi/7HNWrs=; b=av/s3W2lai5KCsmj0nk5HAD6uvDH4kYVcxNrwxXFDhAlvAoH8tk3QB3XIURiKn/2k7 cljyQ5fn1FW2DVAvs0maKCoz9pCzIvTYN6Xbequ13AkQgF/gmH0UXL/KrnK/84hOPo0E GCeR6f/XVIdUhwxjbkO4etVGRHW4td5ZJ+SanxRIG4BsMgIsLuZcpj0EsJCkh1l2wgDg 1TUL3elV32saRRZNzU+ujWhz3cNN1EvpMie5Ta43tP71NYrPiDN1tTBJIVCsVH6xsrAJ TGyqYRQOoZT89nSKpR6wI5K/nmlY24lDrf+/2DdZwie7FmoD3v0875+UgW4O1RNBCFXA aifw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762373993; x=1762978793; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mXk2q4ALXb4iHS81FjGOoDSTFyJQhG/HclBi/7HNWrs=; b=BJtaJC1D/nUGspw1ny7ETll7SBCRHc0HTP/ODVQu2v3j8GYOnufTD7Uw5H5JyfwJ90 yDG6ETmi4ahAScR83JwlgB2psGquM23BJDS5gZ2kNPiM0P4MxgsxcsAzJt+Z7CDhmMiG NKK6m2Bx7b7v5uAIT1RdjBx0m4MrRb4ugDxhRpP30f3t/5shIqR4b4qbG5OtgMya5IsM Szpj1oaZoD1ZX5iyDNjFIr3U8z8eDv5b9gq9eNFkOcZj+Kl0eOvA6DR/F/nMG27vHd/r 8LRcBi7SdX5Pizh0YlgtPnFePKcCDnPXf1V+zvrfcyZf82NjEI1Az4DX+EP/v1rCreD3 o2Vg== X-Forwarded-Encrypted: i=1; AJvYcCXjeJI7q0PR2IiPM+isLQuJJWnvPNGeJ20lXOPonP7rZPuNNs8GDXEQx+JfYQb1EvKAl3Dv+/I=@vger.kernel.org X-Gm-Message-State: AOJu0YyLXqJ19oHDkuNfeNMaJcOVFxdvcOAilfkvQKOD02Y2eDCu8XFF jL0T2fRNqJaJPrXnwSi8akZXWcWhnIKMpzmaysxha1vjn0Dd20VPC320Nnne5TIUzRw= X-Gm-Gg: ASbGncvdrvIPLkx/n3AUKQuVQY6xoh+2IjnsRlEVUK9fvg9mwKH99kTyi/ujtUDa2An 0ZRc4lZ9dp/lbAnrZIhQQ6+ueL3d0XOFIxBKljeQ7xi+NGEI8X5insvdSw0Z7bvSRrGknTtyLRS gP8HAM9WaivYFl25LVcPMPUiN1sxuDcbmAKws+wuTMuawXNvTMTKwOwIZezzKLEkcpmVZx6VCFO 7OFRol6NkQAqf/ZRhjyp1OyKnBAq3Evs5SKwh+amozymBze7GvSn8/V7ialNxl3gwFhlbUboYyQ i8DA5fqqUqLyjBO2ruC9ghds7swPtDD1fF17jwbtI9+EknZYvOSWnS/TkZRbF++kAyhxkC2llZH nFyQNh/JO85x2Ioan+R9RWC7XcQsUqaMFaRFYVSOo+bNZWj+Xy4txtUSY/uZJ8S/bKKe8L0T30P zjfsOaqAyBp2kcQoydDkZgtPysVogfga4Dxq/eRrJ/SWPXWg== X-Google-Smtp-Source: AGHT+IF98gJttNQSkeuSC8loLs07d8+EuCjbsLOat4XOe7ckgVYMOtJqTDfgihKYv1Ij57z/OYHrNw== X-Received: by 2002:a17:906:dc8a:b0:b2d:830a:8c0a with SMTP id a640c23a62f3a-b72654ce7e4mr428738666b.35.1762373992959; Wed, 05 Nov 2025 12:19:52 -0800 (PST) Received: from cloudflare.com (79.184.211.13.ipv4.supernova.orange.pl. [79.184.211.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b728968252bsm47667566b.61.2025.11.05.12.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 12:19:52 -0800 (PST) From: Jakub Sitnicki Date: Wed, 05 Nov 2025 21:19:39 +0100 Subject: [PATCH bpf-next v4 02/16] net: Preserve metadata on pskb_expand_head Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251105-skb-meta-rx-path-v4-2-5ceb08a9b37b@cloudflare.com> References: <20251105-skb-meta-rx-path-v4-0-5ceb08a9b37b@cloudflare.com> In-Reply-To: <20251105-skb-meta-rx-path-v4-0-5ceb08a9b37b@cloudflare.com> To: bpf@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Martin KaFai Lau , Daniel Borkmann , John Fastabend , Stanislav Fomichev , Alexei Starovoitov , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Hao Luo , Jiri Olsa , Arthur Fabre , Jesper Dangaard Brouer , netdev@vger.kernel.org, kernel-team@cloudflare.com X-Mailer: b4 0.15-dev-07fe9 pskb_expand_head() copies headroom, including skb metadata, into the newly allocated head, but then clears the metadata. As a result, metadata is lost when BPF helpers trigger an skb head reallocation. Let the skb metadata remain in the newly created copy of head. Signed-off-by: Jakub Sitnicki --- net/core/skbuff.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 6be01454f262..b4fa9aa2df22 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2218,6 +2218,10 @@ EXPORT_SYMBOL(__pskb_copy_fclone); * * All the pointers pointing into skb header may change and must be * reloaded after call to this function. + * + * Note: If you skb_push() the start of the buffer after reallocating the + * header, call skb_postpush_data_move() first to move the metadata out of + * the way before writing to &sk_buff->data. */ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail, @@ -2289,8 +2293,6 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail, skb->nohdr = 0; atomic_set(&skb_shinfo(skb)->dataref, 1); - skb_metadata_clear(skb); - /* It is not generally safe to change skb->truesize. * For the moment, we really care of rx path, or * when skb is orphaned (not attached to a socket). -- 2.43.0