| Message ID | 20190818090557.17853-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] resource: add a not device managed request_free_mem_region variant | expand |
On Sun, Aug 18, 2019 at 2:12 AM Christoph Hellwig <hch@lst.de> wrote: > > The dev field in struct dev_pagemap is only used to print dev_name in > two places, which are at best nice to have. Just remove the field > and thus the name in those two messages. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Ira Weiny <ira.weiny@intel.com> Needs the below as well. /me goes to check if he ever merged the fix to make the unit test stuff get built by default with COMPILE_TEST [1]. Argh! Nope, didn't submit it for 5.3-rc1, sorry for the thrash. You can otherwise add: Reviewed-by: Dan Williams <dan.j.williams@intel.com> [1]: https://lore.kernel.org/lkml/156097224232.1086847.9463861924683372741.stgit@dwillia2-desk3.amr.corp.intel.com/ --- diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c index cd040b5abffe..3f55f2f99112 100644 --- a/tools/testing/nvdimm/test/iomap.c +++ b/tools/testing/nvdimm/test/iomap.c @@ -132,7 +132,6 @@ void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) if (!nfit_res) return devm_memremap_pages(dev, pgmap); - pgmap->dev = dev; if (!pgmap->ref) { if (pgmap->ops && (pgmap->ops->kill || pgmap->ops->cleanup)) return ERR_PTR(-EINVAL);
On Mon, Aug 19, 2019 at 06:44:02PM -0700, Dan Williams wrote: > On Sun, Aug 18, 2019 at 2:12 AM Christoph Hellwig <hch@lst.de> wrote: > > > > The dev field in struct dev_pagemap is only used to print dev_name in > > two places, which are at best nice to have. Just remove the field > > and thus the name in those two messages. > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > > Needs the below as well. > > /me goes to check if he ever merged the fix to make the unit test > stuff get built by default with COMPILE_TEST [1]. Argh! Nope, didn't > submit it for 5.3-rc1, sorry for the thrash. > > You can otherwise add: > > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > > [1]: https://lore.kernel.org/lkml/156097224232.1086847.9463861924683372741.stgit@dwillia2-desk3.amr.corp.intel.com/ Can you get this merged? Do you want it to go with this series? Jason
On Tue, Aug 20, 2019 at 6:27 AM Jason Gunthorpe <jgg@mellanox.com> wrote: > > On Mon, Aug 19, 2019 at 06:44:02PM -0700, Dan Williams wrote: > > On Sun, Aug 18, 2019 at 2:12 AM Christoph Hellwig <hch@lst.de> wrote: > > > > > > The dev field in struct dev_pagemap is only used to print dev_name in > > > two places, which are at best nice to have. Just remove the field > > > and thus the name in those two messages. > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > > > > Needs the below as well. > > > > /me goes to check if he ever merged the fix to make the unit test > > stuff get built by default with COMPILE_TEST [1]. Argh! Nope, didn't > > submit it for 5.3-rc1, sorry for the thrash. > > > > You can otherwise add: > > > > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > > > > [1]: https://lore.kernel.org/lkml/156097224232.1086847.9463861924683372741.stgit@dwillia2-desk3.amr.corp.intel.com/ > > Can you get this merged? Do you want it to go with this series? Yeah, makes some sense to let you merge it so that you can get kbuild-robot reports about any follow-on memremap_pages() work that may trip up the build. Otherwise let me know and I'll get it queued with the other v5.4 libnvdimm pending bits.
On Tue, Aug 20, 2019 at 07:58:22PM -0700, Dan Williams wrote: > On Tue, Aug 20, 2019 at 6:27 AM Jason Gunthorpe <jgg@mellanox.com> wrote: > > > > On Mon, Aug 19, 2019 at 06:44:02PM -0700, Dan Williams wrote: > > > On Sun, Aug 18, 2019 at 2:12 AM Christoph Hellwig <hch@lst.de> wrote: > > > > > > > > The dev field in struct dev_pagemap is only used to print dev_name in > > > > two places, which are at best nice to have. Just remove the field > > > > and thus the name in those two messages. > > > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > > > > > > Needs the below as well. > > > > > > /me goes to check if he ever merged the fix to make the unit test > > > stuff get built by default with COMPILE_TEST [1]. Argh! Nope, didn't > > > submit it for 5.3-rc1, sorry for the thrash. > > > > > > You can otherwise add: > > > > > > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > > > > > > [1]: https://lore.kernel.org/lkml/156097224232.1086847.9463861924683372741.stgit@dwillia2-desk3.amr.corp.intel.com/ > > > > Can you get this merged? Do you want it to go with this series? > > Yeah, makes some sense to let you merge it so that you can get > kbuild-robot reports about any follow-on memremap_pages() work that > may trip up the build. Otherwise let me know and I'll get it queued > with the other v5.4 libnvdimm pending bits. Done, I used it already to test build the last series from CH.. Jason
On Wed, Aug 21, 2019 at 01:24:20PM -0300, Jason Gunthorpe wrote: > On Tue, Aug 20, 2019 at 07:58:22PM -0700, Dan Williams wrote: > > On Tue, Aug 20, 2019 at 6:27 AM Jason Gunthorpe <jgg@mellanox.com> wrote: > > > > > > On Mon, Aug 19, 2019 at 06:44:02PM -0700, Dan Williams wrote: > > > > On Sun, Aug 18, 2019 at 2:12 AM Christoph Hellwig <hch@lst.de> wrote: > > > > > > > > > > The dev field in struct dev_pagemap is only used to print dev_name in > > > > > two places, which are at best nice to have. Just remove the field > > > > > and thus the name in those two messages. > > > > > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > > > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > > > > > > > > Needs the below as well. > > > > > > > > /me goes to check if he ever merged the fix to make the unit test > > > > stuff get built by default with COMPILE_TEST [1]. Argh! Nope, didn't > > > > submit it for 5.3-rc1, sorry for the thrash. > > > > > > > > You can otherwise add: > > > > > > > > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > > > > > > > > [1]: https://lore.kernel.org/lkml/156097224232.1086847.9463861924683372741.stgit@dwillia2-desk3.amr.corp.intel.com/ > > > > > > Can you get this merged? Do you want it to go with this series? > > > > Yeah, makes some sense to let you merge it so that you can get > > kbuild-robot reports about any follow-on memremap_pages() work that > > may trip up the build. Otherwise let me know and I'll get it queued > > with the other v5.4 libnvdimm pending bits. > > Done, I used it already to test build the last series from CH.. It failed 0-day, I'm guessing some missing kconfig stuff For now I dropped it, but, if you send a v2 I can forward it toward 0-day again! Thanks, Jason
On Wed, Aug 21, 2019 at 4:51 PM Jason Gunthorpe <jgg@mellanox.com> wrote: > > On Wed, Aug 21, 2019 at 01:24:20PM -0300, Jason Gunthorpe wrote: > > On Tue, Aug 20, 2019 at 07:58:22PM -0700, Dan Williams wrote: > > > On Tue, Aug 20, 2019 at 6:27 AM Jason Gunthorpe <jgg@mellanox.com> wrote: > > > > > > > > On Mon, Aug 19, 2019 at 06:44:02PM -0700, Dan Williams wrote: > > > > > On Sun, Aug 18, 2019 at 2:12 AM Christoph Hellwig <hch@lst.de> wrote: > > > > > > > > > > > > The dev field in struct dev_pagemap is only used to print dev_name in > > > > > > two places, which are at best nice to have. Just remove the field > > > > > > and thus the name in those two messages. > > > > > > > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > > > > Reviewed-by: Ira Weiny <ira.weiny@intel.com> > > > > > > > > > > Needs the below as well. > > > > > > > > > > /me goes to check if he ever merged the fix to make the unit test > > > > > stuff get built by default with COMPILE_TEST [1]. Argh! Nope, didn't > > > > > submit it for 5.3-rc1, sorry for the thrash. > > > > > > > > > > You can otherwise add: > > > > > > > > > > Reviewed-by: Dan Williams <dan.j.williams@intel.com> > > > > > > > > > > [1]: https://lore.kernel.org/lkml/156097224232.1086847.9463861924683372741.stgit@dwillia2-desk3.amr.corp.intel.com/ > > > > > > > > Can you get this merged? Do you want it to go with this series? > > > > > > Yeah, makes some sense to let you merge it so that you can get > > > kbuild-robot reports about any follow-on memremap_pages() work that > > > may trip up the build. Otherwise let me know and I'll get it queued > > > with the other v5.4 libnvdimm pending bits. > > > > Done, I used it already to test build the last series from CH.. > > It failed 0-day, I'm guessing some missing kconfig stuff > > For now I dropped it, but, if you send a v2 I can forward it toward > 0-day again! The system works! Sorry for that thrash, I'll track it down.
diff --git a/include/linux/memremap.h b/include/linux/memremap.h index f8a5b2a19945..8f0013e18e14 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -109,7 +109,6 @@ struct dev_pagemap { struct percpu_ref *ref; struct percpu_ref internal_ref; struct completion done; - struct device *dev; enum memory_type type; unsigned int flags; u64 pci_p2pdma_bus_offset; diff --git a/kernel/memremap.c b/kernel/memremap.c index 6ee03a816d67..600a14cbe663 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -96,7 +96,6 @@ static void dev_pagemap_cleanup(struct dev_pagemap *pgmap) static void devm_memremap_pages_release(void *data) { struct dev_pagemap *pgmap = data; - struct device *dev = pgmap->dev; struct resource *res = &pgmap->res; unsigned long pfn; int nid; @@ -123,8 +122,7 @@ static void devm_memremap_pages_release(void *data) untrack_pfn(NULL, PHYS_PFN(res->start), resource_size(res)); pgmap_array_delete(res); - dev_WARN_ONCE(dev, pgmap->altmap.alloc, - "%s: failed to free all reserved pages\n", __func__); + WARN_ONCE(pgmap->altmap.alloc, "failed to free all reserved pages\n"); } static void dev_pagemap_percpu_release(struct percpu_ref *ref) @@ -245,8 +243,6 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) goto err_array; } - pgmap->dev = dev; - error = xa_err(xa_store_range(&pgmap_array, PHYS_PFN(res->start), PHYS_PFN(res->end), pgmap, GFP_KERNEL)); if (error) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 272c6de1bf4e..b39baa2b1faf 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5982,7 +5982,7 @@ void __ref memmap_init_zone_device(struct zone *zone, } } - pr_info("%s initialised, %lu pages in %ums\n", dev_name(pgmap->dev), + pr_info("%s initialised %lu pages in %ums\n", __func__, size, jiffies_to_msecs(jiffies - start)); }