diff mbox series

User SIW fails matching device

Message ID 20190712142718.GA26697@chelsio.com (mailing list archive)
State Changes Requested
Headers show
Series User SIW fails matching device | expand

Commit Message

Potnuri Bharat Teja July 12, 2019, 2:27 p.m. UTC
Hi all,
I observe the following behavior on one of my machines configured for siw.

Issue:
SIW device gets wrong device ops (HW/real rdma driver device ops) instead of
siw device ops due to improper device matching.

Root-cause:
In libibverbs, during user cma initialisation, for each entry from the driver 
list, sysfs device is checked for matching name or device.
If the siw/rxe driver is at the head of the list, then sysfs device matches 
properly with the corresponding siw driver and gets the corresponding siw/rxe 
device ops. Now, If the siw/rxe driver is after the real HW driver cxgb4/mlx5 
respectively in the driver list, then siw sysfs device matches pci device and 
wrongly gets the device ops of HW driver (cxgb4/mlx5).

Below debug prints from verbs_register_driver() and driver_list entries, where 
siw is after cxgb4. I see verbs alloc context landing in cxgb4_alloc_context 
instead of siw_alloc_context, thus breaking user siw.

<debug> verbs_register_driver_22: 184: driver 0x176e370
<debug> verbs_register_driver_22: 185: name ipathverbs
<debug> verbs_register_driver_22: 184: driver 0x176f6a0
<debug> verbs_register_driver_22: 185: name cxgb4
<debug> verbs_register_driver_22: 184: driver 0x176fd50
<debug> verbs_register_driver_22: 185: name cxgb3
<debug> verbs_register_driver_22: 184: driver 0x1777020
<debug> verbs_register_driver_22: 185: name rxe
<debug> verbs_register_driver_22: 184: driver 0x1770a30
<debug> verbs_register_driver_22: 185: name siw
<debug> verbs_register_driver_22: 184: driver 0x1771120
<debug> verbs_register_driver_22: 185: name mlx4
<debug> verbs_register_driver_22: 184: driver 0x1771990
<debug> verbs_register_driver_22: 185: name mlx5
<debug> verbs_register_driver_22: 184: driver 0x1771ff0
<debug> verbs_register_driver_22: 185: name efa

<debug> try_drivers: 372: driver 0x176e370, sysfs_dev 0x1776b20, name: ipathverbs
<debug> try_drivers: 372: driver 0x176f6a0, sysfs_dev 0x1776b20, name: cxgb4
<debug> try_drivers: 372: driver 0x176fd50, sysfs_dev 0x1776b20, name: cxgb3
<debug> try_drivers: 372: driver 0x1777020, sysfs_dev 0x1776b20, name: rxe
<debug> try_drivers: 372: driver 0x1770a30, sysfs_dev 0x1776b20, name: siw
<debug> try_drivers: 372: driver 0x1771120, sysfs_dev 0x1776b20, name: mlx4
<debug> try_drivers: 372: driver 0x1771990, sysfs_dev 0x1776b20, name: mlx5
<debug> try_drivers: 372: driver 0x1771ff0, sysfs_dev 0x1776b20, name: efa

Proposed fix:
I have the below fix that works. It adds siw/rxe driver to the HEAD of the 
driver list and the rest to the tail. I am not sure if this fix is the ideal 
one, so I am attaching it to this mail.

Bharat

Comments

