RDMA: Support more than 255 rdma ports
Subsystems (20)
PATCH 1/1 RDMA: Support more than 255 rdma ports
From: Mark Bloch <[email protected]>
Current code uses many different types when dealing with a port of a RDMA device: u8, unsigned int and u32. Switch to u32 to clean up the logic.
This allows us to make (at least) the core view consistent and use the same type. Unfortunately not all places can be converted. Many uverbs functions expect port to be u8 so keep those places in order not to break UAPIs. HW/Spec defined values must also not be changed.
With the switch to u32 we now can support devices with more than 255 ports. U32_MAX is reserved to make control logic a bit easier to deal with. As a device with U32_MAX ports probably isn't going to happen any time soon this seems like a non issue.
When a device with more than 255 ports is created uverbs will report the RDMA device as having 255 ports as this is the max currently supported.
The verbs interface is not changed yet because the IBTA spec limits the port size in too many places to be u8 and all applications that relies in verbs won't be able to cope with this change. At this stage, we are extending the interfaces that are using vendor channel solely
Once the limitation is lifted mlx5 in switchdev mode will be able to have thousands of SFs created by the device. As the only instance of an RDMA device that reports more than 255 ports will be a representor device and it exposes itself as a RAW Ethernet only device CM/MAD/IPoIB and other ULPs aren't effected by this change and their sysfs/interfaces that are exposes to userspace can remain unchanged.
While here cleanup some alignment issues and remove unneeded sanity checks (mainly in rdmavt),
--- drivers/infiniband/core/cache.c | 84 ++++----- drivers/infiniband/core/cm.c | 12 +- drivers/infiniband/core/cma.c | 20 +- drivers/infiniband/core/cma_configfs.c | 8 +- drivers/infiniband/core/cma_priv.h | 8 +- drivers/infiniband/core/core_priv.h | 28 +-- drivers/infiniband/core/counters.c | 20 +- drivers/infiniband/core/device.c | 36 ++-- drivers/infiniband/core/mad.c | 32 ++-- drivers/infiniband/core/multicast.c | 8 +- drivers/infiniband/core/nldev.c | 2 +- drivers/infiniband/core/opa_smi.h | 4 +- drivers/infiniband/core/roce_gid_mgmt.c | 52 ++--- drivers/infiniband/core/rw.c | 25 +-- drivers/infiniband/core/sa.h | 2 +- drivers/infiniband/core/sa_query.c | 22 +-- drivers/infiniband/core/security.c | 8 +- drivers/infiniband/core/smi.c | 12 +- drivers/infiniband/core/smi.h | 4 +- drivers/infiniband/core/sysfs.c | 16 +- drivers/infiniband/core/user_mad.c | 4 +- drivers/infiniband/core/uverbs_cmd.c | 2 +- drivers/infiniband/core/verbs.c | 29 +-- drivers/infiniband/hw/bnxt_re/hw_counters.c | 4 +- drivers/infiniband/hw/bnxt_re/hw_counters.h | 4 +- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 10 +- drivers/infiniband/hw/bnxt_re/ib_verbs.h | 10 +- drivers/infiniband/hw/cxgb4/provider.c | 12 +- drivers/infiniband/hw/efa/efa.h | 14 +- drivers/infiniband/hw/efa/efa_verbs.c | 14 +- drivers/infiniband/hw/hfi1/hfi.h | 10 +- drivers/infiniband/hw/hfi1/init.c | 2 +- drivers/infiniband/hw/hfi1/ipoib.h | 2 +- drivers/infiniband/hw/hfi1/ipoib_main.c | 4 +- drivers/infiniband/hw/hfi1/mad.c | 128 ++++++------- drivers/infiniband/hw/hfi1/mad.h | 2 +- drivers/infiniband/hw/hfi1/sysfs.c | 2 +- drivers/infiniband/hw/hfi1/verbs.c | 8 +- drivers/infiniband/hw/hfi1/verbs.h | 4 +- drivers/infiniband/hw/hfi1/vnic.h | 2 +- drivers/infiniband/hw/hfi1/vnic_main.c | 2 +- drivers/infiniband/hw/hns/hns_roce_device.h | 4 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 10 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 4 +- drivers/infiniband/hw/hns/hns_roce_main.c | 20 +- drivers/infiniband/hw/i40iw/i40iw_verbs.c | 10 +- drivers/infiniband/hw/mlx4/alias_GUID.c | 16 +- drivers/infiniband/hw/mlx4/mad.c | 46 ++--- drivers/infiniband/hw/mlx4/main.c | 47 ++--- drivers/infiniband/hw/mlx4/mlx4_ib.h | 26 +-- drivers/infiniband/hw/mlx5/cong.c | 8 +- drivers/infiniband/hw/mlx5/counters.c | 10 +- drivers/infiniband/hw/mlx5/counters.h | 2 +- drivers/infiniband/hw/mlx5/ib_rep.c | 4 +- drivers/infiniband/hw/mlx5/ib_rep.h | 4 +- drivers/infiniband/hw/mlx5/ib_virt.c | 16 +- drivers/infiniband/hw/mlx5/mad.c | 16 +- drivers/infiniband/hw/mlx5/main.c | 83 ++++---- drivers/infiniband/hw/mlx5/mlx5_ib.h | 40 ++-- drivers/infiniband/hw/mlx5/qp.c | 2 +- drivers/infiniband/hw/mthca/mthca_av.c | 6 +- drivers/infiniband/hw/mthca/mthca_dev.h | 8 +- drivers/infiniband/hw/mthca/mthca_mad.c | 4 +- drivers/infiniband/hw/mthca/mthca_provider.c | 10 +- drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_main.c | 4 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 4 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 7 +- drivers/infiniband/hw/qedr/main.c | 8 +- drivers/infiniband/hw/qedr/verbs.c | 9 +- drivers/infiniband/hw/qedr/verbs.h | 11 +- drivers/infiniband/hw/qib/qib.h | 8 +- drivers/infiniband/hw/qib/qib_mad.c | 4 +- drivers/infiniband/hw/qib/qib_qp.c | 4 +- drivers/infiniband/hw/qib/qib_sysfs.c | 2 +- drivers/infiniband/hw/qib/qib_verbs.c | 6 +- drivers/infiniband/hw/qib/qib_verbs.h | 6 +- drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 6 +- drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 6 +- .../infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 12 +- .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 10 +- drivers/infiniband/sw/rdmavt/mad.c | 5 +- drivers/infiniband/sw/rdmavt/mad.h | 2 +- drivers/infiniband/sw/rdmavt/vt.c | 34 +--- drivers/infiniband/sw/rdmavt/vt.h | 11 +- drivers/infiniband/sw/rxe/rxe_hw_counters.c | 4 +- drivers/infiniband/sw/rxe/rxe_hw_counters.h | 4 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 10 +- drivers/infiniband/sw/siw/siw_verbs.c | 8 +- drivers/infiniband/sw/siw/siw_verbs.h | 10 +- drivers/infiniband/ulp/ipoib/ipoib.h | 4 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 14 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 3 +- .../ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- include/rdma/ib_cache.h | 18 +- include/rdma/ib_mad.h | 2 +- include/rdma/ib_sa.h | 15 +- include/rdma/ib_verbs.h | 177 ++++++++++-------- include/rdma/rdma_cm.h | 2 +- include/rdma/rdma_counter.h | 16 +- include/rdma/rdma_vt.h | 8 +- include/rdma/rw.h | 18 +- 107 files changed, 777 insertions(+), 777 deletions(-)
drivers/infiniband/core/cache.c +38 -46
@@ -121,7 +121,7 @@ struct ib_gid_table {u32 default_gid_indices; }; -static void dispatch_gid_change_event (struct ib_device *ib_dev,u8 port) +static void dispatch_gid_change_event (struct ib_device *ib_dev,u32 port) {struct ib_event event;
@@ -197,7 +197,7 @@ int ib_cache_gid_parse_type_str(const char *buf) }EXPORT_SYMBOL (ib_cache_gid_parse_type_str); -static struct ib_gid_table *rdma_gid_table (struct ib_device *device,u8 port) +static struct ib_gid_table *rdma_gid_table (struct ib_device *device,u32 port) {return device->port_data[port].cache.gid; }
@@ -237,10 +237,10 @@ static void put_gid_ndev(struct rcu_head *head)static void free_gid_entry_locked (struct ib_gid_table_entry *entry) {struct ib_device *device = entry->attr.device; -u8 port_num = entry->attr.port_num; +u32 port_num = entry->attr.port_num;struct ib_gid_table *table =rdma_gid_table (device, port_num); -dev_dbg (&device->dev,"%s port=%d index=%d gid %pI6\n" , __func__, +dev_dbg (&device->dev,"%s port=%u index=%d gid %pI6\n" , __func__, port_num, entry->attr.index, entry->attr.gid.raw);write_lock_irq (&table->rwlock);
@@ -282,7 +282,7 @@ static void free_gid_work(struct work_struct *work)struct ib_gid_table_entry *entry = container_of(work, struct ib_gid_table_entry, del_work);struct ib_device *device = entry->attr.device; -u8 port_num = entry->attr.port_num; +u32 port_num = entry->attr.port_num;struct ib_gid_table *table =rdma_gid_table (device, port_num);mutex_lock (&table->lock);
@@ -379,7 +379,7 @@ static int add_roce_gid(struct ib_gid_table_entry *entry)* @ix: GID entry index to delete * */ -static void del_gid (struct ib_device *ib_dev,u8 port, +static void del_gid (struct ib_device *ib_dev,u32 port,struct ib_gid_table *table,int ix) {struct roce_gid_ndev_storage *ndev_storage;
@@ -387,7 +387,7 @@ static void del_gid(struct ib_device *ib_dev, u8 port,lockdep_assert_held (&table->lock); -dev_dbg (&ib_dev->dev,"%s port=%d index=%d gid %pI6\n" , __func__, port, +dev_dbg (&ib_dev->dev,"%s port=%u index=%d gid %pI6\n" , __func__, port, ix, table->data_vec[ix]->attr.gid.raw);write_lock_irq (&table->rwlock);
@@ -543,7 +543,7 @@ static void make_default_gid(struct net_device *dev, union ib_gid *gid)addrconf_ifid_eui48 (&gid->raw[8 ], dev); } -static int __ib_cache_gid_add (struct ib_device *ib_dev,u8 port, +static int __ib_cache_gid_add (struct ib_device *ib_dev,u32 port,union ib_gid *gid,struct ib_gid_attr *attr,unsigned long mask,bool default_gid) {
@@ -587,7 +587,7 @@ static int __ib_cache_gid_add(struct ib_device *ib_dev, u8 port,return ret; } -int ib_cache_gid_add (struct ib_device *ib_dev,u8 port, +int ib_cache_gid_add (struct ib_device *ib_dev,u32 port,union ib_gid *gid,struct ib_gid_attr *attr) { unsigned long mask = GID_ATTR_FIND_MASK_GID |
@@ -598,7 +598,7 @@ int ib_cache_gid_add(struct ib_device *ib_dev, u8 port, }static int -_ib_cache_gid_del (struct ib_device *ib_dev,u8 port, +_ib_cache_gid_del (struct ib_device *ib_dev,u32 port,union ib_gid *gid,struct ib_gid_attr *attr,unsigned long mask,bool default_gid) {
@@ -627,7 +627,7 @@ _ib_cache_gid_del(struct ib_device *ib_dev, u8 port,return ret; } -int ib_cache_gid_del (struct ib_device *ib_dev,u8 port, +int ib_cache_gid_del (struct ib_device *ib_dev,u32 port,union ib_gid *gid,struct ib_gid_attr *attr) { unsigned long mask = GID_ATTR_FIND_MASK_GID |
@@ -638,7 +638,7 @@ int ib_cache_gid_del(struct ib_device *ib_dev, u8 port,return _ib_cache_gid_del (ib_dev, port, gid, attr, mask, false); } -int ib_cache_gid_del_all_netdev_gids (struct ib_device *ib_dev,u8 port, +int ib_cache_gid_del_all_netdev_gids (struct ib_device *ib_dev,u32 port,struct net_device *ndev) {struct ib_gid_table *table;
@@ -683,7 +683,7 @@ const struct ib_gid_attr * rdma_find_gid_by_port(struct ib_device *ib_dev, const union ib_gid *gid, enum ib_gid_type gid_type, - u8 port, struct net_device *ndev) + u32 port, struct net_device *ndev) { int local_index;struct ib_gid_table *table;
@@ -734,7 +734,7 @@ EXPORT_SYMBOL(rdma_find_gid_by_port);* */ const struct ib_gid_attr *rdma_find_gid_by_filter ( -struct ib_device *ib_dev,const union ib_gid *gid,u8 port, +struct ib_device *ib_dev,const union ib_gid *gid,u32 port,bool (*filter)(const union ib_gid *gid,const struct ib_gid_attr *,void *),void *context)
@@ -818,7 +818,7 @@ static void release_gid_table(struct ib_device *device,kfree (table); } -static void cleanup_gid_table_port (struct ib_device *ib_dev,u8 port, +static void cleanup_gid_table_port (struct ib_device *ib_dev,u32 port,struct ib_gid_table *table) {int i;
@@ -834,7 +834,7 @@ static void cleanup_gid_table_port(struct ib_device *ib_dev, u8 port,mutex_unlock (&table->lock); } -void ib_cache_gid_set_default_gid (struct ib_device *ib_dev,u8 port, +void ib_cache_gid_set_default_gid (struct ib_device *ib_dev,u32 port,struct net_device *ndev,unsigned long gid_type_mask,enum ib_cache_gid_default_mode mode)
@@ -867,7 +867,7 @@ void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port, } } -static void gid_table_reserve_default (struct ib_device *ib_dev,u8 port, +static void gid_table_reserve_default (struct ib_device *ib_dev,u32 port,struct ib_gid_table *table) {unsigned int i;
@@ -884,7 +884,7 @@ static void gid_table_reserve_default(struct ib_device *ib_dev, u8 port,static void gid_table_release_one (struct ib_device *ib_dev) { -unsigned int p; +u32 p; rdma_for_each_port (ib_dev, p) {release_gid_table (ib_dev, ib_dev->port_data[p].cache.gid);
@@ -895,7 +895,7 @@ static void gid_table_release_one(struct ib_device *ib_dev)static int _gid_table_setup_one (struct ib_device *ib_dev) {struct ib_gid_table *table; -unsigned int rdma_port; +u32 rdma_port; rdma_for_each_port (ib_dev, rdma_port) { table = alloc_gid_table(
@@ -915,7 +915,7 @@ static int _gid_table_setup_one(struct ib_device *ib_dev)static void gid_table_cleanup_one (struct ib_device *ib_dev) { -unsigned int p; +u32 p; rdma_for_each_port (ib_dev, p) cleanup_gid_table_port(ib_dev, p,
@@ -950,7 +950,7 @@ static int gid_table_setup_one(struct ib_device *ib_dev)* Returns 0 on success or appropriate error code. * */ -int rdma_query_gid (struct ib_device *device,u8 port_num, +int rdma_query_gid (struct ib_device *device,u32 port_num,int index,union ib_gid *gid) {struct ib_gid_table *table;
@@ -1014,7 +1014,7 @@ const struct ib_gid_attr *rdma_find_gid(struct ib_device *device,unsigned long mask =GID_ATTR_FIND_MASK_GID |GID_ATTR_FIND_MASK_GID_TYPE ;struct ib_gid_attr gid_attr_val = {.ndev = ndev, .gid_type = gid_type}; -unsigned int p; +u32 p;if (ndev) mask |=GID_ATTR_FIND_MASK_NETDEV ;
@@ -1043,7 +1043,7 @@ const struct ib_gid_attr *rdma_find_gid(struct ib_device *device,EXPORT_SYMBOL (rdma_find_gid);int ib_get_cached_pkey (struct ib_device *device, -u8 port_num, +u32 port_num,int index,u16 *pkey) {
@@ -1069,9 +1069,8 @@ int ib_get_cached_pkey(struct ib_device *device, }EXPORT_SYMBOL (ib_get_cached_pkey); -int ib_get_cached_subnet_prefix (struct ib_device *device, -u8 port_num, -u64 *sn_pfx) +int ib_get_cached_subnet_prefix (struct ib_device *device,u32 port_num, +u64 *sn_pfx) {unsigned long flags;
@@ -1086,10 +1085,8 @@ int ib_get_cached_subnet_prefix(struct ib_device *device, }EXPORT_SYMBOL (ib_get_cached_subnet_prefix); -int ib_find_cached_pkey (struct ib_device *device, -u8 port_num, -u16 pkey, -u16 *index) +int ib_find_cached_pkey (struct ib_device *device,u32 port_num, +u16 pkey,u16 *index) {struct ib_pkey_cache *cache;unsigned long flags;
@@ -1132,10 +1129,8 @@ int ib_find_cached_pkey(struct ib_device *device, }EXPORT_SYMBOL (ib_find_cached_pkey); -int ib_find_exact_cached_pkey (struct ib_device *device, -u8 port_num, -u16 pkey, -u16 *index) +int ib_find_exact_cached_pkey (struct ib_device *device,u32 port_num, +u16 pkey,u16 *index) {struct ib_pkey_cache *cache;unsigned long flags;
@@ -1169,9 +1164,7 @@ int ib_find_exact_cached_pkey(struct ib_device *device, }EXPORT_SYMBOL (ib_find_exact_cached_pkey); -int ib_get_cached_lmc (struct ib_device *device, -u8 port_num, -u8 *lmc) +int ib_get_cached_lmc (struct ib_device *device,u32 port_num,u8 *lmc) {unsigned long flags;int ret =0 ;
@@ -1187,8 +1180,7 @@ int ib_get_cached_lmc(struct ib_device *device, }EXPORT_SYMBOL (ib_get_cached_lmc); -int ib_get_cached_port_state (struct ib_device *device, -u8 port_num, +int ib_get_cached_port_state (struct ib_device *device,u32 port_num,enum ib_port_state *port_state) {unsigned long flags;
@@ -1222,7 +1214,7 @@ EXPORT_SYMBOL(ib_get_cached_port_state);* code. */ const struct ib_gid_attr * -rdma_get_gid_attr (struct ib_device *device,u8 port_num,int index) +rdma_get_gid_attr (struct ib_device *device,u32 port_num,int index) {const struct ib_gid_attr *attr =ERR_PTR (-ENODATA );struct ib_gid_table *table;
@@ -1263,7 +1255,7 @@ ssize_t rdma_query_gid_table(struct ib_device *device,const struct ib_gid_attr *gid_attr;ssize_t num_entries =0 , ret;struct ib_gid_table *table; -unsigned int port_num, i; +u32 port_num, i;struct net_device *ndev;unsigned long flags;
@@ -1361,7 +1353,7 @@ struct net_device *rdma_read_gid_attr_ndev_rcu(const struct ib_gid_attr *attr) container_of(attr, struct ib_gid_table_entry, attr);struct ib_device *device = entry->attr.device;struct net_device *ndev =ERR_PTR (-EINVAL ); -u8 port_num = entry->attr.port_num; +u32 port_num = entry->attr.port_num;struct ib_gid_table *table;unsigned long flags;bool valid;
@@ -1441,7 +1433,7 @@ int rdma_read_gid_l2_fields(const struct ib_gid_attr *attr,EXPORT_SYMBOL (rdma_read_gid_l2_fields);static int config_non_roce_gid_cache (struct ib_device *device, -u8 port,int gid_tbl_len) +u32 port,int gid_tbl_len) {struct ib_gid_attr gid_attr = {};struct ib_gid_table *table;
@@ -1472,7 +1464,7 @@ static int config_non_roce_gid_cache(struct ib_device *device, }static int -ib_cache_update (struct ib_device *device,u8 port,bool enforce_security) +ib_cache_update (struct ib_device *device,u32 port,bool enforce_security) {struct ib_port_attr *tprops =NULL ;struct ib_pkey_cache *pkey_cache =NULL , *old_pkey_cache;
@@ -1621,7 +1613,7 @@ EXPORT_SYMBOL(ib_dispatch_event);int ib_cache_setup_one (struct ib_device *device) { -unsigned int p; +u32 p;int err;rwlock_init (&device->cache_lock);
@@ -1641,7 +1633,7 @@ int ib_cache_setup_one(struct ib_device *device)void ib_cache_release_one (struct ib_device *device) { -unsigned int p; +u32 p;/* * The release function frees all the cache elements.
drivers/infiniband/core/cm.c +6 -6
@@ -202,7 +202,7 @@ static struct attribute *cm_counter_default_attrs[] = {struct cm_port {struct cm_device *cm_dev;struct ib_mad_agent *mad_agent; -u8 port_num; +u32 port_num;struct list_head cm_priv_prim_list;struct list_head cm_priv_altr_list;struct cm_counter_group counter_group[CM_COUNTER_GROUPS ];
@@ -1631,7 +1631,7 @@ static bool cm_req_has_alt_path(struct cm_req_msg *req_msg) req_msg)))); } -static void cm_path_set_rec_type (struct ib_device *ib_device,u8 port_num, +static void cm_path_set_rec_type (struct ib_device *ib_device,u32 port_num,struct sa_path_rec *path,union ib_gid *gid) {if (ib_is_opa_gid (gid) &&rdma_cap_opa_ah (ib_device, port_num))
@@ -1750,7 +1750,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg,static u16 cm_get_bth_pkey (struct cm_work *work) {struct ib_device *ib_dev = work->port->cm_dev->ib_device; -u8 port_num = work->port->port_num; +u32 port_num = work->port->port_num;u16 pkey_index = work->mad_recv_wc->wc->pkey_index;u16 pkey;int ret;
@@ -1778,7 +1778,7 @@ static void cm_opa_to_ib_sgid(struct cm_work *work, struct sa_path_rec *path) {struct ib_device *dev = work->port->cm_dev->ib_device; -u8 port_num = work->port->port_num; +u32 port_num = work->port->port_num;if (rdma_cap_opa_ah (dev, port_num) && (ib_is_opa_gid (&path->sgid))) {
@@ -4333,7 +4333,7 @@ static int cm_add_one(struct ib_device *ib_device)unsigned long flags;int ret;int count =0 ; -unsigned int i; +u32 i; cm_dev =kzalloc (struct_size (cm_dev, port, ib_device->phys_port_cnt),GFP_KERNEL );
@@ -4431,7 +4431,7 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data) .clr_port_cap_mask = IB_PORT_CM_SUP };unsigned long flags; -unsigned int i; +u32 i;write_lock_irqsave (&cm.device_lock, flags);list_del (&cm_dev->list);
drivers/infiniband/core/cma.c +10 -10
@@ -224,7 +224,7 @@ struct class_port_info_context {struct ib_device *device;struct completion done;struct ib_sa_query *sa_query; -u8 port_num; +u32 port_num; }; static int cma_ps_alloc(struct net *net, enum rdma_ucm_port_space ps,
@@ -287,7 +287,7 @@ struct cma_device *cma_enum_devices_by_ibdev(cma_device_filter filter, }int cma_get_default_gid_type (struct cma_device *cma_dev, -unsigned int port) +u32 port) {if (!rdma_is_port_valid (cma_dev->device, port))return -EINVAL ;
@@ -296,7 +296,7 @@ int cma_get_default_gid_type(struct cma_device *cma_dev, }int cma_set_default_gid_type (struct cma_device *cma_dev, -unsigned int port, +u32 port,enum ib_gid_type default_gid_type) {unsigned long supported_gids;
@@ -319,7 +319,7 @@ int cma_set_default_gid_type(struct cma_device *cma_dev,return 0 ; } -int cma_get_default_roce_tos (struct cma_device *cma_dev,unsigned int port) +int cma_get_default_roce_tos (struct cma_device *cma_dev,u32 port) {if (!rdma_is_port_valid (cma_dev->device, port))return -EINVAL ;
@@ -327,7 +327,7 @@ int cma_get_default_roce_tos(struct cma_device *cma_dev, unsigned int port)return cma_dev->default_roce_tos[port -rdma_start_port (cma_dev->device)]; } -int cma_set_default_roce_tos (struct cma_device *cma_dev,unsigned int port, +int cma_set_default_roce_tos (struct cma_device *cma_dev,u32 port,u8 default_roce_tos) {if (!rdma_is_port_valid (cma_dev->device, port))
@@ -562,7 +562,7 @@ static int cma_translate_addr(struct sockaddr *addr, struct rdma_dev_addr *dev_a }static const struct ib_gid_attr * -cma_validate_port (struct ib_device *device,u8 port, +cma_validate_port (struct ib_device *device,u32 port,enum ib_gid_type gid_type,union ib_gid *gid,struct rdma_id_private *id_priv)
@@ -620,7 +620,7 @@ static int cma_acquire_dev_by_src_ip(struct rdma_id_private *id_priv)struct cma_device *cma_dev;enum ib_gid_type gid_type;int ret = -ENODEV ; -unsigned int port; +u32 port;if (dev_addr->dev_type !=ARPHRD_INFINIBAND && id_priv->id.ps ==RDMA_PS_IPOIB )
@@ -711,8 +711,8 @@ static int cma_iw_acquire_dev(struct rdma_id_private *id_priv,struct cma_device *cma_dev;enum ib_gid_type gid_type;int ret = -ENODEV ; -unsigned int port;union ib_gid gid; +u32 port;if (dev_addr->dev_type !=ARPHRD_INFINIBAND && id_priv->id.ps ==RDMA_PS_IPOIB )
@@ -1581,7 +1581,7 @@ static bool cma_match_private_data(struct rdma_id_private *id_priv,static bool cma_protocol_roce (const struct rdma_cm_id *id) {struct ib_device *device = id->device; -const int port_num = id->port_num ?:rdma_start_port (device); +const u32 port_num = id->port_num ?:rdma_start_port (device);return rdma_protocol_roce (device, port_num); }
@@ -4869,9 +4869,9 @@ static int cma_add_one(struct ib_device *device)struct rdma_id_private *to_destroy;struct cma_device *cma_dev;struct rdma_id_private *id_priv; -unsigned int i;unsigned long supported_gids =0 ;int ret; +u32 i; cma_dev =kmalloc (sizeof (*cma_dev),GFP_KERNEL );if (!cma_dev)
drivers/infiniband/core/cma_configfs.c +4 -4
@@ -43,7 +43,7 @@ struct cma_device;struct cma_dev_group ;struct cma_dev_port_group { -unsigned int port_num; +u32 port_num;struct cma_dev_group *cma_dev_group;struct config_group group; };
@@ -200,10 +200,10 @@ static const struct config_item_type cma_port_group_type = {static int make_cma_ports (struct cma_dev_group *cma_dev_group,struct cma_device *cma_dev) { -struct ib_device *ibdev; -unsigned int i; -unsigned int ports_num;struct cma_dev_port_group *ports; +struct ib_device *ibdev; +u32 ports_num; +u32 i; ibdev =cma_get_ib_dev (cma_dev);
drivers/infiniband/core/cma_priv.h +4 -4
@@ -117,11 +117,11 @@ void cma_dev_put(struct cma_device *dev);typedef bool (*cma_device_filter )(struct ib_device *,void *);struct cma_device *cma_enum_devices_by_ibdev (cma_device_filter filter,void *cookie); -int cma_get_default_gid_type (struct cma_device *dev,unsigned int port); -int cma_set_default_gid_type (struct cma_device *dev,unsigned int port, +int cma_get_default_gid_type (struct cma_device *dev,u32 port); +int cma_set_default_gid_type (struct cma_device *dev,u32 port,enum ib_gid_type default_gid_type); -int cma_get_default_roce_tos (struct cma_device *dev,unsigned int port); -int cma_set_default_roce_tos (struct cma_device *dev,unsigned int port, +int cma_get_default_roce_tos (struct cma_device *dev,u32 port); +int cma_set_default_roce_tos (struct cma_device *dev,u32 port,u8 default_roce_tos);struct ib_device *cma_get_ib_dev (struct cma_device *dev);
drivers/infiniband/core/core_priv.h +14 -14
@@ -83,14 +83,14 @@ void ib_device_unregister_sysfs(struct ib_device *device);int ib_device_rename (struct ib_device *ibdev,const char *name);int ib_device_set_dim (struct ib_device *ibdev,u8 use_dim); -typedef void (*roce_netdev_callback )(struct ib_device *device,u8 port, +typedef void (*roce_netdev_callback )(struct ib_device *device,u32 port,struct net_device *idev,void *cookie); -typedef bool (*roce_netdev_filter )(struct ib_device *device,u8 port, +typedef bool (*roce_netdev_filter )(struct ib_device *device,u32 port,struct net_device *idev,void *cookie);struct net_device *ib_device_get_netdev (struct ib_device *ib_dev, -unsigned int port); +u32 port); void ib_enum_roce_netdev(struct ib_device *ib_dev, roce_netdev_filter filter,
@@ -113,7 +113,7 @@ int ib_enum_all_devs(nldev_callback nldev_cb, struct sk_buff *skb,struct ib_client_nl_info {struct sk_buff *nl_msg;struct device *cdev; -unsigned int port; +u32 port;u64 abi; }; int ib_get_client_nl_info(struct ib_device *ibdev, const char *client_name,
@@ -128,24 +128,24 @@ int ib_cache_gid_parse_type_str(const char *buf);const char *ib_cache_gid_type_str (enum ib_gid_type gid_type); -void ib_cache_gid_set_default_gid (struct ib_device *ib_dev,u8 port, +void ib_cache_gid_set_default_gid (struct ib_device *ib_dev,u32 port,struct net_device *ndev,unsigned long gid_type_mask,enum ib_cache_gid_default_mode mode); -int ib_cache_gid_add (struct ib_device *ib_dev,u8 port, +int ib_cache_gid_add (struct ib_device *ib_dev,u32 port,union ib_gid *gid,struct ib_gid_attr *attr); -int ib_cache_gid_del (struct ib_device *ib_dev,u8 port, +int ib_cache_gid_del (struct ib_device *ib_dev,u32 port,union ib_gid *gid,struct ib_gid_attr *attr); -int ib_cache_gid_del_all_netdev_gids (struct ib_device *ib_dev,u8 port, +int ib_cache_gid_del_all_netdev_gids (struct ib_device *ib_dev,u32 port,struct net_device *ndev);int roce_gid_mgmt_init (void );void roce_gid_mgmt_cleanup (void ); -unsigned long roce_gid_type_mask_support (struct ib_device *ib_dev,u8 port); +unsigned long roce_gid_type_mask_support (struct ib_device *ib_dev,u32 port);int ib_cache_setup_one (struct ib_device *device);void ib_cache_cleanup_one (struct ib_device *device);
@@ -215,14 +215,14 @@ int ib_nl_handle_ip_res_resp(struct sk_buff *skb, struct netlink_ext_ack *extack);int ib_get_cached_subnet_prefix (struct ib_device *device, -u8 port_num, -u64 *sn_pfx); +u32 port_num, +u64 *sn_pfx);#ifdef CONFIG_SECURITY_INFINIBAND void ib_security_release_port_pkey_list (struct ib_device *device);void ib_security_cache_change (struct ib_device *device, -u8 port_num, +u32 port_num,u64 subnet_prefix); int ib_security_modify_qp(struct ib_qp *qp,
@@ -247,7 +247,7 @@ static inline void ib_security_release_port_pkey_list(struct ib_device *device) }static inline void ib_security_cache_change (struct ib_device *device, -u8 port_num, +u32 port_num,u64 subnet_prefix) { }
@@ -381,7 +381,7 @@ int ib_setup_port_attrs(struct ib_core_device *coredev);int rdma_compatdev_set (u8 enable); -int ib_port_register_module_stat (struct ib_device *device,u8 port_num, +int ib_port_register_module_stat (struct ib_device *device,u32 port_num,struct kobject *kobj,struct kobj_type *ktype,const char *name);void ib_port_unregister_module_stat (struct kobject *kobj);
drivers/infiniband/core/counters.c +10 -10
@@ -34,7 +34,7 @@ static int __counter_set_mode(struct rdma_port_counter *port_counter,* * Return 0 on success. */ -int rdma_counter_set_auto_mode (struct ib_device *dev,u8 port, +int rdma_counter_set_auto_mode (struct ib_device *dev,u32 port,enum rdma_nl_counter_mask mask,struct netlink_ext_ack *extack) {
@@ -100,7 +100,7 @@ static int __rdma_counter_bind_qp(struct rdma_counter *counter,return ret; } -static struct rdma_counter *alloc_and_bind (struct ib_device *dev,u8 port, +static struct rdma_counter *alloc_and_bind (struct ib_device *dev,u32 port,struct ib_qp *qp,enum rdma_nl_counter_mode mode) {
@@ -238,7 +238,7 @@ static void counter_history_stat_update(struct rdma_counter *counter)* Return: The counter (with ref-count increased) if found */ static struct rdma_counter *rdma_get_counter_auto_mode (struct ib_qp *qp, -u8 port) +u32 port) {struct rdma_port_counter *port_counter;struct rdma_counter *counter =NULL ;
@@ -282,7 +282,7 @@ static void counter_release(struct kref *kref)* rdma_counter_bind_qp_auto - Check and bind the QP to a counter base on * the auto-mode rule */ -int rdma_counter_bind_qp_auto (struct ib_qp *qp,u8 port) +int rdma_counter_bind_qp_auto (struct ib_qp *qp,u32 port) {struct rdma_port_counter *port_counter;struct ib_device *dev = qp->device;
@@ -352,7 +352,7 @@ int rdma_counter_query_stats(struct rdma_counter *counter) }static u64 get_running_counters_hwstat_sum (struct ib_device *dev, -u8 port,u32 index) +u32 port,u32 index) {struct rdma_restrack_entry *res;struct rdma_restrack_root *rt;
@@ -388,7 +388,7 @@ static u64 get_running_counters_hwstat_sum(struct ib_device *dev,* rdma_counter_get_hwstat_value() - Get the sum value of all counters on a * specific port, including the running ones and history data */ -u64 rdma_counter_get_hwstat_value (struct ib_device *dev,u8 port,u32 index) +u64 rdma_counter_get_hwstat_value (struct ib_device *dev,u32 port,u32 index) {struct rdma_port_counter *port_counter;u64 sum;
@@ -443,7 +443,7 @@ static struct rdma_counter *rdma_get_counter_by_id(struct ib_device *dev,/* * rdma_counter_bind_qpn() - Bind QP @qp_num to counter @counter_id */ -int rdma_counter_bind_qpn (struct ib_device *dev,u8 port, +int rdma_counter_bind_qpn (struct ib_device *dev,u32 port,u32 qp_num,u32 counter_id) {struct rdma_port_counter *port_counter;
@@ -493,7 +493,7 @@ int rdma_counter_bind_qpn(struct ib_device *dev, u8 port,* rdma_counter_bind_qpn_alloc() - Alloc a counter and bind QP @qp_num to it * The id of new counter is returned in @counter_id */ -int rdma_counter_bind_qpn_alloc (struct ib_device *dev,u8 port, +int rdma_counter_bind_qpn_alloc (struct ib_device *dev,u32 port,u32 qp_num,u32 *counter_id) {struct rdma_port_counter *port_counter;
@@ -540,7 +540,7 @@ int rdma_counter_bind_qpn_alloc(struct ib_device *dev, u8 port,/* * rdma_counter_unbind_qpn() - Unbind QP @qp_num from a counter */ -int rdma_counter_unbind_qpn (struct ib_device *dev,u8 port, +int rdma_counter_unbind_qpn (struct ib_device *dev,u32 port,u32 qp_num,u32 counter_id) {struct rdma_port_counter *port_counter;
@@ -573,7 +573,7 @@ int rdma_counter_unbind_qpn(struct ib_device *dev, u8 port,return ret; } -int rdma_counter_get_mode (struct ib_device *dev,u8 port, +int rdma_counter_get_mode (struct ib_device *dev,u32 port,enum rdma_nl_counter_mode *mode,enum rdma_nl_counter_mask *mask) {
drivers/infiniband/core/device.c +20 -16
@@ -779,7 +779,7 @@ static void remove_client_context(struct ib_device *device,static int alloc_port_data (struct ib_device *device) {struct ib_port_data_rcu *pdata_rcu; -unsigned int port; +u32 port;if (device->port_data)return 0 ;
@@ -788,6 +788,10 @@ static int alloc_port_data(struct ib_device *device)if (WARN_ON (!device->phys_port_cnt))return -EINVAL ; +/* Reserve U32_MAX so the logic to go over all the ports is sane */ +if (WARN_ON (device->phys_port_cnt ==U32_MAX )) +return -EINVAL ; +/* * device->port_data is indexed directly by the port number to make * access to this data as efficient as possible.
@@ -819,7 +823,7 @@ static int alloc_port_data(struct ib_device *device)return 0 ; } -static int verify_immutable (const struct ib_device *dev,u8 port) +static int verify_immutable (const struct ib_device *dev,u32 port) {return WARN_ON (!rdma_cap_ib_mad (dev, port) &&rdma_max_mad_size (dev, port) !=0 );
@@ -827,7 +831,7 @@ static int verify_immutable(const struct ib_device *dev, u8 port)static int setup_port_data (struct ib_device *device) { -unsigned int port; +u32 port;int ret; ret =alloc_port_data (device);
@@ -2005,7 +2009,7 @@ void ib_dispatch_event_clients(struct ib_event *event) }static int iw_query_port (struct ib_device *device, -u8 port_num, +u32 port_num,struct ib_port_attr *port_attr) {struct in_device *inetdev;
@@ -2044,7 +2048,7 @@ static int iw_query_port(struct ib_device *device, }static int __ib_query_port (struct ib_device *device, -u8 port_num, +u32 port_num,struct ib_port_attr *port_attr) {union ib_gid gid = {};
@@ -2078,7 +2082,7 @@ static int __ib_query_port(struct ib_device *device,* @port_attr pointer. */ int ib_query_port (struct ib_device *device, -u8 port_num, +u32 port_num,struct ib_port_attr *port_attr) {if (!rdma_is_port_valid (device, port_num))
@@ -2130,7 +2134,7 @@ static void add_ndev_hash(struct ib_port_data *pdata)* NETDEV_UNREGISTER event. */ int ib_device_set_netdev (struct ib_device *ib_dev,struct net_device *ndev, -unsigned int port) +u32 port) {struct net_device *old_ndev;struct ib_port_data *pdata;
@@ -2173,7 +2177,7 @@ EXPORT_SYMBOL(ib_device_set_netdev);static void free_netdevs (struct ib_device *ib_dev) {unsigned long flags; -unsigned int port; +u32 port;if (!ib_dev->port_data)return ;
@@ -2204,7 +2208,7 @@ static void free_netdevs(struct ib_device *ib_dev) }struct net_device *ib_device_get_netdev (struct ib_device *ib_dev, -unsigned int port) +u32 port) {struct ib_port_data *pdata;struct net_device *res;
@@ -2291,7 +2295,7 @@ void ib_enum_roce_netdev(struct ib_device *ib_dev,roce_netdev_callback cb, void *cookie) { - unsigned int port; + u32 port; rdma_for_each_port (ib_dev, port)if (rdma_protocol_roce (ib_dev, port)) {
@@ -2369,7 +2373,7 @@ int ib_enum_all_devs(nldev_callback nldev_cb, struct sk_buff *skb,* ib_query_pkey() fetches the specified P_Key table entry. */ int ib_query_pkey (struct ib_device *device, -u8 port_num,u16 index,u16 *pkey) +u32 port_num,u16 index,u16 *pkey) {if (!rdma_is_port_valid (device, port_num))return -EINVAL ;
@@ -2414,7 +2418,7 @@ EXPORT_SYMBOL(ib_modify_device);* @port_modify_mask and @port_modify structure. */ int ib_modify_port (struct ib_device *device, -u8 port_num,int port_modify_mask, +u32 port_num,int port_modify_mask,struct ib_port_modify *port_modify) {int rc;
@@ -2446,10 +2450,10 @@ EXPORT_SYMBOL(ib_modify_port);* parameter may be NULL. */ int ib_find_gid (struct ib_device *device,union ib_gid *gid, -u8 *port_num,u16 *index) +u32 *port_num,u16 *index) {union ib_gid tmp_gid; -unsigned int port; +u32 port;int ret, i; rdma_for_each_port (device, port) {
@@ -2483,7 +2487,7 @@ EXPORT_SYMBOL(ib_find_gid);* @index: The index into the PKey table where the PKey was found. */ int ib_find_pkey (struct ib_device *device, -u8 port_num,u16 pkey,u16 *index) +u32 port_num,u16 pkey,u16 *index) {int ret, i;u16 tmp_pkey;
@@ -2526,7 +2530,7 @@ EXPORT_SYMBOL(ib_find_pkey);* */ struct net_device *ib_get_net_dev_by_params (struct ib_device *dev, -u8 port, +u32 port,u16 pkey,const union ib_gid *gid,const struct sockaddr *addr)
drivers/infiniband/core/mad.c +16 -16
@@ -61,7 +61,7 @@ static void create_mad_addr_info(struct ib_mad_send_wr_private *mad_send_wr, {u16 pkey;struct ib_device *dev = qp_info->port_priv->device; -u8 pnum = qp_info->port_priv->port_num; +u32 pnum = qp_info->port_priv->port_num;struct ib_ud_wr *wr = &mad_send_wr->send_wr;struct rdma_ah_attr attr = {};
@@ -118,7 +118,7 @@ static void ib_mad_send_done(struct ib_cq *cq, struct ib_wc *wc);* Assumes ib_mad_port_list_lock is being held */ static inline struct ib_mad_port_private * -__ib_get_mad_port (struct ib_device *device,int port_num) +__ib_get_mad_port (struct ib_device *device,u32 port_num) {struct ib_mad_port_private *entry;
@@ -134,7 +134,7 @@ __ib_get_mad_port(struct ib_device *device, int port_num)* for a device/port */ static inline struct ib_mad_port_private * -ib_get_mad_port (struct ib_device *device,int port_num) +ib_get_mad_port (struct ib_device *device,u32 port_num) {struct ib_mad_port_private *entry;unsigned long flags;
@@ -222,7 +222,7 @@ EXPORT_SYMBOL(ib_response_mad);* Context: Process context. */ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, - u8 port_num, + u32 port_num, enum ib_qp_type qp_type, struct ib_mad_reg_req *mad_reg_req, u8 rmpp_version,
@@ -549,7 +549,7 @@ static void dequeue_mad(struct ib_mad_list_head *mad_list) }static void build_smp_wc (struct ib_qp *qp,struct ib_cqe *cqe,u16 slid, -u16 pkey_index,u8 port_num,struct ib_wc *wc) +u16 pkey_index,u32 port_num,struct ib_wc *wc) {memset (wc,0 ,sizeof *wc); wc->wr_cqe = cqe;
@@ -608,7 +608,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,struct ib_mad_port_private *port_priv;struct ib_mad_agent_private *recv_mad_agent =NULL ;struct ib_device *device = mad_agent_priv->agent.device; -u8 port_num; +u32 port_num;struct ib_wc mad_wc;struct ib_ud_wr *send_wr = &mad_send_wr->send_wr;size_t mad_size =port_mad_size (mad_agent_priv->qp_info->port_priv);
@@ -1613,7 +1613,7 @@ find_mad_agent(struct ib_mad_port_private *port_priv,if (mad_agent && !mad_agent->agent.recv_handler) {dev_notice (&port_priv->device->dev, -"No receive handler for client %p on port %d\n" , +"No receive handler for client %p on port %u\n" , &mad_agent->agent, port_priv->port_num);deref_mad_agent (mad_agent); mad_agent =NULL ;
@@ -1685,7 +1685,7 @@ static inline int rcv_has_same_gid(const struct ib_mad_agent_private *mad_agent_u8 send_resp, rcv_resp;union ib_gid sgid;struct ib_device *device = mad_agent_priv->agent.device; -u8 port_num = mad_agent_priv->agent.port_num; +u32 port_num = mad_agent_priv->agent.port_num;u8 lmc;bool has_grh;
@@ -1867,7 +1867,7 @@ static void ib_mad_complete_recv(struct ib_mad_agent_private *mad_agent_priv,static enum smi_action handle_ib_smi (const struct ib_mad_port_private *port_priv,const struct ib_mad_qp_info *qp_info,const struct ib_wc *wc, -int port_num, +u32 port_num,struct ib_mad_private *recv,struct ib_mad_private *response) {
@@ -1954,7 +1954,7 @@ static enum smi_action handle_opa_smi(struct ib_mad_port_private *port_priv, struct ib_mad_qp_info *qp_info, struct ib_wc *wc, - int port_num, + u32 port_num, struct ib_mad_private *recv, struct ib_mad_private *response) {
@@ -2010,7 +2010,7 @@ static enum smi_action handle_smi(struct ib_mad_port_private *port_priv, struct ib_mad_qp_info *qp_info, struct ib_wc *wc, - int port_num, + u32 port_num, struct ib_mad_private *recv, struct ib_mad_private *response, bool opa)
@@ -2034,7 +2034,7 @@ static void ib_mad_recv_done(struct ib_cq *cq, struct ib_wc *wc)struct ib_mad_private_header *mad_priv_hdr;struct ib_mad_private *recv, *response =NULL ;struct ib_mad_agent_private *mad_agent; -int port_num; +u32 port_num;int ret =IB_MAD_RESULT_SUCCESS ;size_t mad_size;u16 resp_mad_pkey_index =0 ;
@@ -2947,7 +2947,7 @@ static void destroy_mad_qp(struct ib_mad_qp_info *qp_info)* Create the QP, PD, MR, and CQ if needed */ static int ib_mad_port_open (struct ib_device *device, -int port_num) +u32 port_num) {int ret, cq_size;struct ib_mad_port_private *port_priv;
@@ -3002,7 +3002,7 @@ static int ib_mad_port_open(struct ib_device *device,if (ret) goto error7; -snprintf (name,sizeof name,"ib_mad%d" , port_num); +snprintf (name,sizeof (name),"ib_mad%u" , port_num); port_priv->wq =alloc_ordered_workqueue (name,WQ_MEM_RECLAIM );if (!port_priv->wq) { ret = -ENOMEM ;
@@ -3048,7 +3048,7 @@ static int ib_mad_port_open(struct ib_device *device,* If there are no classes using the port, free the port * resources (CQ, MR, PD, QP) and remove the port's info structure */ -static int ib_mad_port_close (struct ib_device *device,int port_num) +static int ib_mad_port_close (struct ib_device *device,u32 port_num) {struct ib_mad_port_private *port_priv;unsigned long flags;
@@ -3057,7 +3057,7 @@ static int ib_mad_port_close(struct ib_device *device, int port_num) port_priv =__ib_get_mad_port (device, port_num);if (port_priv ==NULL ) {spin_unlock_irqrestore (&ib_mad_port_list_lock, flags); -dev_err (&device->dev,"Port %d not found\n" , port_num); +dev_err (&device->dev,"Port %u not found\n" , port_num);return -ENODEV ; }list_del_init (&port_priv->port_list);
drivers/infiniband/core/multicast.c +4 -4
@@ -63,7 +63,7 @@ struct mcast_port {struct rb_root table;atomic_t refcount;struct completion comp; -u8 port_num; +u32 port_num; };struct mcast_device {
@@ -605,7 +605,7 @@ static struct mcast_group *acquire_group(struct mcast_port *port,*/ struct ib_sa_multicast * ib_sa_join_multicast(struct ib_sa_client *client, - struct ib_device *device, u8 port_num, + struct ib_device *device, u32 port_num, struct ib_sa_mcmember_rec *rec, ib_sa_comp_mask comp_mask, gfp_t gfp_mask, int (*callback)(int status,
@@ -690,7 +690,7 @@ void ib_sa_free_multicast(struct ib_sa_multicast *multicast) }EXPORT_SYMBOL (ib_sa_free_multicast); -int ib_sa_get_mcmember_rec (struct ib_device *device,u8 port_num, +int ib_sa_get_mcmember_rec (struct ib_device *device,u32 port_num,union ib_gid *mgid,struct ib_sa_mcmember_rec *rec) {struct mcast_device *dev;
@@ -732,7 +732,7 @@ EXPORT_SYMBOL(ib_sa_get_mcmember_rec);* success or appropriate error code. * */ -int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num, +int ib_init_ah_from_mcmember(struct ib_device *device, u32 port_num, struct ib_sa_mcmember_rec *rec, struct net_device *ndev, enum ib_gid_type gid_type,
drivers/infiniband/core/nldev.c +1 -1
@@ -242,7 +242,7 @@ static int fill_dev_info(struct sk_buff *msg, struct ib_device *device) {char fw[IB_FW_VERSION_NAME_MAX ];int ret =0 ; -u8 port; +u32 port;if (fill_nldev_handle (msg, device))return -EMSGSIZE ;
drivers/infiniband/core/opa_smi.h +2 -2
@@ -40,11 +40,11 @@#include "smi.h" enum smi_action opa_smi_handle_dr_smp_recv (struct opa_smp *smp,bool is_switch, -int port_num,int phys_port_cnt); +u32 port_num,int phys_port_cnt);int opa_smi_get_fwd_port (struct opa_smp *smp);extern enum smi_forward_action opa_smi_check_forward_dr_smp (struct opa_smp *smp);extern enum smi_action opa_smi_handle_dr_smp_send (struct opa_smp *smp, -bool is_switch,int port_num); +bool is_switch,u32 port_num);/* * Return IB_SMI_HANDLE if the SMP should be handled by the local SMA/SM
drivers/infiniband/core/roce_gid_mgmt.c +26 -26
199 lines not on this page · raw message
drivers/infiniband/core/rw.c +13 -12
@@ -25,7 +25,7 @@ MODULE_PARM_DESC(force_mr, "Force usage of MRs for RDMA READ/WRITE operations");* registration is also enabled if registering memory might yield better * performance than using multiple SGE entries, see rdma_rw_io_needs_mr() */ -static inline bool rdma_rw_can_use_mr (struct ib_device *dev,u8 port_num) +static inline bool rdma_rw_can_use_mr (struct ib_device *dev,u32 port_num) {if (rdma_protocol_iwarp (dev, port_num))return true;
@@ -42,7 +42,7 @@ static inline bool rdma_rw_can_use_mr(struct ib_device *dev, u8 port_num)* optimization otherwise. Additionally we have a debug option to force usage * of MRs to help testing this code path. */ -static inline bool rdma_rw_io_needs_mr (struct ib_device *dev,u8 port_num, +static inline bool rdma_rw_io_needs_mr (struct ib_device *dev,u32 port_num,enum dma_data_direction dir,int dma_nents) {if (dir ==DMA_FROM_DEVICE ) {
@@ -87,7 +87,7 @@ static inline int rdma_rw_inv_key(struct rdma_rw_reg_ctx *reg) }/* Caller must have zero-initialized *reg. */ -static int rdma_rw_init_one_mr (struct ib_qp *qp,u8 port_num, +static int rdma_rw_init_one_mr (struct ib_qp *qp,u32 port_num,struct rdma_rw_reg_ctx *reg,struct scatterlist *sg,u32 sg_cnt,u32 offset) {
@@ -121,7 +121,7 @@ static int rdma_rw_init_one_mr(struct ib_qp *qp, u8 port_num, }static int rdma_rw_init_mr_wrs (struct rdma_rw_ctx *ctx,struct ib_qp *qp, -u8 port_num,struct scatterlist *sg,u32 sg_cnt,u32 offset, +u32 port_num,struct scatterlist *sg,u32 sg_cnt,u32 offset,u64 remote_addr,u32 rkey,enum dma_data_direction dir) {struct rdma_rw_reg_ctx *prev =NULL ;
@@ -308,7 +308,7 @@ static int rdma_rw_map_sg(struct ib_device *dev, struct scatterlist *sg,* Returns the number of WQEs that will be needed on the workqueue if * successful, or a negative error code. */ -int rdma_rw_ctx_init (struct rdma_rw_ctx *ctx,struct ib_qp *qp,u8 port_num, +int rdma_rw_ctx_init (struct rdma_rw_ctx *ctx,struct ib_qp *qp,u32 port_num,struct scatterlist *sg,u32 sg_cnt,u32 sg_offset,u64 remote_addr,u32 rkey,enum dma_data_direction dir) {
@@ -377,7 +377,7 @@ EXPORT_SYMBOL(rdma_rw_ctx_init);* successful, or a negative error code. */ int rdma_rw_ctx_signature_init (struct rdma_rw_ctx *ctx,struct ib_qp *qp, -u8 port_num,struct scatterlist *sg,u32 sg_cnt, +u32 port_num,struct scatterlist *sg,u32 sg_cnt,struct scatterlist *prot_sg,u32 prot_sg_cnt,struct ib_sig_attrs *sig_attrs,u64 remote_addr,u32 rkey,enum dma_data_direction dir)
@@ -505,7 +505,7 @@ static void rdma_rw_update_lkey(struct rdma_rw_reg_ctx *reg, bool need_inval)* completion notification. */ struct ib_send_wr *rdma_rw_ctx_wrs (struct rdma_rw_ctx *ctx,struct ib_qp *qp, -u8 port_num,struct ib_cqe *cqe,struct ib_send_wr *chain_wr) +u32 port_num,struct ib_cqe *cqe,struct ib_send_wr *chain_wr) {struct ib_send_wr *first_wr, *last_wr;int i;
@@ -562,7 +562,7 @@ EXPORT_SYMBOL(rdma_rw_ctx_wrs);* is not set @cqe must be set so that the caller gets a completion * notification. */ -int rdma_rw_ctx_post (struct rdma_rw_ctx *ctx,struct ib_qp *qp,u8 port_num, +int rdma_rw_ctx_post (struct rdma_rw_ctx *ctx,struct ib_qp *qp,u32 port_num,struct ib_cqe *cqe,struct ib_send_wr *chain_wr) {struct ib_send_wr *first_wr;
@@ -581,8 +581,9 @@ EXPORT_SYMBOL(rdma_rw_ctx_post);* @sg_cnt: number of entries in @sg * @dir: %DMA_TO_DEVICE for RDMA WRITE, %DMA_FROM_DEVICE for RDMA READ */ -void rdma_rw_ctx_destroy (struct rdma_rw_ctx *ctx,struct ib_qp *qp,u8 port_num, -struct scatterlist *sg,u32 sg_cnt,enum dma_data_direction dir) +void rdma_rw_ctx_destroy (struct rdma_rw_ctx *ctx,struct ib_qp *qp, +u32 port_num,struct scatterlist *sg,u32 sg_cnt, +enum dma_data_direction dir) {int i;
@@ -620,7 +621,7 @@ EXPORT_SYMBOL(rdma_rw_ctx_destroy);* @dir: %DMA_TO_DEVICE for RDMA WRITE, %DMA_FROM_DEVICE for RDMA READ */ void rdma_rw_ctx_destroy_signature (struct rdma_rw_ctx *ctx,struct ib_qp *qp, -u8 port_num,struct scatterlist *sg,u32 sg_cnt, +u32 port_num,struct scatterlist *sg,u32 sg_cnt,struct scatterlist *prot_sg,u32 prot_sg_cnt,enum dma_data_direction dir) {
@@ -647,7 +648,7 @@ EXPORT_SYMBOL(rdma_rw_ctx_destroy_signature);* compute max_rdma_ctxts and the size of the transport's Send and * Send Completion Queues. */ -unsigned int rdma_rw_mr_factor (struct ib_device *device,u8 port_num, +unsigned int rdma_rw_mr_factor (struct ib_device *device,u32 port_num,unsigned int maxpages) {unsigned int mr_pages;
drivers/infiniband/core/sa.h +1 -1
@@ -49,7 +49,7 @@ static inline void ib_sa_client_put(struct ib_sa_client *client) } int ib_sa_mcmember_rec_query(struct ib_sa_client *client, - struct ib_device *device, u8 port_num, u8 method, + struct ib_device *device, u32 port_num, u8 method, struct ib_sa_mcmember_rec *rec, ib_sa_comp_mask comp_mask, unsigned long timeout_ms, gfp_t gfp_mask,
drivers/infiniband/core/sa_query.c +11 -11
@@ -95,7 +95,7 @@ struct ib_sa_port {struct delayed_work ib_cpi_work;spinlock_t classport_lock;/* protects class port info set */ spinlock_t ah_lock; -u8 port_num; +u32 port_num; };struct ib_sa_device {
@@ -1194,7 +1194,7 @@ void ib_sa_cancel_query(int id, struct ib_sa_query *query) }EXPORT_SYMBOL (ib_sa_cancel_query); -static u8 get_src_path_mask (struct ib_device *device,u8 port_num) +static u8 get_src_path_mask (struct ib_device *device,u32 port_num) {struct ib_sa_device *sa_dev;struct ib_sa_port *port;
@@ -1213,7 +1213,7 @@ static u8 get_src_path_mask(struct ib_device *device, u8 port_num)return src_path_mask; } -static int init_ah_attr_grh_fields (struct ib_device *device,u8 port_num, +static int init_ah_attr_grh_fields (struct ib_device *device,u32 port_num,struct sa_path_rec *rec,struct rdma_ah_attr *ah_attr,const struct ib_gid_attr *gid_attr)
@@ -1251,7 +1251,7 @@ static int init_ah_attr_grh_fields(struct ib_device *device, u8 port_num,* User must invoke rdma_destroy_ah_attr() to release reference to SGID * attributes which are initialized using ib_init_ah_attr_from_path(). */ -int ib_init_ah_attr_from_path (struct ib_device *device,u8 port_num, +int ib_init_ah_attr_from_path (struct ib_device *device,u32 port_num,struct sa_path_rec *rec,struct rdma_ah_attr *ah_attr,const struct ib_gid_attr *gid_attr)
@@ -1409,7 +1409,7 @@ EXPORT_SYMBOL(ib_sa_pack_path);static bool ib_sa_opa_pathrecord_support (struct ib_sa_client *client,struct ib_sa_device *sa_dev, -u8 port_num) +u32 port_num) {struct ib_sa_port *port;unsigned long flags;
@@ -1444,7 +1444,7 @@ enum opa_pr_supported {*/ static int opa_pr_query_possible (struct ib_sa_client *client,struct ib_sa_device *sa_dev, -struct ib_device *device,u8 port_num, +struct ib_device *device,u32 port_num,struct sa_path_rec *rec) {struct ib_port_attr port_attr;
@@ -1533,7 +1533,7 @@ static void ib_sa_path_rec_release(struct ib_sa_query *sa_query)* the query. */ int ib_sa_path_rec_get(struct ib_sa_client *client, - struct ib_device *device, u8 port_num, + struct ib_device *device, u32 port_num, struct sa_path_rec *rec, ib_sa_comp_mask comp_mask, unsigned long timeout_ms, gfp_t gfp_mask,
@@ -1688,7 +1688,7 @@ static void ib_sa_service_rec_release(struct ib_sa_query *sa_query)* the query. */ int ib_sa_service_rec_query(struct ib_sa_client *client, - struct ib_device *device, u8 port_num, u8 method, + struct ib_device *device, u32 port_num, u8 method, struct ib_sa_service_rec *rec, ib_sa_comp_mask comp_mask, unsigned long timeout_ms, gfp_t gfp_mask,
@@ -1784,7 +1784,7 @@ static void ib_sa_mcmember_rec_release(struct ib_sa_query *sa_query) } int ib_sa_mcmember_rec_query(struct ib_sa_client *client, - struct ib_device *device, u8 port_num, + struct ib_device *device, u32 port_num, u8 method, struct ib_sa_mcmember_rec *rec, ib_sa_comp_mask comp_mask,
@@ -1876,7 +1876,7 @@ static void ib_sa_guidinfo_rec_release(struct ib_sa_query *sa_query) } int ib_sa_guid_info_rec_query(struct ib_sa_client *client, - struct ib_device *device, u8 port_num, + struct ib_device *device, u32 port_num, struct ib_sa_guidinfo_rec *rec, ib_sa_comp_mask comp_mask, u8 method, unsigned long timeout_ms, gfp_t gfp_mask,
@@ -2265,7 +2265,7 @@ static void ib_sa_event(struct ib_event_handler *handler,unsigned long flags;struct ib_sa_device *sa_dev =container_of (handler,typeof (*sa_dev), event_handler); -u8 port_num = event->element.port_num - sa_dev->start_port; +u32 port_num = event->element.port_num - sa_dev->start_port;struct ib_sa_port *port = &sa_dev->port[port_num];if (!rdma_cap_ib_sa (handler->device, port->port_num))
drivers/infiniband/core/security.c +4 -4
@@ -193,7 +193,7 @@ static void qp_to_error(struct ib_qp_security *sec)static inline void check_pkey_qps (struct pkey_index_qp_list *pkey,struct ib_device *device, -u8 port_num, +u32 port_num,u64 subnet_prefix) {struct ib_port_pkey *pp, *tmp_pp;
@@ -245,7 +245,7 @@ static int port_pkey_list_insert(struct ib_port_pkey *pp)struct pkey_index_qp_list *tmp_pkey;struct pkey_index_qp_list *pkey;struct ib_device *dev; -u8 port_num = pp->port_num; +u32 port_num = pp->port_num;int ret =0 ;if (pp->state !=IB_PORT_PKEY_VALID )
@@ -538,7 +538,7 @@ void ib_destroy_qp_security_end(struct ib_qp_security *sec) }void ib_security_cache_change (struct ib_device *device, -u8 port_num, +u32 port_num,u64 subnet_prefix) {struct pkey_index_qp_list *pkey;
@@ -649,7 +649,7 @@ int ib_security_modify_qp(struct ib_qp *qp, }static int ib_security_pkey_access (struct ib_device *dev, -u8 port_num, +u32 port_num,u16 pkey_index,void *sec) {
drivers/infiniband/core/smi.c +6 -6
@@ -41,7 +41,7 @@#include "smi.h" #include "opa_smi.h" -static enum smi_action __smi_handle_dr_smp_send(bool is_switch, int port_num, +static enum smi_action __smi_handle_dr_smp_send(bool is_switch, u32 port_num, u8 *hop_ptr, u8 hop_cnt, const u8 *initial_path, const u8 *return_path,
@@ -127,7 +127,7 @@ static enum smi_action __smi_handle_dr_smp_send(bool is_switch, int port_num,* Return IB_SMI_DISCARD if the SMP should be discarded */ enum smi_action smi_handle_dr_smp_send (struct ib_smp *smp, -bool is_switch,int port_num) +bool is_switch,u32 port_num) { return __smi_handle_dr_smp_send(is_switch, port_num, &smp->hop_ptr, smp->hop_cnt,
@@ -139,7 +139,7 @@ enum smi_action smi_handle_dr_smp_send(struct ib_smp *smp, }enum smi_action opa_smi_handle_dr_smp_send (struct opa_smp *smp, -bool is_switch,int port_num) +bool is_switch,u32 port_num) { return __smi_handle_dr_smp_send(is_switch, port_num, &smp->hop_ptr, smp->hop_cnt,
@@ -152,7 +152,7 @@ enum smi_action opa_smi_handle_dr_smp_send(struct opa_smp *smp, OPA_LID_PERMISSIVE); } -static enum smi_action __smi_handle_dr_smp_recv(bool is_switch, int port_num, +static enum smi_action __smi_handle_dr_smp_recv(bool is_switch, u32 port_num, int phys_port_cnt, u8 *hop_ptr, u8 hop_cnt, const u8 *initial_path,
@@ -238,7 +238,7 @@ static enum smi_action __smi_handle_dr_smp_recv(bool is_switch, int port_num,* Return IB_SMI_DISCARD if the SMP should be dropped */ enum smi_action smi_handle_dr_smp_recv (struct ib_smp *smp,bool is_switch, -int port_num,int phys_port_cnt) +u32 port_num,int phys_port_cnt) { return __smi_handle_dr_smp_recv(is_switch, port_num, phys_port_cnt, &smp->hop_ptr, smp->hop_cnt,
@@ -254,7 +254,7 @@ enum smi_action smi_handle_dr_smp_recv(struct ib_smp *smp, bool is_switch,* Return IB_SMI_DISCARD if the SMP should be dropped */ enum smi_action opa_smi_handle_dr_smp_recv (struct opa_smp *smp,bool is_switch, -int port_num,int phys_port_cnt) +u32 port_num,int phys_port_cnt) { return __smi_handle_dr_smp_recv(is_switch, port_num, phys_port_cnt, &smp->hop_ptr, smp->hop_cnt,
drivers/infiniband/core/smi.h +2 -2
@@ -52,11 +52,11 @@ enum smi_forward_action { };enum smi_action smi_handle_dr_smp_recv (struct ib_smp *smp,bool is_switch, -int port_num,int phys_port_cnt); +u32 port_num,int phys_port_cnt);int smi_get_fwd_port (struct ib_smp *smp);extern enum smi_forward_action smi_check_forward_dr_smp (struct ib_smp *smp);extern enum smi_action smi_handle_dr_smp_send (struct ib_smp *smp, -bool is_switch,int port_num); +bool is_switch,u32 port_num);/* * Return IB_SMI_HANDLE if the SMP should be handled by the local SMA/SM
drivers/infiniband/core/sysfs.c +8 -8
@@ -62,7 +62,7 @@ struct ib_port {const struct attribute_group *pma_table;struct attribute_group *hw_stats_ag;struct rdma_hw_stats *hw_stats; -u8 port_num; +u32 port_num; };struct port_attribute {
@@ -94,7 +94,7 @@ struct hw_stats_attribute {const char *buf, size_t count);int index; -u8 port_num; +u32 port_num; }; static ssize_t port_attr_show(struct kobject *kobj,
@@ -812,7 +812,7 @@ static const struct attribute_group *get_counter_table(struct ib_device *dev, }static int update_hw_stats (struct ib_device *dev,struct rdma_hw_stats *stats, -u8 port_num,int index) +u32 port_num,int index) {int ret;
@@ -938,7 +938,7 @@ static void free_hsag(struct kobject *kobj, struct attribute_group *attr_group)kfree (attr_group); } -static struct attribute *alloc_hsa (int index,u8 port_num,const char *name) +static struct attribute *alloc_hsa (int index,u32 port_num,const char *name) {struct hw_stats_attribute *hsa;
@@ -956,7 +956,7 @@ static struct attribute *alloc_hsa(int index, u8 port_num, const char *name)return &hsa->attr; } -static struct attribute *alloc_hsa_lifespan (char *name,u8 port_num) +static struct attribute *alloc_hsa_lifespan (char *name,u32 port_num) {struct hw_stats_attribute *hsa;
@@ -975,7 +975,7 @@ static struct attribute *alloc_hsa_lifespan(char *name, u8 port_num) }static void setup_hw_stats (struct ib_device *device,struct ib_port *port, -u8 port_num) +u32 port_num) {struct attribute_group *hsag;struct rdma_hw_stats *stats;
@@ -1383,7 +1383,7 @@ void ib_free_port_attrs(struct ib_core_device *coredev)int ib_setup_port_attrs (struct ib_core_device *coredev) {struct ib_device *device =rdma_device_to_ibdev (&coredev->dev); -unsigned int port; +u32 port;int ret; coredev->ports_kobj = kobject_create_and_add("ports",
@@ -1437,7 +1437,7 @@ void ib_device_unregister_sysfs(struct ib_device *device)* @ktype: pointer to the ktype for this kobject. * @name: the name of the kobject */ -int ib_port_register_module_stat (struct ib_device *device,u8 port_num, +int ib_port_register_module_stat (struct ib_device *device,u32 port_num,struct kobject *kobj,struct kobj_type *ktype,const char *name) {
drivers/infiniband/core/user_mad.c +2 -2
@@ -101,7 +101,7 @@ struct ib_umad_port {struct ib_device *ib_dev;struct ib_umad_device *umad_dev;int dev_num; -u8 port_num; +u32 port_num; };struct ib_umad_device {
@@ -1145,7 +1145,7 @@ static const struct file_operations umad_sm_fops = {static struct ib_umad_port *get_port (struct ib_device *ibdev,struct ib_umad_device *umad_dev, -unsigned int port) +u32 port) {if (!umad_dev)return ERR_PTR (-EOPNOTSUPP );
drivers/infiniband/core/uverbs_cmd.c +1 -1
@@ -364,7 +364,7 @@ static void copy_query_dev_fields(struct ib_ucontext *ucontext, resp->max_srq_sge = attr->max_srq_sge; resp->max_pkeys = attr->max_pkeys; resp->local_ca_ack_delay = attr->local_ca_ack_delay; - resp->phys_port_cnt = ib_dev->phys_port_cnt; + resp->phys_port_cnt =min_t (u32, ib_dev->phys_port_cnt,U8_MAX ); }static int ib_uverbs_query_device (struct uverbs_attr_bundle *attrs)
drivers/infiniband/core/verbs.c +15 -14
@@ -227,7 +227,8 @@ rdma_node_get_transport(unsigned int node_type) }EXPORT_SYMBOL (rdma_node_get_transport); -enum rdma_link_layer rdma_port_get_link_layer (struct ib_device *device,u8 port_num) +enum rdma_link_layer rdma_port_get_link_layer (struct ib_device *device, +u32 port_num) {enum rdma_transport_type lt;if (device->ops.get_link_layer)
@@ -658,7 +659,7 @@ int ib_get_rdma_header_version(const union rdma_network_hdr *hdr)EXPORT_SYMBOL (ib_get_rdma_header_version);static enum rdma_network_type ib_get_net_type_by_grh (struct ib_device *device, -u8 port_num, +u32 port_num,const struct ib_grh *grh) {int grh_version;
@@ -701,7 +702,7 @@ static bool find_gid_index(const union ib_gid *gid, }static const struct ib_gid_attr * -get_sgid_attr_from_eth (struct ib_device *device,u8 port_num, +get_sgid_attr_from_eth (struct ib_device *device,u32 port_num,u16 vlan_id,const union ib_gid *sgid,enum ib_gid_type gid_type) {
@@ -788,7 +789,7 @@ static int ib_resolve_unicast_gid_dmac(struct ib_device *device,* On success the caller is responsible to call rdma_destroy_ah_attr on the * attr. */ -int ib_init_ah_attr_from_wc (struct ib_device *device,u8 port_num, +int ib_init_ah_attr_from_wc (struct ib_device *device,u32 port_num,const struct ib_wc *wc,const struct ib_grh *grh,struct rdma_ah_attr *ah_attr) {
@@ -919,7 +920,7 @@ void rdma_destroy_ah_attr(struct rdma_ah_attr *ah_attr)EXPORT_SYMBOL (rdma_destroy_ah_attr);struct ib_ah *ib_create_ah_from_wc (struct ib_pd *pd,const struct ib_wc *wc, -const struct ib_grh *grh,u8 port_num) +const struct ib_grh *grh,u32 port_num) {struct rdma_ah_attr ah_attr;struct ib_ah *ah;
@@ -1673,7 +1674,7 @@ static bool is_qp_type_connected(const struct ib_qp *qp)static int _ib_modify_qp (struct ib_qp *qp,struct ib_qp_attr *attr,int attr_mask,struct ib_udata *udata) { -u8 port = attr_mask &IB_QP_PORT ? attr->port_num : qp->port; +u32 port = attr_mask &IB_QP_PORT ? attr->port_num : qp->port;const struct ib_gid_attr *old_sgid_attr_av;const struct ib_gid_attr *old_sgid_attr_alt_av;int ret;
@@ -1801,7 +1802,7 @@ int ib_modify_qp_with_udata(struct ib_qp *ib_qp, struct ib_qp_attr *attr, }EXPORT_SYMBOL (ib_modify_qp_with_udata); -int ib_get_eth_speed (struct ib_device *dev,u8 port_num,u16 *speed,u8 *width) +int ib_get_eth_speed (struct ib_device *dev,u32 port_num,u16 *speed,u8 *width) {int rc;u32 netdev_speed;
@@ -2467,7 +2468,7 @@ int ib_check_mr_status(struct ib_mr *mr, u32 check_mask, }EXPORT_SYMBOL (ib_check_mr_status); -int ib_set_vf_link_state (struct ib_device *device,int vf,u8 port, +int ib_set_vf_link_state (struct ib_device *device,int vf,u32 port,int state) {if (!device->ops.set_vf_link_state)
@@ -2477,7 +2478,7 @@ int ib_set_vf_link_state(struct ib_device *device, int vf, u8 port, }EXPORT_SYMBOL (ib_set_vf_link_state); -int ib_get_vf_config (struct ib_device *device,int vf,u8 port, +int ib_get_vf_config (struct ib_device *device,int vf,u32 port,struct ifla_vf_info *info) {if (!device->ops.get_vf_config)
@@ -2487,7 +2488,7 @@ int ib_get_vf_config(struct ib_device *device, int vf, u8 port, }EXPORT_SYMBOL (ib_get_vf_config); -int ib_get_vf_stats (struct ib_device *device,int vf,u8 port, +int ib_get_vf_stats (struct ib_device *device,int vf,u32 port,struct ifla_vf_stats *stats) {if (!device->ops.get_vf_stats)
@@ -2497,7 +2498,7 @@ int ib_get_vf_stats(struct ib_device *device, int vf, u8 port, }EXPORT_SYMBOL (ib_get_vf_stats); -int ib_set_vf_guid (struct ib_device *device,int vf,u8 port,u64 guid, +int ib_set_vf_guid (struct ib_device *device,int vf,u32 port,u64 guid,int type) {if (!device->ops.set_vf_guid)
@@ -2507,7 +2508,7 @@ int ib_set_vf_guid(struct ib_device *device, int vf, u8 port, u64 guid, }EXPORT_SYMBOL (ib_set_vf_guid); -int ib_get_vf_guid (struct ib_device *device,int vf,u8 port, +int ib_get_vf_guid (struct ib_device *device,int vf,u32 port,struct ifla_vf_guid *node_guid,struct ifla_vf_guid *port_guid) {
@@ -2849,7 +2850,7 @@ void ib_drain_qp(struct ib_qp *qp) }EXPORT_SYMBOL (ib_drain_qp); -struct net_device *rdma_alloc_netdev (struct ib_device *device,u8 port_num, +struct net_device *rdma_alloc_netdev (struct ib_device *device,u32 port_num,enum rdma_netdev_t type,const char *name,unsigned char name_assign_type,void (*setup)(struct net_device *))
@@ -2875,7 +2876,7 @@ struct net_device *rdma_alloc_netdev(struct ib_device *device, u8 port_num, }EXPORT_SYMBOL (rdma_alloc_netdev); -int rdma_init_netdev(struct ib_device *device, u8 port_num, +int rdma_init_netdev(struct ib_device *device, u32 port_num, enum rdma_netdev_t type, const char *name, unsigned char name_assign_type, void (*setup)(struct net_device *),
drivers/infiniband/hw/bnxt_re/hw_counters.c +2 -2
@@ -114,7 +114,7 @@ static const char * const bnxt_re_stat_name[] = {int bnxt_re_ib_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, -u8 port,int index) +u32 port,int index) {struct bnxt_re_dev *rdev =to_bnxt_re_dev (ibdev, ibdev);struct ctx_hw_stats *bnxt_re_stats = rdev->qplib_ctx.stats.dma;
@@ -235,7 +235,7 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, }struct rdma_hw_stats *bnxt_re_ib_alloc_hw_stats (struct ib_device *ibdev, -u8 port_num) +u32 port_num) {BUILD_BUG_ON (ARRAY_SIZE (bnxt_re_stat_name) !=BNXT_RE_NUM_COUNTERS );/* We support only per port stats */
drivers/infiniband/hw/bnxt_re/hw_counters.h +2 -2
@@ -97,8 +97,8 @@ enum bnxt_re_hw_stats { };struct rdma_hw_stats *bnxt_re_ib_alloc_hw_stats (struct ib_device *ibdev, -u8 port_num); +u32 port_num);int bnxt_re_ib_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, -u8 port,int index); +u32 port,int index);#endif /* __BNXT_RE_HW_STATS_H__ */
drivers/infiniband/hw/bnxt_re/ib_verbs.c +5 -5
@@ -189,7 +189,7 @@ int bnxt_re_query_device(struct ib_device *ibdev, }/* Port */ -int bnxt_re_query_port (struct ib_device *ibdev,u8 port_num, +int bnxt_re_query_port (struct ib_device *ibdev,u32 port_num,struct ib_port_attr *port_attr) {struct bnxt_re_dev *rdev =to_bnxt_re_dev (ibdev, ibdev);
@@ -229,7 +229,7 @@ int bnxt_re_query_port(struct ib_device *ibdev, u8 port_num,return 0 ; } -int bnxt_re_get_port_immutable (struct ib_device *ibdev,u8 port_num, +int bnxt_re_get_port_immutable (struct ib_device *ibdev,u32 port_num,struct ib_port_immutable *immutable) {struct ib_port_attr port_attr;
@@ -254,7 +254,7 @@ void bnxt_re_query_fw_str(struct ib_device *ibdev, char *str) rdev->dev_attr.fw_ver[2], rdev->dev_attr.fw_ver[3]); } -int bnxt_re_query_pkey (struct ib_device *ibdev,u8 port_num, +int bnxt_re_query_pkey (struct ib_device *ibdev,u32 port_num,u16 index,u16 *pkey) {struct bnxt_re_dev *rdev =to_bnxt_re_dev (ibdev, ibdev);
@@ -266,7 +266,7 @@ int bnxt_re_query_pkey(struct ib_device *ibdev, u8 port_num, &rdev->qplib_res.pkey_tbl, index, pkey); } -int bnxt_re_query_gid (struct ib_device *ibdev,u8 port_num, +int bnxt_re_query_gid (struct ib_device *ibdev,u32 port_num,int index,union ib_gid *gid) {struct bnxt_re_dev *rdev =to_bnxt_re_dev (ibdev, ibdev);
@@ -374,7 +374,7 @@ int bnxt_re_add_gid(const struct ib_gid_attr *attr, void **context) }enum rdma_link_layer bnxt_re_get_link_layer (struct ib_device *ibdev, -u8 port_num) +u32 port_num) {return IB_LINK_LAYER_ETHERNET ; }
drivers/infiniband/hw/bnxt_re/ib_verbs.h +5 -5
@@ -149,19 +149,19 @@ static inline u16 bnxt_re_get_rwqe_size(int nsge)int bnxt_re_query_device (struct ib_device *ibdev,struct ib_device_attr *ib_attr,struct ib_udata *udata); -int bnxt_re_query_port (struct ib_device *ibdev,u8 port_num, +int bnxt_re_query_port (struct ib_device *ibdev,u32 port_num,struct ib_port_attr *port_attr); -int bnxt_re_get_port_immutable (struct ib_device *ibdev,u8 port_num, +int bnxt_re_get_port_immutable (struct ib_device *ibdev,u32 port_num,struct ib_port_immutable *immutable);void bnxt_re_query_fw_str (struct ib_device *ibdev,char *str); -int bnxt_re_query_pkey (struct ib_device *ibdev,u8 port_num, +int bnxt_re_query_pkey (struct ib_device *ibdev,u32 port_num,u16 index,u16 *pkey);int bnxt_re_del_gid (const struct ib_gid_attr *attr,void **context);int bnxt_re_add_gid (const struct ib_gid_attr *attr,void **context); -int bnxt_re_query_gid (struct ib_device *ibdev,u8 port_num, +int bnxt_re_query_gid (struct ib_device *ibdev,u32 port_num,int index,union ib_gid *gid);enum rdma_link_layer bnxt_re_get_link_layer (struct ib_device *ibdev, -u8 port_num); +u32 port_num);int bnxt_re_alloc_pd (struct ib_pd *pd,struct ib_udata *udata);int bnxt_re_dealloc_pd (struct ib_pd *pd,struct ib_udata *udata); int bnxt_re_create_ah(struct ib_ah *ah, struct rdma_ah_init_attr *init_attr,
drivers/infiniband/hw/cxgb4/provider.c +6 -6
@@ -237,12 +237,12 @@ static int c4iw_allocate_pd(struct ib_pd *pd, struct ib_udata *udata)return 0 ; } -static int c4iw_query_gid (struct ib_device *ibdev,u8 port,int index, +static int c4iw_query_gid (struct ib_device *ibdev,u32 port,int index,union ib_gid *gid) {struct c4iw_dev *dev; -pr_debug ("ibdev %p, port %d, index %d, gid %p\n" , +pr_debug ("ibdev %p, port %u, index %d, gid %p\n" , ibdev, port, index, gid);if (!port)return -EINVAL ;
@@ -295,7 +295,7 @@ static int c4iw_query_device(struct ib_device *ibdev, struct ib_device_attr *proreturn 0 ; } -static int c4iw_query_port (struct ib_device *ibdev,u8 port, +static int c4iw_query_port (struct ib_device *ibdev,u32 port,struct ib_port_attr *props) {int ret =0 ;
@@ -378,7 +378,7 @@ static const char * const names[] = { };static struct rdma_hw_stats *c4iw_alloc_stats (struct ib_device *ibdev, -u8 port_num) +u32 port_num) {BUILD_BUG_ON (ARRAY_SIZE (names) !=NR_COUNTERS );
@@ -391,7 +391,7 @@ static struct rdma_hw_stats *c4iw_alloc_stats(struct ib_device *ibdev,static int c4iw_get_mib (struct ib_device *ibdev,struct rdma_hw_stats *stats, -u8 port,int index) +u32 port,int index) {struct tp_tcp_stats v4, v6;struct c4iw_dev *c4iw_dev =to_c4iw_dev (ibdev);
@@ -420,7 +420,7 @@ static const struct attribute_group c4iw_attr_group = { .attrs = c4iw_class_attributes, }; -static int c4iw_port_immutable (struct ib_device *ibdev,u8 port_num, +static int c4iw_port_immutable (struct ib_device *ibdev,u32 port_num,struct ib_port_immutable *immutable) {struct ib_port_attr attr;
drivers/infiniband/hw/efa/efa.h +7 -7
@@ -120,14 +120,14 @@ struct efa_ah {int efa_query_device (struct ib_device *ibdev,struct ib_device_attr *props,struct ib_udata *udata); -int efa_query_port (struct ib_device *ibdev,u8 port, +int efa_query_port (struct ib_device *ibdev,u32 port,struct ib_port_attr *props);int efa_query_qp (struct ib_qp *ibqp,struct ib_qp_attr *qp_attr,int qp_attr_mask,struct ib_qp_init_attr *qp_init_attr); -int efa_query_gid (struct ib_device *ibdev,u8 port,int index, +int efa_query_gid (struct ib_device *ibdev,u32 port,int index,union ib_gid *gid); -int efa_query_pkey (struct ib_device *ibdev,u8 port,u16 index, +int efa_query_pkey (struct ib_device *ibdev,u32 port,u16 index,u16 *pkey);int efa_alloc_pd (struct ib_pd *ibpd,struct ib_udata *udata);int efa_dealloc_pd (struct ib_pd *ibpd,struct ib_udata *udata);
@@ -142,7 +142,7 @@ struct ib_mr *efa_reg_mr(struct ib_pd *ibpd, u64 start, u64 length, u64 virt_addr, int access_flags, struct ib_udata *udata);int efa_dereg_mr (struct ib_mr *ibmr,struct ib_udata *udata); -int efa_get_port_immutable (struct ib_device *ibdev,u8 port_num, +int efa_get_port_immutable (struct ib_device *ibdev,u32 port_num,struct ib_port_immutable *immutable);int efa_alloc_ucontext (struct ib_ucontext *ibucontext,struct ib_udata *udata);void efa_dealloc_ucontext (struct ib_ucontext *ibucontext);
@@ -156,9 +156,9 @@ int efa_destroy_ah(struct ib_ah *ibah, u32 flags);int efa_modify_qp (struct ib_qp *ibqp,struct ib_qp_attr *qp_attr,int qp_attr_mask,struct ib_udata *udata);enum rdma_link_layer efa_port_link_layer (struct ib_device *ibdev, -u8 port_num); -struct rdma_hw_stats *efa_alloc_hw_stats (struct ib_device *ibdev,u8 port_num); +u32 port_num); +struct rdma_hw_stats *efa_alloc_hw_stats (struct ib_device *ibdev,u32 port_num);int efa_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, -u8 port_num,int index); +u32 port_num,int index);#endif /* _EFA_H_ */
drivers/infiniband/hw/efa/efa_verbs.c +7 -7
@@ -247,7 +247,7 @@ int efa_query_device(struct ib_device *ibdev,return 0 ; } -int efa_query_port (struct ib_device *ibdev,u8 port, +int efa_query_port (struct ib_device *ibdev,u32 port,struct ib_port_attr *props) {struct efa_dev *dev =to_edev (ibdev);
@@ -319,7 +319,7 @@ int efa_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,return 0 ; } -int efa_query_gid (struct ib_device *ibdev,u8 port,int index, +int efa_query_gid (struct ib_device *ibdev,u32 port,int index,union ib_gid *gid) {struct efa_dev *dev =to_edev (ibdev);
@@ -329,7 +329,7 @@ int efa_query_gid(struct ib_device *ibdev, u8 port, int index,return 0 ; } -int efa_query_pkey (struct ib_device *ibdev,u8 port,u16 index, +int efa_query_pkey (struct ib_device *ibdev,u32 port,u16 index,u16 *pkey) {if (index >0 )
@@ -1619,7 +1619,7 @@ int efa_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata)return 0 ; } -int efa_get_port_immutable (struct ib_device *ibdev,u8 port_num, +int efa_get_port_immutable (struct ib_device *ibdev,u32 port_num,struct ib_port_immutable *immutable) {struct ib_port_attr attr;
@@ -1904,7 +1904,7 @@ int efa_destroy_ah(struct ib_ah *ibah, u32 flags)return 0 ; } -struct rdma_hw_stats *efa_alloc_hw_stats (struct ib_device *ibdev,u8 port_num) +struct rdma_hw_stats *efa_alloc_hw_stats (struct ib_device *ibdev,u32 port_num) { return rdma_alloc_hw_stats_struct(efa_stats_names, ARRAY_SIZE(efa_stats_names),
@@ -1912,7 +1912,7 @@ struct rdma_hw_stats *efa_alloc_hw_stats(struct ib_device *ibdev, u8 port_num) }int efa_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, -u8 port_num,int index) +u32 port_num,int index) {struct efa_com_get_stats_params params = {};union efa_com_get_stats_result result;
@@ -1981,7 +1981,7 @@ int efa_get_hw_stats(struct ib_device *ibdev, struct rdma_hw_stats *stats, }enum rdma_link_layer efa_port_link_layer (struct ib_device *ibdev, -u8 port_num) +u32 port_num) {return IB_LINK_LAYER_UNSPECIFIED ; }
drivers/infiniband/hw/hfi1/hfi.h +5 -5
@@ -864,7 +864,7 @@ struct hfi1_pportdata {u8 rx_pol_inv;u8 hw_pidx;/* physical port index */ -u8 port;/* IB port number and index into dd->pports - 1 */ +u32 port;/* IB port number and index into dd->pports - 1 */ /* type of neighbor node */ u8 neighbor_type;u8 neighbor_normal;
@@ -1479,7 +1479,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa, struct hfi1_ctxtdata **rcd);void hfi1_free_ctxt (struct hfi1_ctxtdata *rcd);void hfi1_init_pportdata (struct pci_dev *pdev,struct hfi1_pportdata *ppd, -struct hfi1_devdata *dd,u8 hw_pidx,u8 port); +struct hfi1_devdata *dd,u8 hw_pidx,u32 port);void hfi1_free_ctxtdata (struct hfi1_devdata *dd,struct hfi1_ctxtdata *rcd);int hfi1_rcd_put (struct hfi1_ctxtdata *rcd);int hfi1_rcd_get (struct hfi1_ctxtdata *rcd);
@@ -1975,10 +1975,10 @@ static inline struct hfi1_ibdev *dev_from_rdi(struct rvt_dev_info *rdi) return container_of(rdi, struct hfi1_ibdev, rdi); } -static inline struct hfi1_ibport *to_iport (struct ib_device *ibdev,u8 port) +static inline struct hfi1_ibport *to_iport (struct ib_device *ibdev,u32 port) {struct hfi1_devdata *dd =dd_from_ibdev (ibdev); -unsigned pidx = port -1 ;/* IB number port from 1, hdw from 0 */ +u32 pidx = port -1 ;/* IB number port from 1, hdw from 0 */ WARN_ON (pidx >= dd->num_pports);return &dd->pport[pidx].ibport_data;
@@ -2197,7 +2197,7 @@ extern const struct attribute_group ib_hfi1_attr_group;int hfi1_device_create (struct hfi1_devdata *dd);void hfi1_device_remove (struct hfi1_devdata *dd); -int hfi1_create_port_files (struct ib_device *ibdev,u8 port_num, +int hfi1_create_port_files (struct ib_device *ibdev,u32 port_num,struct kobject *kobj);int hfi1_verbs_register_sysfs (struct hfi1_devdata *dd);void hfi1_verbs_unregister_sysfs (struct hfi1_devdata *dd);
drivers/infiniband/hw/hfi1/init.c +1 -1
@@ -627,7 +627,7 @@ static enum hrtimer_restart cca_timer_fn(struct hrtimer *t)* Common code for initializing the physical port structure. */ void hfi1_init_pportdata (struct pci_dev *pdev,struct hfi1_pportdata *ppd, -struct hfi1_devdata *dd,u8 hw_pidx,u8 port) +struct hfi1_devdata *dd,u8 hw_pidx,u32 port) {int i;uint default_pkey_idx;
drivers/infiniband/hw/hfi1/ipoib.h +1 -1
@@ -143,7 +143,7 @@ struct sk_buff *hfi1_ipoib_prepare_skb(struct hfi1_netdev_rxq *rxq, int size, void *data);int hfi1_ipoib_rn_get_params (struct ib_device *device, -u8 port_num, +u32 port_num,enum rdma_netdev_t type,struct rdma_netdev_alloc_params *params);
drivers/infiniband/hw/hfi1/ipoib_main.c +2 -2
@@ -194,7 +194,7 @@ static void hfi1_ipoib_set_id(struct net_device *dev, int id) }static int hfi1_ipoib_setup_rn (struct ib_device *device, -u8 port_num, +u32 port_num,struct net_device *netdev,void *param) {
@@ -243,7 +243,7 @@ static int hfi1_ipoib_setup_rn(struct ib_device *device, }int hfi1_ipoib_rn_get_params (struct ib_device *device, -u8 port_num, +u32 port_num,enum rdma_netdev_t type,struct rdma_netdev_alloc_params *params) {
drivers/infiniband/hw/hfi1/mad.c +64 -64
504 lines not on this page · raw message
drivers/infiniband/hw/hfi1/mad.h +1 -1
@@ -436,7 +436,7 @@ struct sc2vlnt { COUNTER_MASK(1, 3) | \ COUNTER_MASK(1, 4)) -void hfi1_event_pkey_change (struct hfi1_devdata *dd,u8 port); +void hfi1_event_pkey_change (struct hfi1_devdata *dd,u32 port);void hfi1_handle_trap_timer (struct timer_list *t);u16 tx_link_width (u16 link_width); u64 get_xmit_wait_counters(struct hfi1_pportdata *ppd, u16 link_width,
drivers/infiniband/hw/hfi1/sysfs.c +1 -1
@@ -649,7 +649,7 @@ const struct attribute_group ib_hfi1_attr_group = { .attrs = hfi1_attributes, }; -int hfi1_create_port_files (struct ib_device *ibdev,u8 port_num, +int hfi1_create_port_files (struct ib_device *ibdev,u32 port_num,struct kobject *kobj) {struct hfi1_pportdata *ppd;
drivers/infiniband/hw/hfi1/verbs.c +4 -4
@@ -1407,7 +1407,7 @@ static inline u16 opa_width_to_ib(u16 in) } } -static int query_port (struct rvt_dev_info *rdi,u8 port_num, +static int query_port (struct rvt_dev_info *rdi,u32 port_num,struct ib_port_attr *props) {struct hfi1_ibdev *verbs_dev =dev_from_rdi (rdi);
@@ -1485,7 +1485,7 @@ static int modify_device(struct ib_device *device,return ret; } -static int shut_down_port (struct rvt_dev_info *rdi,u8 port_num) +static int shut_down_port (struct rvt_dev_info *rdi,u32 port_num) {struct hfi1_ibdev *verbs_dev =dev_from_rdi (rdi);struct hfi1_devdata *dd =dd_from_dev (verbs_dev);
@@ -1694,7 +1694,7 @@ static int init_cntr_names(const char *names_in, }static struct rdma_hw_stats *alloc_hw_stats (struct ib_device *ibdev, -u8 port_num) +u32 port_num) {int i, err;
@@ -1758,7 +1758,7 @@ static u64 hfi1_sps_ints(void) }static int get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, -u8 port,int index) +u32 port,int index) {u64 *values;int count;
drivers/infiniband/hw/hfi1/verbs.h +2 -2
@@ -325,10 +325,10 @@ static inline struct rvt_qp *iowait_to_qp(struct iowait *s_iowait)*/ void hfi1_bad_pkey (struct hfi1_ibport *ibp,u32 key,u32 sl,u32 qp1,u32 qp2,u32 lid1,u32 lid2); -void hfi1_cap_mask_chg (struct rvt_dev_info *rdi,u8 port_num); +void hfi1_cap_mask_chg (struct rvt_dev_info *rdi,u32 port_num);void hfi1_sys_guid_chg (struct hfi1_ibport *ibp);void hfi1_node_desc_chg (struct hfi1_ibport *ibp); -int hfi1_process_mad (struct ib_device *ibdev,int mad_flags,u8 port, +int hfi1_process_mad (struct ib_device *ibdev,int mad_flags,u32 port,const struct ib_wc *in_wc,const struct ib_grh *in_grh,const struct ib_mad *in_mad,struct ib_mad *out_mad,size_t *out_mad_size,u16 *out_mad_pkey_index);
drivers/infiniband/hw/hfi1/vnic.h +1 -1
@@ -156,7 +156,7 @@ bool hfi1_vnic_sdma_write_avail(struct hfi1_vnic_vport_info *vinfo,/* vnic rdma netdev operations */ struct net_device *hfi1_vnic_alloc_rn(struct ib_device *device, - u8 port_num, + u32 port_num, enum rdma_netdev_t type, const char *name, unsigned char name_assign_type,
drivers/infiniband/hw/hfi1/vnic_main.c +1 -1
@@ -593,7 +593,7 @@ static void hfi1_vnic_free_rn(struct net_device *netdev) } struct net_device *hfi1_vnic_alloc_rn(struct ib_device *device, - u8 port_num, + u32 port_num, enum rdma_netdev_t type, const char *name, unsigned char name_assign_type,
drivers/infiniband/hw/hns/hns_roce_device.h +2 -2
@@ -876,7 +876,7 @@ struct hns_roce_hw { u16 token, int event);int (*chk_mbox)(struct hns_roce_dev *hr_dev,unsigned int timeout);int (*rst_prc_mbox)(struct hns_roce_dev *hr_dev); -int (*set_gid)(struct hns_roce_dev *hr_dev,u8 port,int gid_index, +int (*set_gid)(struct hns_roce_dev *hr_dev,u32 port,int gid_index,const union ib_gid *gid,const struct ib_gid_attr *attr);int (*set_mac)(struct hns_roce_dev *hr_dev,u8 phy_port,u8 *addr); void (*set_mtu)(struct hns_roce_dev *hr_dev, u8 phy_port,
@@ -1246,7 +1246,7 @@ void hns_roce_cq_completion(struct hns_roce_dev *hr_dev, u32 cqn);void hns_roce_cq_event (struct hns_roce_dev *hr_dev,u32 cqn,int event_type);void hns_roce_qp_event (struct hns_roce_dev *hr_dev,u32 qpn,int event_type);void hns_roce_srq_event (struct hns_roce_dev *hr_dev,u32 srqn,int event_type); -u8 hns_get_gid_index (struct hns_roce_dev *hr_dev,u8 port,int gid_index); +u8 hns_get_gid_index (struct hns_roce_dev *hr_dev,u32 port,int gid_index);void hns_roce_handle_device_err (struct hns_roce_dev *hr_dev);int hns_roce_init (struct hns_roce_dev *hr_dev);void hns_roce_exit (struct hns_roce_dev *hr_dev);
drivers/infiniband/hw/hns/hns_roce_hw_v1.c +5 -5
@@ -54,7 +54,7 @@* GID[0][0], GID[1][0],.....GID[N - 1][0], * And so on */ -u8 hns_get_gid_index (struct hns_roce_dev *hr_dev,u8 port,int gid_index) +u8 hns_get_gid_index (struct hns_roce_dev *hr_dev,u32 port,int gid_index) {return gid_index * hr_dev->caps.num_ports + port; }
@@ -711,7 +711,7 @@ static int hns_roce_v1_rsv_lp_qp(struct hns_roce_dev *hr_dev)int i, j;u8 queue_en[HNS_ROCE_V1_RESV_QP ] = {0 };u8 phy_port; -u8 port =0 ; +u32 port =0 ;u8 sl;/* Reserved cq for loop qp */
@@ -1676,7 +1676,7 @@ static int hns_roce_v1_chk_mbox(struct hns_roce_dev *hr_dev,return 0 ; } -static int hns_roce_v1_set_gid (struct hns_roce_dev *hr_dev,u8 port, +static int hns_roce_v1_set_gid (struct hns_roce_dev *hr_dev,u32 port,int gid_index,const union ib_gid *gid,const struct ib_gid_attr *attr) {
@@ -2673,8 +2673,8 @@ static int hns_roce_v1_m_qp(struct ib_qp *ibqp, const struct ib_qp_attr *attr,int ret = -EINVAL ;u64 sq_ba =0 ;u64 rq_ba =0 ; -int port; -u8 port_num; +u32 port; +u32 port_num;u8 *dmac;u8 *smac;
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +2 -2
@@ -2788,7 +2788,7 @@ static int config_gmv_table(struct hns_roce_dev *hr_dev,return hns_roce_cmq_send (hr_dev, desc,2 ); } -static int hns_roce_v2_set_gid (struct hns_roce_dev *hr_dev,u8 port, +static int hns_roce_v2_set_gid (struct hns_roce_dev *hr_dev,u32 port,int gid_index,const union ib_gid *gid,const struct ib_gid_attr *attr) {
@@ -4238,7 +4238,7 @@ static int modify_qp_init_to_rtr(struct ib_qp *ibqp,u64 *mtts;u8 *dmac;u8 *smac; -int port; +u32 port;int ret; ret =config_qp_rq_buf (hr_dev, hr_qp, context, qpc_mask);
drivers/infiniband/hw/hns/hns_roce_main.c +10 -10
@@ -42,7 +42,7 @@#include "hns_roce_device.h" #include "hns_roce_hem.h" -static int hns_roce_set_mac (struct hns_roce_dev *hr_dev,u8 port,u8 *addr) +static int hns_roce_set_mac (struct hns_roce_dev *hr_dev,u32 port,u8 *addr) {u8 phy_port;u32 i;
@@ -63,7 +63,7 @@ static int hns_roce_set_mac(struct hns_roce_dev *hr_dev, u8 port, u8 *addr)static int hns_roce_add_gid (const struct ib_gid_attr *attr,void **context) {struct hns_roce_dev *hr_dev =to_hr_dev (attr->device); -u8 port = attr->port_num -1 ; +u32 port = attr->port_num -1 ;int ret;if (port >= hr_dev->caps.num_ports)
@@ -77,7 +77,7 @@ static int hns_roce_add_gid(const struct ib_gid_attr *attr, void **context)static int hns_roce_del_gid (const struct ib_gid_attr *attr,void **context) {struct hns_roce_dev *hr_dev =to_hr_dev (attr->device); -u8 port = attr->port_num -1 ; +u32 port = attr->port_num -1 ;int ret;if (port >= hr_dev->caps.num_ports)
@@ -88,7 +88,7 @@ static int hns_roce_del_gid(const struct ib_gid_attr *attr, void **context)return ret; } -static int handle_en_event (struct hns_roce_dev *hr_dev,u8 port, +static int handle_en_event (struct hns_roce_dev *hr_dev,u32 port,unsigned long event) {struct device *dev = hr_dev->dev;
@@ -128,7 +128,7 @@ static int hns_roce_netdev_event(struct notifier_block *self,struct hns_roce_ib_iboe *iboe =NULL ;struct hns_roce_dev *hr_dev =NULL ;int ret; -u8 port; +u32 port; hr_dev = container_of(self, struct hns_roce_dev, iboe.nb); iboe = &hr_dev->iboe;
@@ -210,7 +210,7 @@ static int hns_roce_query_device(struct ib_device *ib_dev,return 0 ; } -static int hns_roce_query_port (struct ib_device *ib_dev,u8 port_num, +static int hns_roce_query_port (struct ib_device *ib_dev,u32 port_num,struct ib_port_attr *props) {struct hns_roce_dev *hr_dev =to_hr_dev (ib_dev);
@@ -218,7 +218,7 @@ static int hns_roce_query_port(struct ib_device *ib_dev, u8 port_num,struct net_device *net_dev;unsigned long flags;enum ib_mtu mtu; -u8 port; +u32 port; port = port_num -1 ;
@@ -258,12 +258,12 @@ static int hns_roce_query_port(struct ib_device *ib_dev, u8 port_num, }static enum rdma_link_layer hns_roce_get_link_layer (struct ib_device *device, -u8 port_num) +u32 port_num) {return IB_LINK_LAYER_ETHERNET ; } -static int hns_roce_query_pkey (struct ib_device *ib_dev,u8 port,u16 index, +static int hns_roce_query_pkey (struct ib_device *ib_dev,u32 port,u16 index,u16 *pkey) { *pkey =PKEY_ID ;
@@ -365,7 +365,7 @@ static int hns_roce_mmap(struct ib_ucontext *context, } } -static int hns_roce_port_immutable (struct ib_device *ib_dev,u8 port_num, +static int hns_roce_port_immutable (struct ib_device *ib_dev,u32 port_num,struct ib_port_immutable *immutable) {struct ib_port_attr attr;
drivers/infiniband/hw/i40iw/i40iw_verbs.c +5 -5
@@ -94,7 +94,7 @@ static int i40iw_query_device(struct ib_device *ibdev,* @props: returning device attributes */ static int i40iw_query_port (struct ib_device *ibdev, -u8 port, +u32 port,struct ib_port_attr *props) { props->lid =1 ;
@@ -2347,7 +2347,7 @@ static int i40iw_req_notify_cq(struct ib_cq *ibcq,* @port_num: port number * @immutable: immutable data for the port return */ -static int i40iw_port_immutable (struct ib_device *ibdev,u8 port_num, +static int i40iw_port_immutable (struct ib_device *ibdev,u32 port_num,struct ib_port_immutable *immutable) {struct ib_port_attr attr;
@@ -2446,7 +2446,7 @@ static void i40iw_get_dev_fw_str(struct ib_device *dev, char *str)* @port_num: port number */ static struct rdma_hw_stats *i40iw_alloc_hw_stats (struct ib_device *ibdev, -u8 port_num) +u32 port_num) {struct i40iw_device *iwdev =to_iwdev (ibdev);struct i40iw_sc_dev *dev = &iwdev->sc_dev;
@@ -2477,7 +2477,7 @@ static struct rdma_hw_stats *i40iw_alloc_hw_stats(struct ib_device *ibdev,*/ static int i40iw_get_hw_stats (struct ib_device *ibdev,struct rdma_hw_stats *stats, -u8 port_num,int index) +u32 port_num,int index) {struct i40iw_device *iwdev =to_iwdev (ibdev);struct i40iw_sc_dev *dev = &iwdev->sc_dev;
@@ -2504,7 +2504,7 @@ static int i40iw_get_hw_stats(struct ib_device *ibdev,* @gid: Global ID */ static int i40iw_query_gid (struct ib_device *ibdev, -u8 port, +u32 port,int index,union ib_gid *gid) {
drivers/infiniband/hw/mlx4/alias_GUID.c +8 -8
@@ -73,12 +73,12 @@ static int get_low_record_time_index(struct mlx4_ib_dev *dev, u8 port, int *resched_delay_sec);void mlx4_ib_update_cache_on_guid_change (struct mlx4_ib_dev *dev,int block_num, -u8 port_num,u8 *p_data) +u32 port_num,u8 *p_data) {int i;u64 guid_indexes;int slave_id; -int port_index = port_num -1 ; +u32 port_index = port_num -1 ;if (!mlx4_is_master (dev->dev))return ;
@@ -86,7 +86,7 @@ void mlx4_ib_update_cache_on_guid_change(struct mlx4_ib_dev *dev, int block_num, guid_indexes =be64_to_cpu ((__force __be64 ) dev->sriov.alias_guid. ports_guid[port_num -1 ]. all_rec_per_port[block_num].guid_indexes); -pr_debug ("port: %d, guid_indexes: 0x%llx\n" , port_num, guid_indexes); +pr_debug ("port: %u, guid_indexes: 0x%llx\n" , port_num, guid_indexes);for (i =0 ; i <NUM_ALIAS_GUID_IN_REC ; i++) {/* The location of the specific index starts from bit number 4
@@ -184,7 +184,7 @@ void mlx4_ib_slave_alias_guid_event(struct mlx4_ib_dev *dev, int slave,* port_number - 1 or 2 */ void mlx4_ib_notify_slaves_on_guid_change (struct mlx4_ib_dev *dev, -int block_num,u8 port_num, +int block_num,u32 port_num,u8 *p_data) {int i;
@@ -206,7 +206,7 @@ void mlx4_ib_notify_slaves_on_guid_change(struct mlx4_ib_dev *dev, guid_indexes =be64_to_cpu ((__force __be64 ) dev->sriov.alias_guid. ports_guid[port_num -1 ]. all_rec_per_port[block_num].guid_indexes); -pr_debug ("port: %d, guid_indexes: 0x%llx\n" , port_num, guid_indexes); +pr_debug ("port: %u, guid_indexes: 0x%llx\n" , port_num, guid_indexes);/*calculate the slaves and notify them*/ for (i =0 ; i <NUM_ALIAS_GUID_IN_REC ; i++) {
@@ -260,11 +260,11 @@ void mlx4_ib_notify_slaves_on_guid_change(struct mlx4_ib_dev *dev, new_state =set_and_calc_slave_port_state (dev->dev, slave_id, port_num,MLX4_PORT_STATE_IB_PORT_STATE_EVENT_GID_VALID , &gen_event); -pr_debug ("slave: %d, port: %d prev_port_state: %d," +pr_debug ("slave: %d, port: %u prev_port_state: %d," " new_port_state: %d, gen_event: %d\n" , slave_id, port_num, prev_state, new_state, gen_event);if (gen_event ==SLAVE_PORT_GEN_EVENT_UP ) { -pr_debug ("sending PORT_UP event to slave: %d, port: %d\n" , +pr_debug ("sending PORT_UP event to slave: %d, port: %u\n" , slave_id, port_num);mlx4_gen_port_state_change_eqe (dev->dev, slave_id, port_num,MLX4_PORT_CHANGE_SUBTYPE_ACTIVE );
@@ -274,7 +274,7 @@ void mlx4_ib_notify_slaves_on_guid_change(struct mlx4_ib_dev *dev,MLX4_PORT_STATE_IB_EVENT_GID_INVALID , &gen_event);if (gen_event ==SLAVE_PORT_GEN_EVENT_DOWN ) { -pr_debug ("sending PORT DOWN event to slave: %d, port: %d\n" , +pr_debug ("sending PORT DOWN event to slave: %d, port: %u\n" , slave_id, port_num); mlx4_gen_port_state_change_eqe(dev->dev, slave_id,
drivers/infiniband/hw/mlx4/mad.c +24 -22
154 lines not on this page · raw message
drivers/infiniband/hw/mlx4/main.c +25 -22
107 lines not on this page · raw message
drivers/infiniband/hw/mlx5/main.c +42 -41
83 lines not on this page · raw message
drivers/infiniband/hw/mthca/mthca_dev.h +4 -4
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/mthca/mthca_mad.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/mthca/mthca_provider.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/ocrdma/ocrdma_ah.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/ocrdma/ocrdma_ah.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/ocrdma/ocrdma_main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/ocrdma/ocrdma_verbs.h +4 -3
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/usnic/usnic_ib_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/usnic/usnic_ib_verbs.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/usnic/usnic_ib_verbs.h +3 -3
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h +5 -5
Lines of this file are not shown. View the raw message.
drivers/infiniband/sw/rxe/rxe_hw_counters.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/infiniband/sw/rxe/rxe_hw_counters.h +2 -2
Lines of this file are not shown. View the raw message.
drivers/infiniband/ulp/ipoib/ipoib_ib.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/infiniband/ulp/ipoib/ipoib_main.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c +1 -1
Lines of this file are not shown. View the raw message.
include/rdma/ib_verbs.h +95 -82
177 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
--
2.29.2
Part of the diff is not shown here. View the raw message.
Jason Gunthorpe
maintainerQuoted 10 lines · Leon Romanovsky
drivers/infiniband/core/cache.c +1
-1@@ -884,7 +884,7 @@ static void gid_table_reserve_default(struct ib_device *ib_dev, u8 port,static void gid_table_release_one (struct ib_device *ib_dev) { -unsigned int p; +u32 p; rdma_for_each_port (ib_dev, p) {release_gid_table (ib_dev, ib_dev->port_data[p].cache.gid);
drivers/infiniband/core/cache.c static void gid_table_release_one(struct ib_device *ib_dev) · line 900
Quoted 7 lines
drivers/infiniband/core/cache.c +1
-1@@ -895,7 +895,7 @@ static void gid_table_release_one(struct ib_device *ib_dev)static int _gid_table_setup_one (struct ib_device *ib_dev) {struct ib_gid_table *table; -unsigned int rdma_port; +u32 rdma_port; rdma_for_each_port (ib_dev, rdma_port) {
Why are we changing this? 'unsigned int' is the right type for port numbers
Jason
Quoted 17 lines · Jason Gunthorpe
Quoted 16 lines · Leon Romanovsky
drivers/infiniband/core/cache.c +2
-2@@ -884,7 +884,7 @@ static void gid_table_reserve_default(struct ib_device *ib_dev, u8 port,static void gid_table_release_one (struct ib_device *ib_dev) { -unsigned int p; +u32 p; rdma_for_each_port (ib_dev, p) {release_gid_table (ib_dev, ib_dev->port_data[p].cache.gid);@@ -895,7 +895,7 @@ static void gid_table_release_one(struct ib_device *ib_dev)static int _gid_table_setup_one (struct ib_device *ib_dev) {struct ib_gid_table *table; -unsigned int rdma_port; +u32 rdma_port;
Quoted 4 lines
drivers/infiniband/core/cache.c static void gid_table_release_one(struct ib_device *ib_dev) · line 900
Quoted 1 line
drivers/infiniband/core/cache.c +0
-0rdma_for_each_port (ib_dev, rdma_port) {Why are we changing this? 'unsigned int' is the right type for port numbers
I prefer to see same types in all places. We use u32 for HW data and netlink, so it makes sense to have it everywhere. Also, at least for me, the u32 is more explicit than "unsigned int".
So when Mark asked me which type to use, I said u32.
Thanks
Quoted 2 lines
Jason
Quoted 31 lines · Leon Romanovsky
From: Mark Bloch <[email protected]>
Current code uses many different types when dealing with a port of a RDMA device: u8, unsigned int and u32. Switch to u32 to clean up the logic.
This allows us to make (at least) the core view consistent and use the same type. Unfortunately not all places can be converted. Many uverbs functions expect port to be u8 so keep those places in order not to break UAPIs. HW/Spec defined values must also not be changed.
With the switch to u32 we now can support devices with more than 255 ports.
U32_MAXis reserved to make control logic a bit easier to deal with. As a device withU32_MAXports probably isn't going to happen any time soon this seems like a non issue.When a device with more than 255 ports is created uverbs will report the RDMA device as having 255 ports as this is the max currently supported.
The verbs interface is not changed yet because the IBTA spec limits the port size in too many places to be u8 and all applications that relies in verbs won't be able to cope with this change. At this stage, we are extending the interfaces that are using vendor channel solely
Once the limitation is lifted mlx5 in switchdev mode will be able to have thousands of SFs created by the device. As the only instance of an RDMA device that reports more than 255 ports will be a representor device and it exposes itself as a RAW Ethernet only device CM/MAD/IPoIB and other ULPs aren't effected by this change and their sysfs/interfaces that are exposes to userspace can remain unchanged.
Quoted 6 lines
While here cleanup some alignment issues and remove unneeded sanity checks (mainly in rdmavt),
Signed-off-by Mark Bloch <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>---
Jason, ping
Thanks
Quoted 31 lines · Leon Romanovsky
From: Mark Bloch <[email protected]>
Current code uses many different types when dealing with a port of a RDMA device: u8, unsigned int and u32. Switch to u32 to clean up the logic.
This allows us to make (at least) the core view consistent and use the same type. Unfortunately not all places can be converted. Many uverbs functions expect port to be u8 so keep those places in order not to break UAPIs. HW/Spec defined values must also not be changed.
With the switch to u32 we now can support devices with more than 255 ports.
U32_MAXis reserved to make control logic a bit easier to deal with. As a device withU32_MAXports probably isn't going to happen any time soon this seems like a non issue.When a device with more than 255 ports is created uverbs will report the RDMA device as having 255 ports as this is the max currently supported.
The verbs interface is not changed yet because the IBTA spec limits the port size in too many places to be u8 and all applications that relies in verbs won't be able to cope with this change. At this stage, we are extending the interfaces that are using vendor channel solely
Once the limitation is lifted mlx5 in switchdev mode will be able to have thousands of SFs created by the device. As the only instance of an RDMA device that reports more than 255 ports will be a representor device and it exposes itself as a RAW Ethernet only device CM/MAD/IPoIB and other ULPs aren't effected by this change and their sysfs/interfaces that are exposes to userspace can remain unchanged.
Quoted 6 lines
While here cleanup some alignment issues and remove unneeded sanity checks (mainly in rdmavt),
Signed-off-by Mark Bloch <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>---
Applied to for-next, I suppose this means the irdma driver needs re-spinning already.
Thanks,
Jason
Quoted 38 lines
Subject: Re: [PATCH rdma-next] RDMA: Support more than 255 rdma ports
Quoted 9 lines · Leon Romanovsky
From: Mark Bloch <[email protected]>
Current code uses many different types when dealing with a port of a RDMA device: u8, unsigned int and u32. Switch to u32 to clean up the logic.
This allows us to make (at least) the core view consistent and use the same type. Unfortunately not all places can be converted. Many uverbs functions expect port to be u8 so keep those places in order not to break
UAPIs.
Quoted 25 lines
HW/Spec defined values must also not be changed.
With the switch to u32 we now can support devices with more than 255 ports.
U32_MAXis reserved to make control logic a bit easier to deal with. As a device withU32_MAXports probably isn't going to happen any time soon this seems like a non issue.When a device with more than 255 ports is created uverbs will report the RDMA device as having 255 ports as this is the max currently supported.
The verbs interface is not changed yet because the IBTA spec limits the port size in too many places to be u8 and all applications that relies in verbs won't be able to cope with this change. At this stage, we are extending the interfaces that are using vendor channel solely
Once the limitation is lifted mlx5 in switchdev mode will be able to have thousands of SFs created by the device. As the only instance of an RDMA device that reports more than 255 ports will be a representor device and it exposes itself as a RAW Ethernet only device CM/MAD/IPoIB and other ULPs aren't effected by this change and their sysfs/interfaces that are exposes to userspace can remain unchanged.
While here cleanup some alignment issues and remove unneeded sanity checks (mainly in rdmavt),
Quoted 7 lines
Quoted 3 lines
Signed-off-by Mark Bloch <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>---
Applied to for-next, I suppose this means the irdma driver needs re-spinning already.
Sure.