From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 E876A347FEB for ; Wed, 5 Nov 2025 20:19:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762373997; cv=none; b=g/ABpSOy7kX5obsDHjs/BsxJkesOSCmgikAe8ceNX7fmRClitKDibVCq0nwWOZIyctTr2V4SunmzhcYX9ctch8BengUwThEH+PPtc4/FC4gVU7mczsL0loCm1KdFAvCrhayTrz4DwkUKm7Rx1UmCFdUgV6zUAbX/YKfUhYVC7OA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762373997; c=relaxed/simple; bh=gYN6oQsJeTreIpISV5I2QoWCby8ALWACx8QsEt2OAeY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e32E5JZ9OxkSsrH2vhBqEH7wnTGAUVTU6sbZWLZZRwtsR5F+oJL299VD2YzCaQQ1m3GdT/wT8TgiGmAb+SISDePBT+xMyvMu80naUizvVBUfaftLYx9rKbs5obK2QeXr9mJe8Jy/VnHcfSxlaVl/dYKCic4XnZsyJ5D9Vi8w0kk= 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=Zu6jXXKx; arc=none smtp.client-ip=209.85.218.53 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="Zu6jXXKx" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-b7155207964so33087066b.2 for ; Wed, 05 Nov 2025 12:19:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1762373994; x=1762978794; 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=QpMzoQFkKhE0WWczd/SmuvEvZhzMypHVeCaCFMbefns=; b=Zu6jXXKxijLr3+12R1eXZZlB+ypL2LsfGqYRIEeyENK7ggX7UELHd5fNoUnR1rHZn8 xDy6glGHzkFpksyoNt/wZreHbg8HeLu+JW//4zlK6x9nsgA1qZnSftDmGRQ8xEFxH+u8 YTSmvhCTaucd6iq0ivq9Q4cTmEqJ7RAftOMDlylF0f6aWpxP+akic8F5SVq+58amNTUH NmXn8DeZSROSvquGwuozHWAwdRWmqVweeNy0kFrC2vl6aLmU9xIz5llj/L/42E9UP0Hi VCR/qvUtcxGP5visZXhJh3+RpuffSWh5SPN4p4by3SY5S1iviydJYj8BJgaC8JL/V8WR LCqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762373994; x=1762978794; 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=QpMzoQFkKhE0WWczd/SmuvEvZhzMypHVeCaCFMbefns=; b=iEzroWHDOyWWP543eIAchqBM+h/1zQqoNXaSZ3Uv8A0u4tbVXQsiuPerAecX7DT11s 87Ctnt9HNt08YH6fMBG3uQXbQT5z0LIQY1RvGIxvitU0f2qm9ZlDgWn1xpDhR+hi68cj ktLSSmgsIN6Z/DGwP069IvFIlMIumNo6qMJhGih0Hh/3h8+s468ElTKPMbFon8UgdnYu 5RjMU/tfR1klm/EWE6fr2XCi8Y0gY3MWA7JCNP1cak/KVrNDmYVlja/DTLBntIAa+Bju +TFv0yvGYIMgd+57eglP0t0eL+NWTjYGxtu106rNjs7RybQn5pDz+I6qzQlDSBzyoexs A7vA== X-Forwarded-Encrypted: i=1; AJvYcCWjbOJd20djzBfuy5p1imgQu3VQ35CDB+awm4KBZ7ha5FN2ts58Nr+uF85yNlTxDPxwo82or+4=@vger.kernel.org X-Gm-Message-State: AOJu0YxveL+ZxX7cfdnqhoAdXLvR4ZU1FSh6woVYhlcmXF4Z/2sCh2+0 hXAMfCpwA4SEly7k1p9tWJNP9FhtlggG2WKQVFIRe0b71BdZPj2cyuJ0Ib2nhswFsIc= X-Gm-Gg: ASbGnctXrMs95u0TWrA712LmrSpxVyKu94mS0ty4A+bD+503hr/ZdQ8lF0WUCuW5na9 rJBF8QPpUniFDlbHWaYD8Gqv5vpXor5WE9fy9Zaz5IKWltBJsXRNZ+RPii0slERSPMF4rRXXzKG xAqvNeAyMBhfTGwF8xkNn2fd7oEE6MkF2+C5r+nvSBHevVRk5sIvBLChuT2wGzdkPh70Y5cyYOE WuNPRljz4yKKMvuwc3SUs9GNxoAQtmeBM/x4x3YW/qUpi1B5O5sqQNFO/P9RJHZjOmBeNemnPdE QzHcC16IpJrCtQ/DSn48N/9OqjITEsFWPwPzyjjMyZdnPDpP2tq7EWH377YcsVBczXj3RuuwZHH K3B4/ghJuZfMEVos26KVNZee0mz6QuToE4YqNEhxcTk7jA/uXnLHpQgrToPY9W7LSm41GcE35Il M1GVpfAUtaVkHtxUaAKnLXrXn3D8fQkctpzJCid2UgzN9dNHOMzzcI4pTr X-Google-Smtp-Source: AGHT+IFKOU8g6wpirWuWQMHW3413z9v+4YiUIqEJ5zj54J/vQUrGm04np4/erv/xPmOpbqCvy7gC5A== X-Received: by 2002:a17:907:7f0f:b0:b6d:7f68:7874 with SMTP id a640c23a62f3a-b726553b051mr444132766b.44.1762373994308; Wed, 05 Nov 2025 12:19:54 -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-b72896c93b6sm43126266b.69.2025.11.05.12.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 12:19:53 -0800 (PST) From: Jakub Sitnicki Date: Wed, 05 Nov 2025 21:19:40 +0100 Subject: [PATCH bpf-next v4 03/16] bpf: Unclone skb head on bpf_dynptr_write to skb metadata 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-3-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 Currently bpf_dynptr_from_skb_meta() marks the dynptr as read-only when the skb is cloned, preventing writes to metadata. Remove this restriction and unclone the skb head on bpf_dynptr_write() to metadata, now that the metadata is preserved during uncloning. This makes metadata dynptr consistent with skb dynptr, allowing writes regardless of whether the skb is cloned. Signed-off-by: Jakub Sitnicki --- include/linux/filter.h | 9 +++++++++ kernel/bpf/helpers.c | 6 ++---- net/core/filter.c | 18 ++++++++++++------ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/include/linux/filter.h b/include/linux/filter.h index f5c859b8131a..2ff4fc1c2386 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -1781,6 +1781,8 @@ int __bpf_xdp_store_bytes(struct xdp_buff *xdp, u32 offset, void *buf, u32 len); void *bpf_xdp_pointer(struct xdp_buff *xdp, u32 offset, u32 len); void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, void *buf, unsigned long len, bool flush); +int __bpf_skb_meta_store_bytes(struct sk_buff *skb, u32 offset, + const void *from, u32 len, u64 flags); void *bpf_skb_meta_pointer(struct sk_buff *skb, u32 offset); #else /* CONFIG_NET */ static inline int __bpf_skb_load_bytes(const struct sk_buff *skb, u32 offset, @@ -1817,6 +1819,13 @@ static inline void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, voi { } +static inline int __bpf_skb_meta_store_bytes(struct sk_buff *skb, u32 offset, + const void *from, u32 len, + u64 flags) +{ + return -EOPNOTSUPP; +} + static inline void *bpf_skb_meta_pointer(struct sk_buff *skb, u32 offset) { return ERR_PTR(-EOPNOTSUPP); diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 865b0dae38d1..050783245c0f 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -1890,10 +1890,8 @@ int __bpf_dynptr_write(const struct bpf_dynptr_kern *dst, u64 offset, void *src, return -EINVAL; return __bpf_xdp_store_bytes(dst->data, dst->offset + offset, src, len); case BPF_DYNPTR_TYPE_SKB_META: - if (flags) - return -EINVAL; - memmove(bpf_skb_meta_pointer(dst->data, dst->offset + offset), src, len); - return 0; + return __bpf_skb_meta_store_bytes(dst->data, dst->offset + offset, src, + len, flags); default: WARN_ONCE(true, "bpf_dynptr_write: unknown dynptr type %d\n", type); return -EFAULT; diff --git a/net/core/filter.c b/net/core/filter.c index 1efec0d70d78..96714eab9c91 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -12023,6 +12023,18 @@ void *bpf_skb_meta_pointer(struct sk_buff *skb, u32 offset) return skb_metadata_end(skb) - skb_metadata_len(skb) + offset; } +int __bpf_skb_meta_store_bytes(struct sk_buff *skb, u32 offset, + const void *from, u32 len, u64 flags) +{ + if (unlikely(flags)) + return -EINVAL; + if (unlikely(bpf_try_make_writable(skb, 0))) + return -EFAULT; + + memmove(bpf_skb_meta_pointer(skb, offset), from, len); + return 0; +} + __bpf_kfunc_start_defs(); __bpf_kfunc int bpf_dynptr_from_skb(struct __sk_buff *s, u64 flags, struct bpf_dynptr *ptr__uninit) @@ -12050,9 +12062,6 @@ __bpf_kfunc int bpf_dynptr_from_skb(struct __sk_buff *s, u64 flags, * XDP context with bpf_xdp_adjust_meta(). Serves as an alternative to * &__sk_buff->data_meta. * - * If passed @skb_ is a clone which shares the data with the original, the - * dynptr will be read-only. This limitation may be lifted in the future. - * * Return: * * %0 - dynptr ready to use * * %-EINVAL - invalid flags, dynptr set to null @@ -12070,9 +12079,6 @@ __bpf_kfunc int bpf_dynptr_from_skb_meta(struct __sk_buff *skb_, u64 flags, bpf_dynptr_init(ptr, skb, BPF_DYNPTR_TYPE_SKB_META, 0, skb_metadata_len(skb)); - if (skb_cloned(skb)) - bpf_dynptr_set_rdonly(ptr); - return 0; } -- 2.43.0