* fix a pmem regression due to drain the block queue in del_gendisk
@ 2021-10-19 7:36 Christoph Hellwig
2021-10-19 7:36 ` [PATCH 1/2] nvdimm/pmem: stop using q_usage_count as external pgmap refcount Christoph Hellwig
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Christoph Hellwig @ 2021-10-19 7:36 UTC (permalink / raw)
To: Dan Williams
Cc: Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang,
linux-block, nvdimm, linux-mm
Hi Dan,
this series fixes my recently introduced regression in the pmem driver by
removing the usage of q_usage_count as the external pgmap refcount in the
pmem driver and then removes the now unused external refcount
infrastructure.
Diffstat:
drivers/nvdimm/pmem.c | 33 +--------------------
include/linux/memremap.h | 18 +----------
mm/memremap.c | 59 +++++++-------------------------------
tools/testing/nvdimm/test/iomap.c | 43 +++++++--------------------
4 files changed, 29 insertions(+), 124 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/2] nvdimm/pmem: stop using q_usage_count as external pgmap refcount 2021-10-19 7:36 fix a pmem regression due to drain the block queue in del_gendisk Christoph Hellwig @ 2021-10-19 7:36 ` Christoph Hellwig 2021-10-19 7:36 ` [PATCH 2/2] memremap: remove support for external pgmap refcounts Christoph Hellwig 2021-10-20 6:38 ` fix a pmem regression due to drain the block queue in del_gendisk Yi Zhang 2 siblings, 0 replies; 11+ messages in thread From: Christoph Hellwig @ 2021-10-19 7:36 UTC (permalink / raw) To: Dan Williams Cc: Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, nvdimm, linux-mm Originally all DAX access when through block_device operations and thus needed a queue reference. But since commit cccbce671582 ("filesystem-dax: convert to dax_direct_access()") all this happens at the DAX device level which uses its own refcounting. Having the external refcount thus wasn't needed but has otherwise been harmless for long time. But now that "block: drain file system I/O on del_gendisk" waits for q_usage_count to reach 0 in del_gendisk this whole scheme can't work anymore (and pmem is the only driver abusing q_usage_count like that). So switch to the internal reference and remove the unbalanced blk_freeze_queue_start that is taken care of by del_gendisk. Fixes: 8e141f9eb803 ("block: drain file system I/O on del_gendisk") Reported-by: Yi Zhang <yi.zhang@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/nvdimm/pmem.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 72de88ff0d30d..f576ee0ce7968 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -333,26 +333,6 @@ static const struct attribute_group *pmem_attribute_groups[] = { NULL, }; -static void pmem_pagemap_cleanup(struct dev_pagemap *pgmap) -{ - struct pmem_device *pmem = pgmap->owner; - - blk_cleanup_disk(pmem->disk); -} - -static void pmem_release_queue(void *pgmap) -{ - pmem_pagemap_cleanup(pgmap); -} - -static void pmem_pagemap_kill(struct dev_pagemap *pgmap) -{ - struct request_queue *q = - container_of(pgmap->ref, struct request_queue, q_usage_counter); - - blk_freeze_queue_start(q); -} - static void pmem_release_disk(void *__pmem) { struct pmem_device *pmem = __pmem; @@ -360,12 +340,9 @@ static void pmem_release_disk(void *__pmem) kill_dax(pmem->dax_dev); put_dax(pmem->dax_dev); del_gendisk(pmem->disk); -} -static const struct dev_pagemap_ops fsdax_pagemap_ops = { - .kill = pmem_pagemap_kill, - .cleanup = pmem_pagemap_cleanup, -}; + blk_cleanup_disk(pmem->disk); +} static int pmem_attach_disk(struct device *dev, struct nd_namespace_common *ndns) @@ -428,10 +405,8 @@ static int pmem_attach_disk(struct device *dev, pmem->disk = disk; pmem->pgmap.owner = pmem; pmem->pfn_flags = PFN_DEV; - pmem->pgmap.ref = &q->q_usage_counter; if (is_nd_pfn(dev)) { pmem->pgmap.type = MEMORY_DEVICE_FS_DAX; - pmem->pgmap.ops = &fsdax_pagemap_ops; addr = devm_memremap_pages(dev, &pmem->pgmap); pfn_sb = nd_pfn->pfn_sb; pmem->data_offset = le64_to_cpu(pfn_sb->dataoff); @@ -445,16 +420,12 @@ static int pmem_attach_disk(struct device *dev, pmem->pgmap.range.end = res->end; pmem->pgmap.nr_range = 1; pmem->pgmap.type = MEMORY_DEVICE_FS_DAX; - pmem->pgmap.ops = &fsdax_pagemap_ops; addr = devm_memremap_pages(dev, &pmem->pgmap); pmem->pfn_flags |= PFN_MAP; bb_range = pmem->pgmap.range; } else { addr = devm_memremap(dev, pmem->phys_addr, pmem->size, ARCH_MEMREMAP_PMEM); - if (devm_add_action_or_reset(dev, pmem_release_queue, - &pmem->pgmap)) - return -ENOMEM; bb_range.start = res->start; bb_range.end = res->end; } -- 2.30.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] memremap: remove support for external pgmap refcounts 2021-10-19 7:36 fix a pmem regression due to drain the block queue in del_gendisk Christoph Hellwig 2021-10-19 7:36 ` [PATCH 1/2] nvdimm/pmem: stop using q_usage_count as external pgmap refcount Christoph Hellwig @ 2021-10-19 7:36 ` Christoph Hellwig 2021-10-21 13:40 ` Adam Borowski 2021-10-20 6:38 ` fix a pmem regression due to drain the block queue in del_gendisk Yi Zhang 2 siblings, 1 reply; 11+ messages in thread From: Christoph Hellwig @ 2021-10-19 7:36 UTC (permalink / raw) To: Dan Williams Cc: Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, nvdimm, linux-mm No driver is left using the external pgmap refcount, so remove the code to support it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/linux/memremap.h | 18 ++-------- mm/memremap.c | 59 +++++++------------------------ tools/testing/nvdimm/test/iomap.c | 43 +++++++--------------- 3 files changed, 27 insertions(+), 93 deletions(-) diff --git a/include/linux/memremap.h b/include/linux/memremap.h index c0e9d35889e8d..a8bc588fe7aa8 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -72,16 +72,6 @@ struct dev_pagemap_ops { */ void (*page_free)(struct page *page); - /* - * Transition the refcount in struct dev_pagemap to the dead state. - */ - void (*kill)(struct dev_pagemap *pgmap); - - /* - * Wait for refcount in struct dev_pagemap to be idle and reap it. - */ - void (*cleanup)(struct dev_pagemap *pgmap); - /* * Used for private (un-addressable) device memory only. Must migrate * the page back to a CPU accessible page. @@ -95,8 +85,7 @@ struct dev_pagemap_ops { * struct dev_pagemap - metadata for ZONE_DEVICE mappings * @altmap: pre-allocated/reserved memory for vmemmap allocations * @ref: reference count that pins the devm_memremap_pages() mapping - * @internal_ref: internal reference if @ref is not provided by the caller - * @done: completion for @internal_ref + * @done: completion for @ref * @type: memory type: see MEMORY_* in memory_hotplug.h * @flags: PGMAP_* flags to specify defailed behavior * @ops: method table @@ -109,8 +98,7 @@ struct dev_pagemap_ops { */ struct dev_pagemap { struct vmem_altmap altmap; - struct percpu_ref *ref; - struct percpu_ref internal_ref; + struct percpu_ref ref; struct completion done; enum memory_type type; unsigned int flags; @@ -191,7 +179,7 @@ static inline unsigned long memremap_compat_align(void) static inline void put_dev_pagemap(struct dev_pagemap *pgmap) { if (pgmap) - percpu_ref_put(pgmap->ref); + percpu_ref_put(&pgmap->ref); } #endif /* _LINUX_MEMREMAP_H_ */ diff --git a/mm/memremap.c b/mm/memremap.c index ed593bf87109a..d7034c55d0a24 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -112,30 +112,6 @@ static unsigned long pfn_next(unsigned long pfn) #define for_each_device_pfn(pfn, map, i) \ for (pfn = pfn_first(map, i); pfn < pfn_end(map, i); pfn = pfn_next(pfn)) -static void dev_pagemap_kill(struct dev_pagemap *pgmap) -{ - if (pgmap->ops && pgmap->ops->kill) - pgmap->ops->kill(pgmap); - else - percpu_ref_kill(pgmap->ref); -} - -static void dev_pagemap_cleanup(struct dev_pagemap *pgmap) -{ - if (pgmap->ops && pgmap->ops->cleanup) { - pgmap->ops->cleanup(pgmap); - } else { - wait_for_completion(&pgmap->done); - percpu_ref_exit(pgmap->ref); - } - /* - * Undo the pgmap ref assignment for the internal case as the - * caller may re-enable the same pgmap. - */ - if (pgmap->ref == &pgmap->internal_ref) - pgmap->ref = NULL; -} - static void pageunmap_range(struct dev_pagemap *pgmap, int range_id) { struct range *range = &pgmap->ranges[range_id]; @@ -167,11 +143,12 @@ void memunmap_pages(struct dev_pagemap *pgmap) unsigned long pfn; int i; - dev_pagemap_kill(pgmap); + percpu_ref_kill(&pgmap->ref); for (i = 0; i < pgmap->nr_range; i++) for_each_device_pfn(pfn, pgmap, i) put_page(pfn_to_page(pfn)); - dev_pagemap_cleanup(pgmap); + wait_for_completion(&pgmap->done); + percpu_ref_exit(&pgmap->ref); for (i = 0; i < pgmap->nr_range; i++) pageunmap_range(pgmap, i); @@ -188,8 +165,7 @@ static void devm_memremap_pages_release(void *data) static void dev_pagemap_percpu_release(struct percpu_ref *ref) { - struct dev_pagemap *pgmap = - container_of(ref, struct dev_pagemap, internal_ref); + struct dev_pagemap *pgmap = container_of(ref, struct dev_pagemap, ref); complete(&pgmap->done); } @@ -295,8 +271,8 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, memmap_init_zone_device(&NODE_DATA(nid)->node_zones[ZONE_DEVICE], PHYS_PFN(range->start), PHYS_PFN(range_len(range)), pgmap); - percpu_ref_get_many(pgmap->ref, pfn_end(pgmap, range_id) - - pfn_first(pgmap, range_id)); + percpu_ref_get_many(&pgmap->ref, + pfn_end(pgmap, range_id) - pfn_first(pgmap, range_id)); return 0; err_add_memory: @@ -362,22 +338,11 @@ void *memremap_pages(struct dev_pagemap *pgmap, int nid) break; } - if (!pgmap->ref) { - if (pgmap->ops && (pgmap->ops->kill || pgmap->ops->cleanup)) - return ERR_PTR(-EINVAL); - - init_completion(&pgmap->done); - error = percpu_ref_init(&pgmap->internal_ref, - dev_pagemap_percpu_release, 0, GFP_KERNEL); - if (error) - return ERR_PTR(error); - pgmap->ref = &pgmap->internal_ref; - } else { - if (!pgmap->ops || !pgmap->ops->kill || !pgmap->ops->cleanup) { - WARN(1, "Missing reference count teardown definition\n"); - return ERR_PTR(-EINVAL); - } - } + init_completion(&pgmap->done); + error = percpu_ref_init(&pgmap->ref, dev_pagemap_percpu_release, 0, + GFP_KERNEL); + if (error) + return ERR_PTR(error); devmap_managed_enable_get(pgmap); @@ -486,7 +451,7 @@ struct dev_pagemap *get_dev_pagemap(unsigned long pfn, /* fall back to slow path lookup */ rcu_read_lock(); pgmap = xa_load(&pgmap_array, PHYS_PFN(phys)); - if (pgmap && !percpu_ref_tryget_live(pgmap->ref)) + if (pgmap && !percpu_ref_tryget_live(&pgmap->ref)) pgmap = NULL; rcu_read_unlock(); diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c index ed563bdd88f39..b752ce47ead3c 100644 --- a/tools/testing/nvdimm/test/iomap.c +++ b/tools/testing/nvdimm/test/iomap.c @@ -100,25 +100,17 @@ static void nfit_test_kill(void *_pgmap) { struct dev_pagemap *pgmap = _pgmap; - WARN_ON(!pgmap || !pgmap->ref); - - if (pgmap->ops && pgmap->ops->kill) - pgmap->ops->kill(pgmap); - else - percpu_ref_kill(pgmap->ref); - - if (pgmap->ops && pgmap->ops->cleanup) { - pgmap->ops->cleanup(pgmap); - } else { - wait_for_completion(&pgmap->done); - percpu_ref_exit(pgmap->ref); - } + WARN_ON(!pgmap); + + percpu_ref_kill(&pgmap->ref); + + wait_for_completion(&pgmap->done); + percpu_ref_exit(&pgmap->ref); } static void dev_pagemap_percpu_release(struct percpu_ref *ref) { - struct dev_pagemap *pgmap = - container_of(ref, struct dev_pagemap, internal_ref); + struct dev_pagemap *pgmap = container_of(ref, struct dev_pagemap, ref); complete(&pgmap->done); } @@ -132,22 +124,11 @@ void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) if (!nfit_res) return devm_memremap_pages(dev, pgmap); - if (!pgmap->ref) { - if (pgmap->ops && (pgmap->ops->kill || pgmap->ops->cleanup)) - return ERR_PTR(-EINVAL); - - init_completion(&pgmap->done); - error = percpu_ref_init(&pgmap->internal_ref, - dev_pagemap_percpu_release, 0, GFP_KERNEL); - if (error) - return ERR_PTR(error); - pgmap->ref = &pgmap->internal_ref; - } else { - if (!pgmap->ops || !pgmap->ops->kill || !pgmap->ops->cleanup) { - WARN(1, "Missing reference count teardown definition\n"); - return ERR_PTR(-EINVAL); - } - } + init_completion(&pgmap->done); + error = percpu_ref_init(&pgmap->ref, dev_pagemap_percpu_release, 0, + GFP_KERNEL); + if (error) + return ERR_PTR(error); error = devm_add_action_or_reset(dev, nfit_test_kill, pgmap); if (error) -- 2.30.2 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] memremap: remove support for external pgmap refcounts 2021-10-19 7:36 ` [PATCH 2/2] memremap: remove support for external pgmap refcounts Christoph Hellwig @ 2021-10-21 13:40 ` Adam Borowski 2021-10-22 5:55 ` Christoph Hellwig 0 siblings, 1 reply; 11+ messages in thread From: Adam Borowski @ 2021-10-21 13:40 UTC (permalink / raw) To: Christoph Hellwig Cc: Dan Williams, Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, nvdimm, linux-mm On Tue, Oct 19, 2021 at 09:36:41AM +0200, Christoph Hellwig wrote: > No driver is left using the external pgmap refcount, so remove the > code to support it. > --- a/include/linux/memremap.h > +++ b/include/linux/memremap.h > @@ -109,8 +98,7 @@ struct dev_pagemap_ops { > */ > struct dev_pagemap { > struct vmem_altmap altmap; > - struct percpu_ref *ref; > - struct percpu_ref internal_ref; > + struct percpu_ref ref; > struct completion done; > enum memory_type type; > unsigned int flags; This breaks at least drivers/pci/p2pdma.c:222 Meow! -- ⢀⣴⠾⠻⢶⣦⠀ ⣾⠁⢠⠒⠀⣿⡁ ⢿⡄⠘⠷⠚⠋⠀ Certified airhead; got the CT scan to prove that! ⠈⠳⣄⠀⠀⠀⠀ ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] memremap: remove support for external pgmap refcounts 2021-10-21 13:40 ` Adam Borowski @ 2021-10-22 5:55 ` Christoph Hellwig 2021-10-22 8:52 ` Adam Borowski 2021-10-22 15:43 ` Dan Williams 0 siblings, 2 replies; 11+ messages in thread From: Christoph Hellwig @ 2021-10-22 5:55 UTC (permalink / raw) To: Adam Borowski Cc: Christoph Hellwig, Dan Williams, Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, nvdimm, linux-mm On Thu, Oct 21, 2021 at 03:40:17PM +0200, Adam Borowski wrote: > This breaks at least drivers/pci/p2pdma.c:222 Indeed. I've updated this patch, but the fix we need to urgently get into 5.15-rc is the first one only anyway. nvdimm maintainers, can you please act on it ASAP? ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] memremap: remove support for external pgmap refcounts 2021-10-22 5:55 ` Christoph Hellwig @ 2021-10-22 8:52 ` Adam Borowski 2021-10-22 15:43 ` Dan Williams 1 sibling, 0 replies; 11+ messages in thread From: Adam Borowski @ 2021-10-22 8:52 UTC (permalink / raw) To: Christoph Hellwig Cc: Dan Williams, Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, nvdimm, linux-mm On Fri, Oct 22, 2021 at 07:55:15AM +0200, Christoph Hellwig wrote: > On Thu, Oct 21, 2021 at 03:40:17PM +0200, Adam Borowski wrote: > > This breaks at least drivers/pci/p2pdma.c:222 > > Indeed. I've updated this patch, but the fix we need to urgently > get into 5.15-rc is the first one only anyway. > > nvdimm maintainers, can you please act on it ASAP? As for build tests, after the p2pdma thingy I've tried all{yes,no,mod}config and a handful of randconfigs, looks like it was the only place you missed. As for runtime, a bunch of ndctl uses work fine with no explosions. Thus: Tested-By. Meow! -- ⢀⣴⠾⠻⢶⣦⠀ Don't be racist. White, amber or black, all beers should ⣾⠁⢠⠒⠀⣿⡁ be judged based solely on their merits. Heck, even if a ⢿⡄⠘⠷⠚⠋⠀ cider applies for a beer's job, why not? ⠈⠳⣄⠀⠀⠀⠀ On the other hand, mass-produced lager is not a race. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] memremap: remove support for external pgmap refcounts 2021-10-22 5:55 ` Christoph Hellwig 2021-10-22 8:52 ` Adam Borowski @ 2021-10-22 15:43 ` Dan Williams 2021-10-26 1:42 ` Dan Williams 1 sibling, 1 reply; 11+ messages in thread From: Dan Williams @ 2021-10-22 15:43 UTC (permalink / raw) To: Christoph Hellwig Cc: Adam Borowski, Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, Linux NVDIMM, Linux MM On Thu, Oct 21, 2021 at 10:55 PM Christoph Hellwig <hch@lst.de> wrote: > > On Thu, Oct 21, 2021 at 03:40:17PM +0200, Adam Borowski wrote: > > This breaks at least drivers/pci/p2pdma.c:222 > > Indeed. I've updated this patch, but the fix we need to urgently > get into 5.15-rc is the first one only anyway. > > nvdimm maintainers, can you please act on it ASAP? Yes, I have been pulled in many directions this past week, but I do plan to get this queued for v5.15-rc7. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] memremap: remove support for external pgmap refcounts 2021-10-22 15:43 ` Dan Williams @ 2021-10-26 1:42 ` Dan Williams 2021-10-26 5:53 ` Christoph Hellwig 0 siblings, 1 reply; 11+ messages in thread From: Dan Williams @ 2021-10-26 1:42 UTC (permalink / raw) To: Christoph Hellwig Cc: Adam Borowski, Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, Linux NVDIMM, Linux MM On Fri, Oct 22, 2021 at 8:43 AM Dan Williams <dan.j.williams@intel.com> wrote: > > On Thu, Oct 21, 2021 at 10:55 PM Christoph Hellwig <hch@lst.de> wrote: > > > > On Thu, Oct 21, 2021 at 03:40:17PM +0200, Adam Borowski wrote: > > > This breaks at least drivers/pci/p2pdma.c:222 > > > > Indeed. I've updated this patch, but the fix we need to urgently > > get into 5.15-rc is the first one only anyway. > > > > nvdimm maintainers, can you please act on it ASAP? > > Yes, I have been pulled in many directions this past week, but I do > plan to get this queued for v5.15-rc7. Ok, this is passing all my tests and will be pushed out to -next tonight. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] memremap: remove support for external pgmap refcounts 2021-10-26 1:42 ` Dan Williams @ 2021-10-26 5:53 ` Christoph Hellwig 2021-10-26 17:34 ` Dan Williams 0 siblings, 1 reply; 11+ messages in thread From: Christoph Hellwig @ 2021-10-26 5:53 UTC (permalink / raw) To: Dan Williams Cc: Christoph Hellwig, Adam Borowski, Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, Linux NVDIMM, Linux MM On Mon, Oct 25, 2021 at 06:42:51PM -0700, Dan Williams wrote: > On Fri, Oct 22, 2021 at 8:43 AM Dan Williams <dan.j.williams@intel.com> wrote: > > > > On Thu, Oct 21, 2021 at 10:55 PM Christoph Hellwig <hch@lst.de> wrote: > > > > > > On Thu, Oct 21, 2021 at 03:40:17PM +0200, Adam Borowski wrote: > > > > This breaks at least drivers/pci/p2pdma.c:222 > > > > > > Indeed. I've updated this patch, but the fix we need to urgently > > > get into 5.15-rc is the first one only anyway. > > > > > > nvdimm maintainers, can you please act on it ASAP? > > > > Yes, I have been pulled in many directions this past week, but I do > > plan to get this queued for v5.15-rc7. > > Ok, this is passing all my tests and will be pushed out to -next tonight. FYI, patch 2 needs a trivial compile fix for the p2p case. But I suspect given how late in the cycle we are you're only picking up patch 1 anyway. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] memremap: remove support for external pgmap refcounts 2021-10-26 5:53 ` Christoph Hellwig @ 2021-10-26 17:34 ` Dan Williams 0 siblings, 0 replies; 11+ messages in thread From: Dan Williams @ 2021-10-26 17:34 UTC (permalink / raw) To: Christoph Hellwig Cc: Adam Borowski, Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, Yi Zhang, linux-block, Linux NVDIMM, Linux MM On Mon, Oct 25, 2021 at 10:54 PM Christoph Hellwig <hch@lst.de> wrote: > > On Mon, Oct 25, 2021 at 06:42:51PM -0700, Dan Williams wrote: > > On Fri, Oct 22, 2021 at 8:43 AM Dan Williams <dan.j.williams@intel.com> wrote: > > > > > > On Thu, Oct 21, 2021 at 10:55 PM Christoph Hellwig <hch@lst.de> wrote: > > > > > > > > On Thu, Oct 21, 2021 at 03:40:17PM +0200, Adam Borowski wrote: > > > > > This breaks at least drivers/pci/p2pdma.c:222 > > > > > > > > Indeed. I've updated this patch, but the fix we need to urgently > > > > get into 5.15-rc is the first one only anyway. > > > > > > > > nvdimm maintainers, can you please act on it ASAP? > > > > > > Yes, I have been pulled in many directions this past week, but I do > > > plan to get this queued for v5.15-rc7. > > > > Ok, this is passing all my tests and will be pushed out to -next tonight. > > FYI, patch 2 needs a trivial compile fix for the p2p case. But I suspect > given how late in the cycle we are you're only picking up patch 1 anyway. Yeah, patch1 I'll push for v5.15-final and patch2 for v5.16-rc1. Send me that fixed up patch and I'll queue it up. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: fix a pmem regression due to drain the block queue in del_gendisk 2021-10-19 7:36 fix a pmem regression due to drain the block queue in del_gendisk Christoph Hellwig 2021-10-19 7:36 ` [PATCH 1/2] nvdimm/pmem: stop using q_usage_count as external pgmap refcount Christoph Hellwig 2021-10-19 7:36 ` [PATCH 2/2] memremap: remove support for external pgmap refcounts Christoph Hellwig @ 2021-10-20 6:38 ` Yi Zhang 2 siblings, 0 replies; 11+ messages in thread From: Yi Zhang @ 2021-10-20 6:38 UTC (permalink / raw) To: Christoph Hellwig Cc: Dan Williams, Vishal Verma, Dave Jiang, Ira Weiny, Jens Axboe, linux-block, Linux NVDIMM, linux-mm Verified the issue was fixed by this patchset. https://lore.kernel.org/linux-block/CAHj4cs87BapQJcV0a=M6=dc9PrsGH6qzqJEt9fbjLK1aShnMPg@mail.gmail.com/ Tested-by: Yi Zhang <yi.zhang@redhat.com> On Tue, Oct 19, 2021 at 3:37 PM Christoph Hellwig <hch@lst.de> wrote: > > Hi Dan, > > this series fixes my recently introduced regression in the pmem driver by > removing the usage of q_usage_count as the external pgmap refcount in the > pmem driver and then removes the now unused external refcount > infrastructure. > > Diffstat: > drivers/nvdimm/pmem.c | 33 +-------------------- > include/linux/memremap.h | 18 +---------- > mm/memremap.c | 59 +++++++------------------------------- > tools/testing/nvdimm/test/iomap.c | 43 +++++++-------------------- > 4 files changed, 29 insertions(+), 124 deletions(-) > -- Best Regards, Yi Zhang ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-10-26 17:35 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-19 7:36 fix a pmem regression due to drain the block queue in del_gendisk Christoph Hellwig 2021-10-19 7:36 ` [PATCH 1/2] nvdimm/pmem: stop using q_usage_count as external pgmap refcount Christoph Hellwig 2021-10-19 7:36 ` [PATCH 2/2] memremap: remove support for external pgmap refcounts Christoph Hellwig 2021-10-21 13:40 ` Adam Borowski 2021-10-22 5:55 ` Christoph Hellwig 2021-10-22 8:52 ` Adam Borowski 2021-10-22 15:43 ` Dan Williams 2021-10-26 1:42 ` Dan Williams 2021-10-26 5:53 ` Christoph Hellwig 2021-10-26 17:34 ` Dan Williams 2021-10-20 6:38 ` fix a pmem regression due to drain the block queue in del_gendisk Yi Zhang
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).