Jason Gunthorpe July 12, 2019, 2:35 p.m. UTC | #1
On Fri, Jul 12, 2019 at 07:57:19PM +0530, Potnuri Bharat Teja wrote:
> Hi all,
> I observe the following behavior on one of my machines configured for siw.
> 
> Issue:
> SIW device gets wrong device ops (HW/real rdma driver device ops) instead of
> siw device ops due to improper device matching.
> 
> Root-cause:
> In libibverbs, during user cma initialisation, for each entry from the driver 
> list, sysfs device is checked for matching name or device.
> If the siw/rxe driver is at the head of the list, then sysfs device matches 
> properly with the corresponding siw driver and gets the corresponding siw/rxe 
> device ops. Now, If the siw/rxe driver is after the real HW driver cxgb4/mlx5 
> respectively in the driver list, then siw sysfs device matches pci device and 
> wrongly gets the device ops of HW driver (cxgb4/mlx5).
> 
> Below debug prints from verbs_register_driver() and driver_list entries, where 
> siw is after cxgb4. I see verbs alloc context landing in cxgb4_alloc_context 
> instead of siw_alloc_context, thus breaking user siw.
> 
> <debug> verbs_register_driver_22: 184: driver 0x176e370
> <debug> verbs_register_driver_22: 185: name ipathverbs
> <debug> verbs_register_driver_22: 184: driver 0x176f6a0
> <debug> verbs_register_driver_22: 185: name cxgb4
> <debug> verbs_register_driver_22: 184: driver 0x176fd50
> <debug> verbs_register_driver_22: 185: name cxgb3
> <debug> verbs_register_driver_22: 184: driver 0x1777020
> <debug> verbs_register_driver_22: 185: name rxe
> <debug> verbs_register_driver_22: 184: driver 0x1770a30
> <debug> verbs_register_driver_22: 185: name siw
> <debug> verbs_register_driver_22: 184: driver 0x1771120
> <debug> verbs_register_driver_22: 185: name mlx4
> <debug> verbs_register_driver_22: 184: driver 0x1771990
> <debug> verbs_register_driver_22: 185: name mlx5
> <debug> verbs_register_driver_22: 184: driver 0x1771ff0
> <debug> verbs_register_driver_22: 185: name efa
> 
> <debug> try_drivers: 372: driver 0x176e370, sysfs_dev 0x1776b20, name: ipathverbs
> <debug> try_drivers: 372: driver 0x176f6a0, sysfs_dev 0x1776b20, name: cxgb4
> <debug> try_drivers: 372: driver 0x176fd50, sysfs_dev 0x1776b20, name: cxgb3
> <debug> try_drivers: 372: driver 0x1777020, sysfs_dev 0x1776b20, name: rxe
> <debug> try_drivers: 372: driver 0x1770a30, sysfs_dev 0x1776b20, name: siw
> <debug> try_drivers: 372: driver 0x1771120, sysfs_dev 0x1776b20, name: mlx4
> <debug> try_drivers: 372: driver 0x1771990, sysfs_dev 0x1776b20, name: mlx5
> <debug> try_drivers: 372: driver 0x1771ff0, sysfs_dev 0x1776b20, name: efa
> 
> Proposed fix:
> I have the below fix that works. It adds siw/rxe driver to the HEAD of the 
> driver list and the rest to the tail. I am not sure if this fix is the ideal 
> one, so I am attaching it to this mail.

Update your rdma-core to latest and this will be fixed fully by using
netlink to match the siw device..

Jason
Potnuri Bharat Teja July 12, 2019, 3:24 p.m. UTC | #2
On Friday, July 07/12/19, 2019 at 20:05:46 +0530, Jason Gunthorpe wrote:
> On Fri, Jul 12, 2019 at 07:57:19PM +0530, Potnuri Bharat Teja wrote:
> > Hi all,
> > I observe the following behavior on one of my machines configured for siw.
> > 
> > Issue:
> > SIW device gets wrong device ops (HW/real rdma driver device ops) instead of
> > siw device ops due to improper device matching.
> > 
> > Root-cause:
> > In libibverbs, during user cma initialisation, for each entry from the driver 
> > list, sysfs device is checked for matching name or device.
> > If the siw/rxe driver is at the head of the list, then sysfs device matches 
> > properly with the corresponding siw driver and gets the corresponding siw/rxe 
> > device ops. Now, If the siw/rxe driver is after the real HW driver cxgb4/mlx5 
> > respectively in the driver list, then siw sysfs device matches pci device and 
> > wrongly gets the device ops of HW driver (cxgb4/mlx5).
> > 
> > Below debug prints from verbs_register_driver() and driver_list entries, where 
> > siw is after cxgb4. I see verbs alloc context landing in cxgb4_alloc_context 
> > instead of siw_alloc_context, thus breaking user siw.
> > 
> > <debug> verbs_register_driver_22: 184: driver 0x176e370
> > <debug> verbs_register_driver_22: 185: name ipathverbs
> > <debug> verbs_register_driver_22: 184: driver 0x176f6a0
> > <debug> verbs_register_driver_22: 185: name cxgb4
> > <debug> verbs_register_driver_22: 184: driver 0x176fd50
> > <debug> verbs_register_driver_22: 185: name cxgb3
> > <debug> verbs_register_driver_22: 184: driver 0x1777020
> > <debug> verbs_register_driver_22: 185: name rxe
> > <debug> verbs_register_driver_22: 184: driver 0x1770a30
> > <debug> verbs_register_driver_22: 185: name siw
> > <debug> verbs_register_driver_22: 184: driver 0x1771120
> > <debug> verbs_register_driver_22: 185: name mlx4
> > <debug> verbs_register_driver_22: 184: driver 0x1771990
> > <debug> verbs_register_driver_22: 185: name mlx5
> > <debug> verbs_register_driver_22: 184: driver 0x1771ff0
> > <debug> verbs_register_driver_22: 185: name efa
> > 
> > <debug> try_drivers: 372: driver 0x176e370, sysfs_dev 0x1776b20, name: ipathverbs
> > <debug> try_drivers: 372: driver 0x176f6a0, sysfs_dev 0x1776b20, name: cxgb4
> > <debug> try_drivers: 372: driver 0x176fd50, sysfs_dev 0x1776b20, name: cxgb3
> > <debug> try_drivers: 372: driver 0x1777020, sysfs_dev 0x1776b20, name: rxe
> > <debug> try_drivers: 372: driver 0x1770a30, sysfs_dev 0x1776b20, name: siw
> > <debug> try_drivers: 372: driver 0x1771120, sysfs_dev 0x1776b20, name: mlx4
> > <debug> try_drivers: 372: driver 0x1771990, sysfs_dev 0x1776b20, name: mlx5
> > <debug> try_drivers: 372: driver 0x1771ff0, sysfs_dev 0x1776b20, name: efa
> > 
> > Proposed fix:
> > I have the below fix that works. It adds siw/rxe driver to the HEAD of the 
> > driver list and the rest to the tail. I am not sure if this fix is the ideal 
> > one, so I am attaching it to this mail.
> 
> Update your rdma-core to latest and this will be fixed fully by using
> netlink to match the siw device..
> 
I pulled the latest rdma-core, still see the issue.

