Message-ID: <48E43657.4040006@jp.fujitsu.com>
Date: Thu, 02 Oct 2008 11:47:51 +0900
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
User-Agent: Thunderbird 2.0.0.17 (Windows/20080914)
MIME-Version: 1.0
To: Alex Chiang <achiang@hp.com>,
       Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
       linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
       jbarnes@virtuousgeek.org, kristen.c.accardi@intel.com, matthew@wil.cx
Subject: Re: [PATCH v3 02/14] PCI: prevent duplicate slot names
References: <20080923163753.12628.98683.stgit@bob.kio> <20080923164523.12628.69510.stgit@bob.kio> <48E09936.2030905@jp.fujitsu.com> <48E189BF.4020907@jp.fujitsu.com> <20081002010542.GA745@ldl.fc.hp.com>
In-Reply-To: <20081002010542.GA745@ldl.fc.hp.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 3464
Lines: 97

Alex-san,

Alex Chiang wrote:
> * Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>:
>> Kenji Kaneshige wrote:
>>> Hi Alex-san,
>>>
>>> Here is one comment, though I have not finished reviewing/testing
>>> your patches yet (sorry for the delay).
>>>
>>> Alex Chiang wrote:
>>>
>>> (snip.)
>>>
>>>> diff --git a/drivers/pci/hotplug/pci_hotplug_core.c  
>>>> b/drivers/pci/hotplug/pci_hotplug_core.c
>>>> index 3e37d63..46802dc 100644
>>>> --- a/drivers/pci/hotplug/pci_hotplug_core.c
>>>> +++ b/drivers/pci/hotplug/pci_hotplug_core.c
>>>> @@ -570,39 +570,32 @@ int pci_hp_register(struct hotplug_slot *slot,  
>>>> struct pci_bus *bus, int slot_nr,
>>>>          return -EINVAL;
>>>>      }
>>>>  -    /* Check if we have already registered a slot with the same 
>>>> name. */
>>>> -    if (get_slot_from_name(name))
>>>> -        return -EEXIST;
>>>> -
>>>>      /*
>>>> -     * No problems if we call this interface from both ACPI_PCI_SLOT
>>>> -     * driver and call it here again. If we've already created the
>>>> -     * pci_slot, the interface will simply bump the refcount.
>>>> +     * Look for existing slot. If we find it, and it was created by a
>>>> +     * slot detection driver (ie, doesn't have a ->hotplug()) then we
>>>> +     * allow the hotplug driver calling us to rename the slot if  
>>>> desired.
>>>> +     *
>>>> +     * Otherwise, create the slot and carry on with life.
>>>>       */
>>>> -    pci_slot = pci_create_slot(bus, slot_nr, name);
>>>> -    if (IS_ERR(pci_slot))
>>>> -        return PTR_ERR(pci_slot);
>>>> -
>>>> -    if (pci_slot->hotplug) {
>>>> -        dbg("%s: already claimed\n", __func__);
>>>> -        pci_destroy_slot(pci_slot);
>>>> -        return -EBUSY;
>>>> +    pci_slot = pci_get_pci_slot(bus, slot_nr);
>>> The pci_get_pci_slot() function refers pci_bus->slots list, so it
>>> should be called with pci_bus_sem semaphore held as pci_create_slot()
>>> does, or pci_bus_sem semaphore should be held by pci_get_pci_slot()
>>> itself.
> 
> Yes, I've changed pci_get_pci_slot() to acquire the pci_bus_sem
> semaphore.
> 
> Thank you for pointing this out.
> 
> It will be fixed in v4 of this patch series, which I will send
> out after I receive the rest of your review comments.
> 

I noticed that changing pci_get_pci_slot() to acquire the pci_bus_sem
might be not enough. If slot was created between pci_get_pci_slot() and
pci_create_slot() by another thread in the following code, something
wrong would happen I think.

        pci_slot = pci_get_pci_slot(bus, slot_nr);
        if (pci_slot) {
                if (pci_slot->hotplug) {
                        result = -EBUSY;
                        goto err;
                }

                if (strcmp(kobject_name(&pci_slot->kobj), name))
                        if ((result = pci_rename_slot(pci_slot, name)))
                                goto err;
        } else {
                pci_slot = pci_create_slot(bus, slot_nr, name);
                if ((result = IS_ERR(pci_slot)))
                        goto out;
        }

I've finished reviewing and testing your patches. The rest of your
patch looks good to me. Of course, we must not forget the comment
from Taku Izumi.

Thanks,
Kenji Kaneshige


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/