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

Commit 6e1a2882 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfp-TC-block-fixes-app-fallback-and-dev_alloc' 



Jakub Kicinski says:

====================
nfp: TC block fixes, app fallback and dev_alloc()

This series has three parts.  First of all John and I fix some
fallout from the TC block conversion.  John also fixes sleeping
in the neigh notifier.

Secondly I reorganise the nfp_app table to make it easier to
deal with excluding apps which have unmet Kconfig dependencies.

Last but not least after the fixes which went into -net some time
ago I refactor the page allocation, add a ethtool counter for
failed allocations and clean the ethtool stat code while at it.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cdc89c91 18f76191

drivers/net/ethernet/netronome/nfp/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ nfp-objs := \ 
	    nfp_net_sriov.o \

	    nfp_netvf_main.o \

	    nfp_port.o \

	    bpf/main.o \

	    bpf/offload.o \

	    nic/main.o



ifeq ($(CONFIG_NFP_APP_FLOWER),y)
@@ -44,6 +42,8 @@ endif 


ifeq ($(CONFIG_BPF_SYSCALL),y)

nfp-objs += \

	    bpf/main.o \

	    bpf/offload.o \

	    bpf/verifier.o \

	    bpf/jit.o

endif

drivers/net/ethernet/netronome/nfp/bpf/main.c

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type, 
		    cls_bpf->common.protocol != htons(ETH_P_ALL) ||

		    cls_bpf->common.chain_index)

			return -EOPNOTSUPP;

		if (nn->dp.bpf_offload_xdp)

			return -EBUSY;



		return nfp_net_bpf_offload(nn, cls_bpf);

	default:

		return -EOPNOTSUPP;

drivers/net/ethernet/netronome/nfp/bpf/offload.c

+0 −3
Original line number Diff line number Diff line
@@ -150,9 +150,6 @@ nfp_net_bpf_offload_prepare(struct nfp_net *nn, 
	unsigned int max_mtu;

	int ret;



	if (!IS_ENABLED(CONFIG_BPF_SYSCALL))

		return -EOPNOTSUPP;



	ret = nfp_net_bpf_get_act(nn, cls_bpf);

	if (ret < 0)

		return ret;

drivers/net/ethernet/netronome/nfp/flower/cmsg.c

+5 −4
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ nfp_flower_cmsg_get_hdr(struct sk_buff *skb) 


struct sk_buff *

nfp_flower_cmsg_alloc(struct nfp_app *app, unsigned int size,

		      enum nfp_flower_cmsg_type_port type)

		      enum nfp_flower_cmsg_type_port type, gfp_t flag)

{

	struct nfp_flower_cmsg_hdr *ch;

	struct sk_buff *skb;



	size += NFP_FLOWER_CMSG_HLEN;



	skb = nfp_app_ctrl_msg_alloc(app, size, GFP_KERNEL);

	skb = nfp_app_ctrl_msg_alloc(app, size, flag);

	if (!skb)

		return NULL;
@@ -78,7 +78,8 @@ nfp_flower_cmsg_mac_repr_start(struct nfp_app *app, unsigned int num_ports) 
	unsigned int size;



	size = sizeof(*msg) + num_ports * sizeof(msg->ports[0]);

	skb = nfp_flower_cmsg_alloc(app, size, NFP_FLOWER_CMSG_TYPE_MAC_REPR);

	skb = nfp_flower_cmsg_alloc(app, size, NFP_FLOWER_CMSG_TYPE_MAC_REPR,

				    GFP_KERNEL);

	if (!skb)

		return NULL;
@@ -109,7 +110,7 @@ int nfp_flower_cmsg_portmod(struct nfp_repr *repr, bool carrier_ok) 
	struct sk_buff *skb;



	skb = nfp_flower_cmsg_alloc(repr->app, sizeof(*msg),

				    NFP_FLOWER_CMSG_TYPE_PORT_MOD);

				    NFP_FLOWER_CMSG_TYPE_PORT_MOD, GFP_KERNEL);

	if (!skb)

		return -ENOMEM;

drivers/net/ethernet/netronome/nfp/flower/cmsg.h

+1 −1
Original line number Diff line number Diff line
@@ -458,6 +458,6 @@ void nfp_flower_cmsg_process_rx(struct work_struct *work); 
void nfp_flower_cmsg_rx(struct nfp_app *app, struct sk_buff *skb);

struct sk_buff *

nfp_flower_cmsg_alloc(struct nfp_app *app, unsigned int size,

		      enum nfp_flower_cmsg_type_port type);

		      enum nfp_flower_cmsg_type_port type, gfp_t flag);



#endif