| Message ID | 1713881751-21621-1-git-send-email-kotaranov@linux.microsoft.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | [rdma-next,1/1] RDMA/mana_ib: fix missing ret value | expand |
On Tue, Apr 23, 2024 at 07:15:51AM -0700, Konstantin Taranov wrote: > From: Konstantin Taranov <kotaranov@microsoft.com> > > Set ret to -ENODEV when netdev_master_upper_dev_get_rcu > returns NULL. > > Fixes: 8b184e4f1c32 ("RDMA/mana_ib: Enable RoCE on port 1") > Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com> > --- > drivers/infiniband/hw/mana/device.c | 1 + > 1 file changed, 1 insertion(+) Applied to for-next, thanks Jason
On Tue, Apr 23, 2024 at 12:03:15PM -0300, Jason Gunthorpe wrote: > On Tue, Apr 23, 2024 at 07:15:51AM -0700, Konstantin Taranov wrote: > > From: Konstantin Taranov <kotaranov@microsoft.com> > > > > Set ret to -ENODEV when netdev_master_upper_dev_get_rcu > > returns NULL. > > > > Fixes: 8b184e4f1c32 ("RDMA/mana_ib: Enable RoCE on port 1") > > Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com> > > --- > > drivers/infiniband/hw/mana/device.c | 1 + > > 1 file changed, 1 insertion(+) > > Applied to for-next, thanks So, what's wrong with my patch that had been sent _before_ this one? At bare minimum I would like to see an explanation.
On Fri, Apr 26, 2024 at 07:53:02PM +0300, Andy Shevchenko wrote: > On Tue, Apr 23, 2024 at 12:03:15PM -0300, Jason Gunthorpe wrote: > > On Tue, Apr 23, 2024 at 07:15:51AM -0700, Konstantin Taranov wrote: > > > From: Konstantin Taranov <kotaranov@microsoft.com> > > > > > > Set ret to -ENODEV when netdev_master_upper_dev_get_rcu > > > returns NULL. > > > > > > Fixes: 8b184e4f1c32 ("RDMA/mana_ib: Enable RoCE on port 1") > > > Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com> > > > --- > > > drivers/infiniband/hw/mana/device.c | 1 + > > > 1 file changed, 1 insertion(+) > > > > Applied to for-next, thanks > > So, what's wrong with my patch that had been sent _before_ this one? Was it? This patch: $ date -d 'Tue, 23 Apr 2024 07:15:51 -0700' -u Tue Apr 23 02:15:51 PM UTC 2024 Your patch: https://lore.kernel.org/20240423204258.3669706-1-andriy.shevchenko@linux.intel.com/ $ date -d 'Tue, 23 Apr 2024 23:42:58 +0300' -u Tue Apr 23 08:42:58 PM UTC 2024 Seems like this one beat yours by six hours? Cheers, Nathan
On Fri, Apr 26, 2024 at 09:58:15AM -0700, Nathan Chancellor wrote: > On Fri, Apr 26, 2024 at 07:53:02PM +0300, Andy Shevchenko wrote: > > On Tue, Apr 23, 2024 at 12:03:15PM -0300, Jason Gunthorpe wrote: > > > On Tue, Apr 23, 2024 at 07:15:51AM -0700, Konstantin Taranov wrote: > > > > From: Konstantin Taranov <kotaranov@microsoft.com> > > > > > > > > Set ret to -ENODEV when netdev_master_upper_dev_get_rcu > > > > returns NULL. > > > > > > > > Fixes: 8b184e4f1c32 ("RDMA/mana_ib: Enable RoCE on port 1") > > > > Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com> > > > > --- > > > > drivers/infiniband/hw/mana/device.c | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > Applied to for-next, thanks > > > > So, what's wrong with my patch that had been sent _before_ this one? > > Was it? > > This patch: > > $ date -d 'Tue, 23 Apr 2024 07:15:51 -0700' -u > Tue Apr 23 02:15:51 PM UTC 2024 > > Your patch: https://lore.kernel.org/20240423204258.3669706-1-andriy.shevchenko@linux.intel.com/ > > $ date -d 'Tue, 23 Apr 2024 23:42:58 +0300' -u > Tue Apr 23 08:42:58 PM UTC 2024 > > Seems like this one beat yours by six hours? Repeating myself from another thread: """ Oh, my... Sorry, I missed PM, it was mine sent after that one! I guess time for weekend. """ Sorry for the noise and have a nice weekend!
diff --git a/drivers/infiniband/hw/mana/device.c b/drivers/infiniband/hw/mana/device.c index fca4d0d85c64..7e09ceb3da53 100644 --- a/drivers/infiniband/hw/mana/device.c +++ b/drivers/infiniband/hw/mana/device.c @@ -87,6 +87,7 @@ static int mana_ib_probe(struct auxiliary_device *adev, upper_ndev = netdev_master_upper_dev_get_rcu(mc->ports[0]); if (!upper_ndev) { rcu_read_unlock(); + ret = -ENODEV; ibdev_err(&dev->ib_dev, "Failed to get master netdev"); goto free_ib_device; }