2019-05-23 21:48:47

by Alan Mikhak

Subject: [PATCH v2] PCI: endpoint: Set endpoint controller pointer to null

Set endpoint controller pointer to null in pci_epc_remove_epf()
to avoid -EBUSY on subsequent call to pci_epc_add_epf().

Requires checking for null endpoint function pointer.

Signed-off-by: Alan Mikhak <[email protected]>
---
drivers/pci/endpoint/pci-epc-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
index e4712a0f249c..2091508c1620 100644
--- a/drivers/pci/endpoint/pci-epc-core.c
+++ b/drivers/pci/endpoint/pci-epc-core.c
@@ -519,11 +519,12 @@ void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf)
{
unsigned long flags;

- if (!epc || IS_ERR(epc))
+ if (!epc || IS_ERR(epc) || !epf)
return;

spin_lock_irqsave(&epc->lock, flags);
list_del(&epf->list);
+ epf->epc = NULL;
spin_unlock_irqrestore(&epc->lock, flags);
}
EXPORT_SYMBOL_GPL(pci_epc_remove_epf);
--
2.7.4

2019-05-24 00:01:08

by Alan Mikhak

Subject: Re: [PATCH v2] PCI: endpoint: Set endpoint controller pointer to null

+Bjorn Helgaas

On Thu, May 23, 2019 at 2:46 PM Alan Mikhak <[email protected]> wrote:
>
> Set endpoint controller pointer to null in pci_epc_remove_epf()
> to avoid -EBUSY on subsequent call to pci_epc_add_epf().
>
> Requires checking for null endpoint function pointer.
>
> Signed-off-by: Alan Mikhak <[email protected]>
> ---
> drivers/pci/endpoint/pci-epc-core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
> index e4712a0f249c..2091508c1620 100644
> --- a/drivers/pci/endpoint/pci-epc-core.c
> +++ b/drivers/pci/endpoint/pci-epc-core.c
> @@ -519,11 +519,12 @@ void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf)
> {
> unsigned long flags;
>
> - if (!epc || IS_ERR(epc))
> + if (!epc || IS_ERR(epc) || !epf)
> return;
>
> spin_lock_irqsave(&epc->lock, flags);
> list_del(&epf->list);
> + epf->epc = NULL;
> spin_unlock_irqrestore(&epc->lock, flags);
> }
> EXPORT_SYMBOL_GPL(pci_epc_remove_epf);
> --
> 2.7.4
>

2019-05-24 08:46:25

by Kishon Vijay Abraham I

Subject: Re: [PATCH v2] PCI: endpoint: Set endpoint controller pointer to null

On 24/05/19 5:27 AM, Alan Mikhak wrote:
> +Bjorn Helgaas
>
> On Thu, May 23, 2019 at 2:46 PM Alan Mikhak <[email protected]> wrote:
>>
>> Set endpoint controller pointer to null in pci_epc_remove_epf()
>> to avoid -EBUSY on subsequent call to pci_epc_add_epf().
>>
>> Requires checking for null endpoint function pointer.
>>
>> Signed-off-by: Alan Mikhak <[email protected]>

Acked-by: Kishon Vijay Abraham I <[email protected]>
>> ---
>> drivers/pci/endpoint/pci-epc-core.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
>> index e4712a0f249c..2091508c1620 100644
>> --- a/drivers/pci/endpoint/pci-epc-core.c
>> +++ b/drivers/pci/endpoint/pci-epc-core.c
>> @@ -519,11 +519,12 @@ void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf)
>> {
>> unsigned long flags;
>>
>> - if (!epc || IS_ERR(epc))
>> + if (!epc || IS_ERR(epc) || !epf)
>> return;
>>
>> spin_lock_irqsave(&epc->lock, flags);
>> list_del(&epf->list);
>> + epf->epc = NULL;
>> spin_unlock_irqrestore(&epc->lock, flags);
>> }
>> EXPORT_SYMBOL_GPL(pci_epc_remove_epf);
>> --
>> 2.7.4
>>

2019-06-11 10:08:30

by Lorenzo Pieralisi

Subject: Re: [PATCH v2] PCI: endpoint: Set endpoint controller pointer to null

On Thu, May 23, 2019 at 02:45:44PM -0700, Alan Mikhak wrote:
> Set endpoint controller pointer to null in pci_epc_remove_epf()
> to avoid -EBUSY on subsequent call to pci_epc_add_epf().
>
> Requires checking for null endpoint function pointer.
>
> Signed-off-by: Alan Mikhak <[email protected]>
> ---
> drivers/pci/endpoint/pci-epc-core.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

Applied to pci/endpoint for v5.3, thanks.

Lorenzo

> diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
> index e4712a0f249c..2091508c1620 100644
> --- a/drivers/pci/endpoint/pci-epc-core.c
> +++ b/drivers/pci/endpoint/pci-epc-core.c
> @@ -519,11 +519,12 @@ void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf)
> {
> unsigned long flags;
>
> - if (!epc || IS_ERR(epc))
> + if (!epc || IS_ERR(epc) || !epf)
> return;
>
> spin_lock_irqsave(&epc->lock, flags);
> list_del(&epf->list);
> + epf->epc = NULL;
> spin_unlock_irqrestore(&epc->lock, flags);
> }
> EXPORT_SYMBOL_GPL(pci_epc_remove_epf);
> --
> 2.7.4
>