From: john.hubbard@gmail.com To: Andrew Morton <akpm@linux-foundation.org> Cc: "Christoph Hellwig" <hch@infradead.org>, "Dan Williams" <dan.j.williams@intel.com>, "Dave Chinner" <david@fromorbit.com>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Ira Weiny" <ira.weiny@intel.com>, "Jan Kara" <jack@suse.cz>, "Jason Gunthorpe" <jgg@ziepe.ca>, "Jérôme Glisse" <jglisse@redhat.com>, LKML <linux-kernel@vger.kernel.org>, amd-gfx@lists.freedesktop.org, ceph-devel@vger.kernel.org, devel@driverdev.osuosl.org, devel@lists.orangefs.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-media@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-xfs@vger.kernel.org, netdev@vger.kernel.org, rds-devel@oss.oracle.com, sparclinux@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org, "John Hubbard" <jhubbard@nvidia.com>, "Benjamin Herrenschmidt" <benh@kernel.crashing.org>, "Christoph Hellwig" <hch@lst.de>, "Michael Ellerman" <mpe@ellerman.id.au>, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 38/41] powerpc: convert put_page() to put_user_page*() Date: Tue, 6 Aug 2019 18:33:37 -0700 Message-ID: <20190807013340.9706-39-jhubbard@nvidia.com> (raw) In-Reply-To: <20190807013340.9706-1-jhubbard@nvidia.com> From: John Hubbard <jhubbard@nvidia.com> For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page() or release_pages(). This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions"). Note that this effectively changes the code's behavior in mm_iommu_unpin(): it now ultimately calls set_page_dirty_lock(), instead of set_page_dirty(). This is probably more accurate. As Christoph Hellwig put it, "set_page_dirty() is only safe if we are dealing with a file backed page where we have reference on the inode it hangs off." [1] [1] https://lore.kernel.org/r/20190723153640.GB720@lst.de Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Christoph Hellwig <hch@lst.de> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: John Hubbard <jhubbard@nvidia.com> --- arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 ++-- arch/powerpc/kvm/book3s_64_mmu_radix.c | 19 ++++++++++++++----- arch/powerpc/kvm/e500_mmu.c | 3 +-- arch/powerpc/mm/book3s64/iommu_api.c | 11 +++++------ 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index 9a75f0e1933b..18646b738ce1 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -731,7 +731,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, * we have to drop the reference on the correct tail * page to match the get inside gup() */ - put_page(pages[0]); + put_user_page(pages[0]); } return ret; @@ -1206,7 +1206,7 @@ void kvmppc_unpin_guest_page(struct kvm *kvm, void *va, unsigned long gpa, unsigned long gfn; int srcu_idx; - put_page(page); + put_user_page(page); if (!dirty) return; diff --git a/arch/powerpc/kvm/book3s_64_mmu_radix.c b/arch/powerpc/kvm/book3s_64_mmu_radix.c index 2d415c36a61d..f53273fbfa2d 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_radix.c +++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c @@ -821,8 +821,12 @@ int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu, */ if (!ptep) { local_irq_enable(); - if (page) - put_page(page); + if (page) { + if (upgrade_write) + put_user_page(page); + else + put_page(page); + } return RESUME_GUEST; } pte = *ptep; @@ -870,9 +874,14 @@ int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu, *levelp = level; if (page) { - if (!ret && (pte_val(pte) & _PAGE_WRITE)) - set_page_dirty_lock(page); - put_page(page); + bool dirty = !ret && (pte_val(pte) & _PAGE_WRITE); + if (upgrade_write) + put_user_pages_dirty_lock(&page, 1, dirty); + else { + if (dirty) + set_page_dirty_lock(page); + put_page(page); + } } /* Increment number of large pages if we (successfully) inserted one */ diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c index 2d910b87e441..67bb8d59d4b1 100644 --- a/arch/powerpc/kvm/e500_mmu.c +++ b/arch/powerpc/kvm/e500_mmu.c @@ -850,8 +850,7 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu, free_privs_first: kfree(privs[0]); put_pages: - for (i = 0; i < num_pages; i++) - put_page(pages[i]); + put_user_pages(pages, num_pages); free_pages: kfree(pages); return ret; diff --git a/arch/powerpc/mm/book3s64/iommu_api.c b/arch/powerpc/mm/book3s64/iommu_api.c index b056cae3388b..e126193ba295 100644 --- a/arch/powerpc/mm/book3s64/iommu_api.c +++ b/arch/powerpc/mm/book3s64/iommu_api.c @@ -170,9 +170,8 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua, return 0; free_exit: - /* free the reference taken */ - for (i = 0; i < pinned; i++) - put_page(mem->hpages[i]); + /* free the references taken */ + put_user_pages(mem->hpages, pinned); vfree(mem->hpas); kfree(mem); @@ -203,6 +202,7 @@ static void mm_iommu_unpin(struct mm_iommu_table_group_mem_t *mem) { long i; struct page *page = NULL; + bool dirty = false; if (!mem->hpas) return; @@ -215,10 +215,9 @@ static void mm_iommu_unpin(struct mm_iommu_table_group_mem_t *mem) if (!page) continue; - if (mem->hpas[i] & MM_IOMMU_TABLE_GROUP_PAGE_DIRTY) - SetPageDirty(page); + dirty = mem->hpas[i] & MM_IOMMU_TABLE_GROUP_PAGE_DIRTY; - put_page(page); + put_user_pages_dirty_lock(&page, 1, dirty); mem->hpas[i] = 0; } } -- 2.22.0
next prev parent reply index Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-07 1:32 [PATCH v3 00/39] put_user_pages(): miscellaneous call sites john.hubbard 2019-08-07 1:33 ` [PATCH v3 01/41] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() john.hubbard 2019-08-07 1:33 ` [PATCH v3 02/41] drivers/gpu/drm/via: convert put_page() to put_user_page*() john.hubbard 2019-08-07 1:33 ` [PATCH v3 03/41] net/xdp: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 04/41] net/rds: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 05/41] net/ceph: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 06/41] x86/kvm: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 07/41] drm/etnaviv: convert release_pages() to put_user_pages() john.hubbard 2019-08-07 1:33 ` [PATCH v3 08/41] drm/i915: convert put_page() to put_user_page*() john.hubbard 2019-08-07 1:33 ` [PATCH v3 09/41] drm/radeon: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 10/41] media/ivtv: " john.hubbard 2019-08-07 8:51 ` Hans Verkuil 2019-08-07 1:33 ` [PATCH v3 11/41] media/v4l2-core/mm: " john.hubbard 2019-08-07 7:20 ` Sakari Ailus 2019-08-07 8:07 ` Hans Verkuil 2019-08-07 1:33 ` [PATCH v3 12/41] genwqe: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 13/41] scif: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 14/41] vmci: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 15/41] rapidio: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 16/41] oradax: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 17/41] staging/vc04_services: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 18/41] drivers/tee: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 19/41] vfio: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 20/41] fbdev/pvr2fb: " john.hubbard 2019-08-09 11:38 ` Bartlomiej Zolnierkiewicz 2019-08-07 1:33 ` [PATCH v3 21/41] fsl_hypervisor: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 22/41] xen: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 23/41] fs/exec.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 24/41] orangefs: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 25/41] uprobes: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 26/41] futex: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 27/41] mm/frame_vector.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 28/41] mm/gup_benchmark.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 29/41] mm/memory.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 30/41] mm/madvise.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 31/41] mm/process_vm_access.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 32/41] crypt: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 33/41] fs/nfs: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 34/41] goldfish_pipe: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 35/41] kernel/events/core.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 36/41] fs/binfmt_elf: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 37/41] security/tomoyo: " john.hubbard 2019-08-07 1:33 ` john.hubbard [this message] 2019-08-08 5:42 ` [PATCH v3 38/41] powerpc: " Michael Ellerman 2019-08-09 1:26 ` John Hubbard 2019-08-09 12:20 ` Michael Ellerman 2019-08-07 1:33 ` [PATCH v3 39/41] mm/mlock.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 40/41] mm/mempolicy.c: " john.hubbard 2019-08-07 1:33 ` [PATCH v3 41/41] mm/ksm: " john.hubbard 2019-08-07 1:49 ` [PATCH v3 00/39] put_user_pages(): miscellaneous call sites John Hubbard 2019-08-30 1:29 ` Mike Marshall 2019-08-30 2:21 ` John Hubbard
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=20190807013340.9706-39-jhubbard@nvidia.com \ --to=john.hubbard@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=amd-gfx@lists.freedesktop.org \ --cc=benh@kernel.crashing.org \ --cc=ceph-devel@vger.kernel.org \ --cc=dan.j.williams@intel.com \ --cc=dave.hansen@linux.intel.com \ --cc=david@fromorbit.com \ --cc=devel@driverdev.osuosl.org \ --cc=devel@lists.orangefs.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=hch@infradead.org \ --cc=hch@lst.de \ --cc=intel-gfx@lists.freedesktop.org \ --cc=ira.weiny@intel.com \ --cc=jack@suse.cz \ --cc=jgg@ziepe.ca \ --cc=jglisse@redhat.com \ --cc=jhubbard@nvidia.com \ --cc=kvm@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nfs@vger.kernel.org \ --cc=linux-rdma@vger.kernel.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=linux-xfs@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=netdev@vger.kernel.org \ --cc=rds-devel@oss.oracle.com \ --cc=sparclinux@vger.kernel.org \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xenproject.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
Linux-Crypto Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-crypto/0 linux-crypto/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-crypto linux-crypto/ https://lore.kernel.org/linux-crypto \ linux-crypto@vger.kernel.org public-inbox-index linux-crypto Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-crypto AGPL code for this site: git clone https://public-inbox.org/public-inbox.git