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

Commit 7c095f5d authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Alexei Starovoitov
Browse files

nfp: bpf: improve wrong FW response warnings 



When FW responds with a message of wrong size or type make sure
the type is checked first and included in the wrong size message.
This makes it easier to figure out which FW command failed.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: default avatarJiong Wang <jiong.wang@netronome.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent df4a37d8

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

+6 −6
Original line number Diff line number Diff line
@@ -218,17 +218,17 @@ nfp_bpf_cmsg_communicate(struct nfp_app_bpf *bpf, struct sk_buff *skb, 
		return skb;



	hdr = (struct cmsg_hdr *)skb->data;

	/* 0 reply_size means caller will do the validation */

	if (reply_size && skb->len != reply_size) {

		cmsg_warn(bpf, "cmsg drop - wrong size %d != %d!\n",

			  skb->len, reply_size);

		goto err_free;

	}

	if (hdr->type != __CMSG_REPLY(type)) {

		cmsg_warn(bpf, "cmsg drop - wrong type 0x%02x != 0x%02lx!\n",

			  hdr->type, __CMSG_REPLY(type));

		goto err_free;

	}

	/* 0 reply_size means caller will do the validation */

	if (reply_size && skb->len != reply_size) {

		cmsg_warn(bpf, "cmsg drop - type 0x%02x wrong size %d != %d!\n",

			  type, skb->len, reply_size);

		goto err_free;

	}



	return skb;

err_free: