From: Christoph Hellwig <hch@lst.de>
To: "Dan Williams" <dan.j.williams@intel.com>,
"Jérôme Glisse" <jglisse@redhat.com>,
"Jason Gunthorpe" <jgg@mellanox.com>,
"Ben Skeggs" <bskeggs@redhat.com>
Cc: linux-mm@kvack.org, nouveau@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, linux-nvdimm@lists.01.org,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 08/22] memremap: pass a struct dev_pagemap to ->kill
Date: Thu, 13 Jun 2019 11:43:11 +0200 [thread overview]
Message-ID: <20190613094326.24093-9-hch@lst.de> (raw)
In-Reply-To: <20190613094326.24093-1-hch@lst.de>
Passing the actual typed structure leads to more understandable code
vs the actual references.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/dax/device.c | 7 +++----
drivers/nvdimm/pmem.c | 6 +++---
drivers/pci/p2pdma.c | 6 +++---
include/linux/memremap.h | 2 +-
kernel/memremap.c | 4 ++--
mm/hmm.c | 4 ++--
tools/testing/nvdimm/test/iomap.c | 6 ++----
7 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index 4adab774dade..e23fa1bd8c97 100644
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -37,13 +37,12 @@ static void dev_dax_percpu_exit(void *data)
percpu_ref_exit(ref);
}
-static void dev_dax_percpu_kill(struct percpu_ref *data)
+static void dev_dax_percpu_kill(struct dev_pagemap *pgmap)
{
- struct percpu_ref *ref = data;
- struct dev_dax *dev_dax = ref_to_dev_dax(ref);
+ struct dev_dax *dev_dax = container_of(pgmap, struct dev_dax, pgmap);
dev_dbg(&dev_dax->dev, "%s\n", __func__);
- percpu_ref_kill(ref);
+ percpu_ref_kill(pgmap->ref);
}
static int check_vma(struct dev_dax *dev_dax, struct vm_area_struct *vma,
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 4efbf184ea68..b9638c6553a1 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -316,11 +316,11 @@ static void pmem_release_queue(void *q)
blk_cleanup_queue(q);
}
-static void pmem_kill(struct percpu_ref *ref)
+static void pmem_kill(struct dev_pagemap *pgmap)
{
- struct request_queue *q;
+ struct request_queue *q =
+ container_of(pgmap->ref, struct request_queue, q_usage_counter);
- q = container_of(ref, typeof(*q), q_usage_counter);
blk_freeze_queue_start(q);
}
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index 6e76380f5b97..3bcacc9222c6 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -82,7 +82,7 @@ static void pci_p2pdma_percpu_release(struct percpu_ref *ref)
complete_all(&p2p->devmap_ref_done);
}
-static void pci_p2pdma_percpu_kill(struct percpu_ref *ref)
+static void pci_p2pdma_percpu_kill(struct dev_pagemap *pgmap)
{
/*
* pci_p2pdma_add_resource() may be called multiple times
@@ -90,10 +90,10 @@ static void pci_p2pdma_percpu_kill(struct percpu_ref *ref)
* times. We only want the first action to actually kill the
* percpu_ref.
*/
- if (percpu_ref_is_dying(ref))
+ if (percpu_ref_is_dying(pgmap->ref))
return;
- percpu_ref_kill(ref);
+ percpu_ref_kill(pgmap->ref);
}
static void pci_p2pdma_release(void *data)
diff --git a/include/linux/memremap.h b/include/linux/memremap.h
index 5f7f40875b35..96a3a6d564ad 100644
--- a/include/linux/memremap.h
+++ b/include/linux/memremap.h
@@ -74,7 +74,7 @@ struct dev_pagemap_ops {
/*
* Transition the percpu_ref in struct dev_pagemap to the dead state.
*/
- void (*kill)(struct percpu_ref *ref);
+ void (*kill)(struct dev_pagemap *pgmap);
};
/**
diff --git a/kernel/memremap.c b/kernel/memremap.c
index e23286ce0ec4..94b830b6eca5 100644
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -92,7 +92,7 @@ static void devm_memremap_pages_release(void *data)
unsigned long pfn;
int nid;
- pgmap->ops->kill(pgmap->ref);
+ pgmap->ops->kill(pgmap);
for_each_device_pfn(pfn, pgmap)
put_page(pfn_to_page(pfn));
@@ -266,7 +266,7 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap)
err_pfn_remap:
pgmap_array_delete(res);
err_array:
- pgmap->ops->kill(pgmap->ref);
+ pgmap->ops->kill(pgmap);
return ERR_PTR(error);
}
EXPORT_SYMBOL_GPL(devm_memremap_pages);
diff --git a/mm/hmm.c b/mm/hmm.c
index 2501ac6045d0..c76a1b5defda 100644
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -1325,9 +1325,9 @@ static void hmm_devmem_ref_exit(void *data)
percpu_ref_exit(ref);
}
-static void hmm_devmem_ref_kill(struct percpu_ref *ref)
+static void hmm_devmem_ref_kill(struct dev_pagemap *pgmap)
{
- percpu_ref_kill(ref);
+ percpu_ref_kill(pgmap->ref);
}
static vm_fault_t hmm_devmem_fault(struct vm_area_struct *vma,
diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c
index 7f5ece9b5011..ee07c4de2b35 100644
--- a/tools/testing/nvdimm/test/iomap.c
+++ b/tools/testing/nvdimm/test/iomap.c
@@ -104,11 +104,9 @@ void *__wrap_devm_memremap(struct device *dev, resource_size_t offset,
}
EXPORT_SYMBOL(__wrap_devm_memremap);
-static void nfit_test_kill(void *_pgmap)
+static void nfit_test_kill(void *pgmap)
{
- struct dev_pagemap *pgmap = _pgmap;
-
- pgmap->ops->kill(pgmap->ref);
+ pgmap->ops->kill(pgmap);
}
void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap)
--
2.20.1
next prev parent reply other threads:[~2019-06-13 15:45 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 9:43 dev_pagemap related cleanups Christoph Hellwig
2019-06-13 9:43 ` [PATCH 01/22] mm: remove the unused ARCH_HAS_HMM_DEVICE Kconfig option Christoph Hellwig
2019-06-13 18:30 ` Jason Gunthorpe
2019-06-13 9:43 ` [PATCH 02/22] mm: remove the struct hmm_device infrastructure Christoph Hellwig
2019-06-13 18:46 ` Jason Gunthorpe
2019-06-13 23:06 ` [Nouveau] " John Hubbard
2019-06-13 9:43 ` [PATCH 03/22] mm: remove hmm_devmem_add_resource Christoph Hellwig
2019-06-13 18:52 ` Jason Gunthorpe
2019-06-14 6:19 ` Christoph Hellwig
2019-06-14 0:54 ` [Nouveau] " John Hubbard
2019-06-20 19:32 ` Michal Hocko
2019-06-13 9:43 ` [PATCH 04/22] mm: don't clear ->mapping in hmm_devmem_free Christoph Hellwig
2019-06-13 19:05 ` Jason Gunthorpe
2019-06-14 6:21 ` Christoph Hellwig
2019-06-14 1:46 ` John Hubbard
2019-06-20 19:36 ` Michal Hocko
2019-06-13 9:43 ` [PATCH 05/22] mm: export alloc_pages_vma Christoph Hellwig
2019-06-14 1:47 ` John Hubbard
2019-06-14 6:23 ` Christoph Hellwig
2019-06-20 19:17 ` Michal Hocko
2019-06-24 18:24 ` Dan Williams
2019-06-25 7:23 ` Christoph Hellwig
2019-06-25 15:00 ` Michal Hocko
2019-06-25 18:03 ` Dan Williams
2019-06-25 19:00 ` Michal Hocko
2019-06-25 19:52 ` Dan Williams
2019-06-26 5:46 ` Michal Hocko
2019-06-26 16:14 ` Dan Williams
2019-06-27 6:41 ` Michal Hocko
2019-06-13 9:43 ` [PATCH 06/22] mm: factor out a devm_request_free_mem_region helper Christoph Hellwig
2019-06-13 19:16 ` Jason Gunthorpe
2019-06-14 6:24 ` Christoph Hellwig
2019-06-15 2:21 ` John Hubbard
2019-06-15 14:30 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 07/22] memremap: move dev_pagemap callbacks into a separate structure Christoph Hellwig
2019-06-13 19:18 ` Jason Gunthorpe
2019-06-13 20:14 ` Logan Gunthorpe
2019-06-13 9:43 ` Christoph Hellwig [this message]
2019-06-13 19:26 ` [PATCH 08/22] memremap: pass a struct dev_pagemap to ->kill Jason Gunthorpe
2019-06-13 20:12 ` Logan Gunthorpe
2019-06-13 20:15 ` Dan Williams
2019-06-13 9:43 ` [PATCH 09/22] memremap: lift the devmap_enable manipulation into devm_memremap_pages Christoph Hellwig
2019-06-13 19:34 ` Jason Gunthorpe
2019-06-13 20:13 ` Dan Williams
2019-06-14 6:28 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 10/22] memremap: add a migrate callback to struct dev_pagemap_ops Christoph Hellwig
2019-06-13 23:42 ` Ralph Campbell
2019-06-14 6:33 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 11/22] memremap: remove the data field in struct dev_pagemap Christoph Hellwig
2019-06-13 19:37 ` Jason Gunthorpe
2019-06-13 9:43 ` [PATCH 12/22] memremap: provide an optional internal refcount " Christoph Hellwig
2019-06-13 9:43 ` [PATCH 13/22] device-dax: use the dev_pagemap internal refcount Christoph Hellwig
2019-06-14 0:22 ` Ira Weiny
2019-06-14 6:35 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 14/22] nouveau: use alloc_page_vma directly Christoph Hellwig
2019-06-13 19:39 ` Jason Gunthorpe
2019-06-13 9:43 ` [PATCH 15/22] nouveau: use devm_memremap_pages directly Christoph Hellwig
2019-06-13 9:43 ` [PATCH 16/22] mm: remove hmm_vma_alloc_locked_page Christoph Hellwig
2019-06-13 9:43 ` [PATCH 17/22] mm: remove hmm_devmem_add Christoph Hellwig
2019-06-13 19:42 ` Jason Gunthorpe
2019-06-14 6:39 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 18/22] mm: mark DEVICE_PUBLIC as broken Christoph Hellwig
2019-06-13 19:44 ` Jason Gunthorpe
2019-06-13 19:53 ` Ralph Campbell
2019-06-13 19:58 ` Jason Gunthorpe
2019-06-14 0:43 ` Ira Weiny
2019-06-14 1:23 ` John Hubbard
2019-06-19 19:27 ` Jason Gunthorpe
2019-06-19 19:46 ` Dan Williams
2019-06-26 3:15 ` John Hubbard
2019-06-26 5:45 ` Michal Hocko
2019-06-26 6:07 ` John Hubbard
2019-06-14 6:43 ` Christoph Hellwig
2019-06-20 19:26 ` Michal Hocko
2019-06-25 7:29 ` Christoph Hellwig
2019-06-25 11:44 ` Jason Gunthorpe
2019-06-25 11:59 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 19/22] mm: simplify ZONE_DEVICE page private data Christoph Hellwig
2019-06-13 9:43 ` [PATCH 20/22] mm: sort out the DEVICE_PRIVATE Kconfig mess Christoph Hellwig
2019-06-13 19:55 ` Jason Gunthorpe
2019-06-13 9:43 ` [PATCH 21/22] mm: remove the HMM config option Christoph Hellwig
2019-06-13 20:01 ` Jason Gunthorpe
2019-06-14 6:47 ` Christoph Hellwig
2019-06-13 9:43 ` [PATCH 22/22] mm: don't select MIGRATE_VMA_HELPER from HMM_MIRROR Christoph Hellwig
2019-06-13 20:04 ` Jason Gunthorpe
2019-06-14 1:53 ` [Nouveau] " John Hubbard
2019-06-14 6:48 ` Christoph Hellwig
2019-06-13 14:16 ` dev_pagemap related cleanups Jason Gunthorpe
2019-06-14 6:12 ` Christoph Hellwig
2019-06-13 18:27 ` Dan Williams
2019-06-13 20:17 ` Logan Gunthorpe
2019-06-13 20:21 ` Dan Williams
2019-06-13 20:24 ` Logan Gunthorpe
2019-06-13 20:48 ` Andrew Morton
2019-06-13 20:40 ` Jason Gunthorpe
2019-06-13 21:21 ` Christoph Hellwig
2019-06-13 23:10 ` Jason Gunthorpe
2019-06-14 6:14 ` Christoph Hellwig
2019-06-14 0:31 ` Ira Weiny
2019-06-14 6:13 ` Christoph Hellwig
2019-06-15 1:14 ` Dan Williams
2019-06-15 8:33 ` Christoph Hellwig
2019-06-15 18:09 ` Dan Williams
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190613094326.24093-9-hch@lst.de \
--to=hch@lst.de \
--cc=bskeggs@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgg@mellanox.com \
--cc=jglisse@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-pci@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).