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

Commit d82693da authored by Yann Droneaud's avatar Yann Droneaud Committed by Roland Dreier
Browse files

IB/core: Rename 'flow' structs to match other uverbs structs 



Commit 436f2ad0 ("IB/core: Export ib_create/destroy_flow through
uverbs") added public data structures to support receive flow
steering.  The new structs are not following the 'uverbs' pattern:
they're lacking the common prefix 'ib_uverbs'.

This patch replaces ib_kern prefix by ib_uverbs.

Signed-off-by: default avatarYann Droneaud <ydroneaud@opteya.com>
Link: http://marc.info/?i=cover.1383773832.git.ydroneaud@opteya.com


Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent f8848274

drivers/infiniband/core/uverbs_cmd.c

+7 −7
Original line number Diff line number Diff line
@@ -2602,7 +2602,7 @@ out_put: 
}



#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec,

static int kern_spec_to_ib_spec(struct ib_uverbs_spec *kern_spec,

				union ib_flow_spec *ib_spec)

{

	ib_spec->type = kern_spec->type;
@@ -2650,7 +2650,7 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file, 
	struct ib_uverbs_create_flow_resp resp;

	struct ib_uobject		  *uobj;

	struct ib_flow			  *flow_id;

	struct ib_kern_flow_attr	  *kern_flow_attr;

	struct ib_uverbs_flow_attr	  *kern_flow_attr;

	struct ib_flow_attr		  *flow_attr;

	struct ib_qp			  *qp;

	int err = 0;
@@ -2676,7 +2676,7 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file, 


	if (cmd.flow_attr.size > (in_len - sizeof(cmd)) ||

	    cmd.flow_attr.size >

	    (cmd.flow_attr.num_of_specs * sizeof(struct ib_kern_spec)))

	    (cmd.flow_attr.num_of_specs * sizeof(struct ib_uverbs_spec)))

		return -EINVAL;



	if (cmd.flow_attr.num_of_specs) {
@@ -2725,16 +2725,16 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file, 
	kern_spec = kern_flow_attr + 1;

	ib_spec = flow_attr + 1;

	for (i = 0; i < flow_attr->num_of_specs &&

	     cmd.flow_attr.size > offsetof(struct ib_kern_spec, reserved) &&

	     cmd.flow_attr.size > offsetof(struct ib_uverbs_spec, reserved) &&

	     cmd.flow_attr.size >=

	     ((struct ib_kern_spec *)kern_spec)->size; i++) {

	     ((struct ib_uverbs_spec *)kern_spec)->size; i++) {

		err = kern_spec_to_ib_spec(kern_spec, ib_spec);

		if (err)

			goto err_free;

		flow_attr->size +=

			((union ib_flow_spec *) ib_spec)->size;

		cmd.flow_attr.size -= ((struct ib_kern_spec *)kern_spec)->size;

		kern_spec += ((struct ib_kern_spec *) kern_spec)->size;

		cmd.flow_attr.size -= ((struct ib_uverbs_spec *)kern_spec)->size;

		kern_spec += ((struct ib_uverbs_spec *) kern_spec)->size;

		ib_spec += ((union ib_flow_spec *) ib_spec)->size;

	}

	if (cmd.flow_attr.size || (i != flow_attr->num_of_specs)) {

include/uapi/rdma/ib_user_verbs.h

+18 −18
Original line number Diff line number Diff line
@@ -701,61 +701,61 @@ struct ib_uverbs_detach_mcast { 
};



#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING

struct ib_kern_eth_filter {

struct ib_uverbs_eth_filter {

	__u8  dst_mac[6];

	__u8  src_mac[6];

	__be16 ether_type;

	__be16 vlan_tag;

};



struct ib_kern_spec_eth {

struct ib_uverbs_spec_eth {

	__u32  type;

	__u16  size;

	__u16  reserved;

	struct ib_kern_eth_filter val;

	struct ib_kern_eth_filter mask;

	struct ib_uverbs_eth_filter val;

	struct ib_uverbs_eth_filter mask;

};



struct ib_kern_ipv4_filter {

struct ib_uverbs_ipv4_filter {

	__be32 src_ip;

	__be32 dst_ip;

};



struct ib_kern_spec_ipv4 {

struct ib_uverbs_spec_ipv4 {

	__u32  type;

	__u16  size;

	__u16  reserved;

	struct ib_kern_ipv4_filter val;

	struct ib_kern_ipv4_filter mask;

	struct ib_uverbs_ipv4_filter val;

	struct ib_uverbs_ipv4_filter mask;

};



struct ib_kern_tcp_udp_filter {

struct ib_uverbs_tcp_udp_filter {

	__be16 dst_port;

	__be16 src_port;

};



struct ib_kern_spec_tcp_udp {

struct ib_uverbs_spec_tcp_udp {

	__u32  type;

	__u16  size;

	__u16  reserved;

	struct ib_kern_tcp_udp_filter val;

	struct ib_kern_tcp_udp_filter mask;

	struct ib_uverbs_tcp_udp_filter val;

	struct ib_uverbs_tcp_udp_filter mask;

};



struct ib_kern_spec {

struct ib_uverbs_spec {

	union {

		struct {

			__u32 type;

			__u16 size;

			__u16 reserved;

		};

		struct ib_kern_spec_eth	    eth;

		struct ib_kern_spec_ipv4    ipv4;

		struct ib_kern_spec_tcp_udp tcp_udp;

		struct ib_uverbs_spec_eth	    eth;

		struct ib_uverbs_spec_ipv4    ipv4;

		struct ib_uverbs_spec_tcp_udp tcp_udp;

	};

};



struct ib_kern_flow_attr {

struct ib_uverbs_flow_attr {

	__u32 type;

	__u16 size;

	__u16 priority;
@@ -774,7 +774,7 @@ struct ib_uverbs_create_flow { 
	__u32 reserved;

	__u64 response;

	__u32 qp_handle;

	struct ib_kern_flow_attr flow_attr;

	struct ib_uverbs_flow_attr flow_attr;

};



struct ib_uverbs_create_flow_resp {