nfp: bpf: don't offload XDP programs in DRV_MODE

DRV_MODE means that user space wants the program to be run in
the driver.  Do not try to offload.  Only offload if no mode
flags have been specified.

Remember what the mode is when the program is installed and refuse
new setup requests if there is already a program loaded in a
different mode.  This should leave it open for us to implement
simultaneous loading of two programs - one in the drv path and
another to the NIC later.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h
index 02fd8d4e253c6f76c61eb857a3f1081e8fcec5c2..7952fbfb94d6942e549b99eb43c074e1f723aaa3 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h
@@ -541,6 +541,7 @@ struct nfp_net_dp {
  * @rss_cfg:            RSS configuration
  * @rss_key:            RSS secret key
  * @rss_itbl:           RSS indirection table
+ * @xdp_flags:         Flags with which XDP prog was loaded
  * @max_r_vecs:                Number of allocated interrupt vectors for RX/TX
  * @max_tx_rings:       Maximum number of TX rings supported by the Firmware
  * @max_rx_rings:       Maximum number of RX rings supported by the Firmware
@@ -590,6 +591,8 @@ struct nfp_net {
        u8 rss_key[NFP_NET_CFG_RSS_KEY_SZ];
        u8 rss_itbl[NFP_NET_CFG_RSS_ITBL_SZ];
 
+       u32 xdp_flags;
+
        unsigned int max_tx_rings;
        unsigned int max_rx_rings;
 

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index f2188b9c36283d88fdc76670398dbe2989cb90b1..9563615cf4b7b036876f5f87915ccefec613a33f 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -3311,16 +3311,23 @@ nfp_net_xdp_setup_drv(struct nfp_net *nn, struct bpf_prog *prog,
 }
 
 static int
-nfp_net_xdp_setup(struct nfp_net *nn, struct bpf_prog *prog,
+nfp_net_xdp_setup(struct nfp_net *nn, struct bpf_prog *prog, u32 flags,
                  struct netlink_ext_ack *extack)
 {
+       struct bpf_prog *offload_prog;
        int err;
 
+       if (nn->dp.xdp_prog && (flags ^ nn->xdp_flags) & XDP_FLAGS_MODES)
+               return -EBUSY;
+
+       offload_prog = flags & XDP_FLAGS_DRV_MODE ? NULL : prog;
+
        err = nfp_net_xdp_setup_drv(nn, prog, extack);
        if (err)
                return err;
 
-       nfp_app_xdp_offload(nn->app, nn, nn->dp.xdp_prog);
+       nfp_app_xdp_offload(nn->app, nn, offload_prog);
+       nn->xdp_flags = flags;
 
        return 0;
 }
@@ -3331,7 +3338,8 @@ static int nfp_net_xdp(struct net_device *netdev, struct netdev_xdp *xdp)
 
        switch (xdp->command) {
        case XDP_SETUP_PROG:
-               return nfp_net_xdp_setup(nn, xdp->prog, xdp->extack);
+               return nfp_net_xdp_setup(nn, xdp->prog, xdp->flags,
+                                        xdp->extack);
        case XDP_QUERY_PROG:
                xdp->prog_attached = !!nn->dp.xdp_prog;
                xdp->prog_id = nn->dp.xdp_prog ? nn->dp.xdp_prog->aux->id : 0;