openvswitch: Allow user space to announce ability to accept unaligned Netlink messages (43d4be9c) · Commits · e / devices / android_kernel_samsung_universal8890

include/uapi/linux/openvswitch.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -75,6 +75,7 @@ enum ovs_datapath_attr {
	OVS_DP_ATTR_UPCALL_PID, /* Netlink PID to receive upcalls */		OVS_DP_ATTR_UPCALL_PID, /* Netlink PID to receive upcalls */
	OVS_DP_ATTR_STATS, /* struct ovs_dp_stats */		OVS_DP_ATTR_STATS, /* struct ovs_dp_stats */
	OVS_DP_ATTR_MEGAFLOW_STATS, /* struct ovs_dp_megaflow_stats */		OVS_DP_ATTR_MEGAFLOW_STATS, /* struct ovs_dp_megaflow_stats */
			OVS_DP_ATTR_USER_FEATURES, /* OVS_DP_F_* */
	__OVS_DP_ATTR_MAX		__OVS_DP_ATTR_MAX
	};		};

	@@ -106,6 +107,9 @@ struct ovs_vport_stats {
	__u64 tx_dropped; /* no space available in linux */		__u64 tx_dropped; /* no space available in linux */
	};		};

			/* Allow last Netlink attribute to be unaligned */
			#define OVS_DP_F_UNALIGNED (1 << 0)

	/* Fixed logical ports. */		/* Fixed logical ports. */
	#define OVSP_LOCAL ((__u32)0)		#define OVSP_LOCAL ((__u32)0)

net/openvswitch/datapath.c

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1040,6 +1040,7 @@ static const struct genl_ops dp_flow_genl_ops[] = {
	static const struct nla_policy datapath_policy[OVS_DP_ATTR_MAX + 1] = {		static const struct nla_policy datapath_policy[OVS_DP_ATTR_MAX + 1] = {
	[OVS_DP_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },		[OVS_DP_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
	[OVS_DP_ATTR_UPCALL_PID] = { .type = NLA_U32 },		[OVS_DP_ATTR_UPCALL_PID] = { .type = NLA_U32 },
			[OVS_DP_ATTR_USER_FEATURES] = { .type = NLA_U32 },
	};		};

	static struct genl_family dp_datapath_genl_family = {		static struct genl_family dp_datapath_genl_family = {
	@@ -1098,6 +1099,9 @@ static int ovs_dp_cmd_fill_info(struct datapath dp, struct sk_buff skb,
	&dp_megaflow_stats))		&dp_megaflow_stats))
	goto nla_put_failure;		goto nla_put_failure;

			if (nla_put_u32(skb, OVS_DP_ATTR_USER_FEATURES, dp->user_features))
			goto nla_put_failure;

	return genlmsg_end(skb, ovs_header);		return genlmsg_end(skb, ovs_header);

	nla_put_failure:		nla_put_failure:
	@@ -1144,6 +1148,12 @@ static struct datapath lookup_datapath(struct net net,
	return dp ? dp : ERR_PTR(-ENODEV);		return dp ? dp : ERR_PTR(-ENODEV);
	}		}

			static void ovs_dp_change(struct datapath dp, struct nlattr *a)
			{
			if (a[OVS_DP_ATTR_USER_FEATURES])
			dp->user_features = nla_get_u32(a[OVS_DP_ATTR_USER_FEATURES]);
			}

	static int ovs_dp_cmd_new(struct sk_buff skb, struct genl_info info)		static int ovs_dp_cmd_new(struct sk_buff skb, struct genl_info info)
	{		{
	struct nlattr **a = info->attrs;		struct nlattr **a = info->attrs;
	@@ -1202,6 +1212,8 @@ static int ovs_dp_cmd_new(struct sk_buff skb, struct genl_info info)
	parms.port_no = OVSP_LOCAL;		parms.port_no = OVSP_LOCAL;
	parms.upcall_portid = nla_get_u32(a[OVS_DP_ATTR_UPCALL_PID]);		parms.upcall_portid = nla_get_u32(a[OVS_DP_ATTR_UPCALL_PID]);

			ovs_dp_change(dp, a);

	vport = new_vport(&parms);		vport = new_vport(&parms);
	if (IS_ERR(vport)) {		if (IS_ERR(vport)) {
	err = PTR_ERR(vport);		err = PTR_ERR(vport);
	@@ -1305,6 +1317,8 @@ static int ovs_dp_cmd_set(struct sk_buff skb, struct genl_info info)
	if (IS_ERR(dp))		if (IS_ERR(dp))
	goto unlock;		goto unlock;

			ovs_dp_change(dp, info->attrs);

	reply = ovs_dp_cmd_build_info(dp, info, OVS_DP_CMD_NEW);		reply = ovs_dp_cmd_build_info(dp, info, OVS_DP_CMD_NEW);
	if (IS_ERR(reply)) {		if (IS_ERR(reply)) {
	err = PTR_ERR(reply);		err = PTR_ERR(reply);

net/openvswitch/datapath.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,8 @@ struct datapath {
	/* Network namespace ref. */		/* Network namespace ref. */
	struct net *net;		struct net *net;
	#endif		#endif

			u32 user_features;
	};		};

	/**		/**