On Mon, Apr 27, 2020 at 02:47:34PM +0300, Leon Romanovsky wrote:
> On Sun, Apr 26, 2020 at 05:31:57PM +0800, Weihang Li wrote:
> > If the name of a device is assigned during ib_register_device(), some
> > drivers have to use dev_*() for printing before register device. Bring
> > assign_name() into ib_alloc_device(), so that drivers can use ibdev_*()
> > anywhere.
> >
> > Signed-off-by: Weihang Li <liweihang@xxxxxxxxxx>
> > drivers/infiniband/core/device.c | 85 +++++++++++++-------------
> > drivers/infiniband/hw/bnxt_re/main.c | 4 +-
> > drivers/infiniband/hw/cxgb4/device.c | 2 +-
> > drivers/infiniband/hw/cxgb4/provider.c | 2 +-
> > drivers/infiniband/hw/efa/efa_main.c | 4 +-
> > drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +-
> > drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +-
> > drivers/infiniband/hw/hns/hns_roce_main.c | 2 +-
> > drivers/infiniband/hw/i40iw/i40iw_verbs.c | 4 +-
> > drivers/infiniband/hw/mlx4/main.c | 4 +-
> > drivers/infiniband/hw/mlx5/ib_rep.c | 8 ++-
> > drivers/infiniband/hw/mlx5/main.c | 18 +++---
> > drivers/infiniband/hw/mthca/mthca_main.c | 2 +-
> > drivers/infiniband/hw/mthca/mthca_provider.c | 2 +-
> > drivers/infiniband/hw/ocrdma/ocrdma_main.c | 4 +-
> > drivers/infiniband/hw/qedr/main.c | 4 +-
> > drivers/infiniband/hw/usnic/usnic_ib_main.c | 4 +-
> > drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 4 +-
> > drivers/infiniband/sw/rxe/rxe.c | 4 +-
> > drivers/infiniband/sw/rxe/rxe.h | 2 +-
> > drivers/infiniband/sw/rxe/rxe_net.c | 4 +-
> > drivers/infiniband/sw/rxe/rxe_verbs.c | 4 +-
> > drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +-
> > include/rdma/ib_verbs.h | 8 +--
> > 24 files changed, 95 insertions(+), 86 deletions(-)
> >
> > diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
> > index d0b3d35..30d28da 100644
> > +++ b/drivers/infiniband/core/device.c
> > @@ -557,9 +557,45 @@ static void rdma_init_coredev(struct ib_core_device *coredev,
> > write_pnet(&coredev->rdma_net, net);
> > }
> >
> > +/*
> > + * Assign the unique string device name and the unique device index. This is
> > + * undone by ib_dealloc_device.
> > + */
> > +static int assign_name(struct ib_device *device, const char *name)
> > +{
> > + static u32 last_id;
> > + int ret;
> > +
> > + down_write(&devices_rwsem);
> > + /* Assign a unique name to the device */
> > + if (strchr(name, '%'))
> > + ret = alloc_name(device, name);
> > + else
> > + ret = dev_set_name(&device->dev, name);
> > + if (ret)
> > + goto out;
> > +
> > + if (__ib_device_get_by_name(dev_name(&device->dev))) {
> > + ret = -ENFILE;
> > + goto out;
> > + }
> > + strlcpy(device->name, dev_name(&device->dev), IB_DEVICE_NAME_MAX);
> > +
> > + ret = xa_alloc_cyclic(&devices, &device->index, device, xa_limit_31b,
> > + &last_id, GFP_KERNEL);
> > + if (ret > 0)
> > + ret = 0;
> > +
> > +out:
> > + up_write(&devices_rwsem);
> > + return ret;
> > +}
> > +
> > /**
> > * _ib_alloc_device - allocate an IB device struct
> > * @size:size of structure to allocate
> > + * @name: unique string device name. This may include a '%' which will
>
> It looks like all drivers are setting "%" in their name and "name" can
> be changed to be "prefix".
Does hfi? I thought the name was forced there for some port swapped
reason?
Jason