commit 7ef6077ec3201f661458297fea776746ba752843 (HEAD, upstream/master)
Merge: 837954ff677c 95934b61a74e
Author: Jason Gunthorpe <jgg@mellanox.com>
Date:   Thu Jul 11 16:18:06 2019 -0300

    Merge pull request #539 from jgunthorpe/netlink

        Use netlink to learn about ibdevs and their related chardevs

-----------

Is there any corresponding kernel change or package dependency? I am currently 
on Doug's wip/dl-for-next branch.
Jason Gunthorpe July 12, 2019, 3:30 p.m. UTC | #3
On Fri, Jul 12, 2019 at 08:54:20PM +0530, Potnuri Bharat Teja wrote:
> On Friday, July 07/12/19, 2019 at 20:05:46 +0530, Jason Gunthorpe wrote:
> > On Fri, Jul 12, 2019 at 07:57:19PM +0530, Potnuri Bharat Teja wrote:
> > > Hi all,
> > > I observe the following behavior on one of my machines configured for siw.
> > > 
> > > Issue:
> > > SIW device gets wrong device ops (HW/real rdma driver device ops) instead of
> > > siw device ops due to improper device matching.
> > > 
> > > Root-cause:
> > > In libibverbs, during user cma initialisation, for each entry from the driver 
> > > list, sysfs device is checked for matching name or device.
> > > If the siw/rxe driver is at the head of the list, then sysfs device matches 
> > > properly with the corresponding siw driver and gets the corresponding siw/rxe 
> > > device ops. Now, If the siw/rxe driver is after the real HW driver cxgb4/mlx5 
> > > respectively in the driver list, then siw sysfs device matches pci device and 
> > > wrongly gets the device ops of HW driver (cxgb4/mlx5).
> > > 
> > > Below debug prints from verbs_register_driver() and driver_list entries, where 
> > > siw is after cxgb4. I see verbs alloc context landing in cxgb4_alloc_context 
> > > instead of siw_alloc_context, thus breaking user siw.
> > > 
> > > <debug> verbs_register_driver_22: 184: driver 0x176e370
> > > <debug> verbs_register_driver_22: 185: name ipathverbs
> > > <debug> verbs_register_driver_22: 184: driver 0x176f6a0
> > > <debug> verbs_register_driver_22: 185: name cxgb4
> > > <debug> verbs_register_driver_22: 184: driver 0x176fd50
> > > <debug> verbs_register_driver_22: 185: name cxgb3
> > > <debug> verbs_register_driver_22: 184: driver 0x1777020
> > > <debug> verbs_register_driver_22: 185: name rxe
> > > <debug> verbs_register_driver_22: 184: driver 0x1770a30
> > > <debug> verbs_register_driver_22: 185: name siw
> > > <debug> verbs_register_driver_22: 184: driver 0x1771120
> > > <debug> verbs_register_driver_22: 185: name mlx4
> > > <debug> verbs_register_driver_22: 184: driver 0x1771990
> > > <debug> verbs_register_driver_22: 185: name mlx5
> > > <debug> verbs_register_driver_22: 184: driver 0x1771ff0
> > > <debug> verbs_register_driver_22: 185: name efa
> > > 
> > > <debug> try_drivers: 372: driver 0x176e370, sysfs_dev 0x1776b20, name: ipathverbs
> > > <debug> try_drivers: 372: driver 0x176f6a0, sysfs_dev 0x1776b20, name: cxgb4
> > > <debug> try_drivers: 372: driver 0x176fd50, sysfs_dev 0x1776b20, name: cxgb3
> > > <debug> try_drivers: 372: driver 0x1777020, sysfs_dev 0x1776b20, name: rxe
> > > <debug> try_drivers: 372: driver 0x1770a30, sysfs_dev 0x1776b20, name: siw
> > > <debug> try_drivers: 372: driver 0x1771120, sysfs_dev 0x1776b20, name: mlx4
> > > <debug> try_drivers: 372: driver 0x1771990, sysfs_dev 0x1776b20, name: mlx5
> > > <debug> try_drivers: 372: driver 0x1771ff0, sysfs_dev 0x1776b20, name: efa
> > > 
> > > Proposed fix:
> > > I have the below fix that works. It adds siw/rxe driver to the HEAD of the 
> > > driver list and the rest to the tail. I am not sure if this fix is the ideal 
> > > one, so I am attaching it to this mail.
> > 
> > Update your rdma-core to latest and this will be fixed fully by using
> > netlink to match the siw device..
> > 
> I pulled the latest rdma-core, still see the issue.
> 
> commit 7ef6077ec3201f661458297fea776746ba752843 (HEAD, upstream/master)
> Merge: 837954ff677c 95934b61a74e
> Author: Jason Gunthorpe <jgg@mellanox.com>
> Date:   Thu Jul 11 16:18:06 2019 -0300
> 
>     Merge pull request #539 from jgunthorpe/netlink
> 
>         Use netlink to learn about ibdevs and their related chardevs
> 
> 
> Is there any corresponding kernel change or package dependency? I am currently 
> on Doug's wip/dl-for-next branch.

