Commit 4fca0377 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

IB/uverbs: Move ib_access_flags and ib_read_counters_flags to uapi 



These constants are used in the ioctl interface so they are part of the
uapi, place them in the correct header for clarity.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 2bd2e98a

include/rdma/ib_verbs.h

+10 −13
Original line number Diff line number Diff line
@@ -1425,14 +1425,16 @@ struct ib_recv_wr { 
};



enum ib_access_flags {

	IB_ACCESS_LOCAL_WRITE	= 1,

	IB_ACCESS_REMOTE_WRITE	= (1<<1),

	IB_ACCESS_REMOTE_READ	= (1<<2),

	IB_ACCESS_REMOTE_ATOMIC	= (1<<3),

	IB_ACCESS_MW_BIND	= (1<<4),

	IB_ZERO_BASED		= (1<<5),

	IB_ACCESS_ON_DEMAND     = (1<<6),

	IB_ACCESS_HUGETLB	= (1<<7),

	IB_ACCESS_LOCAL_WRITE = IB_UVERBS_ACCESS_LOCAL_WRITE,

	IB_ACCESS_REMOTE_WRITE = IB_UVERBS_ACCESS_REMOTE_WRITE,

	IB_ACCESS_REMOTE_READ = IB_UVERBS_ACCESS_REMOTE_READ,

	IB_ACCESS_REMOTE_ATOMIC = IB_UVERBS_ACCESS_REMOTE_ATOMIC,

	IB_ACCESS_MW_BIND = IB_UVERBS_ACCESS_MW_BIND,

	IB_ZERO_BASED = IB_UVERBS_ACCESS_ZERO_BASED,

	IB_ACCESS_ON_DEMAND = IB_UVERBS_ACCESS_ON_DEMAND,

	IB_ACCESS_HUGETLB = IB_UVERBS_ACCESS_HUGETLB,



	IB_ACCESS_SUPPORTED = ((IB_ACCESS_HUGETLB << 1) - 1)

};



/*
@@ -2223,11 +2225,6 @@ struct ib_counters { 
	atomic_t	usecnt;

};



enum ib_read_counters_flags {

	/* prefer read values from driver cache */

	IB_READ_COUNTERS_ATTR_PREFER_CACHED = 1 << 0,

};



struct ib_counters_read_attr {

	u64	*counters_buff;

	u32	ncounters;

include/uapi/rdma/ib_user_ioctl_verbs.h

+16 −0
Original line number Diff line number Diff line
@@ -40,6 +40,17 @@ 
#define RDMA_UAPI_PTR(_type, _name)	__aligned_u64 _name

#endif



enum ib_uverbs_access_flags {

	IB_UVERBS_ACCESS_LOCAL_WRITE = 1 << 0,

	IB_UVERBS_ACCESS_REMOTE_WRITE = 1 << 1,

	IB_UVERBS_ACCESS_REMOTE_READ = 1 << 2,

	IB_UVERBS_ACCESS_REMOTE_ATOMIC = 1 << 3,

	IB_UVERBS_ACCESS_MW_BIND = 1 << 4,

	IB_UVERBS_ACCESS_ZERO_BASED = 1 << 5,

	IB_UVERBS_ACCESS_ON_DEMAND = 1 << 6,

	IB_UVERBS_ACCESS_HUGETLB = 1 << 7,

};



enum ib_uverbs_query_port_cap_flags {

	IB_UVERBS_PCF_SM = 1 << 1,

	IB_UVERBS_PCF_NOTICE_SUP = 1 << 2,
@@ -141,4 +152,9 @@ struct ib_uverbs_flow_action_esp { 
	__aligned_u64	hard_limit_pkts;

};



enum ib_uverbs_read_counters_flags {

	/* prefer read values from driver cache */

	IB_UVERBS_READ_COUNTERS_PREFER_CACHED = 1 << 0,

};



#endif