Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee15f7cd authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

Merge branch 'bpf-xdp-driver-and-hw' 



Jakub Kicinski says:

====================
This set is adding support for loading driver and offload XDP
at the same time.  This enables advanced use cases where some
of the work is offloaded to the NIC and some is done by the host.
Separate netlink attributes are added for each mode of operation.
Driver callbacks for offload are cleaned up a little, including
removal of .prog_attached flag.
====================

Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parents 9c48b1d1 5f428401

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ int bnxt_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
		rc = bnxt_xdp_set(bp, xdp->prog);

		break;

	case XDP_QUERY_PROG:

		xdp->prog_attached = !!bp->xdp_prog;

		xdp->prog_id = bp->xdp_prog ? bp->xdp_prog->aux->id : 0;

		rc = 0;

		break;

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1848,7 +1848,6 @@ static int nicvf_xdp(struct net_device *netdev, struct netdev_bpf *xdp) 
	case XDP_SETUP_PROG:

		return nicvf_xdp_setup(nic, xdp->prog);

	case XDP_QUERY_PROG:

		xdp->prog_attached = !!nic->xdp_prog;

		xdp->prog_id = nic->xdp_prog ? nic->xdp_prog->aux->id : 0;

		return 0;

	default:

drivers/net/ethernet/intel/i40e/i40e_main.c

+0 −1
Original line number Diff line number Diff line
@@ -11841,7 +11841,6 @@ static int i40e_xdp(struct net_device *dev, 
	case XDP_SETUP_PROG:

		return i40e_xdp_setup(vsi, xdp->prog);

	case XDP_QUERY_PROG:

		xdp->prog_attached = i40e_enabled_xdp_vsi(vsi);

		xdp->prog_id = vsi->xdp_prog ? vsi->xdp_prog->aux->id : 0;

		return 0;

	default:

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+0 −1
Original line number Diff line number Diff line
@@ -9966,7 +9966,6 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
	case XDP_SETUP_PROG:

		return ixgbe_xdp_setup(dev, xdp->prog);

	case XDP_QUERY_PROG:

		xdp->prog_attached = !!(adapter->xdp_prog);

		xdp->prog_id = adapter->xdp_prog ?

			adapter->xdp_prog->aux->id : 0;

		return 0;

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+0 −1
Original line number Diff line number Diff line
@@ -4462,7 +4462,6 @@ static int ixgbevf_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
	case XDP_SETUP_PROG:

		return ixgbevf_xdp_setup(dev, xdp->prog);

	case XDP_QUERY_PROG:

		xdp->prog_attached = !!(adapter->xdp_prog);

		xdp->prog_id = adapter->xdp_prog ?

			       adapter->xdp_prog->aux->id : 0;

		return 0;