That should be good enough for the kernel.. Hmm.. The siw stuff didn't
get updated, you need this rdma-core patch too. Please confirm

diff --git a/providers/siw/siw.c b/providers/siw/siw.c
index 23e4dd976caf84..41f33fa16123e9 100644
--- a/providers/siw/siw.c
+++ b/providers/siw/siw.c
@@ -907,7 +907,7 @@ static void siw_device_free(struct verbs_device *vdev)
 }
 
 static const struct verbs_match_ent rnic_table[] = {
-	VERBS_NAME_MATCH("siw", NULL),
+	VERBS_DRIVER_ID(RDMA_DRIVER_SIW),
 	{},
 };
Potnuri Bharat Teja July 12, 2019, 3:52 p.m. UTC | #4
On Friday, July 07/12/19, 2019 at 21:00:32 +0530, Jason Gunthorpe wrote:
> On Fri, Jul 12, 2019 at 08:54:20PM +0530, Potnuri Bharat Teja wrote:
> > On Friday, July 07/12/19, 2019 at 20:05:46 +0530, Jason Gunthorpe wrote:
> > > On Fri, Jul 12, 2019 at 07:57:19PM +0530, Potnuri Bharat Teja wrote:
> > > > Hi all,
> > > > I observe the following behavior on one of my machines configured for siw.
> > > > 
> > > > Issue:
> > > > SIW device gets wrong device ops (HW/real rdma driver device ops) instead of
> > > > siw device ops due to improper device matching.
> > > > 
> > > > Root-cause:
> > > > In libibverbs, during user cma initialisation, for each entry from the driver 
> > > > list, sysfs device is checked for matching name or device.
> > > > If the siw/rxe driver is at the head of the list, then sysfs device matches 
> > > > properly with the corresponding siw driver and gets the corresponding siw/rxe 
> > > > device ops. Now, If the siw/rxe driver is after the real HW driver cxgb4/mlx5 
> > > > respectively in the driver list, then siw sysfs device matches pci device and 
> > > > wrongly gets the device ops of HW driver (cxgb4/mlx5).
> > > > 
> > > > Below debug prints from verbs_register_driver() and driver_list entries, where 
> > > > siw is after cxgb4. I see verbs alloc context landing in cxgb4_alloc_context 
> > > > instead of siw_alloc_context, thus breaking user siw.
> > > > 
> > > > <debug> verbs_register_driver_22: 184: driver 0x176e370
> > > > <debug> verbs_register_driver_22: 185: name ipathverbs
> > > > <debug> verbs_register_driver_22: 184: driver 0x176f6a0
> > > > <debug> verbs_register_driver_22: 185: name cxgb4
> > > > <debug> verbs_register_driver_22: 184: driver 0x176fd50
> > > > <debug> verbs_register_driver_22: 185: name cxgb3
> > > > <debug> verbs_register_driver_22: 184: driver 0x1777020
> > > > <debug> verbs_register_driver_22: 185: name rxe
> > > > <debug> verbs_register_driver_22: 184: driver 0x1770a30
> > > > <debug> verbs_register_driver_22: 185: name siw
> > > > <debug> verbs_register_driver_22: 184: driver 0x1771120
> > > > <debug> verbs_register_driver_22: 185: name mlx4
> > > > <debug> verbs_register_driver_22: 184: driver 0x1771990
> > > > <debug> verbs_register_driver_22: 185: name mlx5
> > > > <debug> verbs_register_driver_22: 184: driver 0x1771ff0
> > > > <debug> verbs_register_driver_22: 185: name efa
> > > > 
> > > > <debug> try_drivers: 372: driver 0x176e370, sysfs_dev 0x1776b20, name: ipathverbs
> > > > <debug> try_drivers: 372: driver 0x176f6a0, sysfs_dev 0x1776b20, name: cxgb4
> > > > <debug> try_drivers: 372: driver 0x176fd50, sysfs_dev 0x1776b20, name: cxgb3
> > > > <debug> try_drivers: 372: driver 0x1777020, sysfs_dev 0x1776b20, name: rxe
> > > > <debug> try_drivers: 372: driver 0x1770a30, sysfs_dev 0x1776b20, name: siw
> > > > <debug> try_drivers: 372: driver 0x1771120, sysfs_dev 0x1776b20, name: mlx4
> > > > <debug> try_drivers: 372: driver 0x1771990, sysfs_dev 0x1776b20, name: mlx5
> > > > <debug> try_drivers: 372: driver 0x1771ff0, sysfs_dev 0x1776b20, name: efa
> > > > 
> > > > Proposed fix:
> > > > I have the below fix that works. It adds siw/rxe driver to the HEAD of the 
> > > > driver list and the rest to the tail. I am not sure if this fix is the ideal 
> > > > one, so I am attaching it to this mail.
> > > 
> > > Update your rdma-core to latest and this will be fixed fully by using
> > > netlink to match the siw device..
> > > 
> > I pulled the latest rdma-core, still see the issue.
> > 
> > commit 7ef6077ec3201f661458297fea776746ba752843 (HEAD, upstream/master)
> > Merge: 837954ff677c 95934b61a74e
> > Author: Jason Gunthorpe <jgg@mellanox.com>
> > Date:   Thu Jul 11 16:18:06 2019 -0300
> > 
> >     Merge pull request #539 from jgunthorpe/netlink
> > 
> >         Use netlink to learn about ibdevs and their related chardevs
> > 
> > 
> > Is there any corresponding kernel change or package dependency? I am currently 
> > on Doug's wip/dl-for-next branch.
> 
> That should be good enough for the kernel.. Hmm.. The siw stuff didn't
> get updated, you need this rdma-core patch too. Please confirm
> 
> diff --git a/providers/siw/siw.c b/providers/siw/siw.c
> index 23e4dd976caf84..41f33fa16123e9 100644
> --- a/providers/siw/siw.c
> +++ b/providers/siw/siw.c
> @@ -907,7 +907,7 @@ static void siw_device_free(struct verbs_device *vdev)
>  }
>  
>  static const struct verbs_match_ent rnic_table[] = {
> -	VERBS_NAME_MATCH("siw", NULL),
> +	VERBS_DRIVER_ID(RDMA_DRIVER_SIW),
>  	{},
>  };
>
It works with above change. Thanks!
diff mbox series

Patch

diff --git a/libibverbs/init.c b/libibverbs/init.c
index 930d91811ca9..e44f0d743063 100644
--- a/libibverbs/init.c
+++ b/libibverbs/init.c
@@ -182,7 +182,10 @@  void verbs_register_driver(const struct verbs_device_ops *ops)

	driver->ops = ops;

-       list_add_tail(&driver_list, &driver->entry);
+       if (!strcmp(ops->name, "siw") || !strcmp(ops->name, "rxe"))
+               list_add(&driver_list, &driver->entry);
+       else
+               list_add_tail(&driver_list, &driver->entry);
 }
---

Thanks,