From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 EAB2734B192 for ; Wed, 5 Nov 2025 20:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762374000; cv=none; b=fSXWMrSUQD7oJaotlM0bfTblyM+voRg+u7Ncdj0s4Tq2YBSeJVHC7mwEHlRAqXaifKYSq9vwWRViWDpOYlv1W72YYwnixUNYLAJu6EVzt06o6zvbxqNn7OrFNrZwPIpx8iTEH1lUlkU2597Jn3cf+mYry1a9bDV0VMb2R/fhGs4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762374000; c=relaxed/simple; bh=1I+ZsuBg0UdnoIKEEzTbkQeFlzkeHVAGD2Ztup8Ifyg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NOQ+xUTFhfSYjb6b2zOCLyyvxtTZtmQ5oNmHjE+xZxZCMagftdFNg4Rd16296EDjmoRF6HgdwYwevs/64upt1E+joABIp3ZBi/cyj+PWSLqHaJDsl66BHg6rbpkO/VtSUEpQk8p62hjaLvFGF/HignI+C/seippkZD2S8Cn3Zfg= 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=UG7NYaft; arc=none smtp.client-ip=209.85.218.50 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="UG7NYaft" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-b472842981fso25617766b.1 for ; Wed, 05 Nov 2025 12:19:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1762373997; x=1762978797; 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=sB4CC5zvn+S4YI0MbjpF4L6Qba6coIxIhHj/jqUzm+s=; b=UG7NYaftEppXB0x8Mce0KCEX49wsd1W55Wtg3cIyAsKTJv17/Mrihd9+FU4OuYljhU LXRraLbccYougGlgX7nfjOwTxa47retKOfjYPOhWLAEz7OE/zsCKpgLUhZmsGoHzz9jR Yo2/6kMV1L0YAGAjUtRRT2lhcq3oCEhC9/VHuwS/zmv8a67f6s11Epm51wYNjoGZ25f6 rPNrwK/GDMOtk22UBY9ctp9eHbbTHSQYJvOFX0oahC0ZldOKwd1Yw699WC6dLG8D5gWX F1yNzFCDHapjyxcrT+nvNzRYjkmyxzUXj60naO6s1kN7OFXKutzv8HdaWncD7CmViwui zoVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762373997; x=1762978797; 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=sB4CC5zvn+S4YI0MbjpF4L6Qba6coIxIhHj/jqUzm+s=; b=MswdtGSZmJlAz2Dcu+9iUSs2F0SWNeTdCOfg5h/Yj5ydEsiE5wARJVJlArPcwyszVJ VLUywIq2MKEWCPQfUHm1NHgmHJ8Zxo+zXVFO5+kM+fx+PomwCsP+cn7RVFB+cnTqakk9 klWaMwjyqViLV3rUSj+P52fE6J4b/FgajYMl7y96gXNgF4f5jUIof4WgEvRhPIrp73O+ rED9i3Lovj5ipJobPPFHn24wtari8kXiYZTnlZnM6adb2dJkqDaCCq0fboPUHfshMF4p ax19/qKrTIJlOejzpW3YPqTwu0N7S7x3btsr4CEPCQG28cs+PVox8yfSYKG7x0uG8B1v ViBg== X-Forwarded-Encrypted: i=1; AJvYcCV2PYMZ/sNucEC5pE2H6a/5i1Ks2+92ZleE4b/YD0GJ07ca+OjVrUPPasvpPC84YEc9Anh4GWI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8aKJ2Q8eKvxowHV/o5nWGZgaaef2ljE/WI3dk28xWeMJcdr/i I2Ib9NrvB3uJPH3K6wQSUrjk1BmtfnJ2Xuy+/mwsVStbZNDwxcFUo5a1uI+XiOxkM0c= X-Gm-Gg: ASbGnctxx64ZPeK2flffKE/HwdSQ4aioDb0o5MivpVE0nx9MpI1+JJnZ4WpXmuBLF/r /dxxMFr5YWm5p55+9fYO4QWJed5+mBnKU7OnA1PDOcWWKDkeCqzEgXLIadbqyclWUmw9JRtNwAO aPdekGBIwpLvfNu48u9O/hwmGNvm/HamjW0BJsPbg+jbWXI2EaingiVssn+8zMRGnxv8QE+SxnE seVI0a09EVxTiuW0AulVlw59gCAg/d/AZJMjUhX7bFTOwK09Ux++xSNQWLaYsvFCJgFtKxIPD+E +ADagagPK+LYbFiKE4yyLSuIhSYw0KX3nENtUfV8SrxtsofIKKf4lvrlwyNI0PvJx+1ifccYrX9 44sH3NUTFlhARJfEQ5pYNEg9To6PKrJ5xAZ4O5MrniOWiSKw7MUITzmmJJdOltg21rNdB1LFZyc 1H192mH6jvu5QQY7YqlE8cvMciYJQDr9iRxgZ2ho3MB48GCA== X-Google-Smtp-Source: AGHT+IERuTRjpcS2Q2Bp2khXOxcPMKKMlVGFqCA4NZtr4Y5pJb9RY7AKeaB9zf9knEK+IeOzQTSgQw== X-Received: by 2002:a17:907:7e9b:b0:b72:5983:dafd with SMTP id a640c23a62f3a-b726529ed98mr432500766b.24.1762373997262; Wed, 05 Nov 2025 12:19:57 -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-b728937d305sm46188866b.24.2025.11.05.12.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 12:19:56 -0800 (PST) From: Jakub Sitnicki Date: Wed, 05 Nov 2025 21:19:42 +0100 Subject: [PATCH bpf-next v4 05/16] bpf: Make bpf_skb_vlan_pop helper metadata-safe 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-5-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 Use the metadata-aware helper to move packet bytes after skb_pull(), ensuring metadata remains valid after calling the BPF helper. Signed-off-by: Jakub Sitnicki --- include/linux/if_vlan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index afa5cc61a0fa..4ecc2509b0d4 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -738,9 +738,9 @@ static inline void vlan_remove_tag(struct sk_buff *skb, u16 *vlan_tci) *vlan_tci = ntohs(vhdr->h_vlan_TCI); - memmove(skb->data + VLAN_HLEN, skb->data, 2 * ETH_ALEN); vlan_set_encap_proto(skb, vhdr); __skb_pull(skb, VLAN_HLEN); + skb_postpull_data_move(skb, VLAN_HLEN, 2 * ETH_ALEN); } /** -- 2.43.0