From nobody Sat Feb 7 10:09:38 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 7803815C156 for ; Wed, 21 Aug 2024 04:56:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724216193; cv=none; b=F8oIUPNpAJVtoltlbOvDIcy7LeygXVA8Dnxth0jCfVOSVxKl0q0Fq3L4d7E3mS52PNYN1kPe7VPuUc6Ab8ztvMwgNnnCrAT01VM98cmK5zcr46FsOpDQYVurqbfHgpXpYK5CWEXp2hiAGMWDV1XB3ZWJC7UMyDa946mo6eqsgSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724216193; c=relaxed/simple; bh=s5P37GIKG3G2oO0kyQUYXjGllNocGKKr7kNww5rDLSc=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=RI1bsvTUdEVjFhTfd33AxzgiXBx+dnBNQUnftbmx+oJNLqOHVAqSp+ANCQ2N0ycV3z8XJsuiqb/bt9clMObvSdGihNt8/DWPyE9gKN4VPOrRCkEMnDojP3V5HSn8zk9ndaCMolBG0XrCoUS6StlmfAg6K7uP/qloNvwu241aKd4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=0V7Dwul5; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="0V7Dwul5" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-70d1df50db2so412188b3a.0 for ; Tue, 20 Aug 2024 21:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1724216192; x=1724820992; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=n8H8zZJTSLIZA5Kni0eGxHGJpUzBApQQ4vV/yayZ8VI=; b=0V7Dwul5eeaZ8FDpKPnpM4Nt8TFN0CALvHABPBFno5Ob+uHsC8gWiIDrJcXH6+52ix bJTyulhHgDoAsG+TM1CGl9b9GLLl6/lUQa2BqslI2/g+u6GSI6BIcAMCRCsc6mNwbsbB D5mLZ23YkrvvnsG/2QVLDXNPgN/RbukUgDxrEmUWqAbQb2UWQY+5FdaBbiYOWc+cVwpN QNAnjDn4aGdW0Gr3jw+fsS5OhYK5MHf3lmmoBrLvL0sW7gpGsM7zDjzdoxsLb5++sbsd WOiQNEiKXa5K9lelNQWU9C0dS3AS6gw/9aKXUB+eGpwHFICuRZu2ad7JRbRWvrp4BfqJ VLpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724216192; x=1724820992; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=n8H8zZJTSLIZA5Kni0eGxHGJpUzBApQQ4vV/yayZ8VI=; b=EWeXTGXIpZWDLQDCwTxeRo9eP0FmYQvgCm/FVanB5qD7XcAwODZ3WqGwqrf+qow8sH RU8KMgUSPanKclGtsdZdKN5zcTHWxZB1KxriC9mPg0fTH+AC6IxFvUzDUG8WBNX2ZBBH 7NpVXDwb7yZi/LqW8LceUpJYJYujqrnWYxP7csiz1h5hfk+xtSEicG5Xq47SJcKIj+/X ZpTvuzdIGqXqiuXFzvWvcMXf3nv0fxNReA5VAV7QZaV2YbF+wh8tvheMi0zuOnIm5zx0 HSkj77dRLQUvlhmf6FsXp3ve7fAXv3kceS2sQXutIaDu33cBswhBz9PqrgiBj08OYUgm kbOA== X-Forwarded-Encrypted: i=1; AJvYcCUTLLB3Y77zG+ulspvU+ZDv/2iwgFU7MWgMAJSAWaoMwmw/uhGRdW7UY344Y2WzOCWVYzozkSUIGGPRnHk=@vger.kernel.org X-Gm-Message-State: AOJu0YyAXuJFxnTPjEcL4E02Aw25xjWlnRJb42OSXr4unoX5nf9kU1By MBCjEf0THsFYh34XRN0a0Md/RM7htVtZ2MoLdMB/fmAOV5rA3uXn6KZKCdMrL4F7MtbH3QqGVmm k/jtxUOSKFZcHl6Bh/RXpFQ== X-Google-Smtp-Source: AGHT+IFh2y500D6uKb4c3MFUUFmM4E7777mmV19vX5QgPa3qn+uNgh1Vax2bsLm5Q0SW4nQDq3/gqZfFU3Z5EFbNvQ== X-Received: from almasrymina.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:4bc5]) (user=almasrymina job=sendgmr) by 2002:a05:6a00:6f48:b0:714:1fad:bd2d with SMTP id d2e1a72fcca58-71423f10777mr22515b3a.3.1724216191415; Tue, 20 Aug 2024 21:56:31 -0700 (PDT) Date: Wed, 21 Aug 2024 04:56:29 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.46.0.184.g6999bdac58-goog Message-ID: <20240821045629.2856641-1-almasrymina@google.com> Subject: [PATCH net-next v21] net: refactor ->ndo_bpf calls into dev_xdp_propagate From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, bpf@vger.kernel.org Cc: Mina Almasry , Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , "=?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?=" , Magnus Karlsson , Maciej Fijalkowski , Jonathan Lemon , Jesper Dangaard Brouer Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When net devices propagate xdp configurations to slave devices, or when core propagates xdp configuration to a device, we will need to perform a memory provider check to ensure we're not binding xdp to a device using unreadable netmem. Currently ->ndo_bpf calls are all over the place. Adding checks to all these places would not be ideal. Refactor all the ->ndo_bpf calls into one place where we can add this check in the future. Suggested-by: Jakub Kicinski Signed-off-by: Mina Almasry --- drivers/net/bonding/bond_main.c | 8 ++++---- drivers/net/hyperv/netvsc_bpf.c | 2 +- include/linux/netdevice.h | 1 + kernel/bpf/offload.c | 2 +- net/core/dev.c | 9 +++++++++ net/xdp/xsk_buff_pool.c | 4 ++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_mai= n.c index f9633a6f8571..73f9416c6c1b 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2258,7 +2258,7 @@ int bond_enslave(struct net_device *bond_dev, struct = net_device *slave_dev, goto err_sysfs_del; } =20 - res =3D slave_dev->netdev_ops->ndo_bpf(slave_dev, &xdp); + res =3D dev_xdp_propagate(slave_dev, &xdp); if (res < 0) { /* ndo_bpf() sets extack error message */ slave_dbg(bond_dev, slave_dev, "Error %d calling ndo_bpf\n", res); @@ -2394,7 +2394,7 @@ static int __bond_release_one(struct net_device *bond= _dev, .prog =3D NULL, .extack =3D NULL, }; - if (slave_dev->netdev_ops->ndo_bpf(slave_dev, &xdp)) + if (dev_xdp_propagate(slave_dev, &xdp)) slave_warn(bond_dev, slave_dev, "failed to unload XDP program\n"); } =20 @@ -5584,7 +5584,7 @@ static int bond_xdp_set(struct net_device *dev, struc= t bpf_prog *prog, goto err; } =20 - err =3D slave_dev->netdev_ops->ndo_bpf(slave_dev, &xdp); + err =3D dev_xdp_propagate(slave_dev, &xdp); if (err < 0) { /* ndo_bpf() sets extack error message */ slave_err(dev, slave_dev, "Error %d calling ndo_bpf\n", err); @@ -5616,7 +5616,7 @@ static int bond_xdp_set(struct net_device *dev, struc= t bpf_prog *prog, if (slave =3D=3D rollback_slave) break; =20 - err_unwind =3D slave_dev->netdev_ops->ndo_bpf(slave_dev, &xdp); + err_unwind =3D dev_xdp_propagate(slave_dev, &xdp); if (err_unwind < 0) slave_err(dev, slave_dev, "Error %d when unwinding XDP program change\n", err_unwind); diff --git a/drivers/net/hyperv/netvsc_bpf.c b/drivers/net/hyperv/netvsc_bp= f.c index 4a9522689fa4..e01c5997a551 100644 --- a/drivers/net/hyperv/netvsc_bpf.c +++ b/drivers/net/hyperv/netvsc_bpf.c @@ -183,7 +183,7 @@ int netvsc_vf_setxdp(struct net_device *vf_netdev, stru= ct bpf_prog *prog) xdp.command =3D XDP_SETUP_PROG; xdp.prog =3D prog; =20 - ret =3D vf_netdev->netdev_ops->ndo_bpf(vf_netdev, &xdp); + ret =3D dev_xdp_propagate(vf_netdev, &xdp); =20 if (ret && prog) bpf_prog_put(prog); diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0ef3eaa23f4b..a4f876767423 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3918,6 +3918,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *s= kb, struct net_device *dev, =20 int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog); u8 dev_xdp_prog_count(struct net_device *dev); +int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf); u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode); =20 int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb); diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 1a4fec330eaa..a5b06bd5fe9b 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -130,7 +130,7 @@ static int bpf_map_offload_ndo(struct bpf_offloaded_map= *offmap, /* Caller must make sure netdev is valid */ netdev =3D offmap->netdev; =20 - return netdev->netdev_ops->ndo_bpf(netdev, &data); + return dev_xdp_propagate(netdev, &data); } =20 static void __bpf_map_offload_destroy(struct bpf_offloaded_map *offmap) diff --git a/net/core/dev.c b/net/core/dev.c index e7260889d4cb..165e9778d422 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -9369,6 +9369,15 @@ u8 dev_xdp_prog_count(struct net_device *dev) } EXPORT_SYMBOL_GPL(dev_xdp_prog_count); =20 +int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf) +{ + if (!dev->netdev_ops->ndo_bpf) + return -EOPNOTSUPP; + + return dev->netdev_ops->ndo_bpf(dev, bpf); +} +EXPORT_SYMBOL_GPL(dev_xdp_propagate); + u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode) { struct bpf_prog *prog =3D dev_xdp_prog(dev, mode); diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index c0e0204b9630..f44d68c8d75d 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -149,7 +149,7 @@ static void xp_disable_drv_zc(struct xsk_buff_pool *poo= l) bpf.xsk.pool =3D NULL; bpf.xsk.queue_id =3D pool->queue_id; =20 - err =3D pool->netdev->netdev_ops->ndo_bpf(pool->netdev, &bpf); + err =3D dev_xdp_propagate(pool->netdev, &bpf); =20 if (err) WARN(1, "Failed to disable zero-copy!\n"); @@ -215,7 +215,7 @@ int xp_assign_dev(struct xsk_buff_pool *pool, bpf.xsk.pool =3D pool; bpf.xsk.queue_id =3D queue_id; =20 - err =3D netdev->netdev_ops->ndo_bpf(netdev, &bpf); + err =3D dev_xdp_propagate(netdev, &bpf); if (err) goto err_unreg_pool; =20 --=20 2.46.0.184.g6999bdac58-goog