From: john.hubbard@gmail.com To: Andrew Morton <akpm@linux-foundation.org> Cc: "Alexander Viro" <viro@zeniv.linux.org.uk>, "Björn Töpel" <bjorn.topel@intel.com>, "Boaz Harrosh" <boaz@plexistor.com>, "Christoph Hellwig" <hch@lst.de>, "Daniel Vetter" <daniel@ffwll.ch>, "Dan Williams" <dan.j.williams@intel.com>, "Dave Chinner" <david@fromorbit.com>, "David Airlie" <airlied@linux.ie>, "David S . Miller" <davem@davemloft.net>, "Ilya Dryomov" <idryomov@gmail.com>, "Jan Kara" <jack@suse.cz>, "Jason Gunthorpe" <jgg@ziepe.ca>, "Jens Axboe" <axboe@kernel.dk>, "Jérôme Glisse" <jglisse@redhat.com>, "Johannes Thumshirn" <jthumshirn@suse.de>, "Magnus Karlsson" <magnus.karlsson@intel.com>, "Matthew Wilcox" <willy@infradead.org>, "Miklos Szeredi" <miklos@szeredi.hu>, "Ming Lei" <ming.lei@redhat.com>, "Sage Weil" <sage@redhat.com>, "Santosh Shilimkar" <santosh.shilimkar@oracle.com>, "Yan Zheng" <zyan@redhat.com>, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, linux-rdma@vger.kernel.org, bpf@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>, "John Hubbard" <jhubbard@nvidia.com> Subject: [PATCH v6 2/3] drivers/gpu/drm/via: convert put_page() to put_user_page*() Date: Sun, 4 Aug 2019 14:40:41 -0700 [thread overview] Message-ID: <20190804214042.4564-3-jhubbard@nvidia.com> (raw) In-Reply-To: <20190804214042.4564-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"). Also reverse the order of a comparison, in order to placate checkpatch.pl. Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Hubbard <jhubbard@nvidia.com> --- drivers/gpu/drm/via/via_dmablit.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 062067438f1d..b5b5bf0ba65e 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -171,7 +171,6 @@ via_map_blit_for_device(struct pci_dev *pdev, static void via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) { - struct page *page; int i; switch (vsg->state) { @@ -186,13 +185,8 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) kfree(vsg->desc_pages); /* fall through */ case dr_via_pages_locked: - for (i = 0; i < vsg->num_pages; ++i) { - if (NULL != (page = vsg->pages[i])) { - if (!PageReserved(page) && (DMA_FROM_DEVICE == vsg->direction)) - SetPageDirty(page); - put_page(page); - } - } + put_user_pages_dirty_lock(vsg->pages, vsg->num_pages, + (vsg->direction == DMA_FROM_DEVICE)); /* fall through */ case dr_via_pages_alloc: vfree(vsg->pages); -- 2.22.0
WARNING: multiple messages have this Message-ID (diff)
From: john.hubbard@gmail.com To: Andrew Morton <akpm@linux-foundation.org> Cc: "Alexander Viro" <viro@zeniv.linux.org.uk>, "Björn Töpel" <bjorn.topel@intel.com>, "Boaz Harrosh" <boaz@plexistor.com>, "Christoph Hellwig" <hch@lst.de>, "Daniel Vetter" <daniel@ffwll.ch>, "Dan Williams" <dan.j.williams@intel.com>, "Dave Chinner" <david@fromorbit.com>, "David Airlie" <airlied@linux.ie>, "David S . Miller" <davem@davemloft.net>, "Ilya Dryomov" <idryomov@gmail.com>, "Jan Kara" <jack@suse.cz>, "Jason Gunthorpe" <jgg@ziepe.ca>, "Jens Axboe" <axboe@kernel.dk>, "Jérôme Glisse" <jglisse@redhat.com>, "Johannes Thumshirn" <jthumshirn@suse.de>, "Magnus Karlsson" <magnus.karlsson@intel.com>, "Matthew Wilcox" <willy@infradead.org>, "Miklos Szeredi" <miklos@szeredi.hu>, "Ming Lei" <ming.lei@redhat.com>, "Sage Weil" <sage@redhat.com> Subject: [PATCH v6 2/3] drivers/gpu/drm/via: convert put_page() to put_user_page*() Date: Sun, 4 Aug 2019 14:40:41 -0700 [thread overview] Message-ID: <20190804214042.4564-3-jhubbard@nvidia.com> (raw) In-Reply-To: <20190804214042.4564-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"). Also reverse the order of a comparison, in order to placate checkpatch.pl. Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Hubbard <jhubbard@nvidia.com> --- drivers/gpu/drm/via/via_dmablit.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 062067438f1d..b5b5bf0ba65e 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -171,7 +171,6 @@ via_map_blit_for_device(struct pci_dev *pdev, static void via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) { - struct page *page; int i; switch (vsg->state) { @@ -186,13 +185,8 @@ via_free_sg_info(struct pci_dev *pdev, drm_via_sg_info_t *vsg) kfree(vsg->desc_pages); /* fall through */ case dr_via_pages_locked: - for (i = 0; i < vsg->num_pages; ++i) { - if (NULL != (page = vsg->pages[i])) { - if (!PageReserved(page) && (DMA_FROM_DEVICE == vsg->direction)) - SetPageDirty(page); - put_page(page); - } - } + put_user_pages_dirty_lock(vsg->pages, vsg->num_pages, + (vsg->direction == DMA_FROM_DEVICE)); /* fall through */ case dr_via_pages_alloc: vfree(vsg->pages); -- 2.22.0
next prev parent reply other threads:[~2019-08-04 21:40 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-04 21:40 [PATCH v6 0/3] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() john.hubbard 2019-08-04 21:40 ` john.hubbard 2019-08-04 21:40 ` [PATCH v6 1/3] " john.hubbard 2019-08-04 21:40 ` john.hubbard 2019-08-06 17:40 ` Ira Weiny 2019-08-06 17:40 ` Ira Weiny 2019-08-06 20:43 ` John Hubbard 2019-08-06 20:43 ` John Hubbard 2019-08-04 21:40 ` john.hubbard [this message] 2019-08-04 21:40 ` [PATCH v6 2/3] drivers/gpu/drm/via: convert put_page() to put_user_page*() john.hubbard 2019-08-04 21:40 ` [PATCH v6 3/3] net/xdp: " john.hubbard 2019-08-04 21:40 ` 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=20190804214042.4564-3-jhubbard@nvidia.com \ --to=john.hubbard@gmail.com \ --cc=airlied@linux.ie \ --cc=akpm@linux-foundation.org \ --cc=axboe@kernel.dk \ --cc=bjorn.topel@intel.com \ --cc=boaz@plexistor.com \ --cc=bpf@vger.kernel.org \ --cc=dan.j.williams@intel.com \ --cc=daniel@ffwll.ch \ --cc=davem@davemloft.net \ --cc=david@fromorbit.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=hch@lst.de \ --cc=idryomov@gmail.com \ --cc=jack@suse.cz \ --cc=jgg@ziepe.ca \ --cc=jglisse@redhat.com \ --cc=jhubbard@nvidia.com \ --cc=jthumshirn@suse.de \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-rdma@vger.kernel.org \ --cc=magnus.karlsson@intel.com \ --cc=miklos@szeredi.hu \ --cc=ming.lei@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=sage@redhat.com \ --cc=santosh.shilimkar@oracle.com \ --cc=viro@zeniv.linux.org.uk \ --cc=willy@infradead.org \ --cc=zyan@redhat.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.