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

Commit d90e5e50 authored by Ariel Levkovich's avatar Ariel Levkovich Committed by Jason Gunthorpe
Browse files

IB/uverbs: Introduce a GRE steering match filter 



Adding a new GRE steering match filter that can match against
key and protocol fields.

Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarAriel Levkovich <lariel@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 20b6563b

drivers/infiniband/core/uverbs_cmd.c

+11 −0
Original line number Diff line number Diff line
@@ -2948,6 +2948,17 @@ int ib_uverbs_kern_spec_to_ib_spec_filter(enum ib_flow_spec_type type, 
		memcpy(&ib_spec->esp.val, kern_spec_val, actual_filter_sz);

		memcpy(&ib_spec->esp.mask, kern_spec_mask, actual_filter_sz);

		break;

	case IB_FLOW_SPEC_GRE:

		ib_filter_sz = offsetof(struct ib_flow_gre_filter, real_sz);

		actual_filter_sz = spec_filter_size(kern_spec_mask,

						    kern_filter_sz,

						    ib_filter_sz);

		if (actual_filter_sz <= 0)

			return -EINVAL;

		ib_spec->gre.size = sizeof(struct ib_flow_spec_gre);

		memcpy(&ib_spec->gre.val, kern_spec_val, actual_filter_sz);

		memcpy(&ib_spec->gre.mask, kern_spec_mask, actual_filter_sz);

		break;

	default:

		return -EINVAL;

	}

include/rdma/ib_verbs.h

+17 −0
Original line number Diff line number Diff line
@@ -1852,6 +1852,7 @@ enum ib_flow_spec_type { 
	IB_FLOW_SPEC_TCP		= 0x40,

	IB_FLOW_SPEC_UDP		= 0x41,

	IB_FLOW_SPEC_VXLAN_TUNNEL	= 0x50,

	IB_FLOW_SPEC_GRE		= 0x51,

	IB_FLOW_SPEC_INNER		= 0x100,

	/* Actions */

	IB_FLOW_SPEC_ACTION_TAG         = 0x1000,
@@ -1994,6 +1995,21 @@ struct ib_flow_spec_esp { 
	struct ib_flow_esp_filter     mask;

};



struct ib_flow_gre_filter {

	__be16 c_ks_res0_ver;

	__be16 protocol;

	__be32 key;

	/* Must be last */

	u8	real_sz[0];

};



struct ib_flow_spec_gre {

	u32                           type;

	u16			      size;

	struct ib_flow_gre_filter     val;

	struct ib_flow_gre_filter     mask;

};



struct ib_flow_spec_action_tag {

	enum ib_flow_spec_type	      type;

	u16			      size;
@@ -2023,6 +2039,7 @@ union ib_flow_spec { 
	struct ib_flow_spec_ipv6        ipv6;

	struct ib_flow_spec_tunnel      tunnel;

	struct ib_flow_spec_esp		esp;

	struct ib_flow_spec_gre		gre;

	struct ib_flow_spec_action_tag  flow_tag;

	struct ib_flow_spec_action_drop drop;

	struct ib_flow_spec_action_handle action;