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

Commit 51a8cefc authored by John Hurley's avatar John Hurley Committed by David S. Miller
Browse files

nfp: flower: offload tos and tunnel flags for ipv4 udp tunnels 



Extract the tos and the tunnel flags from the tunnel key and offload these
action fields. Only the checksum and tunnel key flags are implemented in
fw so reject offloads of other flags. The tunnel key flag is always
considered set in the fw so enforce that it is set in the rule. Note that
the compulsory setting of the tunnel key flag and optional setting of
checksum is inline with how tc currently generates ipv4 udp tunnel
actions.

Signed-off-by: default avatarJohn Hurley <john.hurley@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ed21b637

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

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 
#include "main.h"

#include "../nfp_net_repr.h"



#define NFP_FL_SUPPORTED_IPV4_UDP_TUN_FLAGS	(TUNNEL_CSUM | TUNNEL_KEY)



static void nfp_fl_pop_vlan(struct nfp_fl_pop_vlan *pop_vlan)

{

	size_t act_size = sizeof(struct nfp_fl_pop_vlan);
@@ -274,6 +276,13 @@ nfp_fl_set_ipv4_udp_tun(struct nfp_fl_set_ipv4_udp_tun *set_tun, 
		set_tun->ttl = net->ipv4.sysctl_ip_default_ttl;

	}



	set_tun->tos = ip_tun->key.tos;



	if (!(ip_tun->key.tun_flags & TUNNEL_KEY) ||

	    ip_tun->key.tun_flags & ~NFP_FL_SUPPORTED_IPV4_UDP_TUN_FLAGS)

		return -EOPNOTSUPP;

	set_tun->tun_flags = ip_tun->key.tun_flags;



	/* Complete pre_tunnel action. */

	pre_tun->ipv4_dst = ip_tun->key.u.ipv4.dst;

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

+2 −2
Original line number Diff line number Diff line
@@ -203,9 +203,9 @@ struct nfp_fl_set_ipv4_udp_tun { 
	__be16 reserved;

	__be64 tun_id __packed;

	__be32 tun_type_index;

	__be16 reserved2;

	__be16 tun_flags;

	u8 ttl;

	u8 reserved3;

	u8 tos;

	__be32 extra[2];

};