patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev
@ 2019-06-21  9:40 Andrew Rybchenko
  2019-06-21  9:40 ` [dpdk-stable] [PATCH 2/3] net/sfc: ensure that device is closed on removal Andrew Rybchenko
  2019-06-21  9:52 ` [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev David Marchand
  0 siblings, 2 replies; 6+ messages in thread
From: Andrew Rybchenko @ 2019-06-21  9:40 UTC (permalink / raw)
  To: dev; +Cc: stable, Thomas Monjalon, Ferruh Yigit

If PCI Ethernet device driver removes it on close
(RTE_ETH_DEV_CLOSE_REMOVE) and later PCI device itself is unplugged,
it should not fail because of Ethernet device is already removed.

Fixes: 23ea57a2a0ce ("ethdev: complete closing of port")
Cc: stable@dpdk.org

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
---
Cc: Thomas Monjalon <thomas@monjalon.net>
Cc: Ferruh Yigit <ferruh.yigit@intel.com>

 lib/librte_ethdev/rte_ethdev_pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h
index 23257e986..ccdbb46ec 100644
--- a/lib/librte_ethdev/rte_ethdev_pci.h
+++ b/lib/librte_ethdev/rte_ethdev_pci.h
@@ -184,7 +184,7 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device *pci_dev,
 
 	eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
 	if (!eth_dev)
-		return -ENODEV;
+		return 0;
 
 	if (dev_uninit) {
 		ret = dev_uninit(eth_dev);
-- 
2.17.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [dpdk-stable] [PATCH 2/3] net/sfc: ensure that device is closed on removal
  2019-06-21  9:40 [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev Andrew Rybchenko
@ 2019-06-21  9:40 ` Andrew Rybchenko
  2019-06-21  9:52 ` [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev David Marchand
  1 sibling, 0 replies; 6+ messages in thread
From: Andrew Rybchenko @ 2019-06-21  9:40 UTC (permalink / raw)
  To: dev; +Cc: stable

PCI device may be unplugged when ethdev is not closed yet.

Fixes: aaa3f5f0f79d ("net/sfc: add configure and close stubs")
Cc: stable@dpdk.org

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
---
 drivers/net/sfc/sfc_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index be185d5e9..583f31b8c 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -2196,6 +2196,8 @@ sfc_eth_dev_uninit(struct rte_eth_dev *dev)
 		return 0;
 	}
 
+	sfc_dev_close(dev);
+
 	sa = sfc_adapter_by_eth_dev(dev);
 	sfc_log_init(sa, "entry");
 
-- 
2.17.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev
  2019-06-21  9:40 [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev Andrew Rybchenko
  2019-06-21  9:40 ` [dpdk-stable] [PATCH 2/3] net/sfc: ensure that device is closed on removal Andrew Rybchenko
@ 2019-06-21  9:52 ` David Marchand
  2019-06-21 10:15   ` [dpdk-stable] [dpdk-dev] " Andrew Rybchenko
  1 sibling, 1 reply; 6+ messages in thread
From: David Marchand @ 2019-06-21  9:52 UTC (permalink / raw)
  To: Andrew Rybchenko; +Cc: dev, dpdk stable, Thomas Monjalon, Ferruh Yigit

On Fri, Jun 21, 2019 at 11:41 AM Andrew Rybchenko <arybchenko@solarflare.com>
wrote:

> If PCI Ethernet device driver removes it on close
> (RTE_ETH_DEV_CLOSE_REMOVE) and later PCI device itself is unplugged,
> it should not fail because of Ethernet device is already removed.
>
> Fixes: 23ea57a2a0ce ("ethdev: complete closing of port")
> Cc: stable@dpdk.org
>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
> ---
> Cc: Thomas Monjalon <thomas@monjalon.net>
> Cc: Ferruh Yigit <ferruh.yigit@intel.com>
>
>  lib/librte_ethdev/rte_ethdev_pci.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_ethdev/rte_ethdev_pci.h
> b/lib/librte_ethdev/rte_ethdev_pci.h
> index 23257e986..ccdbb46ec 100644
> --- a/lib/librte_ethdev/rte_ethdev_pci.h
> +++ b/lib/librte_ethdev/rte_ethdev_pci.h
> @@ -184,7 +184,7 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device
> *pci_dev,
>
>         eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
>         if (!eth_dev)
> -               return -ENODEV;
> +               return 0;
>
>         if (dev_uninit) {
>                 ret = dev_uninit(eth_dev);
> --
> 2.17.1
>

We are changing the behavior for all drivers, while I understand this
should apply to the ones that have the RTE_ETH_DEV_CLOSE_REMOVE flag.
Btw, I had reported this earlier [1], care to add a little Reported-by for
me ? :-)

1: http://mails.dpdk.org/archives/dev/2019-June/134150.html

-- 
David Marchand

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev
  2019-06-21  9:52 ` [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev David Marchand
@ 2019-06-21 10:15   ` Andrew Rybchenko
  2019-07-02 17:38     ` Ferruh Yigit
  0 siblings, 1 reply; 6+ messages in thread
From: Andrew Rybchenko @ 2019-06-21 10:15 UTC (permalink / raw)
  To: David Marchand; +Cc: dev, dpdk stable, Thomas Monjalon, Ferruh Yigit

On 6/21/19 12:52 PM, David Marchand wrote:
> On Fri, Jun 21, 2019 at 11:41 AM Andrew Rybchenko <arybchenko@solarflare.com>
> wrote:
>> If PCI Ethernet device driver removes it on close
>> (RTE_ETH_DEV_CLOSE_REMOVE) and later PCI device itself is unplugged,
>> it should not fail because of Ethernet device is already removed.
>>
>> Fixes: 23ea57a2a0ce ("ethdev: complete closing of port")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
>> ---
>> Cc: Thomas Monjalon <thomas@monjalon.net>
>> Cc: Ferruh Yigit <ferruh.yigit@intel.com>
>>
>>   lib/librte_ethdev/rte_ethdev_pci.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_ethdev/rte_ethdev_pci.h
>> b/lib/librte_ethdev/rte_ethdev_pci.h
>> index 23257e986..ccdbb46ec 100644
>> --- a/lib/librte_ethdev/rte_ethdev_pci.h
>> +++ b/lib/librte_ethdev/rte_ethdev_pci.h
>> @@ -184,7 +184,7 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device
>> *pci_dev,
>>
>>          eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
>>          if (!eth_dev)
>> -               return -ENODEV;
>> +               return 0;
>>
>>          if (dev_uninit) {
>>                  ret = dev_uninit(eth_dev);
>> --
>> 2.17.1
>>
> We are changing the behavior for all drivers, while I understand this
> should apply to the ones that have the RTE_ETH_DEV_CLOSE_REMOVE flag.
> Btw, I had reported this earlier [1], care to add a little Reported-by for
> me ? :-)

Yes, I agree. Unfortunately there is no ethdev here to check
RTE_ETH_DEV_CLOSE_REMOVE. It could be PCI driver flag for the
feature, but I'm not sure if it makes sense to add one more
flag for transition.

> 1: http://mails.dpdk.org/archives/dev/2019-June/134150.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev
  2019-06-21 10:15   ` [dpdk-stable] [dpdk-dev] " Andrew Rybchenko
@ 2019-07-02 17:38     ` Ferruh Yigit
  2019-07-03 13:55       ` Ferruh Yigit
  0 siblings, 1 reply; 6+ messages in thread
From: Ferruh Yigit @ 2019-07-02 17:38 UTC (permalink / raw)
  To: Andrew Rybchenko, David Marchand; +Cc: dev, dpdk stable, Thomas Monjalon

On 6/21/2019 11:15 AM, Andrew Rybchenko wrote:
> On 6/21/19 12:52 PM, David Marchand wrote:
>> On Fri, Jun 21, 2019 at 11:41 AM Andrew Rybchenko <arybchenko@solarflare.com>
>> wrote:
>>> If PCI Ethernet device driver removes it on close
>>> (RTE_ETH_DEV_CLOSE_REMOVE) and later PCI device itself is unplugged,
>>> it should not fail because of Ethernet device is already removed.
>>>
>>> Fixes: 23ea57a2a0ce ("ethdev: complete closing of port")
>>> Cc: stable@dpdk.org
>>>
>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>>> Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
>>> ---
>>> Cc: Thomas Monjalon <thomas@monjalon.net>
>>> Cc: Ferruh Yigit <ferruh.yigit@intel.com>
>>>
>>>   lib/librte_ethdev/rte_ethdev_pci.h | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/lib/librte_ethdev/rte_ethdev_pci.h
>>> b/lib/librte_ethdev/rte_ethdev_pci.h
>>> index 23257e986..ccdbb46ec 100644
>>> --- a/lib/librte_ethdev/rte_ethdev_pci.h
>>> +++ b/lib/librte_ethdev/rte_ethdev_pci.h
>>> @@ -184,7 +184,7 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device
>>> *pci_dev,
>>>
>>>          eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
>>>          if (!eth_dev)
>>> -               return -ENODEV;
>>> +               return 0;
>>>
>>>          if (dev_uninit) {
>>>                  ret = dev_uninit(eth_dev);
>>> --
>>> 2.17.1
>>>
>> We are changing the behavior for all drivers, while I understand this
>> should apply to the ones that have the RTE_ETH_DEV_CLOSE_REMOVE flag.
>> Btw, I had reported this earlier [1], care to add a little Reported-by for
>> me ? :-)
> 
> Yes, I agree. Unfortunately there is no ethdev here to check
> RTE_ETH_DEV_CLOSE_REMOVE. It could be PCI driver flag for the
> feature, but I'm not sure if it makes sense to add one more
> flag for transition.
> 
>> 1: http://mails.dpdk.org/archives/dev/2019-June/134150.html

Reported-by: David Marchand <david.marchand@redhat.com>

> 

Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev
  2019-07-02 17:38     ` Ferruh Yigit
@ 2019-07-03 13:55       ` Ferruh Yigit
  0 siblings, 0 replies; 6+ messages in thread
From: Ferruh Yigit @ 2019-07-03 13:55 UTC (permalink / raw)
  To: Andrew Rybchenko, David Marchand; +Cc: dev, dpdk stable, Thomas Monjalon

On 7/2/2019 6:38 PM, Ferruh Yigit wrote:
> On 6/21/2019 11:15 AM, Andrew Rybchenko wrote:
>> On 6/21/19 12:52 PM, David Marchand wrote:
>>> On Fri, Jun 21, 2019 at 11:41 AM Andrew Rybchenko <arybchenko@solarflare.com>
>>> wrote:
>>>> If PCI Ethernet device driver removes it on close
>>>> (RTE_ETH_DEV_CLOSE_REMOVE) and later PCI device itself is unplugged,
>>>> it should not fail because of Ethernet device is already removed.
>>>>
>>>> Fixes: 23ea57a2a0ce ("ethdev: complete closing of port")
>>>> Cc: stable@dpdk.org
>>>>
>>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>>>> Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
>>>> ---
>>>> Cc: Thomas Monjalon <thomas@monjalon.net>
>>>> Cc: Ferruh Yigit <ferruh.yigit@intel.com>
>>>>
>>>>   lib/librte_ethdev/rte_ethdev_pci.h | 2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/lib/librte_ethdev/rte_ethdev_pci.h
>>>> b/lib/librte_ethdev/rte_ethdev_pci.h
>>>> index 23257e986..ccdbb46ec 100644
>>>> --- a/lib/librte_ethdev/rte_ethdev_pci.h
>>>> +++ b/lib/librte_ethdev/rte_ethdev_pci.h
>>>> @@ -184,7 +184,7 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device
>>>> *pci_dev,
>>>>
>>>>          eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
>>>>          if (!eth_dev)
>>>> -               return -ENODEV;
>>>> +               return 0;
>>>>
>>>>          if (dev_uninit) {
>>>>                  ret = dev_uninit(eth_dev);
>>>> --
>>>> 2.17.1
>>>>
>>> We are changing the behavior for all drivers, while I understand this
>>> should apply to the ones that have the RTE_ETH_DEV_CLOSE_REMOVE flag.
>>> Btw, I had reported this earlier [1], care to add a little Reported-by for
>>> me ? :-)
>>
>> Yes, I agree. Unfortunately there is no ethdev here to check
>> RTE_ETH_DEV_CLOSE_REMOVE. It could be PCI driver flag for the
>> feature, but I'm not sure if it makes sense to add one more
>> flag for transition.
>>
>>> 1: http://mails.dpdk.org/archives/dev/2019-June/134150.html
> 
> Reported-by: David Marchand <david.marchand@redhat.com>
> 
>>
> 
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 

Series applied to dpdk-next-net/master, thanks.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-07-03 13:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-21  9:40 [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev Andrew Rybchenko
2019-06-21  9:40 ` [dpdk-stable] [PATCH 2/3] net/sfc: ensure that device is closed on removal Andrew Rybchenko
2019-06-21  9:52 ` [dpdk-stable] [PATCH 1/3] ethdev: avoid error on PCI unplug of already closed ethdev David Marchand
2019-06-21 10:15   ` [dpdk-stable] [dpdk-dev] " Andrew Rybchenko
2019-07-02 17:38     ` Ferruh Yigit
2019-07-03 13:55       ` Ferruh Yigit

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).