Commit e8407fde authored Jul 21, 2020 by Andrii Nakryiko Committed by Alexei Starovoitov Jul 25, 2020

bpf, xdp: Remove XDP_QUERY_PROG and XDP_QUERY_PROG_HW XDP commands



Now that BPF program/link management is centralized in generic net_device
code, kernel code never queries program id from drivers, so
XDP_QUERY_PROG/XDP_QUERY_PROG_HW commands are unnecessary.

This patch removes all the implementations of those commands in kernel, along
the xdp_attachment_query().

This patch was compile-tested on allyesconfig.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200722064603.3350758-10-andriin@fb.com

parent fe48230c

drivers/net/ethernet/amazon/ena/ena_netdev.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -576,15 +576,9 @@ static int ena_xdp_set(struct net_device netdev, struct netdev_bpf bpf)
		*/
		static int ena_xdp(struct net_device netdev, struct netdev_bpf bpf)
		{
		struct ena_adapter *adapter = netdev_priv(netdev);

		switch (bpf->command) {
		case XDP_SETUP_PROG:
		return ena_xdp_set(netdev, bpf);
		case XDP_QUERY_PROG:
		bpf->prog_id = adapter->xdp_bpf_prog ?
		adapter->xdp_bpf_prog->aux->id : 0;
		break;
		default:
		return -EINVAL;
		}

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -330,10 +330,6 @@ int bnxt_xdp(struct net_device dev, struct netdev_bpf xdp)
		case XDP_SETUP_PROG:
		rc = bnxt_xdp_set(bp, xdp->prog);
		break;
		case XDP_QUERY_PROG:
		xdp->prog_id = bp->xdp_prog ? bp->xdp_prog->aux->id : 0;
		rc = 0;
		break;
		default:
		rc = -EINVAL;
		break;

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -1906,9 +1906,6 @@ static int nicvf_xdp(struct net_device netdev, struct netdev_bpf xdp)
		switch (xdp->command) {
		case XDP_SETUP_PROG:
		return nicvf_xdp_setup(nic, xdp->prog);
		case XDP_QUERY_PROG:
		xdp->prog_id = nic->xdp_prog ? nic->xdp_prog->aux->id : 0;
		return 0;
		default:
		return -EINVAL;
		}

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -2077,14 +2077,9 @@ static int setup_xdp(struct net_device dev, struct bpf_prog prog)

		static int dpaa2_eth_xdp(struct net_device dev, struct netdev_bpf xdp)
		{
		struct dpaa2_eth_priv *priv = netdev_priv(dev);

		switch (xdp->command) {
		case XDP_SETUP_PROG:
		return setup_xdp(dev, xdp->prog);
		case XDP_QUERY_PROG:
		xdp->prog_id = priv->xdp_prog ? priv->xdp_prog->aux->id : 0;
		break;
		default:
		return -EINVAL;
		}

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -12923,9 +12923,6 @@ static int i40e_xdp(struct net_device *dev,
		switch (xdp->command) {
		case XDP_SETUP_PROG:
		return i40e_xdp_setup(vsi, xdp->prog);
		case XDP_QUERY_PROG:
		xdp->prog_id = vsi->xdp_prog ? vsi->xdp_prog->aux->id : 0;
		return 0;
		case XDP_SETUP_XSK_UMEM:
		return i40e_xsk_umem_setup(vsi, xdp->xsk.umem,
		xdp->xsk.queue_id);