| Message ID | 1418072517-5413-1-git-send-email-jsitnicki@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On Monday, December 08, 2014 10:01:57 PM Jakub Sitnicki wrote: > PNP core is the last user of the __check_region() which has been > deprecated for almost 12 years (since v2.5.54). Replace it with a combo > of __request_region() followed by __release_region(). > > pnp_check_port() and pnp_check_mem() remain racy after this change. > > Signed-off-by: Jakub Sitnicki <jsitnicki@gmail.com> > --- > > There was a previous attempt at making this change 3 years ago but the > author has never addressed the review comments: > > https://lkml.org/lkml/2011/8/12/216 > > The end goal here is to get rid of __check_region() which lands in > every kernel image because of the PNP core. > > It has been previously pointed out that replacing __check_region() > with request_region() obscures the fact that pnp_check_port() is racy: > > https://lkml.org/lkml/2011/8/11/466 > > Because of that I've also considered just moving __check_region() to > PNP core. However, that would require making free_resource() an > exported symbol in kernel/resource.c. > > On the other hand, a switch to request/release_region() makes > pnp_check_port() and pnp_check_mem() follow the same pattern as found > in pnp_check_irq() and pnp_check_dma(): > > if (!dev->active) { > if (request_<resource type>(...)) > return 0; > free_<resource type>(...); > } > > Admittedly, I was not able to exercise the touched code paths on a > commodity x86_64 laptop or under QEMU / VirtualBox (which lack ISA PnP > support, AFAIK). > > To my understanding, the correct way to test pnp_check_port() or > pnp_check_mem() would be by issuing either: > > $ echo fill >/sys/bus/pnp/devices/XX:YY/resources > or > $ echo auto >/sys/bus/pnp/devices/XX:YY/resources > > ... but only if the device is not attached or active, which is not the > case for ACPI PnP devices on my machines. If anyone can provide hints > on steps to test this, I will be glad to do so. > > drivers/pnp/resource.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c > index 782e822..f980ff7 100644 > --- a/drivers/pnp/resource.c > +++ b/drivers/pnp/resource.c > @@ -179,8 +179,9 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) > /* check if the resource is already in use, skip if the > * device is active because it itself may be in use */ > if (!dev->active) { > - if (__check_region(&ioport_resource, *port, length(port, end))) > + if (!request_region(*port, length(port, end), "pnp")) > return 0; > + release_region(*port, length(port, end)); Shouldn't we also release the resource returned by request_region() if it is not NULL? > } > > /* check if the resource is reserved */ > @@ -241,8 +242,9 @@ int pnp_check_mem(struct pnp_dev *dev, struct resource *res) > /* check if the resource is already in use, skip if the > * device is active because it itself may be in use */ > if (!dev->active) { > - if (check_mem_region(*addr, length(addr, end))) > + if (!request_mem_region(*addr, length(addr, end), "pnp")) > return 0; > + release_mem_region(*addr, length(addr, end)); > } > > /* check if the resource is reserved */ > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Rafael J. Wysocki <rjw@rjwysocki.net> writes: > On Monday, December 08, 2014 10:01:57 PM Jakub Sitnicki wrote: >> diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c >> index 782e822..f980ff7 100644 >> --- a/drivers/pnp/resource.c >> +++ b/drivers/pnp/resource.c >> @@ -179,8 +179,9 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) >> /* check if the resource is already in use, skip if the >> * device is active because it itself may be in use */ >> if (!dev->active) { >> - if (__check_region(&ioport_resource, *port, length(port, end))) >> + if (!request_region(*port, length(port, end), "pnp")) >> return 0; >> + release_region(*port, length(port, end)); > > Shouldn't we also release the resource returned by request_region() if it is > not NULL? > Thanks for taking a look at this. I think we're good here. If you please bear with me for a moment: release_resource() removes an element from the list of resource parent's children (and makes it an orphan): p = &old->parent->child; for (;;) { tmp = *p; if (!tmp) break; if (tmp == old) { *p = tmp->sibling; old->parent = NULL; return 0; } p = &tmp->sibling; } release_region() does the same but with additional checks, and also frees the resource: p = &parent->child; /* ... */ for (;;) { struct resource *res = *p; if (!res) break; if (res->start <= start && res->end >= end) { /* ... */ *p = res->sibling; /* ... */ free_resource(res); return; } p = &res->sibling; } When making the change I've based on other code in the kernel which also make use of request_region(). To quote one example, drivers/net/ethernet/8390/ne2k-pci.c cleans up its I/O port region when initialization fails like so: static int ne2k_pci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { /* ... */ if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) { dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n", NE_IO_EXTENT, ioaddr); return -EBUSY; } /* ... */ dev = alloc_ei_netdev(); if (!dev) { dev_err(&pdev->dev, "cannot allocate ethernet device\n"); goto err_out_free_res; } /* ... */ err_out_free_res: release_region (ioaddr, NE_IO_EXTENT); return -ENODEV; } >> } >> >> /* check if the resource is reserved */ >> @@ -241,8 +242,9 @@ int pnp_check_mem(struct pnp_dev *dev, struct resource *res) >> /* check if the resource is already in use, skip if the >> * device is active because it itself may be in use */ >> if (!dev->active) { >> - if (check_mem_region(*addr, length(addr, end))) >> + if (!request_mem_region(*addr, length(addr, end), "pnp")) >> return 0; >> + release_mem_region(*addr, length(addr, end)); >> } >> >> /* check if the resource is reserved */ >> -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Dec 12, 2014 at 08:47 AM CET, Jakub Sitnicki wrote: > Rafael J. Wysocki <rjw@rjwysocki.net> writes: > >> On Monday, December 08, 2014 10:01:57 PM Jakub Sitnicki wrote: >>> diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c >>> index 782e822..f980ff7 100644 >>> --- a/drivers/pnp/resource.c >>> +++ b/drivers/pnp/resource.c >>> @@ -179,8 +179,9 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) >>> /* check if the resource is already in use, skip if the >>> * device is active because it itself may be in use */ >>> if (!dev->active) { >>> - if (__check_region(&ioport_resource, *port, length(port, end))) >>> + if (!request_region(*port, length(port, end), "pnp")) >>> return 0; >>> + release_region(*port, length(port, end)); >> >> Shouldn't we also release the resource returned by request_region() if it is >> not NULL? >> > > Thanks for taking a look at this. I think we're good here. If you please > bear with me for a moment: > > release_resource() removes an element from the list of resource parent's > children (and makes it an orphan): > > p = &old->parent->child; > for (;;) { > tmp = *p; > if (!tmp) > break; > if (tmp == old) { > *p = tmp->sibling; > old->parent = NULL; > return 0; > } > p = &tmp->sibling; > } > > release_region() does the same but with additional checks, and also > frees the resource: > > p = &parent->child; > /* ... */ > for (;;) { > struct resource *res = *p; > > if (!res) > break; > if (res->start <= start && res->end >= end) { > /* ... */ > *p = res->sibling; > /* ... */ > free_resource(res); > return; > } > p = &res->sibling; > } > > When making the change I've based on other code in the kernel which also > make use of request_region(). > > To quote one example, drivers/net/ethernet/8390/ne2k-pci.c cleans up its > I/O port region when initialization fails like so: > > static int ne2k_pci_init_one(struct pci_dev *pdev, > const struct pci_device_id *ent) > { > /* ... */ > > if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) { > dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n", > NE_IO_EXTENT, ioaddr); > return -EBUSY; > } > > /* ... */ > > dev = alloc_ei_netdev(); > if (!dev) { > dev_err(&pdev->dev, "cannot allocate ethernet device\n"); > goto err_out_free_res; > } > > /* ... */ > > err_out_free_res: > release_region (ioaddr, NE_IO_EXTENT); > return -ENODEV; > } Just wondering, do you have any further thoughts on this? Thanks, Jakub -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday, December 22, 2014 12:19:44 PM Jakub Sitnicki wrote: > On Fri, Dec 12, 2014 at 08:47 AM CET, Jakub Sitnicki wrote: > > Rafael J. Wysocki <rjw@rjwysocki.net> writes: > > > >> On Monday, December 08, 2014 10:01:57 PM Jakub Sitnicki wrote: > >>> diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c > >>> index 782e822..f980ff7 100644 > >>> --- a/drivers/pnp/resource.c > >>> +++ b/drivers/pnp/resource.c > >>> @@ -179,8 +179,9 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) > >>> /* check if the resource is already in use, skip if the > >>> * device is active because it itself may be in use */ > >>> if (!dev->active) { > >>> - if (__check_region(&ioport_resource, *port, length(port, end))) > >>> + if (!request_region(*port, length(port, end), "pnp")) > >>> return 0; > >>> + release_region(*port, length(port, end)); > >> > >> Shouldn't we also release the resource returned by request_region() if it is > >> not NULL? > >> > > > > Thanks for taking a look at this. I think we're good here. If you please > > bear with me for a moment: > > > > release_resource() removes an element from the list of resource parent's > > children (and makes it an orphan): > > > > p = &old->parent->child; > > for (;;) { > > tmp = *p; > > if (!tmp) > > break; > > if (tmp == old) { > > *p = tmp->sibling; > > old->parent = NULL; > > return 0; > > } > > p = &tmp->sibling; > > } > > > > release_region() does the same but with additional checks, and also > > frees the resource: > > > > p = &parent->child; > > /* ... */ > > for (;;) { > > struct resource *res = *p; > > > > if (!res) > > break; > > if (res->start <= start && res->end >= end) { > > /* ... */ > > *p = res->sibling; > > /* ... */ > > free_resource(res); > > return; > > } > > p = &res->sibling; > > } > > > > When making the change I've based on other code in the kernel which also > > make use of request_region(). > > > > To quote one example, drivers/net/ethernet/8390/ne2k-pci.c cleans up its > > I/O port region when initialization fails like so: > > > > static int ne2k_pci_init_one(struct pci_dev *pdev, > > const struct pci_device_id *ent) > > { > > /* ... */ > > > > if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) { > > dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n", > > NE_IO_EXTENT, ioaddr); > > return -EBUSY; > > } > > > > /* ... */ > > > > dev = alloc_ei_netdev(); > > if (!dev) { > > dev_err(&pdev->dev, "cannot allocate ethernet device\n"); > > goto err_out_free_res; > > } > > > > /* ... */ > > > > err_out_free_res: > > release_region (ioaddr, NE_IO_EXTENT); > > return -ENODEV; > > } > > Just wondering, do you have any further thoughts on this? I'll queue it up for 3.20 later in January.
On Monday, December 22, 2014 11:34:48 PM Rafael J. Wysocki wrote: > On Monday, December 22, 2014 12:19:44 PM Jakub Sitnicki wrote: > > On Fri, Dec 12, 2014 at 08:47 AM CET, Jakub Sitnicki wrote: > > > Rafael J. Wysocki <rjw@rjwysocki.net> writes: > > > > > >> On Monday, December 08, 2014 10:01:57 PM Jakub Sitnicki wrote: > > >>> diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c > > >>> index 782e822..f980ff7 100644 > > >>> --- a/drivers/pnp/resource.c > > >>> +++ b/drivers/pnp/resource.c > > >>> @@ -179,8 +179,9 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) > > >>> /* check if the resource is already in use, skip if the > > >>> * device is active because it itself may be in use */ > > >>> if (!dev->active) { > > >>> - if (__check_region(&ioport_resource, *port, length(port, end))) > > >>> + if (!request_region(*port, length(port, end), "pnp")) > > >>> return 0; > > >>> + release_region(*port, length(port, end)); > > >> > > >> Shouldn't we also release the resource returned by request_region() if it is > > >> not NULL? > > >> > > > > > > Thanks for taking a look at this. I think we're good here. If you please > > > bear with me for a moment: > > > > > > release_resource() removes an element from the list of resource parent's > > > children (and makes it an orphan): > > > > > > p = &old->parent->child; > > > for (;;) { > > > tmp = *p; > > > if (!tmp) > > > break; > > > if (tmp == old) { > > > *p = tmp->sibling; > > > old->parent = NULL; > > > return 0; > > > } > > > p = &tmp->sibling; > > > } > > > > > > release_region() does the same but with additional checks, and also > > > frees the resource: > > > > > > p = &parent->child; > > > /* ... */ > > > for (;;) { > > > struct resource *res = *p; > > > > > > if (!res) > > > break; > > > if (res->start <= start && res->end >= end) { > > > /* ... */ > > > *p = res->sibling; > > > /* ... */ > > > free_resource(res); > > > return; > > > } > > > p = &res->sibling; > > > } > > > > > > When making the change I've based on other code in the kernel which also > > > make use of request_region(). > > > > > > To quote one example, drivers/net/ethernet/8390/ne2k-pci.c cleans up its > > > I/O port region when initialization fails like so: > > > > > > static int ne2k_pci_init_one(struct pci_dev *pdev, > > > const struct pci_device_id *ent) > > > { > > > /* ... */ > > > > > > if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) { > > > dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n", > > > NE_IO_EXTENT, ioaddr); > > > return -EBUSY; > > > } > > > > > > /* ... */ > > > > > > dev = alloc_ei_netdev(); > > > if (!dev) { > > > dev_err(&pdev->dev, "cannot allocate ethernet device\n"); > > > goto err_out_free_res; > > > } > > > > > > /* ... */ > > > > > > err_out_free_res: > > > release_region (ioaddr, NE_IO_EXTENT); > > > return -ENODEV; > > > } > > > > Just wondering, do you have any further thoughts on this? > > I'll queue it up for 3.20 later in January. Done now.
On Fri, Jan 30, 2015 at 01:01 AM CET, Rafael J. Wysocki wrote: > On Monday, December 22, 2014 11:34:48 PM Rafael J. Wysocki wrote: >> On Monday, December 22, 2014 12:19:44 PM Jakub Sitnicki wrote: >> > On Fri, Dec 12, 2014 at 08:47 AM CET, Jakub Sitnicki wrote: >> > > Rafael J. Wysocki <rjw@rjwysocki.net> writes: >> > > >> > >> On Monday, December 08, 2014 10:01:57 PM Jakub Sitnicki wrote: >> > >>> diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c >> > >>> index 782e822..f980ff7 100644 >> > >>> --- a/drivers/pnp/resource.c >> > >>> +++ b/drivers/pnp/resource.c >> > >>> @@ -179,8 +179,9 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) >> > >>> /* check if the resource is already in use, skip if the >> > >>> * device is active because it itself may be in use */ >> > >>> if (!dev->active) { >> > >>> - if (__check_region(&ioport_resource, *port, length(port, end))) >> > >>> + if (!request_region(*port, length(port, end), "pnp")) >> > >>> return 0; >> > >>> + release_region(*port, length(port, end)); >> > >> >> > >> Shouldn't we also release the resource returned by request_region() if it is >> > >> not NULL? >> > >> >> > > >> > > Thanks for taking a look at this. I think we're good here. If you please >> > > bear with me for a moment: >> > > >> > > release_resource() removes an element from the list of resource parent's >> > > children (and makes it an orphan): >> > > >> > > p = &old->parent->child; >> > > for (;;) { >> > > tmp = *p; >> > > if (!tmp) >> > > break; >> > > if (tmp == old) { >> > > *p = tmp->sibling; >> > > old->parent = NULL; >> > > return 0; >> > > } >> > > p = &tmp->sibling; >> > > } >> > > >> > > release_region() does the same but with additional checks, and also >> > > frees the resource: >> > > >> > > p = &parent->child; >> > > /* ... */ >> > > for (;;) { >> > > struct resource *res = *p; >> > > >> > > if (!res) >> > > break; >> > > if (res->start <= start && res->end >= end) { >> > > /* ... */ >> > > *p = res->sibling; >> > > /* ... */ >> > > free_resource(res); >> > > return; >> > > } >> > > p = &res->sibling; >> > > } >> > > >> > > When making the change I've based on other code in the kernel which also >> > > make use of request_region(). >> > > >> > > To quote one example, drivers/net/ethernet/8390/ne2k-pci.c cleans up its >> > > I/O port region when initialization fails like so: >> > > >> > > static int ne2k_pci_init_one(struct pci_dev *pdev, >> > > const struct pci_device_id *ent) >> > > { >> > > /* ... */ >> > > >> > > if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) { >> > > dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n", >> > > NE_IO_EXTENT, ioaddr); >> > > return -EBUSY; >> > > } >> > > >> > > /* ... */ >> > > >> > > dev = alloc_ei_netdev(); >> > > if (!dev) { >> > > dev_err(&pdev->dev, "cannot allocate ethernet device\n"); >> > > goto err_out_free_res; >> > > } >> > > >> > > /* ... */ >> > > >> > > err_out_free_res: >> > > release_region (ioaddr, NE_IO_EXTENT); >> > > return -ENODEV; >> > > } >> > >> > Just wondering, do you have any further thoughts on this? >> >> I'll queue it up for 3.20 later in January. > > Done now. If you don't mind me asking, is this going to go through the linux-pm tree? Thanks, Jakub -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday, February 18, 2015 09:51:25 PM Jakub Sitnicki wrote: > On Fri, Jan 30, 2015 at 01:01 AM CET, Rafael J. Wysocki wrote: [cut] > >> I'll queue it up for 3.20 later in January. > > > > Done now. > > If you don't mind me asking, is this going to go through the linux-pm > tree? Yes, but unfortunately I skipped the pnp branch accidentally last time. I'll add it to the next pull request.
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 782e822..f980ff7 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -179,8 +179,9 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) /* check if the resource is already in use, skip if the * device is active because it itself may be in use */ if (!dev->active) { - if (__check_region(&ioport_resource, *port, length(port, end))) + if (!request_region(*port, length(port, end), "pnp")) return 0; + release_region(*port, length(port, end)); } /* check if the resource is reserved */ @@ -241,8 +242,9 @@ int pnp_check_mem(struct pnp_dev *dev, struct resource *res) /* check if the resource is already in use, skip if the * device is active because it itself may be in use */ if (!dev->active) { - if (check_mem_region(*addr, length(addr, end))) + if (!request_mem_region(*addr, length(addr, end), "pnp")) return 0; + release_mem_region(*addr, length(addr, end)); } /* check if the resource is reserved */
PNP core is the last user of the __check_region() which has been deprecated for almost 12 years (since v2.5.54). Replace it with a combo of __request_region() followed by __release_region(). pnp_check_port() and pnp_check_mem() remain racy after this change. Signed-off-by: Jakub Sitnicki <jsitnicki@gmail.com> --- There was a previous attempt at making this change 3 years ago but the author has never addressed the review comments: https://lkml.org/lkml/2011/8/12/216 The end goal here is to get rid of __check_region() which lands in every kernel image because of the PNP core. It has been previously pointed out that replacing __check_region() with request_region() obscures the fact that pnp_check_port() is racy: https://lkml.org/lkml/2011/8/11/466 Because of that I've also considered just moving __check_region() to PNP core. However, that would require making free_resource() an exported symbol in kernel/resource.c. On the other hand, a switch to request/release_region() makes pnp_check_port() and pnp_check_mem() follow the same pattern as found in pnp_check_irq() and pnp_check_dma(): if (!dev->active) { if (request_<resource type>(...)) return 0; free_<resource type>(...); } Admittedly, I was not able to exercise the touched code paths on a commodity x86_64 laptop or under QEMU / VirtualBox (which lack ISA PnP support, AFAIK). To my understanding, the correct way to test pnp_check_port() or pnp_check_mem() would be by issuing either: $ echo fill >/sys/bus/pnp/devices/XX:YY/resources or $ echo auto >/sys/bus/pnp/devices/XX:YY/resources ... but only if the device is not attached or active, which is not the case for ACPI PnP devices on my machines. If anyone can provide hints on steps to test this, I will be glad to do so. drivers/pnp/resource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)