Re: [RFC net-next 6/8] nfp: bpf: add support for XDP_FLAGS_HW_MODE
flat view
From: Daniel Borkmann <daniel@iogearbox.net>
Date: 2017-06-19 23:50:23
On 06/17/2017 01:57 AM, Jakub Kicinski wrote:
quoted hunk ↗ jump to hunk
Respect the XDP_FLAGS_HW_MODE. When it's set install the program on the NIC and skip enabling XDP in the driver. Signed-off-by: Jakub Kicinski <redacted> --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 68648e312129..c5903b6e58c5 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c@@ -3310,19 +3310,22 @@ static int nfp_net_xdp_setup(struct nfp_net *nn, struct bpf_prog *prog, u32 flags, struct netlink_ext_ack *extack) { - struct bpf_prog *offload_prog; + struct bpf_prog *drv_prog, *offload_prog; int err; if (nn->xdp_prog && (flags ^ nn->xdp_flags) & XDP_FLAGS_MODES) return -EBUSY; + drv_prog = flags & XDP_FLAGS_HW_MODE ? NULL : prog; offload_prog = flags & XDP_FLAGS_DRV_MODE ? NULL : prog;
Can you make this assumption here? If dev_change_xdp_fd() is called without XDP_FLAGS_HW_MODE or XDP_FLAGS_DRV_MODE flags, then we set prog to both, drv_prog and offload_prog. Is this expected? Maybe in nfp_net_xdp_setup() check for !hweight32(xdp_flags & XDP_FLAGS_MODES) and then set flags |= XDP_FLAGS_DRV_MODE before both assignments?
quoted hunk ↗ jump to hunk
- err = nfp_net_xdp_setup_drv(nn, prog, extack); + err = nfp_net_xdp_setup_drv(nn, drv_prog, extack); if (err) return err; - nfp_app_xdp_offload(nn->app, nn, offload_prog); + err = nfp_app_xdp_offload(nn->app, nn, offload_prog); + if (err && flags & XDP_FLAGS_HW_MODE) + return err; if (nn->xdp_prog) bpf_prog_put(nn->xdp_prog);@@ -3338,6 +3341,7 @@ static int nfp_net_xdp(struct net_device *netdev, struct netdev_xdp *xdp) switch (xdp->command) { case XDP_SETUP_PROG: + case XDP_SETUP_PROG_HW: return nfp_net_xdp_setup(nn, xdp->prog, xdp->flags, xdp->extack); case XDP_QUERY_PROG: