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

Commit 67fa0341 authored by Jesse Gross's avatar Jesse Gross Committed by David S. Miller
Browse files

openvswitch: Add support for matching on OAM packets. 



Some tunnel formats have mechanisms for indicating that packets are
OAM frames that should be handled specially (either as high priority or
not forwarded beyond an endpoint). This provides support for allowing
those types of packets to be matched.

Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
Signed-off-by: default avatarAndy Zhou <azhou@nicira.com>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 07148121

include/uapi/linux/openvswitch.h

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ enum ovs_tunnel_key_attr { 
	OVS_TUNNEL_KEY_ATTR_TTL,                /* u8 Tunnel IP TTL. */

	OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT,      /* No argument, set DF. */

	OVS_TUNNEL_KEY_ATTR_CSUM,               /* No argument. CSUM packet. */

	OVS_TUNNEL_KEY_ATTR_OAM,                /* No argument. OAM frame.  */

	__OVS_TUNNEL_KEY_ATTR_MAX

};

net/openvswitch/datapath.c

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ static size_t key_attr_size(void) 
		  + nla_total_size(1)   /* OVS_TUNNEL_KEY_ATTR_TTL */

		  + nla_total_size(0)   /* OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT */

		  + nla_total_size(0)   /* OVS_TUNNEL_KEY_ATTR_CSUM */

		  + nla_total_size(0)   /* OVS_TUNNEL_KEY_ATTR_OAM */

		+ nla_total_size(4)   /* OVS_KEY_ATTR_IN_PORT */

		+ nla_total_size(4)   /* OVS_KEY_ATTR_SKB_MARK */

		+ nla_total_size(12)  /* OVS_KEY_ATTR_ETHERNET */

net/openvswitch/flow_netlink.c

+12 −5
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ static int ipv4_tun_from_nlattr(const struct nlattr *attr, 
			[OVS_TUNNEL_KEY_ATTR_TTL] = 1,

			[OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT] = 0,

			[OVS_TUNNEL_KEY_ATTR_CSUM] = 0,

			[OVS_TUNNEL_KEY_ATTR_OAM] = 0,

		};



		if (type > OVS_TUNNEL_KEY_ATTR_MAX) {
@@ -390,6 +391,9 @@ static int ipv4_tun_from_nlattr(const struct nlattr *attr, 
		case OVS_TUNNEL_KEY_ATTR_CSUM:

			tun_flags |= TUNNEL_CSUM;

			break;

		case OVS_TUNNEL_KEY_ATTR_OAM:

			tun_flags |= TUNNEL_OAM;

			break;

		default:

			return -EINVAL;

		}
@@ -447,6 +451,9 @@ static int ipv4_tun_to_nlattr(struct sk_buff *skb, 
	if ((output->tun_flags & TUNNEL_CSUM) &&

	    nla_put_flag(skb, OVS_TUNNEL_KEY_ATTR_CSUM))

		return -EMSGSIZE;

	if ((output->tun_flags & TUNNEL_OAM) &&

	    nla_put_flag(skb, OVS_TUNNEL_KEY_ATTR_OAM))

		return -EMSGSIZE;



	nla_nest_end(skb, nla);

	return 0;