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

Commit 8913806f authored by Pieter Jansen van Vuuren's avatar Pieter Jansen van Vuuren Committed by David S. Miller
Browse files

nfp: flower: fix pedit set actions for multiple partial masks 



Previously we did not correctly change headers when using multiple
pedit actions with partial masks. We now take this into account and
no longer just commit the last pedit action.

Fixes: c0b1bd9a ("nfp: add set ipv4 header action flower offload")
Signed-off-by: default avatarPieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1890fea7

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

+9 −6
Original line number Diff line number Diff line
@@ -429,12 +429,14 @@ nfp_fl_set_ip4(const struct tc_action *action, int idx, u32 off, 


	switch (off) {

	case offsetof(struct iphdr, daddr):

		set_ip_addr->ipv4_dst_mask = mask;

		set_ip_addr->ipv4_dst = exact;

		set_ip_addr->ipv4_dst_mask |= mask;

		set_ip_addr->ipv4_dst &= ~mask;

		set_ip_addr->ipv4_dst |= exact & mask;

		break;

	case offsetof(struct iphdr, saddr):

		set_ip_addr->ipv4_src_mask = mask;

		set_ip_addr->ipv4_src = exact;

		set_ip_addr->ipv4_src_mask |= mask;

		set_ip_addr->ipv4_src &= ~mask;

		set_ip_addr->ipv4_src |= exact & mask;

		break;

	default:

		return -EOPNOTSUPP;
@@ -451,8 +453,9 @@ static void 
nfp_fl_set_ip6_helper(int opcode_tag, int idx, __be32 exact, __be32 mask,

		      struct nfp_fl_set_ipv6_addr *ip6)

{

	ip6->ipv6[idx % 4].mask = mask;

	ip6->ipv6[idx % 4].exact = exact;

	ip6->ipv6[idx % 4].mask |= mask;

	ip6->ipv6[idx % 4].exact &= ~mask;

	ip6->ipv6[idx % 4].exact |= exact & mask;



	ip6->reserved = cpu_to_be16(0);

	ip6->head.jump_id = opcode_tag;