From patchwork Fri Aug 2 02:19:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071741 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54C9E746 for ; Fri, 2 Aug 2019 02:20:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4690828701 for ; Fri, 2 Aug 2019 02:20:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39612287CC; Fri, 2 Aug 2019 02:20:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5382B28701 for ; Fri, 2 Aug 2019 02:20:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4D896B0006; Thu, 1 Aug 2019 22:20:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AD61A6B0008; Thu, 1 Aug 2019 22:20:15 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97A5C6B000C; Thu, 1 Aug 2019 22:20:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 563B06B0006 for ; Thu, 1 Aug 2019 22:20:15 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id q11so40679019pll.22 for ; Thu, 01 Aug 2019 19:20:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qVOEtC+FJUT8up8TCOoMm5YvZPMSmdk5e2B42ED2yyM=; b=H3u1twxHRGwwPp5a4QcDNrGmIrxf8oexzWs0isGlR5xIPgFYSRRQnwpr85YXtOqQ/M d7Es+oA/TmTuOtE1hnteWvJ4PcT1EkUvhSu5V6NXN8YhP0+/TuC4MzppQyBv0PRRboMz iuLh/oXBGRZyguoxXW9RKwUmvyACpQO2gLZxwXENWsBoqmSmY4o/wfe0syScUwndCQVN zazvbX3B3t1sIctnjsZLT3TknoGRTPqkpqrjxOuqrvMrEk1nKgrCmK2j4Tgi2jJWCf2Z 4JDAXPgZvdHm1EG7HWm7opFDrQ1m6sZ6gZgMSIVPHI9e1/Qkfh/VgiqROIpt25XEuo3D EpeQ== X-Gm-Message-State: APjAAAWm6zzSPmq3WAwTX9uH98Bc/djE8U4uE8Q2vGgI3vhzN0/NwjOZ k97jYiZKZIMhYbIO4Cnxvzbx4Wh+Cy/HAiz+wZTH2ziTbuyf7FW7vXmozVnFL0ENGrQw+SLkMq9 nQrGCc780yjn8Ni9LF47dkk7BXp5/ZTGK4BbqzJGi9ZZS8NX1FgCSsKNR90c5EC5Qyw== X-Received: by 2002:a63:520f:: with SMTP id g15mr117652772pgb.28.1564712414858; Thu, 01 Aug 2019 19:20:14 -0700 (PDT) X-Received: by 2002:a63:520f:: with SMTP id g15mr117652727pgb.28.1564712413917; Thu, 01 Aug 2019 19:20:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712413; cv=none; d=google.com; s=arc-20160816; b=G4A4F2Fjjf/aaxTrVAXl7D7wt86KREWq0z4LFkrveMUO14devCj7fOWZS0oOhb31Bi +B3EE4UwmE3JFG96Lbp6AQ2KaRT+ryOgM/ol7UaO79sAjd0nZNSU48ZQamPiulGvg+ai KkvQqX4ST+/aw/NWMXX32l7AlkrRFjH+fDmdK/HOeMfET33Xlr6WP7STgNWm4OHNGx7K jkgmhnCVxzftugK75SRC6iz/Hz5MbmIyI5ZIs2UUvu2pFz2bW8cWMU9/KQ5eT4SHTmrx T5fRRc4QYBR79ProgNSryEWONy5GJYnyPqlAFc7mCNWy8YXG/iP1W24y9RzMp5aTTtg/ 1SoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=qVOEtC+FJUT8up8TCOoMm5YvZPMSmdk5e2B42ED2yyM=; b=G73OAVX1fdzJegYlSZn2IoCNqrDHfwsjCREWkiaM/hmkCtbkL0MjvLZkfjzo0pav4R moXnhEKOEWtQeNa4Kf9PzfMGLifM0Wx674TqnLABPrt9gyykLeJbtYjxuCMdCUbdFfNd NC60tssHwBMMHJz9wdwx2XAKlUcv4XmJFUytR61WWlX/QNQEmUPSuvGMiZJZvpw57XSY KadFziTNYK+29HBeWgiff8Bt8riMHEIjxtaEz5EwBQhURau8kEVXMr4Ex0q/cII75PCK VBkGc2wHdZ3syDoF4VbTBAs/q6gFFcZhVH8+gZ0nNk9Bsg6AmyniiFKJFwTTGBvE2wPB Hn4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RBxCANB3; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id g3sor89155226pld.15.2019.08.01.19.20.13 for (Google Transport Security); Thu, 01 Aug 2019 19:20:13 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RBxCANB3; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qVOEtC+FJUT8up8TCOoMm5YvZPMSmdk5e2B42ED2yyM=; b=RBxCANB3yj2IBv5n/MeFkevk6r/YWJp6ncSc5OW5MYkrOwdGQoB8NmKW/T7bWgCq4d ogyVsF3wAZIqX0pJbAgFZpVhPYy6OCZZYi41BAejxiD0VJCO8w/MyyeZOUOVBXs6OiBT 3HejGNLei8PHKM8Eoxy7r1HjtWg6EZKcWpVkGmP03BddemdqJEnch4O6hL9YpjUNSmsi S3idj2n9DD1vrmCTU9ZxixJF1czgcLrKpLmb9NIGAStVAt9/y4twPWvfN7Ux0CU8Wgrf xyg7g19gwJP3XgmJ+2kbBsMXQEe5u6yN514RiiZUh+ZUk9oY3+b/fuOz5O7S8kKnCATI uYVw== X-Google-Smtp-Source: APXvYqzRQ4S39LIYUw8vjSMlFZMRPugsy/9HDj+OwNNSlxD2DcqfIJG2lr7vJHF9h1rGbVRTrjyILg== X-Received: by 2002:a17:902:e6:: with SMTP id a93mr128590426pla.175.1564712413432; Thu, 01 Aug 2019 19:20:13 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:12 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Matthew Wilcox , Christoph Hellwig Subject: [PATCH 01/34] mm/gup: add make_dirty arg to put_user_pages_dirty_lock() Date: Thu, 1 Aug 2019 19:19:32 -0700 Message-Id: <20190802022005.5117-2-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard Provide more capable variation of put_user_pages_dirty_lock(), and delete put_user_pages_dirty(). This is based on the following: 1. Lots of call sites become simpler if a bool is passed into put_user_page*(), instead of making the call site choose which put_user_page*() variant to call. 2. Christoph Hellwig's observation that set_page_dirty_lock() is usually correct, and set_page_dirty() is usually a bug, or at least questionable, within a put_user_page*() calling chain. This leads to the following API choices: * put_user_pages_dirty_lock(page, npages, make_dirty) * There is no put_user_pages_dirty(). You have to hand code that, in the rare case that it's required. Cc: Matthew Wilcox Cc: Jan Kara Cc: Christoph Hellwig Cc: Ira Weiny Cc: Jason Gunthorpe Signed-off-by: John Hubbard --- drivers/infiniband/core/umem.c | 5 +- drivers/infiniband/hw/hfi1/user_pages.c | 5 +- drivers/infiniband/hw/qib/qib_user_pages.c | 5 +- drivers/infiniband/hw/usnic/usnic_uiom.c | 5 +- drivers/infiniband/sw/siw/siw_mem.c | 10 +- include/linux/mm.h | 5 +- mm/gup.c | 115 +++++++++------------ 7 files changed, 58 insertions(+), 92 deletions(-) diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 08da840ed7ee..965cf9dea71a 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -54,10 +54,7 @@ static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int d for_each_sg_page(umem->sg_head.sgl, &sg_iter, umem->sg_nents, 0) { page = sg_page_iter_page(&sg_iter); - if (umem->writable && dirty) - put_user_pages_dirty_lock(&page, 1); - else - put_user_page(page); + put_user_pages_dirty_lock(&page, 1, umem->writable && dirty); } sg_free_table(&umem->sg_head); diff --git a/drivers/infiniband/hw/hfi1/user_pages.c b/drivers/infiniband/hw/hfi1/user_pages.c index b89a9b9aef7a..469acb961fbd 100644 --- a/drivers/infiniband/hw/hfi1/user_pages.c +++ b/drivers/infiniband/hw/hfi1/user_pages.c @@ -118,10 +118,7 @@ int hfi1_acquire_user_pages(struct mm_struct *mm, unsigned long vaddr, size_t np void hfi1_release_user_pages(struct mm_struct *mm, struct page **p, size_t npages, bool dirty) { - if (dirty) - put_user_pages_dirty_lock(p, npages); - else - put_user_pages(p, npages); + put_user_pages_dirty_lock(p, npages, dirty); if (mm) { /* during close after signal, mm can be NULL */ atomic64_sub(npages, &mm->pinned_vm); diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c index bfbfbb7e0ff4..6bf764e41891 100644 --- a/drivers/infiniband/hw/qib/qib_user_pages.c +++ b/drivers/infiniband/hw/qib/qib_user_pages.c @@ -40,10 +40,7 @@ static void __qib_release_user_pages(struct page **p, size_t num_pages, int dirty) { - if (dirty) - put_user_pages_dirty_lock(p, num_pages); - else - put_user_pages(p, num_pages); + put_user_pages_dirty_lock(p, num_pages, dirty); } /** diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index 0b0237d41613..62e6ffa9ad78 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -75,10 +75,7 @@ static void usnic_uiom_put_pages(struct list_head *chunk_list, int dirty) for_each_sg(chunk->page_list, sg, chunk->nents, i) { page = sg_page(sg); pa = sg_phys(sg); - if (dirty) - put_user_pages_dirty_lock(&page, 1); - else - put_user_page(page); + put_user_pages_dirty_lock(&page, 1, dirty); usnic_dbg("pa: %pa\n", &pa); } kfree(chunk); diff --git a/drivers/infiniband/sw/siw/siw_mem.c b/drivers/infiniband/sw/siw/siw_mem.c index 67171c82b0c4..ab83a9cec562 100644 --- a/drivers/infiniband/sw/siw/siw_mem.c +++ b/drivers/infiniband/sw/siw/siw_mem.c @@ -63,15 +63,7 @@ struct siw_mem *siw_mem_id2obj(struct siw_device *sdev, int stag_index) static void siw_free_plist(struct siw_page_chunk *chunk, int num_pages, bool dirty) { - struct page **p = chunk->plist; - - while (num_pages--) { - if (!PageDirty(*p) && dirty) - put_user_pages_dirty_lock(p, 1); - else - put_user_page(*p); - p++; - } + put_user_pages_dirty_lock(chunk->plist, num_pages, dirty); } void siw_umem_release(struct siw_umem *umem, bool dirty) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0334ca97c584..9759b6a24420 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1057,8 +1057,9 @@ static inline void put_user_page(struct page *page) put_page(page); } -void put_user_pages_dirty(struct page **pages, unsigned long npages); -void put_user_pages_dirty_lock(struct page **pages, unsigned long npages); +void put_user_pages_dirty_lock(struct page **pages, unsigned long npages, + bool make_dirty); + void put_user_pages(struct page **pages, unsigned long npages); #if defined(CONFIG_SPARSEMEM) && !defined(CONFIG_SPARSEMEM_VMEMMAP) diff --git a/mm/gup.c b/mm/gup.c index 98f13ab37bac..7fefd7ab02c4 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -29,85 +29,70 @@ struct follow_page_context { unsigned int page_mask; }; -typedef int (*set_dirty_func_t)(struct page *page); - -static void __put_user_pages_dirty(struct page **pages, - unsigned long npages, - set_dirty_func_t sdf) -{ - unsigned long index; - - for (index = 0; index < npages; index++) { - struct page *page = compound_head(pages[index]); - - /* - * Checking PageDirty at this point may race with - * clear_page_dirty_for_io(), but that's OK. Two key cases: - * - * 1) This code sees the page as already dirty, so it skips - * the call to sdf(). That could happen because - * clear_page_dirty_for_io() called page_mkclean(), - * followed by set_page_dirty(). However, now the page is - * going to get written back, which meets the original - * intention of setting it dirty, so all is well: - * clear_page_dirty_for_io() goes on to call - * TestClearPageDirty(), and write the page back. - * - * 2) This code sees the page as clean, so it calls sdf(). - * The page stays dirty, despite being written back, so it - * gets written back again in the next writeback cycle. - * This is harmless. - */ - if (!PageDirty(page)) - sdf(page); - - put_user_page(page); - } -} - /** - * put_user_pages_dirty() - release and dirty an array of gup-pinned pages - * @pages: array of pages to be marked dirty and released. + * put_user_pages_dirty_lock() - release and optionally dirty gup-pinned pages + * @pages: array of pages to be maybe marked dirty, and definitely released. * @npages: number of pages in the @pages array. + * @make_dirty: whether to mark the pages dirty * * "gup-pinned page" refers to a page that has had one of the get_user_pages() * variants called on that page. * * For each page in the @pages array, make that page (or its head page, if a - * compound page) dirty, if it was previously listed as clean. Then, release - * the page using put_user_page(). + * compound page) dirty, if @make_dirty is true, and if the page was previously + * listed as clean. In any case, releases all pages using put_user_page(), + * possibly via put_user_pages(), for the non-dirty case. * * Please see the put_user_page() documentation for details. * - * set_page_dirty(), which does not lock the page, is used here. - * Therefore, it is the caller's responsibility to ensure that this is - * safe. If not, then put_user_pages_dirty_lock() should be called instead. + * set_page_dirty_lock() is used internally. If instead, set_page_dirty() is + * required, then the caller should a) verify that this is really correct, + * because _lock() is usually required, and b) hand code it: + * set_page_dirty_lock(), put_user_page(). * */ -void put_user_pages_dirty(struct page **pages, unsigned long npages) +void put_user_pages_dirty_lock(struct page **pages, unsigned long npages, + bool make_dirty) { - __put_user_pages_dirty(pages, npages, set_page_dirty); -} -EXPORT_SYMBOL(put_user_pages_dirty); + unsigned long index; -/** - * put_user_pages_dirty_lock() - release and dirty an array of gup-pinned pages - * @pages: array of pages to be marked dirty and released. - * @npages: number of pages in the @pages array. - * - * For each page in the @pages array, make that page (or its head page, if a - * compound page) dirty, if it was previously listed as clean. Then, release - * the page using put_user_page(). - * - * Please see the put_user_page() documentation for details. - * - * This is just like put_user_pages_dirty(), except that it invokes - * set_page_dirty_lock(), instead of set_page_dirty(). - * - */ -void put_user_pages_dirty_lock(struct page **pages, unsigned long npages) -{ - __put_user_pages_dirty(pages, npages, set_page_dirty_lock); + /* + * TODO: this can be optimized for huge pages: if a series of pages is + * physically contiguous and part of the same compound page, then a + * single operation to the head page should suffice. + */ + + if (!make_dirty) { + put_user_pages(pages, npages); + return; + } + + for (index = 0; index < npages; index++) { + struct page *page = compound_head(pages[index]); + /* + * Checking PageDirty at this point may race with + * clear_page_dirty_for_io(), but that's OK. Two key + * cases: + * + * 1) This code sees the page as already dirty, so it + * skips the call to set_page_dirty(). That could happen + * because clear_page_dirty_for_io() called + * page_mkclean(), followed by set_page_dirty(). + * However, now the page is going to get written back, + * which meets the original intention of setting it + * dirty, so all is well: clear_page_dirty_for_io() goes + * on to call TestClearPageDirty(), and write the page + * back. + * + * 2) This code sees the page as clean, so it calls + * set_page_dirty(). The page stays dirty, despite being + * written back, so it gets written back again in the + * next writeback cycle. This is harmless. + */ + if (!PageDirty(page)) + set_page_dirty_lock(page); + put_user_page(page); + } } EXPORT_SYMBOL(put_user_pages_dirty_lock); From patchwork Fri Aug 2 02:19:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071743 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6FB3813AC for ; Fri, 2 Aug 2019 02:20:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F788287C6 for ; Fri, 2 Aug 2019 02:20:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52552287CB; Fri, 2 Aug 2019 02:20:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCB6C28701 for ; Fri, 2 Aug 2019 02:20:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC5706B0008; Thu, 1 Aug 2019 22:20:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ADA656B000C; Thu, 1 Aug 2019 22:20:16 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7CC4E6B000D; Thu, 1 Aug 2019 22:20:16 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 423726B0008 for ; Thu, 1 Aug 2019 22:20:16 -0400 (EDT) Received: by mail-pl1-f199.google.com with SMTP id s21so40699981plr.2 for ; Thu, 01 Aug 2019 19:20:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qSYlns3rxzw4u/DyjG2ivKH4pSlvpz3tTvNpv+Vzl0A=; b=B1E+21BZKz+oc+9YS5TXR528NxUQpzEGW6O+9sgV9aQZkbaq6POo+wR9iQ1Gld0eZj 9CbgNXo5cpJoFuGuXoj+KkLRABG4TDh/pZW2akIebntvU1naSmVA3ZSO9vY4bVJJiidz z0KUxiaHFGVg3LaOW7fR4oRfX+MbATfg8K0+ayZBc3Yxj1qto1OFQHRNK64FvIGzDZKA u7n1z3YGhcSTSOhvqbSZ2S9f6uTz/I9rnqtOkI4cdqO0GfD6iJZU0J5x5zJR7WEOASJ5 iDrkYXshHuLyFWHqLlgs+mMDf0EUV75ejRayUOewwlu208upBeIZbElv+n7hNG2sBjiR zBcA== X-Gm-Message-State: APjAAAX2lI9oOlnZeiHNQRUMVCaVVUjOGDgi3QaJKywsOme56lHk+dj2 VLqrEqZOlf+OPLWdPyDiUgaXI8N+Ym8AP3m2DLT6KSGLr5fsQBNJ2w3LwNkMDBgD0n+QoH80fTB SEOVOcE/Fd/ClQZpt0rTwnuRXOzsF+vh5oGtp/t0hkxfAbLGH+x29LQAB/iOxTx5KkA== X-Received: by 2002:a17:90a:2567:: with SMTP id j94mr1870414pje.121.1564712415953; Thu, 01 Aug 2019 19:20:15 -0700 (PDT) X-Received: by 2002:a17:90a:2567:: with SMTP id j94mr1870371pje.121.1564712415213; Thu, 01 Aug 2019 19:20:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712415; cv=none; d=google.com; s=arc-20160816; b=Nc3hSMyaTZpXeYbwpYqgZdXyjSZYWi6oPftrRJtkGpLHuyCqVrdJ8Cqb8IgU0Wwwvq wl+OaXYI/zzf7RQx3zSWOtersi2VZ8dlyDEFvO8w78cIlnJxGLkR5lEAORw84CPkuoKZ A2WymA84s4OK0wWRpm8trgwIExqwqVhj8fKzlHT9YkuxSzdUIGZEjOuvv04RKSjt/KH9 GdmaM4pUj7eQqyabwMEm/x3erB/HaF/iVT31dzG75QrouLjutS5hyYPsE4gAaVJ6/sGz 4w5n5DXoshP+VygehIwBaDeDCpBgdUn0hG+o+Sn/pTq+0SYQ8NaOFG1WCqN9Aks9N51N jsVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=qSYlns3rxzw4u/DyjG2ivKH4pSlvpz3tTvNpv+Vzl0A=; b=DC9yLyGa8Y6eLVvyqzq/u0CZk7HI3Bh3bU1l0cOX+ZDpmw+r/izwXPrPwXSe+LzeBv CiJv2Liy417eSi6YLyKnJ7P/KAGrywN5o+SspcOwmQGf64VYfwubjqlh9NabM4SiSS16 wsgOXk9N74zZpmUPo2sNhmPegZArqAofiqysynGBIRx/ZodQ52VvtmKFqADkNgaRF64S TuWvcgtZwGLnhNR7GJ8Qu1PsrM+1ZV9s2Jf9QUmeidTQz5rwaQrg2vSF09/jkUl8oK0I Gq4zyVSFa+cshovecTk483PZrQGLBY4zhJqXTPoS+0lD2HawSFBq9rvZhJzqU0qIJV65 deLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="D/j6QNqz"; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f9sor87819962plr.31.2019.08.01.19.20.15 for (Google Transport Security); Thu, 01 Aug 2019 19:20:15 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="D/j6QNqz"; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qSYlns3rxzw4u/DyjG2ivKH4pSlvpz3tTvNpv+Vzl0A=; b=D/j6QNqz3yFiYsyeUlBoZoB8rZu5aCb/yvzz1zxOgNp3ybEqPbsxe9btxXQCwNnRiL 1hhEXFWz1aCfU0TnFrQv5Hdu1Y4yj+09YOcLKnBgch2wIeWxdJn+CuF7gDQRR3DG86LM Y2SvxC7kLx20v2OT7+JApu4gV5A7mbLpTUBZ6FnTk6beDldtvE5mb/QvfkkyqN0v2VG1 9ofVdaCVs4q01OeX0AkhxB3Ji5RomrK0H8nso03ee71VFXG/bdlheK3cdFpHFmb/m/jZ kT41q1q3qFT4PGqgyOwuRL5tvfmQTGDLJg5egH8fWfpo6yuqqIAezax6SWmNi42S34sa BMyg== X-Google-Smtp-Source: APXvYqwe/PIHkPn7ZzlBTJ10qqxG8IKfziWCo/9dNIX4ajnyTWnRigA/C0Xc1g8+MHenU4v2W+nK1Q== X-Received: by 2002:a17:902:24b:: with SMTP id 69mr123383293plc.250.1564712414959; Thu, 01 Aug 2019 19:20:14 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:14 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Santosh Shilimkar , "David S . Miller" Subject: [PATCH 02/34] net/rds: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:33 -0700 Message-Id: <20190802022005.5117-3-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Santosh Shilimkar Cc: David S. Miller Cc: netdev@vger.kernel.org Cc: linux-rdma@vger.kernel.org Cc: rds-devel@oss.oracle.com Signed-off-by: John Hubbard --- net/rds/info.c | 5 ++--- net/rds/message.c | 2 +- net/rds/rdma.c | 15 +++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/net/rds/info.c b/net/rds/info.c index 03f6fd56d237..ca6af2889adf 100644 --- a/net/rds/info.c +++ b/net/rds/info.c @@ -162,7 +162,6 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval, struct rds_info_lengths lens; unsigned long nr_pages = 0; unsigned long start; - unsigned long i; rds_info_func func; struct page **pages = NULL; int ret; @@ -235,8 +234,8 @@ int rds_info_getsockopt(struct socket *sock, int optname, char __user *optval, ret = -EFAULT; out: - for (i = 0; pages && i < nr_pages; i++) - put_page(pages[i]); + if (pages) + put_user_pages(pages, nr_pages); kfree(pages); return ret; diff --git a/net/rds/message.c b/net/rds/message.c index 50f13f1d4ae0..d7b0d266c437 100644 --- a/net/rds/message.c +++ b/net/rds/message.c @@ -404,7 +404,7 @@ static int rds_message_zcopy_from_user(struct rds_message *rm, struct iov_iter * int i; for (i = 0; i < rm->data.op_nents; i++) - put_page(sg_page(&rm->data.op_sg[i])); + put_user_page(sg_page(&rm->data.op_sg[i])); mmp = &rm->data.op_mmp_znotifier->z_mmp; mm_unaccount_pinned_pages(mmp); ret = -EFAULT; diff --git a/net/rds/rdma.c b/net/rds/rdma.c index 916f5ec373d8..6762e8696b99 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -162,8 +162,7 @@ static int rds_pin_pages(unsigned long user_addr, unsigned int nr_pages, pages); if (ret >= 0 && ret < nr_pages) { - while (ret--) - put_page(pages[ret]); + put_user_pages(pages, ret); ret = -EFAULT; } @@ -276,7 +275,7 @@ static int __rds_rdma_map(struct rds_sock *rs, struct rds_get_mr_args *args, if (IS_ERR(trans_private)) { for (i = 0 ; i < nents; i++) - put_page(sg_page(&sg[i])); + put_user_page(sg_page(&sg[i])); kfree(sg); ret = PTR_ERR(trans_private); goto out; @@ -464,9 +463,10 @@ void rds_rdma_free_op(struct rm_rdma_op *ro) * to local memory */ if (!ro->op_write) { WARN_ON(!page->mapping && irqs_disabled()); - set_page_dirty(page); + put_user_pages_dirty_lock(&page, 1, true); + } else { + put_user_page(page); } - put_page(page); } kfree(ro->op_notifier); @@ -481,8 +481,7 @@ void rds_atomic_free_op(struct rm_atomic_op *ao) /* Mark page dirty if it was possibly modified, which * is the case for a RDMA_READ which copies from remote * to local memory */ - set_page_dirty(page); - put_page(page); + put_user_pages_dirty_lock(&page, 1, true); kfree(ao->op_notifier); ao->op_notifier = NULL; @@ -867,7 +866,7 @@ int rds_cmsg_atomic(struct rds_sock *rs, struct rds_message *rm, return ret; err: if (page) - put_page(page); + put_user_page(page); rm->atomic.op_active = 0; kfree(rm->atomic.op_notifier); From patchwork Fri Aug 2 02:19:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7961746 for ; Fri, 2 Aug 2019 02:20:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9CE628701 for ; Fri, 2 Aug 2019 02:20:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC6A7287C0; Fri, 2 Aug 2019 02:20:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43D8328701 for ; Fri, 2 Aug 2019 02:20:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3AB566B000C; Thu, 1 Aug 2019 22:20:18 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 335306B000D; Thu, 1 Aug 2019 22:20:18 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 187E56B000E; Thu, 1 Aug 2019 22:20:18 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id D59B86B000C for ; Thu, 1 Aug 2019 22:20:17 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id p15so2815108pgl.18 for ; Thu, 01 Aug 2019 19:20:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=weSPcOAlMB+nks0BWLOsxsBmAu907UZGrfndvq6oQnc=; b=SCZofcUrpvn/j+LPY8F9zc3BJ+vXlD1Kh/yxqS/KUob93I2XUinFmYDg4GU3nm9/eY H/cIuluDy5IFSzkZYUlAXtILWOhdvfnJiMK2xou54kToqstmLhrMgZobtFoKG1zX2FhY oVgmmFRI8EnQK+ReIBCyTwrO88uj0VhhEFx7CBhRM+LAf6X1WQDoWGzcs2m2A+8qCSUV JVU8ZeRFPWNzUuEq6+wOdHDI1d9+EAZ/ytOSxyoajOoo9PPlX0NfmCgSzg3VCAJJKVGJ a8BXxh7IeN1eoqMxUukaVktsZ1zEStRuDYQ83f+OgKcIh4xfwz+1+SE2etA4qtMuqhnc u+zg== X-Gm-Message-State: APjAAAUubcgPpXxpCwgxMHUGWX/mXNXbrVF2iFwaqkEnJUoNqJGaoVRP yEGCCfoVeM4muUXW+exEPLi2kUZc/6Tdadj3OS0hlEHLxKowgcjhJQgIUMeuv2YfqZlm8d4X0OE /D30kwVfuH0gLNjjKOQTSAprzd/ln59DlD3+98Y479rAoYX4jJkUPd60Z2AGJJu3oBw== X-Received: by 2002:a17:902:2ac8:: with SMTP id j66mr123173293plb.273.1564712417521; Thu, 01 Aug 2019 19:20:17 -0700 (PDT) X-Received: by 2002:a17:902:2ac8:: with SMTP id j66mr123173247plb.273.1564712416705; Thu, 01 Aug 2019 19:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712416; cv=none; d=google.com; s=arc-20160816; b=D3EChVHO/WfnbSC29Oh2EQ/UxnVo73+mGqhE83rA5hMg+GAAJT13VMN5JbEnIGJPJy kfZvf2PoFXvJFIK5OtuirbGmHBB3ek9tRcQ82DM4uovozRnMpgZQbFkcdgRh+oGXwwGl cHoQuV13eiHzSfqeGyE0YPbZCkaGEj5vFGoC2A9q8gO2mhx91RkWaOAgo+FxD7Ka2VVg 3glghlKZokS+QCT8UhK/wmTmxqAIwIq1rM8WfknKdTb1JuIl/44z2Cjnvs1jLVEXRa2Z ks7H/5nOKMs8HOAWzNwn1Vw9jxGeK7qs5yVGDkYmTSudoUFCBxLqLyMRd5XGDs7zbGwc +PKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=weSPcOAlMB+nks0BWLOsxsBmAu907UZGrfndvq6oQnc=; b=N5iDwgag+m9FVnGtMw/RZuimC5SkDmXMDMxZ3GVLbHBFuGXQKxJ5txhtAlMsGGt/Vi v6YjW8J5bYjSh+OVqkvqKLcYaTa6C6gTliQGFF3KSraWhI7cmqFXNB1LhAlXED1QXd/h rYYd3AIUFfjDq7HAFOCrMj7+d6GCNlE8kbt/8rucdz3NSs6wjK6Io41jSfeLuSJpnYDW xu46T205MyRa16pyv7HPKZ8TMyKxMwtyibrEEGy2twoV+guwx7gGMOU1gduhtuLuIOtM DTuAO1i5+o5B2EdKai7XwgWzKm9ulqU+n/2qg6YMHKig9BieKET07J3LrxGLQWlXAK/R myGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="g/PNAVO1"; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id g4sor89047610plt.30.2019.08.01.19.20.16 for (Google Transport Security); Thu, 01 Aug 2019 19:20:16 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="g/PNAVO1"; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=weSPcOAlMB+nks0BWLOsxsBmAu907UZGrfndvq6oQnc=; b=g/PNAVO1jcA7rjmvur5Gi5SyBm+cHCwd0FZu0S4Yd4WKYY8nqKUy+Kjq5L8LbAIDam oq+DMw/apiFaV6V9t2AYTvJ0UtZRGdqpPgiFYeIHq5U9A659jHv3iijVBsi80zStn1WW yA7d3ZYX2ikKALXpz54vXEPMXgXSlYxT87JksMZBQueD34Vn0QLhvvHOTCuzyirgAxhY PS1hXIRKbtV044f7MD5ThhAFxJavcS5DN9nP30sURDOyWv4TACAbp0MhELnCZVrxEr+Y L5R1pu68TEBkTXOjXzFMyL79KTHMlgJNcYv+KmIulF31bskwh/7J7wKRv6nstiIy1Eix KMbg== X-Google-Smtp-Source: APXvYqxciGgcMDXcQ3A2dbcQcp1f7eltXWtJvGVKyn0lRu+bq9UEFtA9QCl9A6sNDZqj7/W8XpREEA== X-Received: by 2002:a17:90a:2385:: with SMTP id g5mr1977411pje.12.1564712416439; Thu, 01 Aug 2019 19:20:16 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:16 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Ilya Dryomov , Sage Weil , "David S . Miller" Subject: [PATCH 03/34] net/ceph: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:34 -0700 Message-Id: <20190802022005.5117-4-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Ilya Dryomov Cc: Sage Weil Cc: David S. Miller Cc: ceph-devel@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: John Hubbard Acked-by: Jeff Layton --- net/ceph/pagevec.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c index 64305e7056a1..c88fff2ab9bd 100644 --- a/net/ceph/pagevec.c +++ b/net/ceph/pagevec.c @@ -12,13 +12,7 @@ void ceph_put_page_vector(struct page **pages, int num_pages, bool dirty) { - int i; - - for (i = 0; i < num_pages; i++) { - if (dirty) - set_page_dirty_lock(pages[i]); - put_page(pages[i]); - } + put_user_pages_dirty_lock(pages, num_pages, dirty); kvfree(pages); } EXPORT_SYMBOL(ceph_put_page_vector); From patchwork Fri Aug 2 02:19:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071755 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 52CD313AC for ; Fri, 2 Aug 2019 02:20:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4364E28701 for ; Fri, 2 Aug 2019 02:20:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37179287C6; Fri, 2 Aug 2019 02:20:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 951FF28701 for ; Fri, 2 Aug 2019 02:20:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 028C46B000D; Thu, 1 Aug 2019 22:20:20 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F1D1B6B000E; Thu, 1 Aug 2019 22:20:19 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D20E06B0010; Thu, 1 Aug 2019 22:20:19 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 9CF206B000D for ; Thu, 1 Aug 2019 22:20:19 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id n9so42973534pgq.4 for ; Thu, 01 Aug 2019 19:20:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=8SOviSW3O4erJ4o/T7vOdTDRu8uyyXM9kIDmKsHyj7c=; b=KuK+nAMsLrslVITijdrQmymXnA6Ree1uuNwkZO1UhQ8JbVJ1wNYuQk336HxG35Jur2 Wa5a0xgbxIdB/rp8n5lsgnLTQmAeiUx00+W79em/4IawNA55VHYNHmcJTd0yFSL+yNpB OdFWYoJ6JThnHGu008SX4HZPPxQqTM5hJOSlNn1iaicfVJ5yo/vpUyDrku2Dr2kHKUty EhjZM2GKNwoJZqj9elW1ntihU+yYxZks7inA0A7iFmh96nMHpaIaiH+CiuZ0j1a3cYD6 i1BM8aAnwRw38IeSu/dz7Aug5ODAqUVHW7B+clG/rvMN1MbiQsY25lWhQy4X0oFsEx// /u9w== X-Gm-Message-State: APjAAAWEjsB9eC0WbBMtNuo76GPcYNaDMj5q9uTOgPEacC4mzILlgiVG hKdio/AP+e5wWZnq6eIDHBq+ueVtNRZvvhhHXva8yQ01O3I49NtNWniAe+cv5lnYh8eOf2J8EH4 psyTBb6hwrTx6Mpa8zUpJmORrqig0BpjqsU6IMF4W6KyQfZAswEwm3JTXqe05X3fDaA== X-Received: by 2002:a62:16:: with SMTP id 22mr58942706pfa.151.1564712419292; Thu, 01 Aug 2019 19:20:19 -0700 (PDT) X-Received: by 2002:a62:16:: with SMTP id 22mr58942654pfa.151.1564712418300; Thu, 01 Aug 2019 19:20:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712418; cv=none; d=google.com; s=arc-20160816; b=Xg1uHTyq86PSDe1DKefU2spCKeg/RqgQ6+wslFnwvjUMPbW86tW261Pp9ZrmtrYJ6v nWN0B8PyiQPQolmveKr/He4IwVkvINFIpt7m0aVc7owwWlb52uy4OXQXgNehmuhNPXCo ykurYSeWYutPStryvdObSVimfqjpNMLzhKUWjPECLZAEzwiiNFHKdZ5U5GlW0ZzNyLLx n3uHMmQiOxnemDgCSwkBHxAc+LRZcWKZn5R8kI+IC9JzdB4Aiom9ODgCLDYLZ++XJXgz fQl0rm89Atv+MeWEetRtddlBUh6DwsG/dITX1hV9zwECSTr+f2IqGR7US0E3neZ/xXtH u8Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=8SOviSW3O4erJ4o/T7vOdTDRu8uyyXM9kIDmKsHyj7c=; b=iozDrWm95Pj6M1EF17iYRfcO6BrxFdTAyHGyo8vN/M+FbLl1jT/2YiD42xSjGehiBM PpjQsqAnXYMQlmQlY+fK6pala6k22OQSBolQB9lvP0suRkYIUtP2Skphm1ucDmIA4FQp K5GijabOE9RGuJTFdOo6bz4aorCJfmPUac/GggeL6wK4RcBphY2zX/oKeo/yBCfLhJRz WTmaP3qESJ9RDpSYb+TodJhwcT9GY0cyTREj+3FCvcrIfHW6AnlEX9o64japtYGtN5ed CombG7CRoc8Gff3yFZN1id8R+vry8zJB8khJU9LDfektedRcBgAgr6ezaFN7agurhCU9 tWvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="fX9VH11/"; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f41sor8414293pjg.15.2019.08.01.19.20.18 for (Google Transport Security); Thu, 01 Aug 2019 19:20:18 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="fX9VH11/"; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8SOviSW3O4erJ4o/T7vOdTDRu8uyyXM9kIDmKsHyj7c=; b=fX9VH11/xtmCZY5ktyfRXv+8oFT24qnzRAke9R5fEGSeD2IzOy84ZG8im/eaEUg8Lt YkXZtAgFC41AXSsr/ysnzaRAFRybM7sVVSGjTeMscCtwe6TgKQtIwxVTNVhX+CyOlaHj zyT65gbiAfpxTAt1YaJp886/lI6PgypiCjw7omXplGhR0qwXivcLAeNmtsNmtXQS2+4w xqKa+JcZGRrR5eWJB589WBbm/hXzKEauxkOa/UURNDAyCoi6UPYtZRE7atesr45WwiIq ErXdMxUJmMSia9/QMT7Nme9zP4x0BmIDxW3018QpZobBFVGv7P1VjjU6MaObsA2EybjP VU2g== X-Google-Smtp-Source: APXvYqy6SxWBaLdRR2vg6Lx/woJAETS/7eDG5dTzML6C7DLLIiEKJ1wWpgVv8K7hxMNjNoQ+Y+s8Dw== X-Received: by 2002:a17:90a:8c92:: with SMTP id b18mr1836391pjo.97.1564712418017; Thu, 01 Aug 2019 19:20:18 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:17 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Joerg Roedel , Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: [PATCH 04/34] x86/kvm: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:35 -0700 Message-Id: <20190802022005.5117-5-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page(). This is part a tree-wide conversion, as described in commit fc1d8e7cca2d ("mm: introduce put_user_page*(), placeholder versions"). Cc: Joerg Roedel Cc: Paolo Bonzini Cc: "Radim Krčmář" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: kvm@vger.kernel.org Signed-off-by: John Hubbard --- arch/x86/kvm/svm.c | 4 ++-- virt/kvm/kvm_main.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 7eafc6907861..ff93c923ed36 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1827,7 +1827,7 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr, err: if (npinned > 0) - release_pages(pages, npinned); + put_user_pages(pages, npinned); kvfree(pages); return NULL; @@ -1838,7 +1838,7 @@ static void sev_unpin_memory(struct kvm *kvm, struct page **pages, { struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; - release_pages(pages, npages); + put_user_pages(pages, npages); kvfree(pages); sev->pages_locked -= npages; } diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 887f3b0c2b60..4b6a596ea8e9 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1499,7 +1499,7 @@ static int hva_to_pfn_slow(unsigned long addr, bool *async, bool write_fault, if (__get_user_pages_fast(addr, 1, 1, &wpage) == 1) { *writable = true; - put_page(page); + put_user_page(page); page = wpage; } } @@ -1831,7 +1831,7 @@ EXPORT_SYMBOL_GPL(kvm_release_page_clean); void kvm_release_pfn_clean(kvm_pfn_t pfn) { if (!is_error_noslot_pfn(pfn) && !kvm_is_reserved_pfn(pfn)) - put_page(pfn_to_page(pfn)); + put_user_page(pfn_to_page(pfn)); } EXPORT_SYMBOL_GPL(kvm_release_pfn_clean); From patchwork Fri Aug 2 02:19:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071757 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90592746 for ; Fri, 2 Aug 2019 02:20:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81CF928701 for ; Fri, 2 Aug 2019 02:20:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72B5A2877B; Fri, 2 Aug 2019 02:20:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F275B2877B for ; Fri, 2 Aug 2019 02:20:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61D6E6B000E; Thu, 1 Aug 2019 22:20:21 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5A6346B0010; Thu, 1 Aug 2019 22:20:21 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D37C6B0266; Thu, 1 Aug 2019 22:20:21 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 08ECF6B000E for ; Thu, 1 Aug 2019 22:20:21 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id m17so37489366pgh.21 for ; Thu, 01 Aug 2019 19:20:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=pwlX9Z4uen7Ts0pUwmBLgDhtihaB/D0UZN8JDoMe4ZA=; b=NRMUcULKNxQewzXrDbU9TD+2bxY/9kvkWhZrBcJLfUkAZf/ttBOppZXGV/LE9UnWBR NQqJbFrhh+0y9QA3nKDIKqrRiSm/OvkQ2fR5PP97LN3aC/eA5Q6XBsaFz5wgx4YZO60J j+8g50aEIJGt1dLBzKurUWy5GKznuOFfvDtYZeULiIYDbUzyuHUvthBCh4SwZmf8OxiI Gjzkbvp4tKmGNlIjIUnzWSKyF/tciiC2PAZm+RThBM9QXmzJ5pd7Oqi2iNPaJbtDI1Tj qoqXZyi+p04rCmuSjTY24+kLpQIHSfqyxX2TjQihbi64PwHl6htQMKDkqastFs3X//J+ DfWQ== X-Gm-Message-State: APjAAAUOsVKQsOejz9mYvqhK7CrPA1q0l7IhZbNVE6mCTPVU2vWwsdio TWoCiVApkhl4JCkf80VCypNaAOYSX+77vnZ+h/SMqRlkZOvsqUAk7xt+18h9lLrXwBp7ZkaBtBc y8LTLEZ8DjT68OxOt0hkUbgfk7lNvJIeSyLK170CSP2EK686avkBGJLUtj27KaRcwBQ== X-Received: by 2002:a17:90a:fa12:: with SMTP id cm18mr1846362pjb.137.1564712420732; Thu, 01 Aug 2019 19:20:20 -0700 (PDT) X-Received: by 2002:a17:90a:fa12:: with SMTP id cm18mr1846315pjb.137.1564712420087; Thu, 01 Aug 2019 19:20:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712420; cv=none; d=google.com; s=arc-20160816; b=1FoCN3UHSm6Ir86nNgT+iwXChylMzvZyQ1qdXuljihN3icQEI01CiurbXmEUbJP+Zp wJ+VNnSjirdRlUwGZLIHMVFBlKDY/b/LmRhhDsGewe87jVSVcp0991eWRKtNIPjjCm4u NgvH++LV6zX+1xaAIuKuG5UTAnZYASd1jNXcxnV1e7pS6rOIACIpNSFNO+MULinaa8Tg QV3eWU1AwZLcy8qMYOHfB5jxqDuWgWkCCGHWsV67FlUCbl8Xgi87PzztPPXVZdAwLc2T lzJ5JhtTmvYa0zwAdb3WXHOwM4xsGhlh0kYcACezOsvujwSDfnDhQcaleoewrZLwtnG0 C/Rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=pwlX9Z4uen7Ts0pUwmBLgDhtihaB/D0UZN8JDoMe4ZA=; b=Ogd6eFk4qH3PUXlRMpRyGFwsSXMg3sc+mzxUMwzspfROX4KyPKuL3nLcM7044EScNM 0eAluktA4SP8WBKcblOf8VTOcHZfAZAjgeAcvpB4cSlsluKDC0C7IlOudCrJe8PkbaFT mW6f8CWI1fEBVwlQsJQASz2CBqpgVNuV4F701BiJR696krjQ13JRhiGTAl/ND+qIucD6 bCKFMtg9/BdNjAJElia8Tjvq4uZAEPtvUrJd9O1C4vy4cHv6qylvEi5KlfXDti1d+qui 2npA7/pc4EnBRePOu0HyW6pa+1rK8wRCzGaCveDFvWmbQGHj2lR/sXucCor37DPo9M4I TcTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=cXVKp+Dg; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id o11sor88973814plk.18.2019.08.01.19.20.19 for (Google Transport Security); Thu, 01 Aug 2019 19:20:20 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=cXVKp+Dg; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pwlX9Z4uen7Ts0pUwmBLgDhtihaB/D0UZN8JDoMe4ZA=; b=cXVKp+Dgxhj784uTGfvPyG1yYJG0TluF022pFhUyHpRdik351Pihe9of7XZeuP0Vwt h/i6WlGcIKVNKfHSeDSEUHKJX3j3X/NshFFci/lhMH4/SgEjIokRiJ+YouFN6I+GBm4y zUjQOfq6557LaDfB1SW3dyyvMia7x+7GSnkQpaKA5dSoAhqdxSb/NVVqK5YIHjTvA0IX 6H4EsdOomJX2kg/hRhJVVxm3sX/zmn87r9Fum/tKlkDFYTmAnDUVoJ7rlCgUuzHH8DwS QuPnhojZwqXr2XSW6HhlWm7VIgfEjZi50Ea1bZ4R+3m+Y3fnnezSFaVuWGen2JpYqC8g nI5w== X-Google-Smtp-Source: APXvYqzjw3eL+xmFFeLCY8pAtt0uU+dboybjV0Tj2XnMiuSE8KPva7u+GlTOi6iXLJ1oNBX2ZlUCDA== X-Received: by 2002:a17:902:a413:: with SMTP id p19mr129958448plq.134.1564712419691; Thu, 01 Aug 2019 19:20:19 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.18 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:19 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Joerg Roedel , Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Subject: [PATCH 05/34] drm/etnaviv: convert release_pages() to put_user_pages() Date: Thu, 1 Aug 2019 19:19:36 -0700 Message-Id: <20190802022005.5117-6-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Joerg Roedel Cc: Paolo Bonzini Cc: "Radim Krčmář" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: kvm@vger.kernel.org Signed-off-by: John Hubbard --- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index e8778ebb72e6..a0144a5ee325 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -686,7 +686,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj) ret = get_user_pages_fast(ptr, num_pages, !userptr->ro ? FOLL_WRITE : 0, pages); if (ret < 0) { - release_pages(pvec, pinned); + put_user_pages(pvec, pinned); kvfree(pvec); return ret; } @@ -710,7 +710,7 @@ static void etnaviv_gem_userptr_release(struct etnaviv_gem_object *etnaviv_obj) if (etnaviv_obj->pages) { int npages = etnaviv_obj->base.size >> PAGE_SHIFT; - release_pages(etnaviv_obj->pages, npages); + put_user_pages(etnaviv_obj->pages, npages); kvfree(etnaviv_obj->pages); } } From patchwork Fri Aug 2 02:19:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071761 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C1D514E5 for ; Fri, 2 Aug 2019 02:20:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F042628701 for ; Fri, 2 Aug 2019 02:20:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3A3C287C0; Fri, 2 Aug 2019 02:20:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 637B82877B for ; Fri, 2 Aug 2019 02:20:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D6FC6B0010; Thu, 1 Aug 2019 22:20:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 279176B0266; Thu, 1 Aug 2019 22:20:23 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 001086B0269; Thu, 1 Aug 2019 22:20:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id BBB6C6B0010 for ; Thu, 1 Aug 2019 22:20:22 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id 21so47103801pfu.9 for ; Thu, 01 Aug 2019 19:20:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fEUR/G5OnJcefSlX4AYJWWcgqHhC+JXxEofDOG22P/4=; b=X90YSg/b8WXVXiIp43Z1Y7aJgrAx6lO200+j/kYqCfT/trYf/l8/RkYX9kicjYR7Iv ej7LrQg/T3EcVtFEW3tjFitBjQzBwlPb3d9R76NsICi02AbTZiOmU/JpuNG4FHrZ/ZIm IU+Gf3XHSJPmPmXVeOIAFHwHRNOuUiEvEjwrZBd/sLWCoVdzynNyRX/JXi9zgnTDABD8 sLIggs7SRBIGWhavNdlKtr/TCVTkmrAEXFjjqkvJrYix+bbWsRGv+p1utr0ineDlXyAE g5Gg1cJeNQUF10HvcPJf+HuUk/yz1lmnckXfGQ9qUA60AHg5qnRFyrrkPtqtc0VgR64q CNwg== X-Gm-Message-State: APjAAAUq21dLDJ+o53pJfH/PvGk8gqV4q2Cm8phBMijVgLnO1pY8+niC KSxKyXG5GKgoZGdDbPCvqhV/HpT9vfr53RskDXzqAsZXOkh/lizJi4FG1TSb6TgA9A+yLlzltCH kXAfzl1HwvjWg7tXA2cU/8q9OBImm4NZHUlpRD6JfCkg4YbcM3NW8SegK3pkFU6LRVw== X-Received: by 2002:a63:7b18:: with SMTP id w24mr121465081pgc.328.1564712422310; Thu, 01 Aug 2019 19:20:22 -0700 (PDT) X-Received: by 2002:a63:7b18:: with SMTP id w24mr121465046pgc.328.1564712421486; Thu, 01 Aug 2019 19:20:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712421; cv=none; d=google.com; s=arc-20160816; b=0rZg3+XB6hMMZfyvWVEApNutoMrfREvClOWnBBWB6pVF2NA/VzV5a4T1W8+sEdpIJD JP1fpfdgMg3ENzuO2553oDwRfQguHKipHKYCvg/epMFyrocnqaFtHC+gNl/cBzBsJXXu vr4NUUEkHERg5NJrSBg3uugiXA7CjmCOVDDOTQIPa1MXtsH9LrnhiZIU8WxPm8M4lxYt xKmrzgKVkSA5ENNghYHuN58W9hj9RrMOcip8isUC0261a3v0DQKTK25WBbWp1FadTxCg mISOvYz6VaY1iYvsMry6r5z8CJTv7E5xHDAzlqD+P/sqqi7OwbynNAdduP/HIL/p3aOL LOwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=fEUR/G5OnJcefSlX4AYJWWcgqHhC+JXxEofDOG22P/4=; b=EwmrSljOZY5q+ZOaDHS1Yu6geiq7ke6FfAhlXe8fUP49GF9oWKEcNVvQh0vgZ7zeLX 1IiWX04po7kS05qkXyFLUodj3XGwDuk+Clt99xPLe094ItPTR+EPN1R/bmkqQoX7xIaH tIANx6ruTYZS8TLRnjsDGNNeOmoA8cDpJchrp7U9gdr+YnY82VP9W5iQkMVI9ICn0A2N NoAxcOndMwLcnVwOiqElu2SRiu4bwmwlZ3yVcnm5VBcjw9ZUx+j6xN1kmjeXPDPnHIwy 2maJ1zUXmm4txzNoDzPc4bNtmT3nDU6tEsOYbMTbabsyipXTr/qSFusJ6GV3xt1fLLlM X95g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ZjBIvPI6; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id d33sor89161499pla.46.2019.08.01.19.20.21 for (Google Transport Security); Thu, 01 Aug 2019 19:20:21 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ZjBIvPI6; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fEUR/G5OnJcefSlX4AYJWWcgqHhC+JXxEofDOG22P/4=; b=ZjBIvPI6FGYYuQaoM3wYb6xPjNep6A1qdBgLoxOD+angQDRZC9mN7qZBiGsA4x1Mmk DVp0b1Fq3km/l8LFUFJZZReS797zF2kYF9KrMWUllVa8HFfcUrM1hAE1P/qQjXzrMnOX JxD/xFl+WZHXSEuAGF9iElPEIqC+TRo873joNlnRMAHY9AMqSmLW3nsU27bTpXhcFKV6 4LeM2yIf45e6IoMit2yX6aFzmLhkspb/EkG8Tlqf3bZNN4WeHI7tMYFctQdF6liMtwoJ IvfT9HS49sxx2bYOPNOBswTMjccuTwXWnzyhwEMT1ktty7/Al6mbgY/88Wt++RCGQUor cVVw== X-Google-Smtp-Source: APXvYqx7CDlh0PC+iGQbvpFabXIK4hA95kcB6ECyCRgjU7tdLEhAXCZnA9jGvinS59yHHVq1pirulQ== X-Received: by 2002:a17:902:a409:: with SMTP id p9mr130268364plq.218.1564712421229; Thu, 01 Aug 2019 19:20:21 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.19 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:20 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie Subject: [PATCH 06/34] drm/i915: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:37 -0700 Message-Id: <20190802022005.5117-7-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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 i915_gem_userptr_put_pages(): it now calls set_page_dirty_lock(), instead of set_page_dirty(). This is probably more accurate. As Christophe 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: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: David Airlie Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Hubbard --- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index 528b61678334..c18008d3cc2a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -527,7 +527,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work) } mutex_unlock(&obj->mm.lock); - release_pages(pvec, pinned); + put_user_pages(pvec, pinned); kvfree(pvec); i915_gem_object_put(obj); @@ -640,7 +640,7 @@ static int i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) __i915_gem_userptr_set_active(obj, true); if (IS_ERR(pages)) - release_pages(pvec, pinned); + put_user_pages(pvec, pinned); kvfree(pvec); return PTR_ERR_OR_ZERO(pages); @@ -663,11 +663,8 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj, i915_gem_gtt_finish_pages(obj, pages); for_each_sgt_page(page, sgt_iter, pages) { - if (obj->mm.dirty) - set_page_dirty(page); - mark_page_accessed(page); - put_page(page); + put_user_pages_dirty_lock(&page, 1, obj->mm.dirty); } obj->mm.dirty = false; From patchwork Fri Aug 2 02:19:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071767 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 600D4746 for ; Fri, 2 Aug 2019 02:20:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 526B328701 for ; Fri, 2 Aug 2019 02:20:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45D39287C0; Fri, 2 Aug 2019 02:20:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C112528701 for ; Fri, 2 Aug 2019 02:20:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8DCB76B0266; Thu, 1 Aug 2019 22:20:24 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 864906B0269; Thu, 1 Aug 2019 22:20:24 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 690C96B026A; Thu, 1 Aug 2019 22:20:24 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 362786B0266 for ; Thu, 1 Aug 2019 22:20:24 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id u21so47115787pfn.15 for ; Thu, 01 Aug 2019 19:20:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=o2GwgSJoRuvPfZ2J7Awdgxw+WyrY01QvDnyFb1fV9Xk=; b=mlwnsEALdRsby1S2JOmRzQbifCV0qQdthJMEY1uDAeho67E3TDzCb5Vo4RHEge+nNp UwGhsioRe4ewPbWpJhsH56qvHC1CuJZycm5XNZTq1t5tZMq6z8nMhO90O/DYjtqNLlGW 9O8Ky4aWgw8CcMdz94uoHUlgDSWmeGa66/aT4tsXBY4HbffbTgjbxKu9UcVr4YlDobDe 9+6hcxrVs3psfh09+lrK68gO4mQ1imxr8Ohzo+Bps/W6yUBrWDTA336bR2iD4gqb2vLY 4/DhnGqgPAvhR2BifjQb6uoR8/bptMexcmhpA/m9mpDPNHtG7jzO6igtC10MzsNyzpbP p00A== X-Gm-Message-State: APjAAAVfTWm/zFH+bDVtRVkMto3fuKofZ82LUBmeasCsiCNMscDiPCTz 3Jvc4kqsJ4INuZ5bSCUeeqJEcv+WAibaPg7fTHqcIE5gtFonIRz2p9VzwRBD+99eYjvVfNdBGkD Mz55jMz+mp6FDiEOi+iSlaGxqyg6WlO+YG6nvRh91VNT4X9uFhcHr/YI2Jcj2wCXEBg== X-Received: by 2002:a65:5082:: with SMTP id r2mr95448743pgp.170.1564712423762; Thu, 01 Aug 2019 19:20:23 -0700 (PDT) X-Received: by 2002:a65:5082:: with SMTP id r2mr95448712pgp.170.1564712422991; Thu, 01 Aug 2019 19:20:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712422; cv=none; d=google.com; s=arc-20160816; b=AQGCUlKMqJq5H5+AZUk3VnIkTS5bSC19IM4BBO9a9+r8GYJfzR5/9JFEyzqhiCNmVY 6FItU7s5GRWia82UhNGMv8pP9ePjcGvSSA0QKADVAE/8qy045oWUsz2epOKXA7lVdvWq G7cMi0cf186/oUy3OPCj4+pC5SpjLO7kR33GJ/u3zVBbsDTnakDN7mGGhH09ounfvIFL 0gbOeP6a2Gvd9F6V1zeHcdZoBhW8NcDSgj2V3IRqIpGxulbimFZ+BWJ0XMcdkK2uegS7 iJlXSxW+zrGyVWbZWDjKk+HJHHHrf4m5D90dFBufn3RGFDQH/p6tA7lNmfmoj/+wp4Ij mzkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=o2GwgSJoRuvPfZ2J7Awdgxw+WyrY01QvDnyFb1fV9Xk=; b=D5BaEkdlXeivfkTw75pU5ZkKz2yQDKhrGWCt+uDVDVqvI458a1KbnVEiBMxzKINSzY RrRoQN1mkR2ssI3XmQ/KgEZtJbCAkFWyDBRy7veE5IOU9DNrJ6Cxw3MIIm8scLYLFj5z +4Rc2nu2k4+Jze5HxPFoQIhpwzXXNTRV+rtqlcwJsNB122AHBukHVZ3j5a4ASLl3AWDq OO4njqLHrKxY7CqGc073CJeMtMKTTfC7WnaziruNY2oLPLtclT27YYa/9ZcRjje6ZE4K A4nyWEJFMMKZaTpayWqSaD/v9N+6lSlljVQlb2IW+Hh8LUxdcknGBORuAqzi5s2xJEY4 kqEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=JHrYMRfe; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id s13sor87656825plr.24.2019.08.01.19.20.22 for (Google Transport Security); Thu, 01 Aug 2019 19:20:22 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=JHrYMRfe; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o2GwgSJoRuvPfZ2J7Awdgxw+WyrY01QvDnyFb1fV9Xk=; b=JHrYMRfeJbxJPRvVu2mUWlOPSRz5X9TsMoYGj7w11YGTme72BLb2VCmJtiT1crMj8E WFW+MhbnbkJpTwkrKMzEtbVI7vTqXv+SI+hFx6FZWh0IsKOr81DSRZrT3ou0zge/dnd5 EXgsdat7mGxiPUC4r8AnIJEtDvOIZL+G3eepAaSt906tZ2zy13M8CWEIWzA2V9xqXZwe 3r8aKK6oVTx9NMfrfbSmVNdddYS2ismfu/I+qiVZNMv3LWt0KFKP68hGnbZ9FH7YXxJX ux6o95ZiuMx2wtoGxh0CwNNs1fyU+QkDE3uHv/C0GSypFYyOdTrFbpn3G312jKYOi/u7 rhUg== X-Google-Smtp-Source: APXvYqzAaZbEuJQ23N6QFJdC6uFCaO+rLm14VcZtE9+tOy9uyfg9aPHBipIj9sgNkOpEwRVfN6Xk3w== X-Received: by 2002:a17:902:9688:: with SMTP id n8mr126124101plp.227.1564712422766; Thu, 01 Aug 2019 19:20:22 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:22 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Zhou , David Airlie Subject: [PATCH 07/34] drm/radeon: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:38 -0700 Message-Id: <20190802022005.5117-8-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Alex Deucher Cc: Christian König Cc: David (ChunMing) Zhou Cc: David Airlie Cc: amd-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Hubbard --- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index fb3696bc616d..4c9943fa10df 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -540,7 +540,7 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_tt *ttm) kfree(ttm->sg); release_pages: - release_pages(ttm->pages, pinned); + put_user_pages(ttm->pages, pinned); return r; } From patchwork Fri Aug 2 02:19:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071769 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B99CC13AC for ; Fri, 2 Aug 2019 02:20:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAEF128701 for ; Fri, 2 Aug 2019 02:20:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E1D1287C0; Fri, 2 Aug 2019 02:20:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20BF828701 for ; Fri, 2 Aug 2019 02:20:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CAB846B0269; Thu, 1 Aug 2019 22:20:25 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C62B86B026A; Thu, 1 Aug 2019 22:20:25 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8C746B026B; Thu, 1 Aug 2019 22:20:25 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 6DA326B0269 for ; Thu, 1 Aug 2019 22:20:25 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id m19so31964606pgv.7 for ; Thu, 01 Aug 2019 19:20:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qLhYs8BKsJD26dkkDQW7qDqDKRQ6ceEysj+E+zVe/Zg=; b=PRVbx2E1JV4vDP5vnBSCHXLkw1ErnQHtiFb+nj7FqMLvG9orYkCVSg6dZNbQqC1c8J dth9rjkNIPtTYMurKTVLqxMvtZe9I50VZRxdGcBCIR+SYk3oUwnLXK2BD+hOmGZyC/Yh apOD3mnDYb0ZLsE4MAHTSaLOVCB4dRPoG4xlah07jlUyFPLFqRyOGPdvOMOZNGKv30bH 6+85CsEuHJaHCJfLLIl7XCE6B7B/R1K4nccPsyMTKmu7c6oeZ9Ttd0U5Otv6IfRW/Jk+ DBzDOlFVQ4oo71ZDSEonl58y1hELEN3uGHkAsSTzqkXsmCGc0jyzH+YpRLezdRQYYCaa f4bw== X-Gm-Message-State: APjAAAVecmAZ4PmuHoOAc6iPp7vZ8ItGgo4HEJWOzAAUxYpppSdGG9pz tPpUhAHC1wh6ocWbVKoetKWRetmtq1zEI3OOToMQNlcTl4FoRDJ526JzAK+CTcZdqS9Ze22iXxI JjP0ZJeUEL44ZnflJ6CSH5n8GahqVmLVUpsLv496BuXp9oDRzZ3EUjRw62o+ZaNQc5A== X-Received: by 2002:a17:90a:8d09:: with SMTP id c9mr1873755pjo.131.1564712425105; Thu, 01 Aug 2019 19:20:25 -0700 (PDT) X-Received: by 2002:a17:90a:8d09:: with SMTP id c9mr1873722pjo.131.1564712424447; Thu, 01 Aug 2019 19:20:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712424; cv=none; d=google.com; s=arc-20160816; b=i8WnqB/qKVxcQpU+AUfqPyqeHwJej/qd29fFH9PY5XOhJsB+0269kjU9YRMVoWouXW ChxlwWb3dn7s3ikjaOS3qu5qF1xz2gQeljt0DJfkNEYEhhkUabTSYTiMPyca53oq+X3k 0UbhevXIF2VAF/u2ejVk/QvmdLH2qslruai9Mywi19z0qaBPX7Z82LXgxgqFmTw4cmt4 pO35AZBAFvlFB765MJUw4+TwEYkg410ST/aYns1kcJsu5JeltBYeK5GEbRY6S0ff+oLp uhrW02QvajYPWohlmju/8IdE4qASOVHLb5N6iuwoepRBqcqnJNHYK9OSbDMuJqIv6POR QP2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=qLhYs8BKsJD26dkkDQW7qDqDKRQ6ceEysj+E+zVe/Zg=; b=Amj6ci2Jas9yOtVQixghO/IBqsvW5MdsEOhnq1WvzfxlMysGrSu3+x5h5eenDN69HD tkD/vBBSfnU5XXRicB9eciIqxEM1BUB1P69HCmMqrVl8Xp9EIeyVIq/C0nGKtaEIrmxZ 4DqnhvV2WoGgj4FNBqMztZKvD+GsQJ61jwERSmIH5FdXO4Xmf7lzFokL1EQu8UM7NHnF f9/+G9MSHiXyhBf/PdEO9LVHyJO6FtmnHqrK8Z4mdYfQV5AW3ufwPVCBevcqq4aGhcT9 WdSy7K/xeX9a4emNlX4grwOiaRbWv+H6b90xGB9Be11fekFX35plgHE47e5UPbWlJAO2 y+eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mO2EsXIn; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a38sor88091962pla.0.2019.08.01.19.20.24 for (Google Transport Security); Thu, 01 Aug 2019 19:20:24 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=mO2EsXIn; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qLhYs8BKsJD26dkkDQW7qDqDKRQ6ceEysj+E+zVe/Zg=; b=mO2EsXInu3VlKA104JEnfgx6jDjnSEwvGouzsXnnB6AUhB4nvA/xUkFDDFSnp0kAVb uzJcZIfv98AAj+k04bO7VhQK6uHpuI27M0R+JJmNHqmsuBRinpXiyXzVO3vG2KOnwG10 9wLLSCL2f4bGbhp3gn22p2RGwRVC/ywoZ78m+PYeQh5xx0q2EjBUJcL8fGu/7GpGYNTC uoBxihJiCgimiOEov856ivIQlm2ZtbCKKeyCad06O9lOqE5uy2qRmSTr2cNmPxvRt3hH pW5v3ngGfAjNbaRjAeL1vDJ+MdUfb90y74Jjb2kpsnBznTRKzfySI1iA5+bGvCblKYHE C88Q== X-Google-Smtp-Source: APXvYqzyCRty8QPAc9XoTrRagrp/y/95vNaIlWT3LNdx/ZaWWXrbiDzYki+gcyf8LhQXoed6UV6NgQ== X-Received: by 2002:a17:902:6b0c:: with SMTP id o12mr26388046plk.113.1564712424200; Thu, 01 Aug 2019 19:20:24 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.22 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:23 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Andy Walls , Mauro Carvalho Chehab Subject: [PATCH 08/34] media/ivtv: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:39 -0700 Message-Id: <20190802022005.5117-9-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Andy Walls Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org Signed-off-by: John Hubbard --- drivers/media/pci/ivtv/ivtv-udma.c | 14 ++++---------- drivers/media/pci/ivtv/ivtv-yuv.c | 10 +++------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/media/pci/ivtv/ivtv-udma.c b/drivers/media/pci/ivtv/ivtv-udma.c index 5f8883031c9c..7c7f33c2412b 100644 --- a/drivers/media/pci/ivtv/ivtv-udma.c +++ b/drivers/media/pci/ivtv/ivtv-udma.c @@ -92,7 +92,7 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr, { struct ivtv_dma_page_info user_dma; struct ivtv_user_dma *dma = &itv->udma; - int i, err; + int err; IVTV_DEBUG_DMA("ivtv_udma_setup, dst: 0x%08x\n", (unsigned int)ivtv_dest_addr); @@ -119,8 +119,7 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr, IVTV_DEBUG_WARN("failed to map user pages, returned %d instead of %d\n", err, user_dma.page_count); if (err >= 0) { - for (i = 0; i < err; i++) - put_page(dma->map[i]); + put_user_pages(dma->map, err); return -EINVAL; } return err; @@ -130,9 +129,7 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr, /* Fill SG List with new values */ if (ivtv_udma_fill_sg_list(dma, &user_dma, 0) < 0) { - for (i = 0; i < dma->page_count; i++) { - put_page(dma->map[i]); - } + put_user_pages(dma->map, dma->page_count); dma->page_count = 0; return -ENOMEM; } @@ -153,7 +150,6 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr, void ivtv_udma_unmap(struct ivtv *itv) { struct ivtv_user_dma *dma = &itv->udma; - int i; IVTV_DEBUG_INFO("ivtv_unmap_user_dma\n"); @@ -170,9 +166,7 @@ void ivtv_udma_unmap(struct ivtv *itv) ivtv_udma_sync_for_cpu(itv); /* Release User Pages */ - for (i = 0; i < dma->page_count; i++) { - put_page(dma->map[i]); - } + put_user_pages(dma->map, dma->page_count); dma->page_count = 0; } diff --git a/drivers/media/pci/ivtv/ivtv-yuv.c b/drivers/media/pci/ivtv/ivtv-yuv.c index cd2fe2d444c0..9465a7d450b6 100644 --- a/drivers/media/pci/ivtv/ivtv-yuv.c +++ b/drivers/media/pci/ivtv/ivtv-yuv.c @@ -81,8 +81,7 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, uv_pages, uv_dma.page_count); if (uv_pages >= 0) { - for (i = 0; i < uv_pages; i++) - put_page(dma->map[y_pages + i]); + put_user_pages(&dma->map[y_pages], uv_pages); rc = -EFAULT; } else { rc = uv_pages; @@ -93,8 +92,7 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, y_pages, y_dma.page_count); } if (y_pages >= 0) { - for (i = 0; i < y_pages; i++) - put_page(dma->map[i]); + put_user_pages(dma->map, y_pages); /* * Inherit the -EFAULT from rc's * initialization, but allow it to be @@ -112,9 +110,7 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, /* Fill & map SG List */ if (ivtv_udma_fill_sg_list (dma, &uv_dma, ivtv_udma_fill_sg_list (dma, &y_dma, 0)) < 0) { IVTV_DEBUG_WARN("could not allocate bounce buffers for highmem userspace buffers\n"); - for (i = 0; i < dma->page_count; i++) { - put_page(dma->map[i]); - } + put_user_pages(dma->map, dma->page_count); dma->page_count = 0; return -ENOMEM; } From patchwork Fri Aug 2 02:19:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DDC66186E for ; Fri, 2 Aug 2019 02:20:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD132285C4 for ; Fri, 2 Aug 2019 02:20:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF748286A4; Fri, 2 Aug 2019 02:20:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A987E285D9 for ; Fri, 2 Aug 2019 02:20:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 905A36B026A; Thu, 1 Aug 2019 22:20:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7EF956B026B; Thu, 1 Aug 2019 22:20:27 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66B726B026C; Thu, 1 Aug 2019 22:20:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id 340F76B026A for ; Thu, 1 Aug 2019 22:20:27 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id q10so23249852pgi.9 for ; Thu, 01 Aug 2019 19:20:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5vxuyadJL7U7uLaLdbmi0wM48++CcjfxvCZKqh2vh4A=; b=gI0vGplMX/LDdx3V5hpCJIMNUzFZ2c9clYCyCCfXvdhKGVrSvkG0YOCtfkx7mhPAtu 0Jk9eeYln/M2jgp43PZC/Vxrdo32go23hed+NcDrgWVC9Ls2HXvUyjtv5OJW4PuSLmbF H/IF2bbT5b47SlbcMz3oCapSF4/0UrW5Qwg+kNB9y5FHWHcG1CL5v4SAuLDVzB0GCrmN E+k5Lcs7K8iL+ZhHxdCQL0v0mslP0kvGnaKZoDc4eLvUqwaP2lZplSNjrPYz3xdryIp0 YyOrKikWfQ/sfnWp1TtBBKHi4GiB74vm6pcaJbTgeg7bXCuxnNYb5y+rc+uDv76aBNxO k+9g== X-Gm-Message-State: APjAAAUGPPb/ZmdtnsFfpKWKGbcfUCA0bsKbfjuvgTv3OId0Qhbv5ylz Ht3Q465rXU3/U2phMTBDo9EH4z0ZAdTSFusRbBIgifJ20iCDEhXYm+xXqFUzkqRZ+wtq/wQyBHM Y20PcMx8QjbOSlf/wrNu7DNJlqZTy0KTEwJZ6ApE0Y1fKw9IczFonOab64cTyiyBfew== X-Received: by 2002:a17:90a:bd8c:: with SMTP id z12mr1927171pjr.60.1564712426895; Thu, 01 Aug 2019 19:20:26 -0700 (PDT) X-Received: by 2002:a17:90a:bd8c:: with SMTP id z12mr1927111pjr.60.1564712425978; Thu, 01 Aug 2019 19:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712425; cv=none; d=google.com; s=arc-20160816; b=LpCI1oBailUewayBc0ZCvKJZhMIA2VFb/4vL9XBYA7cU0pQPEix6tz3OEdxyJjLJSY zM2VR+praKa1SQufb3PETvnzAN+RCi/ta9eELeCo2Pk6fn4wZWD3eRK8O6pTZCy2ZvLD ti2eZj2ig5fIiFwWS9a6UDDVZwTeyvyfkzvICpftp6uCMm5DqklF8OEQsMJM7A6pf2vR kh0vB/De4GEfB2lon48G3MoIq1mQyiqtacqA8qoOiT2pSgpSe1+seqziMZ91evBc5Qn0 WKBYgPBzyykn7MoIPEWJfkMLRypSPQBTMQB1XRflkUXhiSyImPtKytGNLAisnCUQauNe lDQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=5vxuyadJL7U7uLaLdbmi0wM48++CcjfxvCZKqh2vh4A=; b=YRWj4qWNer/riFv3Pc9nRYitT6WAau26Mr9YeQujYQBiztqi8hhdqL8QyArUtc8ZEk /CwcCJaaoP+649ocvtypt2z8H33I6GPOYwypZr6e/E2yQAXG9rB8PoDAGzFLTj+vHZ6H 3C1LNcz2lK/IJqzW8T6XM1F+yz7JrDd8UCARZuLCD3NkagDDVv0f/DVeivGnzuKBzdai dtdzFeeWZqE5el4o06ors9GdQCaU70432p3H2x5pUdS2+9va5Tnft3bzciUoYgBTMN6b Du8wuXAPLKhg1DjNLt5C4XC935WAvlG7YJLJwtneXLa8mdlrgmXSin2aaC8Lbz+qzy50 l7ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IPnKJ+t+; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 73sor87844791plf.60.2019.08.01.19.20.25 for (Google Transport Security); Thu, 01 Aug 2019 19:20:25 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IPnKJ+t+; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5vxuyadJL7U7uLaLdbmi0wM48++CcjfxvCZKqh2vh4A=; b=IPnKJ+t+ZuscR+9jkZCr9SYsDod9H1pKxsH7GEiMUhOWm9vGlL+eTdFKhv7CAbJqfW uU/KQltFOReuOI2Tb15OkXQ52DWMqedLb39cjCQmyiEWLJR87wjugh79Hhbg0qc6zuHg MYJzaAbjIW3STqDPj5Lq2JXvJEE6XELaroV158AptkQMUJ7o1/IZqEXjs4JGgfMi9wWi x8L4AJBxrRgeZMqNQthxmzZvgld8OAsmXF7S7qthmuL3HABTVNmwDglQdeK4bcdDS+le GYNA0EDvk+skaAjBLW5tt19+LuDGuf6feAdMRYQaTc3LrWG+I4hPzx8Lwm1aQRwe4UW2 hk+g== X-Google-Smtp-Source: APXvYqx4n4e9g9/ly0KjHqDWX94uIzBzDxMQOC1nP9LzDlFTNiWIDkQ4j/aY6KUtiphGoFtrA+EDzw== X-Received: by 2002:a17:902:f301:: with SMTP id gb1mr126844849plb.292.1564712425718; Thu, 01 Aug 2019 19:20:25 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:25 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Mauro Carvalho Chehab , Kees Cook , Hans Verkuil , Sakari Ailus , Robin Murphy , Souptick Joarder Subject: [PATCH 09/34] media/v4l2-core/mm: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:40 -0700 Message-Id: <20190802022005.5117-10-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Mauro Carvalho Chehab Cc: Kees Cook Cc: Hans Verkuil Cc: Sakari Ailus Cc: Jan Kara Cc: Robin Murphy Cc: Souptick Joarder Cc: Dan Williams Cc: linux-media@vger.kernel.org Signed-off-by: John Hubbard --- drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/videobuf-dma-sg.c b/drivers/media/v4l2-core/videobuf-dma-sg.c index 66a6c6c236a7..d6eeb437ec19 100644 --- a/drivers/media/v4l2-core/videobuf-dma-sg.c +++ b/drivers/media/v4l2-core/videobuf-dma-sg.c @@ -349,8 +349,7 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma) BUG_ON(dma->sglen); if (dma->pages) { - for (i = 0; i < dma->nr_pages; i++) - put_page(dma->pages[i]); + put_user_pages(dma->pages, dma->nr_pages); kfree(dma->pages); dma->pages = NULL; } From patchwork Fri Aug 2 02:19:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071783 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E5FA913AC for ; Fri, 2 Aug 2019 02:20:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4711285C4 for ; Fri, 2 Aug 2019 02:20:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C801228620; Fri, 2 Aug 2019 02:20:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4458D285C4 for ; Fri, 2 Aug 2019 02:20:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0CC6A6B026B; Thu, 1 Aug 2019 22:20:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ED46E6B026C; Thu, 1 Aug 2019 22:20:28 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFF796B026D; Thu, 1 Aug 2019 22:20:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id 8F6C86B026B for ; Thu, 1 Aug 2019 22:20:28 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id 6so47130173pfi.6 for ; Thu, 01 Aug 2019 19:20:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Qd17+I20JNTl38JpPt9ENs79+ajS7TX5o2e3ywFXns4=; b=EZ75VMTYGMZZbNCNEAaV1e46YbHY0ppgCRxa/ZvQdkls8KtdS/jBB4N30fb4EQ+60l qYTGPbKC9zEVmAadwizR/fSeG06l8bpvL6sKf/UKbM11mPpK6t6w3b9i8B12arRw9r91 kEEzfO2tz6vVceJLUCZ1jUtyyzChT/x6vOV9qgMKM5JLDlByp2oEjgGkMK8Vv5Vjn24+ vVVVV2KcOfz6hkuZAj2HOWeJmi50qsTw9z1dsM11o4yyA5TYNm/ZorbvkFdMhCM7zv0w FZcwQHiWS6x6vZ3rTSpoRXNsI/AsDZFGkXFDCr5+JT4Otc2SCqdlPNsZn3GZkYBhK74s GY1g== X-Gm-Message-State: APjAAAWq6uvXAmurqghU+KT9dIRpGVUO9rj41cHJYL8yvcnWLiEWF8pp W7i+ucB94/Pk8e3959vgN8AAtWcvMsbl6ylOFHtVOCyfaLj6OsUt90aPmdpksYEf7nn8fXAbd1t d4gpI2bP7jMY3lwaFW1QGxsqV+OGjtCjSNUXTUTsMht9S33U+5zO8AMdU3bswc8qBhA== X-Received: by 2002:a63:c1c:: with SMTP id b28mr89876845pgl.354.1564712428187; Thu, 01 Aug 2019 19:20:28 -0700 (PDT) X-Received: by 2002:a63:c1c:: with SMTP id b28mr89876819pgl.354.1564712427498; Thu, 01 Aug 2019 19:20:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712427; cv=none; d=google.com; s=arc-20160816; b=coGJPUDQcg7DDK+BwLs2RuA1HBndEA8mkjcaVezdAmczbxR2PnD/VSbATJs97uL3WH Ay5ptdf4eYRzoxzjT7ATrU8kIYhf0qqPd1a6PsO6DCXvPkmohyLu5Oh6dMAx9zXC5rF/ r3lXqLjmkv9anypZyQIxiB7Wm4W2Q+gppy6NpRvqUzHRInBDiWCcPDzmyTVNdOwnzb9s 6HJ/S3E7JvFCnAtfZbWVSXaAL5NPdGPX9yO4sEBvujg/64KWbdw1/HA5i5juWJv1zwDR CxM86Mh3ADgE6F3uu8M6K7BO+Xs7LRsQwg5dr7qkEmTKM1YNcre0J4/fFwY2VzOmPa/7 gowQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Qd17+I20JNTl38JpPt9ENs79+ajS7TX5o2e3ywFXns4=; b=VCMLXQhE97I29aCvWFh2JGVFhuvi0DPChs0XCGPqfWILk5SQNDCGba3Y6b58OiXnYW 7VOWSnTU43OxMok6Isod0gzCdJAKeFmCYTI/HW3IOWV15Opn6Wx0eGYPB5/ZtKZPII7s yvKNwGI3WmAkbYxPRCkYQiiCnp9FSHpPO04fAS75p09sSQo8W0aUKQHIGoDvOrt2CvFl n4HAq9CNlOPnhgRePB922JaoEoHZPS610Q7HqZuswPEwYsUUSgkGfpLQocGeAPswxRis jlENTV6GUgD+IO7liseI7lSW71mhDPfDROd9gtkvAD/RCHKtPNZMYcUDgX351AHvOXzk y59Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gkgYcjKv; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 31sor49670699pgy.17.2019.08.01.19.20.27 for (Google Transport Security); Thu, 01 Aug 2019 19:20:27 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gkgYcjKv; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qd17+I20JNTl38JpPt9ENs79+ajS7TX5o2e3ywFXns4=; b=gkgYcjKv8mviCpscfvidKdy0yp2exmwhbdFHg1VYLE3YGnNwT45rP9cYRgwxWvdSGD XzCmVpBd7+RlIjI+MEb+wWJpyo2f4ZmUYQSjUgDqWwLqeKRJRBA6AZnXsK08IyCyXhiy 4dNgArxki6iOU/cWoHR8rdD6eQRfJHzRIm1i/ZNo3u5RbTwbDPqtUA6ksm0/Lv2IxLjK q70kCAhSPRAGOQENe2IrIBNCWn54pipkVfZgN+QCwPKsZgDTTDuP78ZHv5mKxve9ym1t pLsjPHA1rQycUPxkIzWtiiwiI/XQHl1n8MJ/ZwIZ8xTcRU1Mrrugy/JGwgBrkRXuy135 NXOg== X-Google-Smtp-Source: APXvYqzcfAPxLmmHN9CIJXSofnjYAmirbplKZ2y79i+8ei53QCOaijMzmdrNExYuUwo7YKHbzyVulQ== X-Received: by 2002:a63:4e60:: with SMTP id o32mr124066909pgl.68.1564712427200; Thu, 01 Aug 2019 19:20:27 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:26 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Frank Haverkamp , "Guilherme G. Piccoli" , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 10/34] genwqe: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:41 -0700 Message-Id: <20190802022005.5117-11-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). This changes the release code slightly, because each page slot in the page_list[] array is no longer checked for NULL. However, that check was wrong anyway, because the get_user_pages() pattern of usage here never allowed for NULL entries within a range of pinned pages. Cc: Frank Haverkamp Cc: "Guilherme G. Piccoli" Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Signed-off-by: John Hubbard Acked-by: Greg Kroah-Hartman --- drivers/misc/genwqe/card_utils.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/misc/genwqe/card_utils.c b/drivers/misc/genwqe/card_utils.c index 2e1c4d2905e8..2a888f31d2c5 100644 --- a/drivers/misc/genwqe/card_utils.c +++ b/drivers/misc/genwqe/card_utils.c @@ -517,24 +517,13 @@ int genwqe_free_sync_sgl(struct genwqe_dev *cd, struct genwqe_sgl *sgl) /** * genwqe_free_user_pages() - Give pinned pages back * - * Documentation of get_user_pages is in mm/gup.c: - * - * If the page is written to, set_page_dirty (or set_page_dirty_lock, - * as appropriate) must be called after the page is finished with, and - * before put_page is called. + * The pages may have been written to, so we call put_user_pages_dirty_lock(), + * rather than put_user_pages(). */ static int genwqe_free_user_pages(struct page **page_list, unsigned int nr_pages, int dirty) { - unsigned int i; - - for (i = 0; i < nr_pages; i++) { - if (page_list[i] != NULL) { - if (dirty) - set_page_dirty_lock(page_list[i]); - put_page(page_list[i]); - } - } + put_user_pages_dirty_lock(page_list, nr_pages, dirty); return 0; } From patchwork Fri Aug 2 02:19:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071789 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA18C13AC for ; Fri, 2 Aug 2019 02:20:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8D702852A for ; Fri, 2 Aug 2019 02:20:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBA58285D9; Fri, 2 Aug 2019 02:20:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 270A62852A for ; Fri, 2 Aug 2019 02:20:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E8466B026C; Thu, 1 Aug 2019 22:20:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 273946B026D; Thu, 1 Aug 2019 22:20:31 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 076B86B026E; Thu, 1 Aug 2019 22:20:30 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id C14776B026C for ; Thu, 1 Aug 2019 22:20:30 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id f25so47044228pfk.14 for ; Thu, 01 Aug 2019 19:20:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=34zW6BJN89MycamN6XZc+aPi3iIpUXsyW4mngm2d11Q=; b=Jd1u86ENORQ5h2XsNayKhfO/JaCR1RfBTWxgaXeBTzjOQyIOa37b5F1EWeaO3Tn1bQ pUlo/CnRKIUyaRFUDFiPx+xw29clA2zDwyK0QEtfI378Q9J4Vpl2nvasObUMf7j1glt5 fC/DnMmBODdAG9bz7u0LVkCmS95HGTi10a2q8I6l86xGlTLPBhjayESjBAxImB2Pqb6x O1PXK1Joumx2x2PNyn5Kyy86Sp65xwONTuQkFU+TXfoNUyH5x7VLFoGeMENktvKXwH7R /Wt5E20NCLtpQhF94mRn2mEgJVPzAj4RkDVBNnFC3UJ0Kt5Aq0g2vydHxNjF4AUUxEQJ XmMQ== X-Gm-Message-State: APjAAAVdiA8e3BcrG0py3QmttX421eKc+WGIbfK3NegTmhbcLctyJKBy FnFo1t/RvEK0oqtym+Nn2paOx9Pbs7JYUBVnvMp9JqDTEv5/aF8rGazyPVQOj3ls+ZCcAtqRohc YkS4vUeBMBW/v+mII4jQPp5gfVc9ZMVI8JAlPDccZm1IE0N0UvOSUTjLwhvgg8uT/7Q== X-Received: by 2002:a63:4c5a:: with SMTP id m26mr119901477pgl.270.1564712430323; Thu, 01 Aug 2019 19:20:30 -0700 (PDT) X-Received: by 2002:a63:4c5a:: with SMTP id m26mr119901446pgl.270.1564712429538; Thu, 01 Aug 2019 19:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712429; cv=none; d=google.com; s=arc-20160816; b=Jxey2pYIaZ3zQIqkHltqYAoc7zANqpavIZnmL90yhhlTrVquEff/lxTdcfHLT73rbY YIBuMltJpqpKS4mKy663WAEmibeL8mW97L9lIfm1FURSYv4V9sMddjMuqbCPg3dyFfrj m0WHuuxIH8oiaDTr9k8o6pPhxrbdMVHuhL0A9/E0Y/NBhYaymoW3fpo8phu44Jfcd/q9 EuIV82KRRTIsa2hktwFE4XVdRWOysf80HHo9z69GXIBS1o1k3W8Tv+NIVBCEZXRFQUl9 ctHDtWcOTMiR0cuIvLlxZiLvBk5Ns3/H9rbUurm5Z/XuEF7Kv3WPhJ3gwrY+QltdCnNA Ec9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=34zW6BJN89MycamN6XZc+aPi3iIpUXsyW4mngm2d11Q=; b=Krb3OQmbkrVfx3/vChbWRP9pzpmvQK8Jnd+JUVLIJCrQCjO9U1TN1Mfu1zPppMHJ2L V+8NLeSV9onJYuSdcImJvTWyYIOlS3twkrVCc12cDF6xv5BAuJAUv1HNIYEygdjYd1r0 kn2GCBUQKSTIsyjo1e2HIMgDK3hfnAf5h9nq9wvIkYsY7cUEyTuOw0pErefoykqbXG1h xImxhIo8faSaEn3IgShawg0Bgo743ZhqGGlkySW24xdbxBP80YNRp6EjJMeE0yKrEy0X uwSt/SqRHSrK56pHn9uiieU4/TpqWmWwIzzyfYx+HhbE/6K8nAootyy4vn3dsp5IdwBY u+DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=t5NAqE3V; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l6sor24469932pgt.33.2019.08.01.19.20.29 for (Google Transport Security); Thu, 01 Aug 2019 19:20:29 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=t5NAqE3V; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=34zW6BJN89MycamN6XZc+aPi3iIpUXsyW4mngm2d11Q=; b=t5NAqE3Vka8KgkTsGoLz9ngltlH4Rvcpb6lwK1UP3GX3tIbQ8zi6/BtK7Yp4TzERha wSeLot/t6ZWJImnvKBZhoEDQI6w3o5UiMaJgEpqqKVxcZT34GhcoUwN2IZVyDwqCPKlC a7Buv+1Wht5mLnbtK6+0hFPG1gydiYPwhnLgxc7zgGLfQhg2ssESYfy+n2RPvUdztRim jUlI8gdPL0+PZqp56ewu9yAP9JBceuh2IC1TKvQK+F/6hCHCM/byLJfkcX1hvyboPVI9 xbVnybXy2ozmgwqFr15PYWmG4HhsZR295UWof1NeRQ0AKr4kLzhdz4MTCgaGRcNk5CYS eE0w== X-Google-Smtp-Source: APXvYqzeCy+7cVID+Rr3XWOFQDSekWzD7T6/ZvL7pRVEGXoHJuKXgEeLRZGzPIVKoEslJMD2nH6qbg== X-Received: by 2002:a65:6454:: with SMTP id s20mr122064853pgv.15.1564712429240; Thu, 01 Aug 2019 19:20:29 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:28 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Sudeep Dutt , Ashutosh Dixit , Arnd Bergmann , Joerg Roedel , Robin Murphy , Zhen Lei Subject: [PATCH 11/34] scif: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:42 -0700 Message-Id: <20190802022005.5117-12-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Sudeep Dutt Cc: Ashutosh Dixit Cc: Arnd Bergmann Cc: Joerg Roedel Cc: Robin Murphy Cc: Zhen Lei Signed-off-by: John Hubbard --- drivers/misc/mic/scif/scif_rma.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c index 01e27682ea30..d84ed9466920 100644 --- a/drivers/misc/mic/scif/scif_rma.c +++ b/drivers/misc/mic/scif/scif_rma.c @@ -113,13 +113,14 @@ static int scif_destroy_pinned_pages(struct scif_pinned_pages *pin) int writeable = pin->prot & SCIF_PROT_WRITE; int kernel = SCIF_MAP_KERNEL & pin->map_flags; - for (j = 0; j < pin->nr_pages; j++) { - if (pin->pages[j] && !kernel) { + if (kernel) { + for (j = 0; j < pin->nr_pages; j++) { if (writeable) - SetPageDirty(pin->pages[j]); + set_page_dirty_lock(pin->pages[j]); put_page(pin->pages[j]); } - } + } else + put_user_pages_dirty_lock(pin->pages, pin->nr_pages, writeable); scif_free(pin->pages, pin->nr_pages * sizeof(*pin->pages)); @@ -1385,11 +1386,9 @@ int __scif_pin_pages(void *addr, size_t len, int *out_prot, if (ulimit) __scif_dec_pinned_vm_lock(mm, nr_pages); /* Roll back any pinned pages */ - for (i = 0; i < pinned_pages->nr_pages; i++) { - if (pinned_pages->pages[i]) - put_page( - pinned_pages->pages[i]); - } + put_user_pages(pinned_pages->pages, + pinned_pages->nr_pages); + prot &= ~SCIF_PROT_WRITE; try_upgrade = false; goto retry; From patchwork Fri Aug 2 02:19:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C2E3514E5 for ; Fri, 2 Aug 2019 02:20:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B33B52852A for ; Fri, 2 Aug 2019 02:20:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A64F628628; Fri, 2 Aug 2019 02:20:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 106822852A for ; Fri, 2 Aug 2019 02:20:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77D406B026D; Thu, 1 Aug 2019 22:20:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 72BFF6B026E; Thu, 1 Aug 2019 22:20:32 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F7296B026F; Thu, 1 Aug 2019 22:20:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 25BAD6B026D for ; Thu, 1 Aug 2019 22:20:32 -0400 (EDT) Received: by mail-pl1-f197.google.com with SMTP id a5so40762792pla.3 for ; Thu, 01 Aug 2019 19:20:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qtbgyNHZ/W16Wsr49ObVlGXNsYs5Ix8cECAWpHw8QNg=; b=W0Iy836ebfyqLHHZn7hSq2WwsN02Ij0IFTBd4WBAi/BEN/P+h58C5O7qJF5FsTE3ec RuN2F/9USe0dnvIwpHAkPEDqaBwDfUwy+Dw5ljTQDjSjXHaQnfjHe4Uuk4uAk9uZJiOR In7J8QF1OW3JalI2M5nf6f6uoNTxwUR8YRyPCEEhEks8CErEhWipIbJaPCKyFoFi45NF UJjEGgKi1JnUdNG4LD9wLu3tp1n+Uug2Czf69/dSjcHccvhWSnW5NYlO3Kqf3gFm2l39 VTDygYy497cRgCGKn82Xql2Ox/rasvCinvrUjFOLUBsf5mkVR7PXHmKRp1tqCtlqoW0e TrSQ== X-Gm-Message-State: APjAAAXQk7ok8QQFYFCrfc3tLIrXJpkQ1OTKZ9Fax27K8UZ0suhg+EBz obZSvA+tFc2XNRiAjvQofP44KxKzIm12CJ6p52IkXRxsY1eSGiVsLgasJgBZ9CAIojIZwbRA1Zk KY3uEDgB0E6vw9Rt1vnw6txFCkWwi4VPvqKStwooiWtB3prZnHbfwGGaTWGc42dImww== X-Received: by 2002:a17:902:3341:: with SMTP id a59mr10419449plc.186.1564712431796; Thu, 01 Aug 2019 19:20:31 -0700 (PDT) X-Received: by 2002:a17:902:3341:: with SMTP id a59mr10419411plc.186.1564712431090; Thu, 01 Aug 2019 19:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712431; cv=none; d=google.com; s=arc-20160816; b=rOp6VB8HVjOrPRx2In/gkMX64E5VAnxm0K+AEUucASkgmCzkbrm9t42S2vHwCSvVfd Sl0bOAWnI21vGohxldATHZhuybG5EZazmMiCzU03qbgzyVqBkn6WGekU8jIygiRF/AbE FPMgpx9NItD89gxb49tgu7CV8HNh66dvjiqBhB2ANLzZn+ksXWRI44cNFgniCHQIcTaA 4E/7SjcOnxdSaHcug74IYazgDYSrMUz8FWPyO3hFR0MnBSRzSAFuJfQDK3VDaErgTZ7m iOBUIu/xKdahrz6Je7gjNoEpl07KSL9VwLpxsuRf2jTbxdU9VvO3yJ+SV9SGWJ+Bm0Wg V63A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=qtbgyNHZ/W16Wsr49ObVlGXNsYs5Ix8cECAWpHw8QNg=; b=ze5YRWy290UwH5jphNceSyVjk+xoB4viiKa/E4qQ9edV97mA/WEGeteajmehdDSf1u 03up3Ew3LNhMtk1UBj588BgwMOXGhQCkaEZ+VkqALC9X6zd1czeY/+exbeAupEYE3ncR 5E4DbslZeTIWremaBIgndi6SBMzCcCATMuY2C3ixXtP/0GrAT+H8EAWwvQyzOmvKBVvX +btpCbHlMTc/0RnUSxL1z1FFLBuwG3e+bnmNYtP8Tq0lXu4TPiOQYgVEtDTo9HYqZChL 8XEmANLKfb1Q4VvtABPnIM5IW5xqc4SbwKHaDqr3vEsWgpGJv1YFlSSJ1uJcV5fwM9Ib bYBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RO5t4Ioq; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id ck2sor86124273plb.1.2019.08.01.19.20.30 for (Google Transport Security); Thu, 01 Aug 2019 19:20:31 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RO5t4Ioq; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qtbgyNHZ/W16Wsr49ObVlGXNsYs5Ix8cECAWpHw8QNg=; b=RO5t4Ioq4WOEkql+z1BxTA9XpQ5l0uBsUNJdBVpEbEdDpylZNAFokBSBfkt63Vmsnw KKnFnDLW2SLxaXe4yEcd4Uwphs0F9rh9yrBF7wrtI6jX7Smsup4E8B+OCU5PAghiuPUe n/rru2nRkN4fBDLxv0E5LWIc3+ez3bVuBV4gRzIu0YbbR7/jG/nHlqRg4ui2ABpoKbbs zzA9SmSgidMvseL2Kb+bN8XRYc2qyorbmCL2eKn81WG2j5TabLu8TlIG3hp8Y7Gq/i02 vYgsWfOu94xgHEddrADmlOmkGGALS2TQwhC3ZfS61Jjz+jw13+1q5hfNRcQVjxbv88fI 6ULQ== X-Google-Smtp-Source: APXvYqwKrOY4Kztkj41s0a6oi7zayzaXd8LpjaiCIksbrU4wJsvnJgU6mF0Bb9Hw/Pj5xfTEZIafcQ== X-Received: by 2002:a17:902:5ac4:: with SMTP id g4mr131986648plm.80.1564712430821; Thu, 01 Aug 2019 19:20:30 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:30 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Arnd Bergmann , Al Viro , "Gustavo A. R. Silva" , Kees Cook Subject: [PATCH 12/34] vmci: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:43 -0700 Message-Id: <20190802022005.5117-13-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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 qp_release_pages(): it now ultimately calls set_page_dirty_lock(), instead of set_page_dirty(). This is probably more accurate. As Christophe 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: Arnd Bergmann Cc: Al Viro Cc: "Gustavo A. R. Silva" Cc: Kees Cook Signed-off-by: John Hubbard --- drivers/misc/vmw_vmci/vmci_context.c | 2 +- drivers/misc/vmw_vmci/vmci_queue_pair.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/misc/vmw_vmci/vmci_context.c b/drivers/misc/vmw_vmci/vmci_context.c index 16695366ec92..9daa52ee63b7 100644 --- a/drivers/misc/vmw_vmci/vmci_context.c +++ b/drivers/misc/vmw_vmci/vmci_context.c @@ -587,7 +587,7 @@ void vmci_ctx_unset_notify(struct vmci_ctx *context) if (notify_page) { kunmap(notify_page); - put_page(notify_page); + put_user_page(notify_page); } } diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c index 8531ae781195..e5434551d0ef 100644 --- a/drivers/misc/vmw_vmci/vmci_queue_pair.c +++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c @@ -626,15 +626,8 @@ static void qp_release_queue_mutex(struct vmci_queue *queue) static void qp_release_pages(struct page **pages, u64 num_pages, bool dirty) { - int i; - - for (i = 0; i < num_pages; i++) { - if (dirty) - set_page_dirty(pages[i]); - - put_page(pages[i]); - pages[i] = NULL; - } + put_user_pages_dirty_lock(pages, num_pages, dirty); + memset(pages, 0, num_pages * sizeof(struct page *)); } /* From patchwork Fri Aug 2 02:19:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071795 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5190B746 for ; Fri, 2 Aug 2019 02:20:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42E6E2852A for ; Fri, 2 Aug 2019 02:20:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36441285D9; Fri, 2 Aug 2019 02:20:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA3DB2852A for ; Fri, 2 Aug 2019 02:20:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F44A6B026E; Thu, 1 Aug 2019 22:20:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 752316B026F; Thu, 1 Aug 2019 22:20:34 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F30B6B0270; Thu, 1 Aug 2019 22:20:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 2B7C06B026E for ; Thu, 1 Aug 2019 22:20:34 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id e20so47142618pfd.3 for ; Thu, 01 Aug 2019 19:20:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=60C6UutqWDg70MnmR2wOYRHcozVv05mGJual4EWfkd0=; b=qP04Ro6T7fJLSZPPjdXGrSZhutjHwdMuuKS6ysYJxSWSBFnXx5HNBtneQ7JWwyORTo TgMGRLbRrX1iSai6MHFJpWMPrwTHUWD8SEcaPYjPn++r+lNGloIFYg9jknL2R+0K50xk IhYn5vL6RPY8R0OTt0Eg4E4N+lruemngRdaHfbH739pYelbm8TyWtMONmmaKPb3Ns1zs t8nv9H1e0NlKArTZqx5gEA4A0AO+P51ysuwya1QZW6fhr4b7+BPNrg6MIvWPZLqRUTEU krMpkF8lyd5vs9IO5zoq4jtpK4Q8g2Xi0BQYc7bpzrtnWTNSPd4laIFjbKyuo2JwbGDI JtuQ== X-Gm-Message-State: APjAAAVYAcliFIktqOUsh6w27IxD7NN5iJ4A9WBEvOoJXoHKGrPSXkMC +NoULCGwxabCoP6Eam5Uai9PphSlA5mBAkmIBMToHEpG9C7JgwS3mOOEpHlagbPizsFiC8X2jCr J0fUw2eO2N9vgpopf2KBJDZkIn6NhtsO/hmrI2ldV/5fH+Ea5M4rKks9m7tVM84Ta0A== X-Received: by 2002:a63:dd16:: with SMTP id t22mr90682616pgg.140.1564712433778; Thu, 01 Aug 2019 19:20:33 -0700 (PDT) X-Received: by 2002:a63:dd16:: with SMTP id t22mr90682567pgg.140.1564712432758; Thu, 01 Aug 2019 19:20:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712432; cv=none; d=google.com; s=arc-20160816; b=Ac/RjM/UNJlVTVUr40YAEqIHjq1f7mamFrbddWuhiva4w/f8Q8wYY7QCwJaZM7yhQF nqSjgkssXLQRAIJpAl5UbBVvdC5lORX3sa5/oMOlrDir776Ma0AnWN3kvKt2zPaNBD81 ZateRnLJHQUDLS6xbOmdNo54xMcTXqjdjhEDUh+nd+3ZE1D8H+SEANe71CcPXB3FOwZ7 8TbykTQ6uxoK9jgaHNAIPE2JJqTRjo05wYzuAez9eEmml2aNND2tlyr0hhKZVqXJLaXR I+H/42ah3PUSXixvuhf/NvPSSPlU9QHTELicKy68tK4VCGmxeIBPQ0/6BgeTBNDNkKCC mFlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=60C6UutqWDg70MnmR2wOYRHcozVv05mGJual4EWfkd0=; b=nwPJK+RSoQIxjbNpxbSJ0y9o0R6IHyXU6St0L0hBxEAYC+kkscdgXPuId1EM9ytkL0 h0krdnzwDkc/HXqzjvofr1z5Y8nlnMU6KcmTdg7BPDnvhlBJea32Mg+sTGoO+jK2WJSE UNrkEGWXZaJAa6MCLNecT6ydlOam9QiTazOQ7woysub88LEJMKOfWpFrabWSOiHSMEHG huZ6JAkq/fd0OLtdd5O+ViN3saB+jMMHXRV/Uk82fJoWGJ89BpjRzaovsQ8h1LXYX7hF s5gUw5wuaDmNT4Z4e0fhwchuze6QhYiDBD0JzmCk46WBLEvGL8+MYpb4eJVS8zaiZMG4 /CcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=OcjBgeGu; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id z64sor54779653pfz.10.2019.08.01.19.20.32 for (Google Transport Security); Thu, 01 Aug 2019 19:20:32 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=OcjBgeGu; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=60C6UutqWDg70MnmR2wOYRHcozVv05mGJual4EWfkd0=; b=OcjBgeGu8UZCjg/O5HE3tZTmbKV/JxG356gcwN7XI4m7laLxmDfYwr2J+xgouxj3fQ Co0dhwd0qY47xArJmyB+EhpJv8h8AiGjGK24lKEHkHPsH9RjihM7pMRvNW+41GJgCLyu 4QfSp0AC2zblPx9c01ipPR4kYld7HwcvdeZgybQdYrqzUfXd232AEHGN5xFwKTyZmR0/ 4nQ8d9yxpivs4/vMxrtO/9Xc8hiQJpvET/VRicWc2zu2qdEUBl4z9cTSyxwtCJdabvcM Ei+d8hsTWnZC71PLDlgF5ytQlKruZFkMxa42zlyyGk4z93JPolm9Mu5LN9FxicLHKdhc nCzA== X-Google-Smtp-Source: APXvYqxJWuQ3PRZS25/rGW/r93tu8qJViELHafWX8OhR+SZHdvKx4eGJZdpIEmnFGk4IpVB5b1wjUA== X-Received: by 2002:a62:d45d:: with SMTP id u29mr56669248pfl.135.1564712432510; Thu, 01 Aug 2019 19:20:32 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:32 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Matt Porter , Alexandre Bounine , Al Viro , Logan Gunthorpe , Christophe JAILLET , Ioan Nicu , Kees Cook , Tvrtko Ursulin Subject: [PATCH 13/34] rapidio: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:44 -0700 Message-Id: <20190802022005.5117-14-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Matt Porter Cc: Alexandre Bounine Cc: Al Viro Cc: Logan Gunthorpe Cc: Christophe JAILLET Cc: Ioan Nicu Cc: Kees Cook Cc: Tvrtko Ursulin Signed-off-by: John Hubbard --- drivers/rapidio/devices/rio_mport_cdev.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c index 8155f59ece38..0e8ea0e5a89e 100644 --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c @@ -572,14 +572,12 @@ static void dma_req_free(struct kref *ref) struct mport_dma_req *req = container_of(ref, struct mport_dma_req, refcount); struct mport_cdev_priv *priv = req->priv; - unsigned int i; dma_unmap_sg(req->dmach->device->dev, req->sgt.sgl, req->sgt.nents, req->dir); sg_free_table(&req->sgt); if (req->page_list) { - for (i = 0; i < req->nr_pages; i++) - put_page(req->page_list[i]); + put_user_pages(req->page_list, req->nr_pages); kfree(req->page_list); } @@ -815,7 +813,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, struct mport_dma_req *req; struct mport_dev *md = priv->md; struct dma_chan *chan; - int i, ret; + int ret; int nents; if (xfer->length == 0) @@ -946,8 +944,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, err_pg: if (!req->page_list) { - for (i = 0; i < nr_pages; i++) - put_page(page_list[i]); + put_user_pages(page_list, nr_pages); kfree(page_list); } err_req: From patchwork Fri Aug 2 02:19:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071797 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3C90C13AC for ; Fri, 2 Aug 2019 02:20:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CD7F2852A for ; Fri, 2 Aug 2019 02:20:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21015285D9; Fri, 2 Aug 2019 02:20:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A40CA2852A for ; Fri, 2 Aug 2019 02:20:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 224436B026F; Thu, 1 Aug 2019 22:20:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1D5FA6B0270; Thu, 1 Aug 2019 22:20:36 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 050166B0271; Thu, 1 Aug 2019 22:20:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id C2A166B026F for ; Thu, 1 Aug 2019 22:20:35 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id q14so47138309pff.8 for ; Thu, 01 Aug 2019 19:20:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6zqhiQUR/t5HSZML/x55nFGZKGW5GK1LULKEmO0k7kA=; b=Q0uqyhjDn5CAHW1mIYEldoESJTNTYtWB7EhVn9sTRY1eea0CVgJs1pdpYQXPobtBeC q5hF6BuuFAKjfjoHe8QGzHaT07GzfEVqhW05BOeZPJIRo0paflnpvCnnqVDugs24dcud uNIuB4IE9SOB4wcM97VV9Z8104GGtKhuDI3rlw9RXnOJlJPSYzbCH8TsPI4exaOHgLqk yd/nja/QEP7E0PtHTkO6rtIqZ2ZvwaJElOGNvKq01OC6LO9VwwDmBUnnxkmO/mJE1zoY K4veEBRFKNpUY8iqb3xQJw4IT5Sid5FbKCdrNgaa0N3e6D7jGfOkTKT4TX3My6J50BVq MhCw== X-Gm-Message-State: APjAAAXkdng9AOyN1tvjZzs1xvdkdFY/3uJr4kxfaoVKPaH/Tt3w8u8h V9/LZ8lOSw8YwSIHGwY0Vv9fHOvQqRaH1D+bn2VUaOWLKvfyhL+wa+77s7lcmEg4V13/DQFW6ld WIk5i+jrdvXmRNss7caCioG86tfqe6Y8AkqWhbMMYq/LQ/CrXfY9W6UZYbX22O4S6tw== X-Received: by 2002:a17:902:f81:: with SMTP id 1mr33907607plz.191.1564712435467; Thu, 01 Aug 2019 19:20:35 -0700 (PDT) X-Received: by 2002:a17:902:f81:: with SMTP id 1mr33907544plz.191.1564712434448; Thu, 01 Aug 2019 19:20:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712434; cv=none; d=google.com; s=arc-20160816; b=hk1mhp3q5YL98kDMav+0aDiKJAgf3aUI6lpYy5z44937XKCAvttwSeZ5ypqYdvBlVg c/UHkhRG2s94FUWSM3yHSB4xo8sTVj9ibaqP1KdEW6IYFA6ENhC7Rwxp/sOjkRy3EXBE XnFVccfxBaHZivwN52ym+nmQybdpZnxSgde/7LlGqAkA8eD/ZnA0u/Q9j7ZHIERVLm+b BUh0cMKmr057SGQ+MZVgIuxE2ER3IkplT5tDyo+3DKVbgtJTaEGNWPXDwurLXq+X5YGn sDujTL2ot1XtHpM62m6nLVHWII18OhOwpcqCufUY1ZLGT4DMW4Tj8xGXErteOTuxN4kX VOOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=6zqhiQUR/t5HSZML/x55nFGZKGW5GK1LULKEmO0k7kA=; b=mQzYhe2mZFD3E3JcR5Fs/co/nIWVFa6+0nliPSDQJxzzLAK/EJml8AjN5uhAZTuRMC IwysVkN+6/oswf9iDre7nguG98hMWY4APzjxp8539wojaHAnxvjcK1Qp0qFHsgm6aJd/ e0SkGuAeGcI9yhkexzbx2XcKptQWdtN8QgN9+vsh2X/12cxr5sM2Xlu2P4xxiDyxjSTo KJNVtU3qHc+Lj+A4nReibZGX3ApUuLlbndkwYh+rn+Aqt28ihLekCnNd0vicJdqy6mYe Qd4LsTxUhHLNB3tb2FeWt8s8Wc+sAGo3XzwYK+bOr1MBnKTwzUWvLs1bPMPF7g8c/P02 9ckg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=F6zwcO4L; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 31sor49670783pgy.17.2019.08.01.19.20.34 for (Google Transport Security); Thu, 01 Aug 2019 19:20:34 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=F6zwcO4L; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6zqhiQUR/t5HSZML/x55nFGZKGW5GK1LULKEmO0k7kA=; b=F6zwcO4LIlIH0MhJxHttCJTdvFyVFQT/4arw8VEiUMf3H4eEoUX+759aMNEB4E5yQk Nz2fCbsNakzpI2Ix1oQ23cChuh59P2OEpLwWSX6x9IY/wvMOZe6lEWSb2zFdzp0gprdi y9rnyWNc6RyhaZMvzhG8ve4bXMhMFks51tm4rHvgstN2tswx5ZOG0+I0UrLn8K8liKz6 o59abaE04tV7AfXXxMZta+A8VG8S0kkDg1uyI4tR9b3t+a4fVwe1pYra9FjftWzgoUTS x4tLp6R3lAg/evT8dl18ZgG3qJOUMIaQFDribAsCQyGjHMfkpuycFyZQ36o14QJqnxy+ vrdA== X-Google-Smtp-Source: APXvYqxawjrrBWhVHWqru35UkhsNUwOEktD3Ze9ukSGMVZSHmBDx+KHUyZVGOPhrL6EFpIA4EvvUgw== X-Received: by 2002:a63:b64:: with SMTP id a36mr113099405pgl.215.1564712434076; Thu, 01 Aug 2019 19:20:34 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:33 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , "David S . Miller" , Jonathan Helman , Rob Gardner , Andy Shevchenko , Jonathan Corbet , Wei Yongjun , Mauro Carvalho Chehab Subject: [PATCH 14/34] oradax: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:45 -0700 Message-Id: <20190802022005.5117-15-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: David S. Miller Cc: Jonathan Helman Cc: Rob Gardner Cc: Andy Shevchenko Cc: Jonathan Corbet Cc: Wei Yongjun Cc: Mauro Carvalho Chehab Cc: sparclinux@vger.kernel.org Signed-off-by: John Hubbard --- drivers/sbus/char/oradax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/sbus/char/oradax.c b/drivers/sbus/char/oradax.c index 8af216287a84..029e619992fc 100644 --- a/drivers/sbus/char/oradax.c +++ b/drivers/sbus/char/oradax.c @@ -412,7 +412,7 @@ static void dax_unlock_pages(struct dax_ctx *ctx, int ccb_index, int nelem) dax_dbg("freeing page %p", p); if (j == OUT) set_page_dirty(p); - put_page(p); + put_user_page(p); ctx->pages[i][j] = NULL; } } From patchwork Fri Aug 2 02:19:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4860714E5 for ; Fri, 2 Aug 2019 02:20:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3ACF128620 for ; Fri, 2 Aug 2019 02:20:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E60D285D9; Fri, 2 Aug 2019 02:20:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B796F2852A for ; Fri, 2 Aug 2019 02:20:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24C806B0270; Thu, 1 Aug 2019 22:20:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1AFC66B0271; Thu, 1 Aug 2019 22:20:38 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 051D76B0272; Thu, 1 Aug 2019 22:20:37 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id BDD7E6B0270 for ; Thu, 1 Aug 2019 22:20:37 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id i134so9204052pgd.11 for ; Thu, 01 Aug 2019 19:20:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UPRfD7vyasD2XVfdl0NeBW26eHm6l3ABDQSSTKq1HX4=; b=UeiQBWMVwyGiSQaF/Ym4gs/0xnxsb787wrDqr9eqaxs1ioHxwYhAp2Kh+1UReb3+cN 7Zg8lqjNjxix1eyUrj9oXsLK+v2aHxXhDVO3uEIXrF0l8Z2YZKvtdgm1Z9IL2d6lcrU2 N9P5WniTLubfXL3Jjr65KPfwTx3GqIHUseZ9QrosxnS41DVkA/yx+GHKoHAdVggIgbUK 9VQpKJvq+4qWczCUh/CZ5B6hD1XZo/uILf8wTK1MtoGLgO9WJpoVWeG0ehCj0AgDAFli GabOcgnTiklrPeOaYHRr/LdjGIpjVlZrriCDKDkZVpozKhutq5oeGy116c2FqPdorJfX 2HxQ== X-Gm-Message-State: APjAAAUAJxFy2zuleG985ls5hgZqh3t5dmxsmSc3LWfOLQzEfyZy4Gso NNUXJrll2kYtaDFuNLIWnnzlUwMU0haJN0hqBGYdTv+V3r0M761a+KYzYc0FNzDP5CefUI7taUd S6d4I2ldiunS/mWyGYl+OCJqCYTJ24j8r53uGVpCPq4igna7o3Upeg+GylvIBA+bmIQ== X-Received: by 2002:a17:902:9a07:: with SMTP id v7mr21587718plp.245.1564712437454; Thu, 01 Aug 2019 19:20:37 -0700 (PDT) X-Received: by 2002:a17:902:9a07:: with SMTP id v7mr21587645plp.245.1564712436165; Thu, 01 Aug 2019 19:20:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712436; cv=none; d=google.com; s=arc-20160816; b=bG/NSrMuhKNHI5mJIUvpvjYr6smOVhBr8IfKKKBq52/Dcj/JApKegz3BuOhUSOMj1V s/NwNxjTs1sNLS+uIX5yB7z5csj2ui2E/F7VKtnToORWMCO5fOCtxbuiJDuM2wN9jAka PT8P75QWZKbEpjeqLVl3z7CUDRqJpzCCl0unDtS+sfxFyR0iO8jbtO/rAIByL9c+rCXC hzhJaY2sDl+rtCHNYz1JQarXxWBVneQQEul4xTorJvwXR3RLjHRgmMpXIoQ2n8Ypnxzn PfN5qNGKnXZ5ngFMg950wyjRv2jS88ZVRrr/RSN/h0JHj1pEQbc6uZu5IXroFr2AogvT Vdqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=UPRfD7vyasD2XVfdl0NeBW26eHm6l3ABDQSSTKq1HX4=; b=giZkv41DLVS2ZOoAqH0S7drXZizevkiR58I/7UvPylgbYEHyLKJ7vdwKsRK+CRKoIi IpOvkHfAYjk0d+m9LH1Bv/OUUl0h07mgSbLFpncnUmjYmoGnwuhjJ3HsNYpABOwlTZkC eBRr3tFnYy6SHIJE+3lTZiEHTUOYAmX2Lr2VUEnQWDyOV+JpQrYFSITuAqnL+p9tJkbZ R99qwmwyvUkTVHYu5jy7GPV/R6rAzfmGV7jAQtCIk+w0GavSLRrH95EP8VV/JmtFQ7aR o/hqn1GGPebTSooP0Qmx4kVTSlGLhR7cewJ/0449c9WT1d/A+MXpHYMD87VZ+q3dT5Lu 2rOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TDJzpDwE; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id bx14sor8438257pjb.21.2019.08.01.19.20.36 for (Google Transport Security); Thu, 01 Aug 2019 19:20:36 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TDJzpDwE; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UPRfD7vyasD2XVfdl0NeBW26eHm6l3ABDQSSTKq1HX4=; b=TDJzpDwE2oXFjm8cRNjQ8xrt4Ta2d3wf2Cpo0GoFM9thJ0XtvCvH4mP4rm1obsYrxe XfcKcMWeGW7+jGqqsIeZqIQivf0rjt9KMIQPJwYrX9aXaeynZfYblNMyZkWwFJwZth79 e4fMCJd20kqdE18/wOh4Jbz0PSr2Nv8bt8KSNv7hBSUy22vg0EGXVDctxg6pWi24C6E/ aytHIR9O0Oe5Nfk4mH6Tawu8cduDw0xsgEveOl493+9jCWiudUUBNmztlAbrHUK6dK5c cZre9/z25iL+oH1skqqYaquBXUxt6bEZ/OhP0nmn5k+Ox8GOIXBHEB9I8h3iWNYPWkz5 1iug== X-Google-Smtp-Source: APXvYqzQQn/4+/qhyIZ5gzUBopHqYfn0J/db4aXm+9arPe8eAWsGtJFKretZ1QBLJdXBLY5X+jbCWQ== X-Received: by 2002:a17:90a:7f85:: with SMTP id m5mr1901500pjl.78.1564712435904; Thu, 01 Aug 2019 19:20:35 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:35 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Eric Anholt , Stefan Wahren , Greg Kroah-Hartman , Mihaela Muraru , Suniel Mahesh , Al Viro , Sidong Yang , Kishore KP Subject: [PATCH 15/34] staging/vc04_services: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:46 -0700 Message-Id: <20190802022005.5117-16-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Eric Anholt Cc: Stefan Wahren Cc: Greg Kroah-Hartman Cc: Mihaela Muraru Cc: Suniel Mahesh Cc: Al Viro Cc: Sidong Yang Cc: Kishore KP Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: devel@driverdev.osuosl.org Signed-off-by: John Hubbard Acked-by: Greg Kroah-Hartman --- .../vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index 61c69f353cdb..ec92b4c50e95 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -336,10 +336,7 @@ cleanup_pagelistinfo(struct vchiq_pagelist_info *pagelistinfo) } if (pagelistinfo->pages_need_release) { - unsigned int i; - - for (i = 0; i < pagelistinfo->num_pages; i++) - put_page(pagelistinfo->pages[i]); + put_user_pages(pagelistinfo->pages, pagelistinfo->num_pages); } dma_free_coherent(g_dev, pagelistinfo->pagelist_buffer_size, @@ -454,10 +451,7 @@ create_pagelist(char __user *buf, size_t count, unsigned short type) __func__, actual_pages, num_pages); /* This is probably due to the process being killed */ - while (actual_pages > 0) { - actual_pages--; - put_page(pages[actual_pages]); - } + put_user_pages(pages, actual_pages); cleanup_pagelistinfo(pagelistinfo); return NULL; } From patchwork Fri Aug 2 02:19:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071809 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DC5C746 for ; Fri, 2 Aug 2019 02:20:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C9F32852A for ; Fri, 2 Aug 2019 02:20:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F3A5285D9; Fri, 2 Aug 2019 02:20:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AF282852A for ; Fri, 2 Aug 2019 02:20:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 113C46B0271; Thu, 1 Aug 2019 22:20:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 09EB66B0272; Thu, 1 Aug 2019 22:20:39 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5AA76B0273; Thu, 1 Aug 2019 22:20:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id AE6666B0271 for ; Thu, 1 Aug 2019 22:20:38 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id f25so47044447pfk.14 for ; Thu, 01 Aug 2019 19:20:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=CBO3xGCo70BH915jG2N5Cwh2jdAxvuNp3xf6kgL3BUo=; b=TFC/5zLOY0aQjpi7xc2soor1hYrnxVZDS6v1FMeWRatHoAcJBqAuseCZZQ/fazhABa lIvwLG0260m/tfXiNbV/zNazGpHq41kBmH/h1LNo702DGkxC5N+x2z6K9rRzhwU4UyuN qdAVMz5aFJTZCBos7MkdfgT+tadS+bg+wBr4UoXiogzBcxn6+LvoX1pCIav6sofYPhqP wJx+vDNPbSgalAdVl8REXMMLlS7we9WPAV9EC48oEIRwQd1/ZJ/6ppYdV8dL81PSAoqk Y0lYgHxSvESk5Aw4X9suP5+clevAHFDc8f6zRaBQwxJWuFMp9neBbEkfQe2TOOh2fIsg MWzQ== X-Gm-Message-State: APjAAAWMyMRM4x+L1UBtafV/qILV2JT+YoVTiWcRP3Dv6NaBZ+WbTXK8 SevgQqYSMOv+KaTDvLWeljaozj1XnRKyKLjdd7X/mm+dn7vMMrjrFNeH/7TnP1j22Pb8N/0fJqR N/eVoUzZ/wwmDC/zibgxs/WzVMoQKjNtAqKH7AfSLNY0M3EelEZ5oYdd0UCWYpWOxLg== X-Received: by 2002:a62:6:: with SMTP id 6mr55781262pfa.159.1564712438405; Thu, 01 Aug 2019 19:20:38 -0700 (PDT) X-Received: by 2002:a62:6:: with SMTP id 6mr55781211pfa.159.1564712437734; Thu, 01 Aug 2019 19:20:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712437; cv=none; d=google.com; s=arc-20160816; b=ouO8ewB7ucqA9MFg3CeYE6f4u1gmIm9KdsK9mBzAG7d4UhtD1eCwcfjeHYsdIRIsWd 84iMtjycrmHsrZZkrXbtktQulPpCylBa9KbI6I4WeLK6HA2ESlIdBdvBBDmwkurE93qt rPqRKed05khAOOGXue8Gh2SSIM4ld6/09UhkHrepBYApUUt9K/AfU4gpzpZQCeYNS0QG mTFR5tEVaAokAc8/Qk7ei+zI03F3Fh2toL4JJQqYdXXDpUd2w54BaYF4Zfa05sI23Bgo ITSCyvPiMe3qwb6oJdEpCVLQliZ+Fw1yQfieQ+fCZWlaHYga00HSk2qg/d761QAvYvr2 WBnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=CBO3xGCo70BH915jG2N5Cwh2jdAxvuNp3xf6kgL3BUo=; b=qMGel11o46pWFJfOvKOfn6eN+c+11H/oJlQ31P4o2ntFxsFEMv11iG0ESSu3+cY4k9 rur/eZG5FgdjoD28xafP99N3agB7ZgztxN/qLHo9f2bKjdbGZkgCn6ALYdCBiWwA+bpG xXnb/TLFWkhuKi0I3VCPHG13bSsCPV31XjKMViJ4glYmKREcAye2JQq+/ZlCcNTXDaLI 8CqwLzF4S41b03nKanQNESoYy7L9j1Etf69t+FYs7yyz3IS9dqTDChsOC+rdFMpJFWgl 6fXpsqzeFfdsHkgwkiZSB6Njc4ixEouF3W6l4zIYa/CVsl92zuTKq9NwFeVO7pCKs1st moJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ICzJUrYT; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id n2sor15198017pgh.45.2019.08.01.19.20.37 for (Google Transport Security); Thu, 01 Aug 2019 19:20:37 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ICzJUrYT; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CBO3xGCo70BH915jG2N5Cwh2jdAxvuNp3xf6kgL3BUo=; b=ICzJUrYTaIdsry/DtrBHUvha+R1kZxiR3TimqNDYFmB7o5jfa7m5UsfpaX/zpz7gqG QDNhfomKE98We8ADhaaApqL24L4GLju/2Iqw8fB/Gdc8zIwCPKElMlCmrcylshjiY6HA Wpq/jdgFFEI2UXPzsw4kiY3k+2UuXyC1t4Wgx970D5YK3PPwUf+ffB7bQXfIs3z5ka8f jIxsm6PzFlXfLaS3w/r9zrOwtEfiVXxBJ3zPq4sXYknfWxx8T3YIHBMUaH+laDDR6clX EbIaZCmFhhDYcIMZgiNQmuBlXcj32bO5TFJ498KeDHFEPtpyis1t2GqB2XiuUnW1fIm6 uMYw== X-Google-Smtp-Source: APXvYqxkmOrmri+Wx3FPhMPhDHr4oTLl0gd58UJ9/zI2U5cFZ+LG43cVChESIiZ/iGIXbamewPD5YA== X-Received: by 2002:a65:51c1:: with SMTP id i1mr101132075pgq.417.1564712437381; Thu, 01 Aug 2019 19:20:37 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:36 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Jens Wiklander Subject: [PATCH 16/34] drivers/tee: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:47 -0700 Message-Id: <20190802022005.5117-17-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Jens Wiklander Signed-off-by: John Hubbard Acked-by: Jens Wiklander --- drivers/tee/tee_shm.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 2da026fd12c9..c967d0420b67 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -31,16 +31,13 @@ static void tee_shm_release(struct tee_shm *shm) poolm->ops->free(poolm, shm); } else if (shm->flags & TEE_SHM_REGISTER) { - size_t n; int rc = teedev->desc->ops->shm_unregister(shm->ctx, shm); if (rc) dev_err(teedev->dev.parent, "unregister shm %p failed: %d", shm, rc); - for (n = 0; n < shm->num_pages; n++) - put_page(shm->pages[n]); - + put_user_pages(shm->pages, shm->num_pages); kfree(shm->pages); } @@ -313,16 +310,13 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, return shm; err: if (shm) { - size_t n; - if (shm->id >= 0) { mutex_lock(&teedev->mutex); idr_remove(&teedev->idr, shm->id); mutex_unlock(&teedev->mutex); } if (shm->pages) { - for (n = 0; n < shm->num_pages; n++) - put_page(shm->pages[n]); + put_user_pages(shm->pages, shm->num_pages); kfree(shm->pages); } } From patchwork Fri Aug 2 02:19:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071825 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B215E746 for ; Fri, 2 Aug 2019 02:21:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0E572852A for ; Fri, 2 Aug 2019 02:21:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9456D28628; Fri, 2 Aug 2019 02:21:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 276EC285D9 for ; Fri, 2 Aug 2019 02:21:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C10216B0272; Thu, 1 Aug 2019 22:20:40 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B9A396B0273; Thu, 1 Aug 2019 22:20:40 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A0AC6B0274; Thu, 1 Aug 2019 22:20:40 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 61E536B0272 for ; Thu, 1 Aug 2019 22:20:40 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id a21so39529646pgv.0 for ; Thu, 01 Aug 2019 19:20:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0y5rJgolnpdx1vwnOpLTxW7O4fuw+3wJL+gU2Q7/qgc=; b=hQ1g0aymoOajOz/jU/Gh8ilxwoGec6FEJzBaQvsQN0V/u8WPYYNUzpxQyY69xjykZX cgFy54AhFPUA3TOzLPKRXlYkhugVdcDUIzFVv2SLHy4HANUD0erT6s6LHjlsECg7JF2b NgCCZX7n9HrqPzyyrrI+t+WkvmioRO16GukB3uHmrPukW5EpS20BaEQ9rn6YXQn4RB6Y krSC7wYOP5VnVkMy5joLi1Tqr+K1CpzpwWkNOM3nyVOqK4x1n5571KOpen+xgfoXt/JK lq0AtGtaX6laO5YaS3J8JbIN8fZ26pEilHJJAvbDT/ZNwkO6H5dcP4wR/sRIwHBRA1WI 7SpA== X-Gm-Message-State: APjAAAX1u3x58aeOEsa6OOTsKglypVPPGDy2JG5R7ysc+2B6r/PGSjMk hZpU08tDGcJ2g5Ib2CI3hLW6eNRK7EvFiy7iKlzPll1J9FnXCD0lDzae0eumgVhobJhM7g/qNni oKKb6O1SWFfdJbzYd7XrGPMt03r4u15cCRMfZcheOLQUUSQj86fPCwa+5Yeyli4Cv2g== X-Received: by 2002:a17:90a:d817:: with SMTP id a23mr1858814pjv.54.1564712440051; Thu, 01 Aug 2019 19:20:40 -0700 (PDT) X-Received: by 2002:a17:90a:d817:: with SMTP id a23mr1858749pjv.54.1564712439252; Thu, 01 Aug 2019 19:20:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712439; cv=none; d=google.com; s=arc-20160816; b=eg2k1Jien1Vucd4O0Mr74JJTKdiih38gqVt8W9JmYPpoPrwgH2cS8bFWLFE8lo2TLq 2qWouiWYBGZgoFgIKzdfwvc28Z0yTzkLrns8teAk4uxvJMirOx/9bLbk1Zw8lF75+Xfe qQJr0aNViuRbwSlpPigQPA2mpp8Zorjh2xUXAraECQfgxbh6/QYxChY/mBDnGOMwOM1D Q/NVJoM7f+P1zeOGltnYsGi993CKsz6yry+hjIrAViepKAL7cHvCHjjeKJC43LX5PtWI iqnS3wMGJHatZv/4f5FeMv1xvFH9TDcglT2Uw5kCPCHMACcdGVEOv3JkrfAvudJgbND+ UAcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=0y5rJgolnpdx1vwnOpLTxW7O4fuw+3wJL+gU2Q7/qgc=; b=0BqlQqOxhgrnD/ytGzAL6U+vBW/wFxBN5b9SiRw2vpToRl0jI6GmP50Ds6l+O0Szw3 u+DLh97Ln7RS0efZg1yxSVIGxr0NGF9EHG/FQQXh2x1q98gq2YYPPnaTzdZdzUd2EnDK L/JEPHKRYQvokmVG6Tao9tFG85zM4UnvJiY+r+Zk0+enUvNfSgqvY+FooC/PTmDTgTHO ZfVNig/H5g+W1djsjpIupjC/2dHgevvhIsA9oo2a0cZSuerdQW3ykDMSP2yPZuHy5JtX BaOIH28VlN4XDF9v42/PtWvL8xb2UoxjjF2e2TBusgIPwWE+s1bLZhjlcvFpoj4D7M1+ 0OBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=XcvG9Oty; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id o2sor8318925pjp.26.2019.08.01.19.20.39 for (Google Transport Security); Thu, 01 Aug 2019 19:20:39 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=XcvG9Oty; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0y5rJgolnpdx1vwnOpLTxW7O4fuw+3wJL+gU2Q7/qgc=; b=XcvG9OtyU86jk5JnQKO48GBJW89xfPHHxg+Ne0d0GJwSK2IuihtMCJFR8pabDqBzEF DuPSfNePU528rZ6hBUi+QFYoZILMY8tdggEmTr3mN7PzDRJ7a6OmrfV2tsrS8kf2+6HI Zo6kU0MY4gjn6C4vTTeXk9IHVKARwawE7INoHfJ5sfq56uo1gVj3e8g1oiz6b7OI/wgS KnIyWK9Z49VV7ULXr41yNDN0bWyja3EYTBz6mLtPsaZCe7aB+yHXvCTEBAOwbU3wp1bf uiomAHYjSX4K0Tach88phQCyk3zfRucll/enDp2U+3MmHAZ/atNajIitsMHfeEHfycq9 ft2g== X-Google-Smtp-Source: APXvYqwl6c8l8akPJ/a0xk+3KepmeSM3zSOQCzHQzAg87pSWv9yrqkhky05R7WwjG4AiAw2gALdPbw== X-Received: by 2002:a17:90a:b908:: with SMTP id p8mr1903028pjr.94.1564712438974; Thu, 01 Aug 2019 19:20:38 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:38 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Alex Williamson Subject: [PATCH 17/34] vfio: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:48 -0700 Message-Id: <20190802022005.5117-18-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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 qp_release_pages(): it now ultimately calls set_page_dirty_lock(), instead of set_page_dirty(). This is probably more accurate. As Christophe 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: Alex Williamson Cc: kvm@vger.kernel.org Signed-off-by: John Hubbard --- drivers/vfio/vfio_iommu_type1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 054391f30fa8..5a5461a14299 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -320,9 +320,9 @@ static int put_pfn(unsigned long pfn, int prot) { if (!is_invalid_reserved_pfn(pfn)) { struct page *page = pfn_to_page(pfn); - if (prot & IOMMU_WRITE) - SetPageDirty(page); - put_page(page); + bool dirty = prot & IOMMU_WRITE; + + put_user_pages_dirty_lock(&page, 1, dirty); return 1; } return 0; @@ -356,7 +356,7 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr, */ if (ret > 0 && vma_is_fsdax(vmas[0])) { ret = -EOPNOTSUPP; - put_page(page[0]); + put_user_page(page[0]); } } up_read(&mm->mmap_sem); From patchwork Fri Aug 2 02:19:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071829 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8340313AC for ; Fri, 2 Aug 2019 02:21:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74F2D2852A for ; Fri, 2 Aug 2019 02:21:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68C2C285D9; Fri, 2 Aug 2019 02:21:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFA862852A for ; Fri, 2 Aug 2019 02:21:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46DFA6B0273; Thu, 1 Aug 2019 22:20:42 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 421CD6B0274; Thu, 1 Aug 2019 22:20:42 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 273296B0275; Thu, 1 Aug 2019 22:20:42 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id E05A56B0273 for ; Thu, 1 Aug 2019 22:20:41 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id y22so40726998plr.20 for ; Thu, 01 Aug 2019 19:20:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Zk7mJfsjIPJK9Qgsn0u5osZJajJrXebF0c1tZrgdgoI=; b=tMHEVkwSmfs1vsDeakJ9kK+OWXuZaWS/fESpKEnAuimjZf4i9eHE6/UjCD6HIl1FQp 2RTeVL8NSr3wHvFI02qwas1Z7HS7GG4zepbNmsuzQKjNe25w95FjyUIwbr1OYKn86hdr y75i4QFcv6MIEV/nFffF4P+kM9AhsB4uN7Co5RJ+YLvJhrMiUe69FrvFMIowIn79GOjQ CB7VblnVlckxkkoUxvUzR5V8fkJkWfDvoVe35nLe1RU/gWdykqpgREXWmEHMjoNfDdgb Y9V/Z6rEAA4v8Mg2ZyLbPrCZSqwR0DAhyxvfpSyMLzKyZtRkqXme8te3/E8LXU5cU2/7 Xukw== X-Gm-Message-State: APjAAAVpaKeBtIHVaY5HqTMbSNGfYAtS+P8BU/bfapRtb99HTZ/KMm8x PBLV96BYKbewN06BIGoJMo1LsezLnJ8+drEMGHpKRRwJjNVxZobjB/1h0tCvVDqdEdYVeBjdeIG comLH9TFuahCGQNMtTkwT4c54+syVPTAOjQ7o4FPEtCxaApaFe6JAjMuzyFXEn2HQqA== X-Received: by 2002:a17:902:28c1:: with SMTP id f59mr11480plb.269.1564712441569; Thu, 01 Aug 2019 19:20:41 -0700 (PDT) X-Received: by 2002:a17:902:28c1:: with SMTP id f59mr11428plb.269.1564712440706; Thu, 01 Aug 2019 19:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712440; cv=none; d=google.com; s=arc-20160816; b=dQi/yObVVmQUFaalfyUZUgtVJ+b+aFSJmIGNrzHHDuZZWDsOPtq0jGGnKlTf2dSe02 Dp/hf3UWKrX+4A4KcRStawrtF7smr62oTJhRTOV8uAFb7KKPrstqyaMMVWKT3fr+AvVN QjdQm8/Knj7tVf7zVms5nouqsERzDu5bjyuMfAcezMAMadBomnhy87IZ93WD8Hk5oEjh yqSt3I/m9vSvIlT/toI6QAZb35D5/LPu0BLj/cBlNx+XA3AR5Q9JikeM47A+GNC9LnC+ vL6gUFiewO74WGSu6g1ii0NA/k3J0a+0c/+2UQd9WQqmlcOBFKUMGGu77ApFbISz/3nX SB6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Zk7mJfsjIPJK9Qgsn0u5osZJajJrXebF0c1tZrgdgoI=; b=LRUvUuc7OWmAY4GJFuYblyNmVRk/wHpslrCdazcTktoB2u2hMNEW63hEy1TwC9xVv8 UxPJqGgY631u/o9yz0yiUyXAHkU48yaTVIB93cuxe3AIje0DlRik4nig1Bj2oWZ6TQOQ qjQiOzgeGupD5ttDmAV+gV0Dd/0CaL9iNJCrMW+QcfaVFiwu7JQnp3byfsKxSyGg3IOC 4Oari1rblC5X5lBh8ZO11IcUJeNn7pzsYM6VcITau0/i3X9WrtJwDuXea+yuiSIE+9Zw btCL66zt8uo4oDlR4ENxk9mS/Wn90gt4df8kQc1PHsjTeEol+BE7VWAF7UB9MNSdbemr l+Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=nL5gA8Hk; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y7sor87387026plp.58.2019.08.01.19.20.40 for (Google Transport Security); Thu, 01 Aug 2019 19:20:40 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=nL5gA8Hk; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zk7mJfsjIPJK9Qgsn0u5osZJajJrXebF0c1tZrgdgoI=; b=nL5gA8HkBp1qUXL8uSk44yRPDpQM1GzztnKY+vjFkpLO4+ej8Ho3KCm6C4y+E5m8LE h9Iaftsjh1UsJUr+Pb21bHX0tSSHXapiGzhmehbpJMXTX/8OVSokepo7ZYp/sAOufRJM Dn+Q/LNbJL1I2nNGcQbJ8ZQUaKHbOXUsbWTmj876BCAWOoZWZ6NdZCYaUx//X8gLE1Fe Ao4iR+EL7uUQrdQvqWcLAimsvB7jPrqJUl8VTCYTJSYJDpeTKlwz9tVoL0Kex6hlm0oH POKBdW3YOuZavjeRiRdEl20H0UanKpKGw2d45prgvnfRqnKjFtcxDl+Dci+NMwFW+1GP a0XA== X-Google-Smtp-Source: APXvYqztsbUVpJnR1pWJXE324fW+SugJBxHHKLNQRZirN/VnD1v0OsiDr/qT4pG5Y0OOV3QlfOZRKQ== X-Received: by 2002:a17:902:830c:: with SMTP id bd12mr131600821plb.237.1564712440479; Thu, 01 Aug 2019 19:20:40 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:40 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Bartlomiej Zolnierkiewicz , Kees Cook , Al Viro , Bhumika Goyal , Arvind Yadav Subject: [PATCH 18/34] fbdev/pvr2fb: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:49 -0700 Message-Id: <20190802022005.5117-19-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Bartlomiej Zolnierkiewicz Cc: Kees Cook Cc: Al Viro Cc: Bhumika Goyal Cc: Arvind Yadav Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: John Hubbard --- drivers/video/fbdev/pvr2fb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c index 7ff4b6b84282..0e4f9aa6444d 100644 --- a/drivers/video/fbdev/pvr2fb.c +++ b/drivers/video/fbdev/pvr2fb.c @@ -700,8 +700,7 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf, ret = count; out_unmap: - for (i = 0; i < nr_pages; i++) - put_page(pages[i]); + put_user_pages(pages, nr_pages); kfree(pages); From patchwork Fri Aug 2 02:19:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 47EDF746 for ; Fri, 2 Aug 2019 02:21:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2392B28644 for ; Fri, 2 Aug 2019 02:21:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16F12285D9; Fri, 2 Aug 2019 02:21:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 963542852A for ; Fri, 2 Aug 2019 02:21:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A61806B0274; Thu, 1 Aug 2019 22:20:43 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9ECED6B0275; Thu, 1 Aug 2019 22:20:43 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 865746B0276; Thu, 1 Aug 2019 22:20:43 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 5201B6B0274 for ; Thu, 1 Aug 2019 22:20:43 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id m19so31965076pgv.7 for ; Thu, 01 Aug 2019 19:20:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=py067aGaFWqYQnWW3CrL2Yk9VWIyNl4WEpwUsrZ7LgI=; b=TsER7YXORXSLDr2LWeLXX27OOiKfwf77unGLrcqLexv0t7/QLfU+jQ5M8wwCfjm5V6 NybxOkDXD0B4935fkJbxSD2PkMiUKq4ne0fmlWA0RnJNaTrKSKK5icjMjnsgq2jwYpbW o0E5Kt4tLbmnBRSzDJ12bHSY6QZrraL0nYi6VtLtk2tX3h3qq5u3yUi86K8DyVWykSf8 hgsaAGwlOhcghlX4HkISRds/a9th92YqKoIXlfomGkLOKXH1+v3ApjDyKH0DUGupZQHG mmTQXhdcJXc22pDORmvtFeNwpQ0Rhe94A2rrp+jl5Hq5FKlwfPI1Ln3Oox6/fll7BTUy Rekg== X-Gm-Message-State: APjAAAVDDrWDk1SEWmouJXx9+iRg+bOaVF8cmkdVxEkdrRsDpA3u0I8m jwr+vsJ6lKJgdLfwN0/qWTGmb75qoQi/+2hD1rSCJv59BV/oz2kCZQHYUdNQi2mOxpDv2IcXveY iS7sP9UkowFNuu9nGVCei7a7pxVrO5Z/cxhDnyAtsGf6W/p2+PD9KDAiE2j+Bd9ajwQ== X-Received: by 2002:a63:f443:: with SMTP id p3mr41586152pgk.345.1564712442957; Thu, 01 Aug 2019 19:20:42 -0700 (PDT) X-Received: by 2002:a63:f443:: with SMTP id p3mr41586108pgk.345.1564712442220; Thu, 01 Aug 2019 19:20:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712442; cv=none; d=google.com; s=arc-20160816; b=QEJ2CT6KIrfQgDyA5zT6qU+4LCQ7osgHMu0EeX8lDICgW9bZhMGGagZjo10W7bCQW/ uNVkTTMcbAN+IbmtiQEGqT7vxDByEc12NBZujwe27Gb8DM6B4OqCZ50cYoB6g1GmWAtl VnLC/SPq3tD4DZznOdF6uaZMjEPYLe3BPvYY2zA7Fxjj3Mtj/9J6j8Fr5qjigJH5cCF9 HKrVMvFTX2W7R10NyP018MYfQbXGvxeJmf8qzDYSvLnTxppKt9b6gjb6jtY/At+lnrBI 5Kad/nqHR6QX5HJ/hBBkAFoaCAMSqFrv0zTwOoDXfMYL5XMrjqG/M/sggVZ/l14w0PSn 4W/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=py067aGaFWqYQnWW3CrL2Yk9VWIyNl4WEpwUsrZ7LgI=; b=fk3/76IYLAfxwu14ovmCjgwIhpk/v6LWX8jQdKzzrv8WIW8h6kKL0Ug8W6ThLiocBf 9OZlXM6hZXulJXKww9g41zi0jwzX8WX1H+IgSei7o/TNe3hjQZDTRr1QHATd4taONdGa BEruabIYgJEaLj//GJQ5oNrKYGb8DVMlykjscQHpWku/E6cScIR1dvEbHyJeE469bzJY CKqTVl65+u1FyeNfWosuz0vBdIw8Mb+QcWmfedLhrUPJ7OM2n1OWbZh+WwIssBNrUZr3 f93psjFEehd3h2QZgffTRECYPJwhQANmfQZOLFl4Fi3T+ACHHhkM492GW/+Zt2kCFkE4 K7Rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=lOZaOBHn; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id i1sor87599453plt.55.2019.08.01.19.20.42 for (Google Transport Security); Thu, 01 Aug 2019 19:20:42 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=lOZaOBHn; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=py067aGaFWqYQnWW3CrL2Yk9VWIyNl4WEpwUsrZ7LgI=; b=lOZaOBHnHG96U7CUpGeMR/TMYtjEa4y/ygakLmz0BtnL+pIOpa3C2toztsy8fW4gwW tSTtviLJ7HOi9DtUi5KI4XY0WPu2eSdUBZVMSVezuKPLNyCDQwUs6J0/BBBZ+6xhu24Z FFakCBm8lWNZ+G5ej5b+50tyKMtD+b21oulPMq7HB8nLNBdaEf18LO4IyZXO6FYAkAZH Gf/avj3rVBNxZL42D+4KJvp1yOXbbtpENzFq10jG7FxODtHOFfbvskOX/bZ+DtIk1XsS LtXAfdLjn1YTVqg0w1Z1LAlYkVjy6XQT7mshmHFnFkvQYLq3O8bZzk73cr7CrbSrM5zf ODTw== X-Google-Smtp-Source: APXvYqxy0BkUtbl8ULTboF2upH0nHFnxM+Cu1b4hTcaSsJxULdUpLCIdwe/mZoVo5hGjgo4EZJg93Q== X-Received: by 2002:a17:902:f46:: with SMTP id 64mr130019975ply.235.1564712441986; Thu, 01 Aug 2019 19:20:41 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:41 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Al Viro , Kees Cook , Rob Herring Subject: [PATCH 19/34] fsl_hypervisor: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:50 -0700 Message-Id: <20190802022005.5117-20-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). This changes the release code slightly, because each page slot in the page_list[] array is no longer checked for NULL. However, that check was wrong anyway, because the get_user_pages() pattern of usage here never allowed for NULL entries within a range of pinned pages. Cc: Al Viro Cc: Kees Cook Cc: Rob Herring Signed-off-by: John Hubbard --- drivers/virt/fsl_hypervisor.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c index 93d5bebf9572..a8f78d572c45 100644 --- a/drivers/virt/fsl_hypervisor.c +++ b/drivers/virt/fsl_hypervisor.c @@ -292,11 +292,8 @@ static long ioctl_memcpy(struct fsl_hv_ioctl_memcpy __user *p) virt_to_phys(sg_list), num_pages); exit: - if (pages) { - for (i = 0; i < num_pages; i++) - if (pages[i]) - put_page(pages[i]); - } + if (pages) + put_user_pages(pages, num_pages); kfree(sg_list_unaligned); kfree(pages); From patchwork Fri Aug 2 02:19:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E4F213AC for ; Fri, 2 Aug 2019 02:21:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EF942877B for ; Fri, 2 Aug 2019 02:21:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71D09287C0; Fri, 2 Aug 2019 02:21:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9CCC2877B for ; Fri, 2 Aug 2019 02:21:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5A106B0275; Thu, 1 Aug 2019 22:20:44 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D6FCC6B0276; Thu, 1 Aug 2019 22:20:44 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C351C6B0277; Thu, 1 Aug 2019 22:20:44 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 8E36F6B0275 for ; Thu, 1 Aug 2019 22:20:44 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id e20so47142985pfd.3 for ; Thu, 01 Aug 2019 19:20:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NpCZQ4VK8hzAbP37Qxye6UhXG/4cH2zDttwN2tDhLJk=; b=fDCPM2zT6ks6Go6ik94Sj3EZSaLBQK1d/BTuGWyGmqJlV1/T3Scyg6JF0y8q9ndQdI Htky3r1N54M/w0Kv2u5bFNtcjpv6mOXvLytQLi/apoUsRtRuqo/ME6gIv5f20W2l3aq7 0O+NUxlpOHEWF8o9HFL9skkakHfxpNCNgBN2OA8OzqVoHee9eiZ9aNEci/dHhgN3vAGY BwmGqbgxx30Wd1P/l8/V369ZRoB/28zBCTX/BD6Df17f6KmzkPiu0ci7eSF3GPQuLwVs HV/RFpBwVNlGCCzYf1NtQZU8OlussEmXAZ6roiwZS3TjwfbXjS1cJtYSkvNdcV7asI2S BFFg== X-Gm-Message-State: APjAAAU9txjmcLc2n3IDNP0Pd2KrE70YR/RswaOISbKhC515f6MEjKaR DSatXI00mwih7D2jVRCDuxx6g85zllMdXvShXzw6bbFMkLCoc53cP3s0fkguLiDGdcSrQ//ffnU x3//sLdkvVJ+tXdxQNljkQOAq9zhkKt8CDSd0wK48RX3IymZ1Qw0gzK6L+KyEQPnXJw== X-Received: by 2002:a62:cf07:: with SMTP id b7mr57179432pfg.217.1564712444278; Thu, 01 Aug 2019 19:20:44 -0700 (PDT) X-Received: by 2002:a62:cf07:: with SMTP id b7mr57179382pfg.217.1564712443671; Thu, 01 Aug 2019 19:20:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712443; cv=none; d=google.com; s=arc-20160816; b=tUU58na/SNXDgQVdS/5fqEE/av2kbH7TZ4b7QfzfhNnko7PdZmadkgnVlV7ZMxMwOO RiTapO2wFsUkBY4jifzGeQwD3IS8OJdxPY2kgbS7mV6KBA6EREHbSusq5ygiPTGhRz9/ j2299pJOSW1fetM26LewVtASJDEediGeLWrEXPHihBw8InSknNQ8QjIGUXlph6XpVZVO CjNdYpEE7fFzI6Km03rpshGXLtW6TGu17NqLKO4obm2HzafNW1ndNBTIU89eVtgLeoH3 jRj/igvPoeIp+62uQZEYh0+eokXy1uCZ7wZtxWgEd/H8zVKuUuqS0uBoUpOypjyHujTy 79AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NpCZQ4VK8hzAbP37Qxye6UhXG/4cH2zDttwN2tDhLJk=; b=HRmX4pQ04ZX0jhUtfqeV0ePc+cINtdSO9Hk8vt2COjD8VtJEjF0JMZJkrdnucD2j5a e6aQ+1z5lef6eZXgqkkIz80Qgio4pFIdu7T+KirRB10NsQEPfE0pxpA2uNcOclA8x90m gg1eIHzY9DoUWNc3d2VX9430cS5waX4vS2L4u+uxlNUIIyj5JJJYByOlRAJSkLbkYmig bujmTkrhwDx6rm/cuBwC30d/ApRGkCbAR7MTTgOJRVAHS1H4bGta9ceSJWvWctn3O3oe QzWHUf6B4D4qI4MbzRxNGKm+ob5PTJF6LGj/f09ui/rQncpZVG6g7A4q6asDLenxHKc9 yvLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hA+dHc1d; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 13sor54950272pfi.28.2019.08.01.19.20.43 for (Google Transport Security); Thu, 01 Aug 2019 19:20:43 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hA+dHc1d; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NpCZQ4VK8hzAbP37Qxye6UhXG/4cH2zDttwN2tDhLJk=; b=hA+dHc1dKtzF01UNAT1GCb910It9M6OYeo1UwisVEiPximZ0Uizqhd58Gx7EN+cwqG oOXAC9GpXS9cMgyPAFeZsWw6yiG5HTsH6dTfrkzHKXhkxbTehvYO/DkXd3o8uGT1hUxz 8W3I7PS2I6VpD8By/LG/APt7ortKYREWRihQ/MahJgv1XZqDU9aXSO+0f9WVFU4wcOzF PifhANph7r1h1aR2sJtcNbzpatSVDPr8LOmoCCwtkUnv/6xTTuq0KjPRlt5jI5AQn0Bo qGRQZk7nx9WeapKs5M+9pdwyKPbEullYlAI/CW2M7lTdWIAU5bo5Tw/OmRhRr64X9QFj r+xA== X-Google-Smtp-Source: APXvYqwoCf/Pdnvn5s1n1tJ64nDODMRXeExgk7vpJhyWgRCwW2Xl8gxjUqSaBtscPD/0WWSuL29y+g== X-Received: by 2002:a62:fb18:: with SMTP id x24mr55563811pfm.231.1564712443423; Thu, 01 Aug 2019 19:20:43 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.42 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:42 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Boris Ostrovsky , Juergen Gross Subject: [PATCH 20/34] xen: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:51 -0700 Message-Id: <20190802022005.5117-21-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Boris Ostrovsky Cc: Juergen Gross Cc: xen-devel@lists.xenproject.org Signed-off-by: John Hubbard --- drivers/xen/gntdev.c | 5 +---- drivers/xen/privcmd.c | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 4c339c7e66e5..2586b3df2bb6 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -864,10 +864,7 @@ static int gntdev_get_page(struct gntdev_copy_batch *batch, void __user *virt, static void gntdev_put_pages(struct gntdev_copy_batch *batch) { - unsigned int i; - - for (i = 0; i < batch->nr_pages; i++) - put_page(batch->pages[i]); + put_user_pages(batch->pages, batch->nr_pages); batch->nr_pages = 0; } diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 2f5ce7230a43..29e461dbee2d 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -611,15 +611,10 @@ static int lock_pages( static void unlock_pages(struct page *pages[], unsigned int nr_pages) { - unsigned int i; - if (!pages) return; - for (i = 0; i < nr_pages; i++) { - if (pages[i]) - put_page(pages[i]); - } + put_user_pages(pages, nr_pages); } static long privcmd_ioctl_dm_op(struct file *file, void __user *udata) From patchwork Fri Aug 2 02:19:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071839 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE4CF13AC for ; Fri, 2 Aug 2019 02:21:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF7682877B for ; Fri, 2 Aug 2019 02:21:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C29EB287C0; Fri, 2 Aug 2019 02:21:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5AB8A2877B for ; Fri, 2 Aug 2019 02:21:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 72E826B0276; Thu, 1 Aug 2019 22:20:46 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6B7A66B0277; Thu, 1 Aug 2019 22:20:46 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 55AC86B0278; Thu, 1 Aug 2019 22:20:46 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 1C6376B0276 for ; Thu, 1 Aug 2019 22:20:46 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id z14so39392657pgr.22 for ; Thu, 01 Aug 2019 19:20:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6GC3vp7Kgk6wrS2t1aIFSliRmKpmpPmHRVTf1Sq+2hE=; b=YVFSgldlCu4VStXc9EkVyc2wKSx0yv6JUIgenlzVEIxlPm+Lz5qu+oX0c9uFQhom4z bz3DmWvuCrNjmfyuFamey/Mi6Rvo9OTk79FKKWLpqaGWRNzQGHv+n3TMpcJPqjEzgp0A k6+OIxNROdTlu6U7b8N+qOITHmPvb9z1ha1ynViQeQgPuB09PS/7MIIVT83pX7eZj22d frJK1B56RSmHMJJY83mSLJbUFlkLT9R3OszsYSp+4ExuHx9/ydBC1+6LhSmnGJtB3QD1 joGwr3sa5X74saeqd+6248ezapCYHSGZHdB+xMIdtaWH8qUqTTA4yF9mRbyQk+bOstTf FfNA== X-Gm-Message-State: APjAAAUran9fbX8kWVESHd0ogSkJvR2S9LtNKz9mcY9wHknR+zZgI55g AiHiAtuZczbQjd6EJEiKWbGe1AAfcaLDsaDbRgy2NWgOhWxlzwvb8c3GiuMkk2VTpwjwGJWTWGi 473DM4/7k9qxaHZbdePoiQCKqVZqH5sU5XmwcyMRjDLgWMoGWrsOCWHPFSJu/4cnNiQ== X-Received: by 2002:a65:4108:: with SMTP id w8mr23428279pgp.263.1564712445684; Thu, 01 Aug 2019 19:20:45 -0700 (PDT) X-Received: by 2002:a65:4108:: with SMTP id w8mr23428246pgp.263.1564712445041; Thu, 01 Aug 2019 19:20:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712445; cv=none; d=google.com; s=arc-20160816; b=fWku9JpEo44p6UZUe+2gnKPHQ7YJsPetQR2pJ5HVq5qKUk6bqqSPIqCLqEH75CxYU2 Hm8abJ7HXIsrll8xrJFx1sYaazSGecz+cZY2DcPMOpirKWFgv8htLuFdP1UgfBsBLQEy qJAUNoxp/VvYs8Xjqjrc0BcgK7Y3X7SS+282Nd4W3OYzgJNXBPZoX8DIcSLreVElsXjS 51gFnnr/rRBQDRscclCWKl91SwTLhoV8jco0+jO4KiHuRhBhWh2mTIuFxM418CUBegfg 8bnQRZiUrWsaQxYoxdSDTk97V5MM3iWnCZZXP0stemZHrQFm0xGKstuk4vXm2zzF1EAI qiBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=6GC3vp7Kgk6wrS2t1aIFSliRmKpmpPmHRVTf1Sq+2hE=; b=h7LYTqZBiMVXG/4sVJdOfjPUtRPAHUsG9Ap63qpfsGk9E6ZELJVDOUkdd2zhzjLMad h3SeRXe9rpOcBPckKyTRzYTkyAlFUyJ4kCS4U6gxUEB2IanHrtzpO92NeUp/Li6dFu0W A+dVJZpM8mCcXZBu5TxW5iYk6NrNcyMI0CcPtVXId2y4V8LFvJRm+TbqKYbTeito0h5V +iriqN6j9OTKQDfZDxZzpkoqwV8DP2hP0S5gKKtzCpnTQJh06pvB52KyXZaLy5tpxIgz UrXm4sQtg4kkG6vcVTS1o/mub9pilEAL6av/rBk/9rc7BO2kfGa9stVOpQ4M4ReR5os0 YVXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=p2jdLnF+; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 3sor8431721pjm.3.2019.08.01.19.20.44 for (Google Transport Security); Thu, 01 Aug 2019 19:20:45 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=p2jdLnF+; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6GC3vp7Kgk6wrS2t1aIFSliRmKpmpPmHRVTf1Sq+2hE=; b=p2jdLnF+o2jszv2jswOdGKVlOI6oap0/O8UoWJ6UXd1vWJ7ZTNuGXBJzfbZP+U3/qi otCtgNo0FYJGbVJMagQHVxCjJNv9DsL+tAgpbtcseuLRjx2D2oJRJvb8QUEovItoJ4yu tqM1+sKVNJqdRAOn+U29/OmuIVN0dCZaqyMULYrLeNzvWGSINvgRw2ctCEPTtpJHvG4Y 9Lt1J9Pu4o6vmxc1Dlj1+fWckvxFMkS2v0xzgYEyRXbpmL6oLpAd8HeumDihMK2pn/qS boIjYLobOad+m+G9IYsoBFXJgOFcyiWgGfoj3yVWjcIkFyKdq3aTzC8VwLjAVimMrt3Q 7cZw== X-Google-Smtp-Source: APXvYqyrk8OHD0K9x3jg/zl4sLls8epCiHibtZqTP4ohZ230SxHbnF+YASroUXHGf8XghjTINYs0fA== X-Received: by 2002:a17:90a:b394:: with SMTP id e20mr1897367pjr.76.1564712444816; Thu, 01 Aug 2019 19:20:44 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:44 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Alexander Viro Subject: [PATCH 21/34] fs/exec.c: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:52 -0700 Message-Id: <20190802022005.5117-22-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Signed-off-by: John Hubbard --- fs/exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/exec.c b/fs/exec.c index f7f6a140856a..ee442151582f 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -227,7 +227,7 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, static void put_arg_page(struct page *page) { - put_page(page); + put_user_page(page); } static void free_arg_pages(struct linux_binprm *bprm) From patchwork Fri Aug 2 02:19:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071841 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 56813746 for ; Fri, 2 Aug 2019 02:21:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 488732877B for ; Fri, 2 Aug 2019 02:21:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C819287C0; Fri, 2 Aug 2019 02:21:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE0AE2877B for ; Fri, 2 Aug 2019 02:21:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CD3BE6B0277; Thu, 1 Aug 2019 22:20:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C37066B0278; Thu, 1 Aug 2019 22:20:47 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAED46B0279; Thu, 1 Aug 2019 22:20:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 75C186B0277 for ; Thu, 1 Aug 2019 22:20:47 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id k9so40739256pls.13 for ; Thu, 01 Aug 2019 19:20:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=3zvxFRr3gjg9t3ZKCwZWoMY3PeLUGF9FofBT0j+JfJs=; b=qq7aHc2YXwEJkV2UMq1eOL2T1OaTMVpPABaOIz6MY2L0fjtaSa1cIL40siFOZJLEBV 19+dTINILwvGN+huNLnq5+I0QbA3ZvCuwka/7yE1y/EEaP8gSRxM6AIZRLBM7vgdQ3ud olcg0A+Igdj8c/4glUEUsJfpRWkHY53ITNg9mFJwRi10JWMT0tSXT9ix9DRitjYMP6VX YLORPxvz6fu7vb6vHD5bIa2Bs3pNBXHx1LyS55MyWxyds9HhDHtAiDPgadU8D3HBxJwF TUSTesoqgQALNqa3S8lKrayENwbFBWXr+Kp2qZe9PqMKzGOsu4IN3Rte8IGeEOAfJdVs 1B7A== X-Gm-Message-State: APjAAAWiZhG2ZWc8u68Eve8wrU/swBW2EBDC9LtWCi261oEhdJbOeK78 jPfv6c99L+meZ5UBBGMFjes066dvmlknCQJCGLNJ0yMudH7ReGLYSwGHcrpHH4fX13bJo9UUa5A MgoEYtcw8utsQixJVpwbpzai8aOnoJDUOWMxAXIv/A4PSIrhtwmtyPX16BWrvO3kflQ== X-Received: by 2002:aa7:9dcd:: with SMTP id g13mr58150346pfq.204.1564712447170; Thu, 01 Aug 2019 19:20:47 -0700 (PDT) X-Received: by 2002:aa7:9dcd:: with SMTP id g13mr58150299pfq.204.1564712446587; Thu, 01 Aug 2019 19:20:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712446; cv=none; d=google.com; s=arc-20160816; b=KTdfMZnRghsdOL8e73JTBoxld0f1lENJ5D7E6yfLZmyRMQuvygjtng9lyouVQg7uWJ jHtyC/EXlp22smEU02yxs6+BwiaDNJulQAYRr8zjCGBL2Qfsh4iGMPUZyhJ2lHITBov7 QyP8G4hx+VxO4eHkpIRrjXI4zdb5SMi3DRlis2mFuZ20LFcE0iZDMJ7Zh7cF6SECA8mg AxmsEOfgj2GXKcJkdH9IexwKP5t/pO9SDKuFi8g+ym5MGiOfDwf6jYSMZgEIsYot0nmG 53dw4CPZyspkie/trKXI6lB+W5IT89mI9TYQi/dbJE0oZPOEy7x3fs7b5qCFEB2/LJND Jj8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=3zvxFRr3gjg9t3ZKCwZWoMY3PeLUGF9FofBT0j+JfJs=; b=M1H8dNTolxbFw0mCqVIsqOQBZOG0mAX+1zfdP+J+QXTcrl5twEIY0avGVllQNaLAmZ Go2tDYtK6cAEP0aSOhU510tjOA4rrmvtubVOzGMKjEAIkjnERYBB1EnmEhUlrKNY8JvX WOhi28ObTDkKpw5v/I2QRfQFjHZvuM66MrY5sVSyXE0ZEzwSNQl/k3mBAi57s9GfnOhd i+v4sAHnea9l/+eLm18BkoXzYznkYmVtuvB/M+8rTvVa/Y2epxEwKvWBCsvSHJl+pfpg tZZiXf3ALOHwcxW5sxGwLt8Xupb3y8i2jcAhbQ4/TxzMtZQqunXbQluWvEmsbVQh9LZq hX0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bFa24Z5m; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p61sor8449572pjp.0.2019.08.01.19.20.46 for (Google Transport Security); Thu, 01 Aug 2019 19:20:46 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bFa24Z5m; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3zvxFRr3gjg9t3ZKCwZWoMY3PeLUGF9FofBT0j+JfJs=; b=bFa24Z5mQSzxC4eOzJ4+7AblweRywqOmLHClqtb5KdjCAjd1PUSEw/ZsQSQOyWjUsC 1nWyBkhFn3Be02SULNTaYtTCG2J6o3/uRCn091UpjmhLyF7xPQy8wXw/xt4PRY9wiXXM V1nMLk4YhEUMXleXPkZw51V9rlN393l9K+gVXIZUF6ECoqP/Y8CZfCnooK6DgUB0tUD4 eFt7VWtlBH1sk6kipujvSPJHkQR53+eHLV2iAcuMnAVCEWZM24hHRYthkAG8xQ/D08vi iFZfyGckqNCA5JtaUEszagJMdsqH6lCds+G1LZm6Cvnsgs6SuhZpo2MKRXwMzsClRxnN IVug== X-Google-Smtp-Source: APXvYqxR/U1dL3txs9pGjSe+FwW9uMtR0k4KNaBNNpf6pbzUbZzBuQi9NPNfHMjGx+8Bx8bZmFuKIw== X-Received: by 2002:a17:90a:8c18:: with SMTP id a24mr1817929pjo.111.1564712446323; Thu, 01 Aug 2019 19:20:46 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:45 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Mike Marshall , Martin Brandenburg Subject: [PATCH 22/34] orangefs: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:53 -0700 Message-Id: <20190802022005.5117-23-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Mike Marshall Cc: Martin Brandenburg Cc: devel@lists.orangefs.org Signed-off-by: John Hubbard --- fs/orangefs/orangefs-bufmap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c index 2bb916d68576..f2f33a16d604 100644 --- a/fs/orangefs/orangefs-bufmap.c +++ b/fs/orangefs/orangefs-bufmap.c @@ -168,10 +168,7 @@ static DEFINE_SPINLOCK(orangefs_bufmap_lock); static void orangefs_bufmap_unmap(struct orangefs_bufmap *bufmap) { - int i; - - for (i = 0; i < bufmap->page_count; i++) - put_page(bufmap->page_array[i]); + put_user_pages(bufmap->page_array, bufmap->page_count); } static void @@ -280,7 +277,7 @@ orangefs_bufmap_map(struct orangefs_bufmap *bufmap, for (i = 0; i < ret; i++) { SetPageError(bufmap->page_array[i]); - put_page(bufmap->page_array[i]); + put_user_page(bufmap->page_array[i]); } return -ENOMEM; } From patchwork Fri Aug 2 02:19:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071845 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9133913AC for ; Fri, 2 Aug 2019 02:21:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8260D2877B for ; Fri, 2 Aug 2019 02:21:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75FCB287CB; Fri, 2 Aug 2019 02:21:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 130F32877B for ; Fri, 2 Aug 2019 02:21:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7546B6B0278; Thu, 1 Aug 2019 22:20:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 66CA26B0279; Thu, 1 Aug 2019 22:20:49 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4E1AC6B027A; Thu, 1 Aug 2019 22:20:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 139546B0278 for ; Thu, 1 Aug 2019 22:20:49 -0400 (EDT) Received: by mail-pl1-f199.google.com with SMTP id j12so40681179pll.14 for ; Thu, 01 Aug 2019 19:20:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lKIFYbXGeRFczJ7GPuSawhtMV9YIx2+MYUTps7oOTAE=; b=RJNDNg8qzkPq7ntCGi19JS8xxHUol5fRkq7es8VW0ImlLdSeiArZOFwd7ARZpzc5ZB LKjyKLNZoGXEcqlcmgy+YpI949yEqM+7Ev0SRsbajl+pMGDkuHFKGs/zTkhfKl4rYXpB 92pTo4tHxKILGcyGZAvA6z3u7TfoSY9QbaQPXEcKaXrOdqE3m1QFg6z8jEPPI0aZ4P9H 0z/mZYfTbXYtZbR4pUBxP4iP0krtBoBfxN4uJ2CJTLtasZr7v/S9LhPNkFNbBc/ew1UQ +FdYCEOPntpe1DHt2+NE9NTFJIbDywUlXmT/JrjjXhluuFB1AcdqB3c/I+3yBoebPgTQ oANQ== X-Gm-Message-State: APjAAAWmTDbJC5KiQX75ae0mBkly6apfxrS0FeI8gPxj2mrINOQFLmHu R5tpXOfZnp26FzLGlXnJsy0oWVnr1Ky1ndmNDULx2OiEb1vvk9shrMMZKTfG0TYCALlTaZf8u4Q fgotx6s+BG28F/BPGY+h78TDvDhsA43damSPreWmgZP5wRGImp3Wr5XgVQp0gQFWyqA== X-Received: by 2002:a62:cdc8:: with SMTP id o191mr57009547pfg.74.1564712448760; Thu, 01 Aug 2019 19:20:48 -0700 (PDT) X-Received: by 2002:a62:cdc8:: with SMTP id o191mr57009487pfg.74.1564712448140; Thu, 01 Aug 2019 19:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712448; cv=none; d=google.com; s=arc-20160816; b=YXYOTMcWgOHYe73R/IaQYgaNOAA6dmsJSHBZ87WPjeUH/6gLSFfSqU873UmEraeZ3J qcfCGoY4jYE5dhjuEAEqu3FgkHVr/0sh+29vs+ySq2cbig+C8U0NDZUre9FwRwm2+9WR kcGSthPkmC/bSZG9p9801oYUfbk6/omLSWhGTVRkOkaUTd3TOzvPQ4vsnF94vkfeqLjI vnBK7QVkUOTFITJQD80n0GdVjp4ChVSZHqAsRQXUQu5FdASnRXisLTsPeFZEU4mZnTSE MucIuJLGu1h7yHjKxGVSDtTVU0mJb9B1D/WXqN0PbcHQMX3jFcjsThAlcvnsJMBaQadt Sbrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=lKIFYbXGeRFczJ7GPuSawhtMV9YIx2+MYUTps7oOTAE=; b=NC/7CJUjlkyGsBr+2aj9jZe7UWahBd8C85hyDNIjGd1vhbXIusxVV39igy/yrWLD4d 383R9tP4CUH+zfB+CNFW1QYhEevLBEXvOMOMFko1oMnw40gFTQmT1L6kTgwML5HNycwx CU176VxuiworytTxJztQSV5PmgNSOOd/K5JBRW3vIB0X1XE5vvausgrlgbpBJ1Q8WE+0 Adc36vwDS8ZpUnjmlygMyxOkmWLeVPUWs0au1sk9AFuXGk6+biFEJcGVKtNGDxJA8fmF IlyIIhXJBbOC3zpAdwXWv8hn9DLCDrKdYZflhS3p/lLGzgUvSOSPJ/cMYKsHBHOfXC+V jT6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=R1dyNzOz; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h4sor8179487pji.23.2019.08.01.19.20.48 for (Google Transport Security); Thu, 01 Aug 2019 19:20:48 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=R1dyNzOz; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lKIFYbXGeRFczJ7GPuSawhtMV9YIx2+MYUTps7oOTAE=; b=R1dyNzOze/eqllrUqxRpjhDn38RC7VsduB92QlfhFLYwuwka43d0Yt9myEGcw6WlZm fYIT193clb3cCKkKRa4gQjk01O64tt0BXAAw6nkursyUCEWzk96M/WL6vzziPZU6IL+r rvITeJdAvAjJK8q/L91CFM+eVayVF1xEXzXBIhRNt9HdhEGbz9zWiE6QknGvjT5Q+PbG 0FUQwvdG6OLHf8hS8zvFCr0JHd7YtbTEpJO3//HXWtUvFA/ZCzXGA0y95q3Jed0ZzVaE Qk7ZxouFXvlN6jsSJv67cehYgfxqrCWaOQlJqOD886yacjrOWwt50AkY8+51bO/ECErB IQTg== X-Google-Smtp-Source: APXvYqxwmSe9JrA8Nqe8Cu6LF/8yd68XYfT17/pT9PHXIhg3Pa3JuYgXApqhYkPrHPsf3+6NRlbhyg== X-Received: by 2002:a17:90a:601:: with SMTP id j1mr1872789pjj.96.1564712447882; Thu, 01 Aug 2019 19:20:47 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:47 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim Subject: [PATCH 23/34] uprobes: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:54 -0700 Message-Id: <20190802022005.5117-24-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: John Hubbard --- kernel/events/uprobes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 84fa00497c49..4a575de8cec8 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -397,7 +397,7 @@ __update_ref_ctr(struct mm_struct *mm, unsigned long vaddr, short d) ret = 0; out: kunmap_atomic(kaddr); - put_page(page); + put_user_page(page); return ret; } @@ -504,7 +504,7 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, ret = __replace_page(vma, vaddr, old_page, new_page); put_page(new_page); put_old: - put_page(old_page); + put_user_page(old_page); if (unlikely(ret == -EAGAIN)) goto retry; @@ -1981,7 +1981,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr) return result; copy_from_page(page, vaddr, &opcode, UPROBE_SWBP_INSN_SIZE); - put_page(page); + put_user_page(page); out: /* This needs to return true for any variant of the trap insn */ return is_trap_insn(&opcode); From patchwork Fri Aug 2 02:19:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071849 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0392D746 for ; Fri, 2 Aug 2019 02:21:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E535F2877B for ; Fri, 2 Aug 2019 02:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D681A287C0; Fri, 2 Aug 2019 02:21:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 556B02877B for ; Fri, 2 Aug 2019 02:21:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3FDBB6B0279; Thu, 1 Aug 2019 22:20:51 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3336C6B027A; Thu, 1 Aug 2019 22:20:51 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1ADD76B027B; Thu, 1 Aug 2019 22:20:51 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id D37F26B0279 for ; Thu, 1 Aug 2019 22:20:50 -0400 (EDT) Received: by mail-pl1-f199.google.com with SMTP id r7so40743486plo.6 for ; Thu, 01 Aug 2019 19:20:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rRiJNzkH0bRoPJKYXoQcsROADD9YH4USeXVLEsmAa1E=; b=r+i3YmgE7v22AH15+PBbtnpqpvOIdFOfqgcedhwuGlENzqpyO+bnvBdB1zdKqan1Jd YbA0l/dBeACyZFBubC8kVQ7sz5DyZIcQhMxWWrNolyRE1z87fG0ROJaTrICwWRueS1ui hr+ev95EHG5HdLMA/S6ZaxJ+RnwnlSpWDCtp7kEz0yttXYiPAGBLAb+mU8qNBWkRVPOm YbrlYlIYtuu+n6D31jdwWLIVS5mDAXW7H2fR29iQD7UaUlSykhb5O5SpzuW9gWgNsaLY Vw8N620T2e11a4nbfrYmTzNyIuC9dQgcEmGRjlTDhgBqd2ZKFUqRS6NRNaM4B0hmZaMA AHhg== X-Gm-Message-State: APjAAAULQP3bOmHnNPqUzAHPJcRMJAxU9CGdy77tmA2n611PRk3cSHlY wz4eNgdCd6lD0PWjrUVqgIJvIRo2gyb1GrR5fi7fogeff+K5ee7ZCjsskbIPebx1LlnPIloStPU zRGcITvtKL0WNLRhDI4S6Zf8+lMD+OoSSGQOhmXuvRQkrtw69QsmR1iNb26CDlObrZQ== X-Received: by 2002:a65:654d:: with SMTP id a13mr105399011pgw.196.1564712450425; Thu, 01 Aug 2019 19:20:50 -0700 (PDT) X-Received: by 2002:a65:654d:: with SMTP id a13mr105398978pgw.196.1564712449716; Thu, 01 Aug 2019 19:20:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712449; cv=none; d=google.com; s=arc-20160816; b=w7gXrLRJfNuVbWfgXPLMmkDj5tGkoWZ9pcZeqUbNiuAWlZ3TNm/oKltCPd/856/+Sl 3KrlyE2UKb51vaZL6L4Llv5zZ7Kk1s1l2p+pmNX09H49gejOQisrgeLSOHPDuniJY/BM 1zvPo4GMDpc9S2EFo2RTtkB5ShqXBG7FrBKRxacfPX4m+TDjaGR5+oCk3aVGAAAA6igN LwG35BNPxTXPJCZkqtX4Y686wUDd2SqDh0ebQzhJZfSDxMNc33LGWm8tb+B7FMiTXYKO 1rXRSzwBZ2tVRjQJO1KVCUXbUHocxY5x+qKt4hWjDZ06wgLsntV2ItnVseaM6S4HOBRE I0ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=rRiJNzkH0bRoPJKYXoQcsROADD9YH4USeXVLEsmAa1E=; b=q5fjvC7ljazP9DW0j/NVW53XaBbTLIKzlB+DlWpZ4DWFeDXEXEndS4cC0QcpjNfd1s wo6ADhjtOTv8PcgZ41Sda4jdfy6P9s+92/P5xzH8rv6ZUcV7LszlQEkTtEn52IvfOIPe tdHXacTAMn+Xw0VDcrOqdtSO2XXHD62l8hw++OmImSAdQAamm6CpoNoBQ4e6HsfA2AE8 09/+j6jfRwZmWRsyhxmuOYHD8bpPQt8op5X0LJ4drL/ayBQbSrr88FRmE8rRqUPOy/W3 m0pc7HXk9aQgjxwod7QyZkDTxdOvmzGayLhRexDz/JKmrE+VJpP/ydUuS0/+/RvkXFzp A1zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IdQZjyJh; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id m23sor8427906pjv.21.2019.08.01.19.20.49 for (Google Transport Security); Thu, 01 Aug 2019 19:20:49 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IdQZjyJh; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rRiJNzkH0bRoPJKYXoQcsROADD9YH4USeXVLEsmAa1E=; b=IdQZjyJhMTiA3ru+rOrbTXLCRfg1Iz7YPF+8DSWpdWDcWtOO1jwAD+njJSqb4AFsL3 BoorK7WVXpk5wvzf+3MNWsWlqvxT2AU71m913kuKWpgnoA+0ZYT8hPv0DG2k2t5CL0So 4HfYIB1+xctKU8nZMy0TNVHkmmwgfvFDwPBOEjDSZMguKyYiKdAvH/kYmRGOOCm1PmW7 4QVOBE2D85KD1ebTOdlBPaqm/TGzFf20gzANQLnGH2MHePv/KbpSRa5elxYK3OTWVg7W lX3umVSebAxAiH6LaR7v6UhLbExl0YmQ1qyvKE73k3aH42K6tSy55ZxlEvZWhHEAZhKs EwnQ== X-Google-Smtp-Source: APXvYqyQ9NWbm7e7UjvOHtMhAwjS+tkI0uFYNRjX3KlyXdyqOSjy3adbw2n2ONz+amcM+RqqbPvknQ== X-Received: by 2002:a17:90a:cb15:: with SMTP id z21mr1894788pjt.87.1564712449418; Thu, 01 Aug 2019 19:20:49 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:48 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart Subject: [PATCH 24/34] futex: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:55 -0700 Message-Id: <20190802022005.5117-25-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Darren Hart Signed-off-by: John Hubbard --- kernel/futex.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index 6d50728ef2e7..4b4cae58ec57 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -623,7 +623,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a lock_page(page); shmem_swizzled = PageSwapCache(page) || page->mapping; unlock_page(page); - put_page(page); + put_user_page(page); if (shmem_swizzled) goto again; @@ -675,7 +675,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a if (READ_ONCE(page->mapping) != mapping) { rcu_read_unlock(); - put_page(page); + put_user_page(page); goto again; } @@ -683,7 +683,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a inode = READ_ONCE(mapping->host); if (!inode) { rcu_read_unlock(); - put_page(page); + put_user_page(page); goto again; } @@ -702,7 +702,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a */ if (!atomic_inc_not_zero(&inode->i_count)) { rcu_read_unlock(); - put_page(page); + put_user_page(page); goto again; } @@ -723,7 +723,7 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, enum futex_a } out: - put_page(page); + put_user_page(page); return err; } From patchwork Fri Aug 2 02:19:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071851 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3B2B013AC for ; Fri, 2 Aug 2019 02:21:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AF7A2877B for ; Fri, 2 Aug 2019 02:21:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EBA0287C0; Fri, 2 Aug 2019 02:21:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 996162877B for ; Fri, 2 Aug 2019 02:21:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 66B3C6B027A; Thu, 1 Aug 2019 22:20:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5CD1C6B027B; Thu, 1 Aug 2019 22:20:52 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F89C6B027C; Thu, 1 Aug 2019 22:20:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 06E946B027A for ; Thu, 1 Aug 2019 22:20:52 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id w5so46432639pgs.5 for ; Thu, 01 Aug 2019 19:20:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XDFswRI13oGzit66yuxshlgOj+nOKd4gwJhAdxr7MGM=; b=faGv4B3fgnrXT4bcHPhIWq4ENyYMGFBz7ywyupfcHIg9gwniNtp/sUmAysACJXCKPU cfciRNM8XA+s+DDVJdZIxHRhHn3MtuzVM/Ny5PlkF2Q/L3tnFBOI6iLokmBRBumSR7Q4 +IbFlSz1O/+vfc0VvNbLfz6bY2ssz5G3J+Wq8CVvq0tdL/bxXb6Yvu0CQdAAkJFkIwr/ c/nyZHzPS81CvSu+DbRKISTwH4PRF/EUkQZ1aJXju4CGMIBC0aSJkFkUcSBVxD7zEjyp 2dao5JIUXMltmocFPPwQXaJ0cIyXVt8PfeQxXxgTZeTEzRUGVssOlBDn/i34/ibNmXXW FtGg== X-Gm-Message-State: APjAAAVijrHi7ENmgKurA1bRDEpY89Qfzw03D8A0PwvNxrjlhticNHFp dfaky68yfnu9uErDcGm9g/285qJK8zVQ7k8x2OHFa7s+aunp5M+wEWSKFTcQZskjkMf1vyKyywq x2iTM4LO9LrXJvzMt1SJsJNQRwlhxs7gQehUBF6N3PUUA6n7kUWIpvzeFYSag2kfsQQ== X-Received: by 2002:a17:90a:7788:: with SMTP id v8mr1937199pjk.132.1564712451698; Thu, 01 Aug 2019 19:20:51 -0700 (PDT) X-Received: by 2002:a17:90a:7788:: with SMTP id v8mr1937155pjk.132.1564712451088; Thu, 01 Aug 2019 19:20:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712451; cv=none; d=google.com; s=arc-20160816; b=qkIGTrv549wRCHiBWiwBqdNfij1VHJiSjdqcs2fhRad/3pVo0ValHSqYr7zTGi0BK7 xY3aBgUcNDOLfFPFOqDwme4JYCe7T+2Q/4x91xAOefuQcqYymo6HCVTk0zyxobvIy9im cemSza++7SnLnsg5Dm/8oTU0Jmm9a1Jem6tCDTV2w5UZT/CHJ9AOkcQBaIQZrFhq0alF 3kID0vv6/pxHqzPpFL6k2cJdV0LP60LINNe0amwgvc3Ngcg3Ea2aD9cPz1yqTGOpIEcN 9548sinjdmnL1xWjmgWx7AUP5URRstUat+mHfO7NnOWH9y1u23Db2SYiv5DXoWwpYtxZ L0sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XDFswRI13oGzit66yuxshlgOj+nOKd4gwJhAdxr7MGM=; b=UyGV0S4gVZUZXTrAZstd2YjMHgqpgr8nb4u+Z3m1/smESQ3k9zFCxkSdJ/JdFpDY0p 9F0tQOSm1T2UGz2cmPr0Iv6/p8xYFojhlQ1akvd8oE4qiN0XsQdVuKJEg2CiTuYq0cVt fMrJBgTCP0hw94CUXs2G2sVa4w121O21sQueuYVkqOXgcvIwkdeIaKzCDGnTCuybHPP4 TU0Itfl/SghrrDRuLH0QEnAwFTGZFuPpp2lXxcZ5x1R+wIqfPXpiDtHUAaNJaSZ4bEzj Yus4Kn47uvL5km0mA4gfSUh3Q3Qxpx8WktwbdrcHt4j5r8bTuNSNXwU1d+84pnvAXQZW COmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hP1EduyK; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y131sor54784518pfb.27.2019.08.01.19.20.50 for (Google Transport Security); Thu, 01 Aug 2019 19:20:51 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hP1EduyK; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XDFswRI13oGzit66yuxshlgOj+nOKd4gwJhAdxr7MGM=; b=hP1EduyKMG+yuXrF7KrLXpEWytv06HPkyhEngT/TxypVjl15UFdBSQ01HK831DacB6 y18d2lzANesimTaq9XDZY67ictckhnVqIa+djvmZG+RwwqwovWVosZPm2hXdPP8mZbc0 0yKrCu+VZPWp1BX7LdN24uYM7pD4/H1JhmD/G5vWAzU3HcQxPlc6uryb9qFNED1nmvuy vlc0Xyq/DfVAu1bkczBpbXVhlvoDYp/Xx1PasljpvjsnXilMO1dGN5gCe8VOPhx84A7a m7JqyBz4DRJG/5S/1NCOJ5bKHp9eLh6RG6N9nPftC1UPm2sven5C2Ciggp1fXGl7R4y9 0EuQ== X-Google-Smtp-Source: APXvYqxrGBxtmn7yAK9mdNxfQbE+IWGBlk1o9qGDinrparVfdT4goa6Xy1ipLTWrwKQoX2yj/q+h8w== X-Received: by 2002:aa7:8218:: with SMTP id k24mr54831158pfi.221.1564712450876; Thu, 01 Aug 2019 19:20:50 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:50 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Mel Gorman , Vlastimil Babka Subject: [PATCH 25/34] mm/frame_vector.c: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:56 -0700 Message-Id: <20190802022005.5117-26-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Dan Williams Cc: Jan Kara Cc: Mel Gorman Cc: Vlastimil Babka Signed-off-by: John Hubbard --- mm/frame_vector.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/frame_vector.c b/mm/frame_vector.c index c64dca6e27c2..f590badac776 100644 --- a/mm/frame_vector.c +++ b/mm/frame_vector.c @@ -120,7 +120,6 @@ EXPORT_SYMBOL(get_vaddr_frames); */ void put_vaddr_frames(struct frame_vector *vec) { - int i; struct page **pages; if (!vec->got_ref) @@ -133,8 +132,7 @@ void put_vaddr_frames(struct frame_vector *vec) */ if (WARN_ON(IS_ERR(pages))) goto out; - for (i = 0; i < vec->nr_frames; i++) - put_page(pages[i]); + put_user_pages(pages, vec->nr_frames); vec->got_ref = false; out: vec->nr_frames = 0; From patchwork Fri Aug 2 02:19:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071857 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 52BFE186E for ; Fri, 2 Aug 2019 02:21:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 412EE2877B for ; Fri, 2 Aug 2019 02:21:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 351DE287CB; Fri, 2 Aug 2019 02:21:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23B172877B for ; Fri, 2 Aug 2019 02:21:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E7F86B027B; Thu, 1 Aug 2019 22:20:54 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2735C6B027C; Thu, 1 Aug 2019 22:20:54 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09D326B027D; Thu, 1 Aug 2019 22:20:54 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id C6F1F6B027B for ; Thu, 1 Aug 2019 22:20:53 -0400 (EDT) Received: by mail-pl1-f199.google.com with SMTP id 71so40750609pld.1 for ; Thu, 01 Aug 2019 19:20:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=o8Q8kE8hzW/DwKrVVZh1taN77rkNxpuim/5zYvIGd0I=; b=X3P0XIyftkvskZZG1kEyi3q5wLo0gMbKGu2wcsTy6JVC52fUKeNUWwmvbkco0scb8r ph24fqeWpFyfPmGho7E9j5lPC/reOitja7spC1MBHrHvKcu2NfijIvilLV1cs9xlFtCD FEpQ6AzKNwT8W0E+fUb3SfK3eFABWqUmyWcbQYzg9NMm+JEPl4X19DxXGsNikw4ygSb+ qX8/tTGer+JnVBIT48P0tttQS8KgiV2p7+BtWW3o45R0i8hwC4YgDWIBvUPmIogkTETR UYmHLKN2kgvMxKSH6w0y3dpskGMK0CJC1qPNq3RTXJBiP1Xd6MNi9/S2AYNft2bbDJKZ W5aw== X-Gm-Message-State: APjAAAXt2iB38wpjB7u4sijQxpIPfofJvzN/e8cvVbKuoTsMZEzH3d5M 2csx27nZTWnJ3zx6u/gdu+OXxzBL30xzzVjT0qX5scI9vlKdnjC58oGHQTY/5kBVtCj2F9C+f5g hALyHFWA0LcsSg2TyVgTk3f+S0XM2YjpUPsURbEsixXTiOofgz+cTjtXV5TXGj3/sIw== X-Received: by 2002:a63:6c4:: with SMTP id 187mr114362377pgg.401.1564712453430; Thu, 01 Aug 2019 19:20:53 -0700 (PDT) X-Received: by 2002:a63:6c4:: with SMTP id 187mr114362343pgg.401.1564712452709; Thu, 01 Aug 2019 19:20:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712452; cv=none; d=google.com; s=arc-20160816; b=oI64TPt/7NPbO1sxjf4AwqMWPIumXNbdvF41QfWOW+f+AD6zZHxaG0tNpoaXABR5zO bAVqRQ/iLRQJTQitXgeeWkPP/MDrtAAaqkqItClHDVELATWijswvzkBV7exhf6tTT0FD lFZYrQz7Gz27nplowuEPyLiJt/dpltB/KSnNJKw8qLZHyNLjNt0mXvUCBwHkiZGn5H9X iL/HpRXVfSlx72FJbpP55tYeJnAS7Gaf5nJgxQN7ChXpUxvtzts9MGXxi7fJuFAreoYM VSLWcZjma/u7WIkqOC4IKtxmFG5WxEtk1R0HJ7uX03tjgCslT3GqpxJq7BlrphMEtD16 IuIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=o8Q8kE8hzW/DwKrVVZh1taN77rkNxpuim/5zYvIGd0I=; b=CNpv0+BK+aDdYzUssByZ59ssQHq3ykxJwk9o3u2Boj5y/tMRyF4b02IGlHTeTeOPFb kBq5JRlZz3/ANY0tDyNJca4sofnF5uzEaojMcq5TOmHzDtBMotAGX3P/nNa7Ugb8Jri+ DXaOB9dF+z/iyZDimi6XmzP04cn79vi+vmtBp+xxQ9HxAISscHTXM1RVCxYEC8HLWvfP PxFba0tMMLhAyopb9I45sbd1PhaHq9ddPHD5BL7vafWCDRYAXzJcBOGc+pe9HrMg7UaX rhSmHnG15H7TXs9892GkaHQ8qKpp2FA/JnBR1RRpdwwh4x7JAyXfdVlJXdOmo8DoBQAc oZNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SN9JCWjR; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h2sor88629086plr.53.2019.08.01.19.20.52 for (Google Transport Security); Thu, 01 Aug 2019 19:20:52 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SN9JCWjR; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o8Q8kE8hzW/DwKrVVZh1taN77rkNxpuim/5zYvIGd0I=; b=SN9JCWjRa62SDUJKkHaVdcwHX85kw/BYyJx1Oz6MKq1tPWuA+R+kvOX6gTDvC/TGzM WuYG+JBQhglp5JUL5bE3kcONL91y/gVNfG1/TEEmXEUkwsc3IV9ZwlZo4fZZ39RQbUrI einldN97i3VjPzZmNrk7Gi70UVvHdYeVSXiOY7z0rmJg1OD2RJX0hB2kTyBbOVlbD4F/ wFv0bPm5s1TrbkD6/tFvn6bnIJfGHM4gcvzjJiA5o2aPM4xOIDqOY4iccbO2F7+VYayI O0zTQo6na3+rAYAFM80xDRcL3DANvgDbjQbLbpyWsZCgQEzyIKagAyXZm1uNkiwXdu5u s1Rw== X-Google-Smtp-Source: APXvYqz1YTjVZYS+LesWuf1AG7NOEG7XNcFlAKVjP+75gMoI5m//7o/WseaBl+rAw+Wa9I/u7wQNfg== X-Received: by 2002:a17:902:740a:: with SMTP id g10mr129917590pll.82.1564712452476; Thu, 01 Aug 2019 19:20:52 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:51 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Dan Carpenter , Greg Kroah-Hartman , Keith Busch , "Kirill A . Shutemov" , "Michael S . Tsirkin" , YueHaibing Subject: [PATCH 26/34] mm/gup_benchmark.c: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:57 -0700 Message-Id: <20190802022005.5117-27-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Dan Carpenter Cc: Greg Kroah-Hartman Cc: Keith Busch Cc: Kirill A. Shutemov Cc: Michael S. Tsirkin Cc: YueHaibing Signed-off-by: John Hubbard Reviewed-by: Keith Busch --- mm/gup_benchmark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c index 7dd602d7f8db..515ac8eeb6ee 100644 --- a/mm/gup_benchmark.c +++ b/mm/gup_benchmark.c @@ -79,7 +79,7 @@ static int __gup_benchmark_ioctl(unsigned int cmd, for (i = 0; i < nr_pages; i++) { if (!pages[i]) break; - put_page(pages[i]); + put_user_page(pages[i]); } end_time = ktime_get(); gup->put_delta_usec = ktime_us_delta(end_time, start_time); From patchwork Fri Aug 2 02:19:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071867 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E77D746 for ; Fri, 2 Aug 2019 02:21:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E6602877B for ; Fri, 2 Aug 2019 02:21:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EBCE287D1; Fri, 2 Aug 2019 02:21:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74065287BA for ; Fri, 2 Aug 2019 02:21:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 160B56B027C; Thu, 1 Aug 2019 22:20:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 0E5FA6B027D; Thu, 1 Aug 2019 22:20:56 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EAA5D6B027E; Thu, 1 Aug 2019 22:20:55 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id AD6886B027C for ; Thu, 1 Aug 2019 22:20:55 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id w5so46432737pgs.5 for ; Thu, 01 Aug 2019 19:20:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GAYBkmVoEF3i3+udFKn42Z4HyLG0jAAiACtL32v96bk=; b=PcHbEInYP+oas7bxzYf9pXprVZ4asBF/W2/zFLDMa7ceXNBWg0kYoOJvvGszlnft3t BSVsmkS3FrUxMdRJ8HDnKqemBoCJLPlly2mGxpF/Dc1nnf4W7ZaFDgLB10/5J/uPDbXI oSo82qyHlbrLWcdcsTAwql6Y5n6nZMpXfpJ+VFwBnW29kmFnSLlV8ONWdI6tKoI5hsZc UNUfKlgXKBo7Z6SwvdJVk84gwKfpd4z0ZUuFkfEu/o/m6p/2/FQWCy+7nRzxKiP+R3II 4tALSfzWKWCG+iXE3wujd44tRh5x5QLQ0DN/iXMf3xd8ihsCKi7OuFp9PRNTG0bZS1ob E+PQ== X-Gm-Message-State: APjAAAWc+Kjvi/nc/77Vx4i3sLP+diiWob7NilLL1vVEAuQSNQXuwAPJ oE5h9BMDk2BmW0z2VNTUzeLVjkla1W8olEWqJ8JD7ONLe5KfsgYxl5qGDRPBpX8GkZbOaQkyBvm 1Ul65iAfH1ilt3ZcTcKM7TKvqgMI6ercAD+9bqhxz9BeGmFNmm/Ar02kjPY3nmt98pw== X-Received: by 2002:a17:902:2869:: with SMTP id e96mr124368747plb.203.1564712455382; Thu, 01 Aug 2019 19:20:55 -0700 (PDT) X-Received: by 2002:a17:902:2869:: with SMTP id e96mr124368695plb.203.1564712454435; Thu, 01 Aug 2019 19:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712454; cv=none; d=google.com; s=arc-20160816; b=EbvcAbjW83UVLzwyIF+DBZVgE95YB5OM1KOaqrw4/FFvK1oJ42PCq4mq4S8zwspbxw SKE3LZo/nWsfJur97MEAhyIIhO8n8+18RWRfiYp2/F0e7utpaaYI0krsn8GnLxuIfEy1 HW+RmwCI0sWqxayPx0lIQ1930IEaEOUVpPKclC/griGfM1zL+Elw8zChrRPwot76V2n4 09wpJgRmPcHNf3PPLEiWpSbaH2pOPh7e8ehA+UjiBoG1mbs+yXbnAHEkSE85aD/3Wn3a SPCGmBAZ6GgKz8t3FuLNc97ItKfkYLUqi8P/kcyBx+6dB5xfb+s+olE0txHDT/p3tj2Z Bmhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=GAYBkmVoEF3i3+udFKn42Z4HyLG0jAAiACtL32v96bk=; b=vX/cYZVgYNT2AbdJObT1Q+WiZw8ZTg1ZKTd+D8FcO9M0WiyoK6gt59CE4akJZiTPru ErZuDrYhVPEpiHRyHjpaVcHQ6UHOS9sjqC1mZNcaW3c+AosjegS5HN2a9IqwWtxXrm4u 1kZNQeoGd3wxW+7h8BzLNEHiKaqYccTLk6zwcZr9AEY0UzMavn6PxUkw3H7LfcuPpp4t 2lsWsGZ+w8vW+n4VDGD/WmW10qHW3I2QThzgaqAtWlMkeFjwkSy0TXbYGScI6rNffZd/ IjP4WM1Td7r9UTyYTL7PskVwS7TD3FK2/abU4frt19VimuQrWnxRtvdFEcD1itfW9eWs C7nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bmiw3CX7; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id a1sor29177427pfc.63.2019.08.01.19.20.54 for (Google Transport Security); Thu, 01 Aug 2019 19:20:54 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=bmiw3CX7; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GAYBkmVoEF3i3+udFKn42Z4HyLG0jAAiACtL32v96bk=; b=bmiw3CX7eWARhNE7AvtkZmQS4x25Aeig4lpzknXcIaYlaD2lFjd7SScDpJpgYkkx7H M9zB+YKzWGQiUxpLMFNGr5C65PRt2twJ1gMudyUxXC2keVru4Xjo/FbRHcQrMN3Y+TrZ eo41sq59jY3La9DLko+7E0ikMqlCsHblNQuS0OdL1WxPMxgnPsNhJmLosVpKu/cSt2yk /jFkZ5J0l+DrkETHxtxwR7Cu6qeEDmLrh7LIOTNKe2v9mBpFbaPnHS0W/dcoeyOSz4Iu 4HCVwyMi41Z2O7etDQGq6Zv3vzS7McPz5uoywJBAMCcGAE7RrRQ8O1qBbeYiWwc/8w4w LKxQ== X-Google-Smtp-Source: APXvYqxC0ya0xWU0ncqxEWJISgZVi9PxJ3dzG7YEhtGnuj+4PZQMAaeHdCEV26ObbLm8aGFRS+hMhQ== X-Received: by 2002:aa7:9481:: with SMTP id z1mr57240070pfk.92.1564712454191; Thu, 01 Aug 2019 19:20:54 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:53 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , "Aneesh Kumar K . V" , Huang Ying , Matthew Wilcox , Michal Hocko , Peter Zijlstra , Rik van Riel , Souptick Joarder , Will Deacon Subject: [PATCH 27/34] mm/memory.c: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:58 -0700 Message-Id: <20190802022005.5117-28-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Aneesh Kumar K.V Cc: Huang Ying Cc: Jérôme Glisse Cc: Matthew Wilcox Cc: Michal Hocko Cc: Peter Zijlstra Cc: Rik van Riel Cc: Souptick Joarder Cc: Will Deacon Signed-off-by: John Hubbard --- mm/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memory.c b/mm/memory.c index e2bb51b6242e..8870968496ea 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4337,7 +4337,7 @@ int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, buf, maddr + offset, bytes); } kunmap(page); - put_page(page); + put_user_page(page); } len -= bytes; buf += bytes; From patchwork Fri Aug 2 02:19:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 61BA3746 for ; Fri, 2 Aug 2019 02:21:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E190287BA for ; Fri, 2 Aug 2019 02:21:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40FA7287CC; Fri, 2 Aug 2019 02:21:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9A862877B for ; Fri, 2 Aug 2019 02:21:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35D046B027D; Thu, 1 Aug 2019 22:20:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2E7FC6B027E; Thu, 1 Aug 2019 22:20:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 187C26B027F; Thu, 1 Aug 2019 22:20:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id D75C46B027D for ; Thu, 1 Aug 2019 22:20:56 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id i2so47122740pfe.1 for ; Thu, 01 Aug 2019 19:20:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Puv5caB6Xd1AJbwd7nGzyFKNouoVWAfL+vJwz/b+4QQ=; b=Ba04IUtSj+yDwCs7XnfohxncE3mYEB6+RyTfscGUb0uSUatUG/VA3g4bS9/2HUeFd3 fVLMfaO2xAm5lq0C1ycCv0WeZrlG2F6kX7uBNxp8GB3BfbXU0UYZ6AH6m6vvfmYEEPtS OtbbZqnp6cCsQYTPpBnKWaGNl2yNLpfq/5cNDBCRg1cJlaSut4/iLEjCpVSc6L36PGpq UnvoytILkSjl+qRVGzU6pmSsRFafzHV48/uMLE46nvuWPTC4TSbG2W2Xun5ckbxxalCX qrQtxpiFf36hdHFK2Q5qWDEPeQVOU9QIauQoO5CC9fe8b9bsN7f0JW1Skp+FhQ9qY+KH OUjg== X-Gm-Message-State: APjAAAW89VhxKLwYOQP9r0/MDZy6boORTO806A9QpNoRmNo22766Hf2z 2kh7XIHZzDD+GxTYsLCd8yvYRoEj3JOwWRE2FApvGkTZcSh7eiTm1OijDFnDvpuDkGpxZQph3j4 waIKVFFbeK/ftvDcppjWwZ5qtdzaS9C2/BrHhH3TcCf2v/Cfp3CYwvGgvHJ/qET2jeA== X-Received: by 2002:aa7:9117:: with SMTP id 23mr57235462pfh.206.1564712456584; Thu, 01 Aug 2019 19:20:56 -0700 (PDT) X-Received: by 2002:aa7:9117:: with SMTP id 23mr57235411pfh.206.1564712456015; Thu, 01 Aug 2019 19:20:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712456; cv=none; d=google.com; s=arc-20160816; b=SbMnRBEehAGy1ol5cQuZze2QfZYhEqpe544QVZZC470OAtuGTeIteMGiYdInD/wspc mXCQpK1ZRVEFhHoQTYVi1af3m5J1qFe8pcEoC6DJzUR7SzXrNrhqUJjt1GI3fQAFCapx BZnsVTC5I+oVneHRzWqgd6sb6TutwGOz6BmyDYYK/dX5+mTpqyPwL6XfBdS5N7RclAHJ a0pLc2IGIeUk1qZjDla1nInfafhC2QuwHFItjN+Tq3w4VJRCmcE4InfF4dIx6Bp4vGeC y+u95g7Cq2KDBHiZ5bzfswHkw6VDP9xToLg8khWqfx64bKJNvbKZGuPzFz042gaR7Xku 9ZLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Puv5caB6Xd1AJbwd7nGzyFKNouoVWAfL+vJwz/b+4QQ=; b=p1ddIH4ui3/ff9SkOLcnBRghQQjj68OvQB3YBiyAYAYIN+y9/j9zu9MMx+N1kw82hf Tncxs6xi5GLnHgULBAI7OYc6U2IfjWV1J6wCj3WMAvqwk69CpeudhGmdS2AxUhtlqw2T JBKAYQJvqlpk7tbisvPG9RcyW9jdyZ8RqLoGQQlZl3QWf6P6njcN96A8lUNt4WG5a5Qn QR6WiuVbQLivuuNUL4Q0tyoqqFREsCRdomMULJDgQs06ozpDSxtqDK6iaS/173ZNUwtT q9ity9/WmPGmwFR6yOkh3ynlMy4FMtDmDTD8H1GVYL4rtiMlg2cpTsepd4fL3fhd5bme zOfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QRyVr5yg; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 73sor87845938plf.60.2019.08.01.19.20.55 for (Google Transport Security); Thu, 01 Aug 2019 19:20:56 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QRyVr5yg; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Puv5caB6Xd1AJbwd7nGzyFKNouoVWAfL+vJwz/b+4QQ=; b=QRyVr5yg7UVnGFe/94tarV2cx/oce/jeAuEbGS+hXnWMVkUY07iSzJ+XdsjD5nlJBq rtaqXFFIyJDVZMz/IPqdxV28iUWO51kec9aYcvEuc1NKK19hn11UPjRAndaZuD321pFs RKnDddIFoWzyAYe9j0yIZ0ilD198KHwio3GcyDW9wHOLHbZQnh4EWC6hi4aeKuKjN/3A ASJiUynmLC6iZL/fZBtp3/NtpLCOGP1VvcXTdQwMcpbWEECy63Zknc8xjKmFGFNfVmU2 0O+/0uGt4SKVMx7bM2tpg32Bk0v9UkWkkUlVmxU39ntVy853hr2Hw2jr21+6/jgrAg21 vCDw== X-Google-Smtp-Source: APXvYqyaZ4okZt4HMDulUfOascyI9kF+Bm8CH1styyIgJXB6Yp2GZVtQjz5NJsvyCn9V25oNb5Ohjg== X-Received: by 2002:a17:902:100a:: with SMTP id b10mr87552918pla.338.1564712455774; Thu, 01 Aug 2019 19:20:55 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:55 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Daniel Black , Matthew Wilcox , Mike Kravetz Subject: [PATCH 28/34] mm/madvise.c: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:19:59 -0700 Message-Id: <20190802022005.5117-29-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Dan Williams Cc: Daniel Black Cc: Jan Kara Cc: Jérôme Glisse Cc: Matthew Wilcox Cc: Mike Kravetz Signed-off-by: John Hubbard --- mm/madvise.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/madvise.c b/mm/madvise.c index 968df3aa069f..1c6881a761a5 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -672,7 +672,7 @@ static int madvise_inject_error(int behavior, * routine is responsible for pinning the page to prevent it * from being released back to the page allocator. */ - put_page(page); + put_user_page(page); ret = memory_failure(pfn, 0); if (ret) return ret; From patchwork Fri Aug 2 02:20:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D678B746 for ; Fri, 2 Aug 2019 02:21:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3CD52877B for ; Fri, 2 Aug 2019 02:21:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7CAD287C6; Fri, 2 Aug 2019 02:21:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BA612877B for ; Fri, 2 Aug 2019 02:21:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A48C6B027F; Thu, 1 Aug 2019 22:20:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 703F56B0280; Thu, 1 Aug 2019 22:20:59 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 530E26B0281; Thu, 1 Aug 2019 22:20:59 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 19C966B027F for ; Thu, 1 Aug 2019 22:20:59 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id q11so40680105pll.22 for ; Thu, 01 Aug 2019 19:20:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=P44t64b1Yt2CczJo6SOAPYnnEfAXhRMhGjbg0YSdFKY=; b=aqHrofF7uT3BAThuPYFwpUjT00vkycHOwnrnrxLOJjVoT3M2rhjetOrQnv3zZxRDHi //LUnQ2pnag8jAVnSp/bkApA9KtuOdvsxemcXWuSy3txmzWx3YpRGppNnbAHpkoOSSXI zINg1nzngtUXr8N7XJItMRxgNE10AzHUUlMcM2dWyHTIlzz0zvxOjA7CVBF39baL0xvb LWSEK1KNhiSOtH6RGx4R6IieEmL1mRVXycbrmpgNqSwCUA3KqYoEReGyiZGkDhVXzkrz CNXgQ1GqlACK9VXSriYJmi2yhLiqpUfpdLSRycAvqTqWeFLgxv97Pgr1oNg19rAfnxRo e6iA== X-Gm-Message-State: APjAAAWmtnALzYRXhN3I0L3Faskd0vJqHOCgPzE8Ss3IZ7Fv2Pv/Rlq5 tb1grvqDoyGFuJIwePDDTyMw0idkMbSFTtihiAZM6ED/O6GdLyalRQo0a+oz3eVKwAQFitdxw9B EmK1HwxkX1GQ8JL6mdwQF1/AWTCVwf73SJ926d0JE7nEUSQStC/Hd5iRsck3ItOGTCw== X-Received: by 2002:aa7:8007:: with SMTP id j7mr56398806pfi.154.1564712458767; Thu, 01 Aug 2019 19:20:58 -0700 (PDT) X-Received: by 2002:aa7:8007:: with SMTP id j7mr56398742pfi.154.1564712457745; Thu, 01 Aug 2019 19:20:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712457; cv=none; d=google.com; s=arc-20160816; b=rrsQWFJIe6MFzEwHUZBWKK2w/FzYVNH4TX8N50ne0wlSTOtiD2LkFAFJ3HBjN5vexA bdeqhXPc38ad/rT/3kSGqLeuP08IRLxd9ETZwJHX1Mi77fhYd34kcYY6kgsqqksuFd+j bUFKBYE0B0r1ZHsixboKnoJ63QuhZGC5EeTmz5S2N0WuUo4AfPixmthbD7o3Df5r0a2t 31qUT4PXWQdmpRLNiZdHHE7pTcYQ/2Ax2Xv+10lvD9SEYrnlF0T8tB9bEcMPlItR+iDs PbuBpf7gceq9uen9NFw6MB5SDfaCcUMbarcgBdT1GPccVV//mXpcZ/kkLUNAV77Tt4ae 8jkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=P44t64b1Yt2CczJo6SOAPYnnEfAXhRMhGjbg0YSdFKY=; b=mDUqApE7nR3c8mA4uaLVSmzLy7CoCRqldVLS3L2eqyqsSFB4e6NzJwI/M5mCpqW/nt UQnnEbh8EF/qDagWujyrwd5jGh6YnUrQI55NnvlhAfpwREZeOhV2yyksVR01pFJTQjoZ 9AbfUWTlJL05xT6dAD5aQqhg6PvrvBH1pdgUYHapIJA6NvLTjc4X4sGcQXwUdWyHuKHh aNaCTs6PdO/vxcmEwiHki7aA49rdCPJ2sLwyce0+mpWvrdf/ZvgcWWTTCxmwD10HPIOM nitwMn7myLSnClc5Lj/PJ1LDM/ubGAfdO9Xl55AcDrYhNRSqyu5P83T+qtGuQyi4qrRO C7Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pDDjdXXj; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id s28sor42923919pgl.38.2019.08.01.19.20.57 for (Google Transport Security); Thu, 01 Aug 2019 19:20:57 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pDDjdXXj; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P44t64b1Yt2CczJo6SOAPYnnEfAXhRMhGjbg0YSdFKY=; b=pDDjdXXj6RFblmUZntZEJACUef7RKkNl/YK04UbkHBUCjruhPz1DvjNzBz0yKiKhLU m7TMmjuez3cY0GOJbOTSBK2VUdIVnusEW0vCSFZAYXoD3irkbR/lbNxP1xvdu08hMie7 kzmRBnIq1D5NEN+UIvAycIBnd5W1b4XDWFug/SXkacUthZGPwZUithvAb6zFZK598+Zf KNchzaJdTnwJOaC7HcvTulBYTwt81Zp1hO/B2Q1bZULoUdzowXbHyNeGUScibcu9SmcM prETRVYk+V5bEeFpHbvbtuzpFBWpu22yc2ThdO/xtNJdbTSkoBepWkhbKAkxtBTCzSLm uqtg== X-Google-Smtp-Source: APXvYqzmhx2HN9zJqN7W3z+BTBjGONUj50lIUbKXplqq4RVMAlpQQWHUfPagZ1wT+1La24vM3uCr4Q== X-Received: by 2002:a63:9c5:: with SMTP id 188mr86233384pgj.2.1564712457422; Thu, 01 Aug 2019 19:20:57 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:56 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Al Viro , Andrea Arcangeli , Christopher Yeoh , Heiko Carstens , Ingo Molnar , Jann Horn , Lorenzo Stoakes , Mathieu Desnoyers , Mike Rapoport , Rashika Kheria Subject: [PATCH 29/34] mm/process_vm_access.c: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:20:00 -0700 Message-Id: <20190802022005.5117-30-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Al Viro Cc: Andrea Arcangeli Cc: Christopher Yeoh Cc: Dave Hansen Cc: Heiko Carstens Cc: Ingo Molnar Cc: Jann Horn Cc: Lorenzo Stoakes Cc: Mathieu Desnoyers Cc: Mike Rapoport Cc: Rashika Kheria Signed-off-by: John Hubbard --- mm/process_vm_access.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c index 357aa7bef6c0..4d29d54ec93f 100644 --- a/mm/process_vm_access.c +++ b/mm/process_vm_access.c @@ -96,7 +96,7 @@ static int process_vm_rw_single_vec(unsigned long addr, flags |= FOLL_WRITE; while (!rc && nr_pages && iov_iter_count(iter)) { - int pages = min(nr_pages, max_pages_per_loop); + int pinned_pages = min(nr_pages, max_pages_per_loop); int locked = 1; size_t bytes; @@ -106,14 +106,15 @@ static int process_vm_rw_single_vec(unsigned long addr, * current/current->mm */ down_read(&mm->mmap_sem); - pages = get_user_pages_remote(task, mm, pa, pages, flags, - process_pages, NULL, &locked); + pinned_pages = get_user_pages_remote(task, mm, pa, pinned_pages, + flags, process_pages, NULL, + &locked); if (locked) up_read(&mm->mmap_sem); - if (pages <= 0) + if (pinned_pages <= 0) return -EFAULT; - bytes = pages * PAGE_SIZE - start_offset; + bytes = pinned_pages * PAGE_SIZE - start_offset; if (bytes > len) bytes = len; @@ -122,10 +123,9 @@ static int process_vm_rw_single_vec(unsigned long addr, vm_write); len -= bytes; start_offset = 0; - nr_pages -= pages; - pa += pages * PAGE_SIZE; - while (pages) - put_page(process_pages[--pages]); + nr_pages -= pinned_pages; + pa += pinned_pages * PAGE_SIZE; + put_user_pages(process_pages, pinned_pages); } return rc; From patchwork Fri Aug 2 02:20:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3FE0A1890 for ; Fri, 2 Aug 2019 02:21:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3056E287C0 for ; Fri, 2 Aug 2019 02:21:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 200CB287D1; Fri, 2 Aug 2019 02:21:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9BCED287C0 for ; Fri, 2 Aug 2019 02:21:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A4626B0280; Thu, 1 Aug 2019 22:21:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 704CF6B0281; Thu, 1 Aug 2019 22:21:00 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D1966B0282; Thu, 1 Aug 2019 22:21:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 23B266B0280 for ; Thu, 1 Aug 2019 22:21:00 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id h3so46429247pgc.19 for ; Thu, 01 Aug 2019 19:21:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4iYkOl3aeyTERThJenFq1/3UwJx4Onl0nTT+k7YLDaI=; b=Wwz1piYhfFa4FiZaUIGzW8jO3Svd0kCU9RP1hEqu1meQynoYWxwlIzbkMCezVL68lX wzLzwlD+a9L8c7/MZvQirRWjCW23scPfmH0lFRr4ahN/PBDZZeF+5nF51XiHCai2hS+r yQJ+q3kO1+5F2rZ5aI7NPZwtuRxJFfnjJXBAEyijJA8h+G3XZUFxvfhXJW1uTnzxEwM6 JggzxWZVHcAqC1udmHSDUeIRqiUQERlbxTHUIc9GAHX12g8UrU2I2OVki9hyWqa4BrVG wZ6fN18nxdQxKundhPS9eNjXUUrfkshPtLAu0RBbfQWAdO086wSiYl2687xxzrRfcCyO pjeg== X-Gm-Message-State: APjAAAXkHHcc+ZzcIQMEFwG6LkxvHbDrXz8CObnVzbuZ5KzM3xnW7rgu un8+Qf7JCeMpdS6fRFF/4BFOD+IgMvJajMCRnBZCOOcOLbQ5RSg+MH/zFy4qqzcy0WSmQEzHOli FMeZdlOYP///ZEb1l+Rr98M8tAGzFNTSjt6xcGYnNqGcgU31XSPn7BJgmcLD/zaUsTQ== X-Received: by 2002:a17:90a:8c18:: with SMTP id a24mr1818758pjo.111.1564712459829; Thu, 01 Aug 2019 19:20:59 -0700 (PDT) X-Received: by 2002:a17:90a:8c18:: with SMTP id a24mr1818729pjo.111.1564712459217; Thu, 01 Aug 2019 19:20:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712459; cv=none; d=google.com; s=arc-20160816; b=dVbZoN1kgdMvCrfl0F52MQb5LQhmLHlv224EorKwQRn2bxko+KyIqZrq0usYo3iO/l rwtv1duanJI5jB4RuMCfAlqHx088a4WfE59qNlU7eDT0c9JX8s3UlG9QMc+gag3FkKaF 5JWOVUOuvU4fY9hx/9oMSpRv3aXoDDK9ycc05mbOCUIjodsPSM7rURmJ3XVRaEa6fVmv X1OPfPOOq0dz2hjJcdKp+6KsQwTEuST4jlc4L6uCYRCwmVbTZ3y3NRSjFAft6FJkJIeg fRmE1EBZ6oYxRiAq3Gxk7rKp8ReVifiA6xdlaUlye5A7YUCjRgYynwzwN8zhBervZkpA QF5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=4iYkOl3aeyTERThJenFq1/3UwJx4Onl0nTT+k7YLDaI=; b=zxsLDcrNOPTvtKmF/ILUj8N8hwPv6FjuHF0n1OqJXkyq0GD9eG+y7q2kUzahKOTaFN e+8V2w7yPv4ZojBdbDj9H8gpdP3/Y2s/ZwU67GFz3V9j5Q4ofymCIEk2dyjtxivRe3LY TZXhkLpF52N2PsY//zQBxGSTmIVyvOcbvNOjhFgCYk6hW4nHARpREvqBQcGiBBVy6kiZ Ri90nn+bnvNgXqEPb/Sxk6GejAWPXDR1Lsk9qMCCxhIxfditIMYXe/N8vq/ztVqCbZjf raarGlNXGeRVjMCrvM0Pkik+Yx/i5jMoodM+q4oKpnUnb/5K77g+7YTl8YaqmO+1Y0Tq tkYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=elfpTxMe; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id c4sor88549110plo.34.2019.08.01.19.20.59 for (Google Transport Security); Thu, 01 Aug 2019 19:20:59 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=elfpTxMe; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4iYkOl3aeyTERThJenFq1/3UwJx4Onl0nTT+k7YLDaI=; b=elfpTxMe1/6j0BhX2ft/28omzWdU5w7mpxF5KS6Ry8a8zkGJScYbqAJ2NTQjOpA+gX oQX8NO2qfr8fQYzhkmlI2m44i8n5UA95IshiSsHQfSaUB55LfEMP8Nf6Bwly/9Em6O/v kb75MLzprl0H6ilua+Tsx9/J/pL9/kQBkbd23F8nfmf7/S2UoqNko9rQth0i8PtjUyLH QNhM+JJQO3CxcyAMQTRjV2IrQz9Ukzpv3t7kO6uUD4p+f92uGnc2g/qdEf6YIu13QPQ3 M8XRiksoxntjoSZ9RhVKNzEdpCIwtT4CToNN39nu0gxIxKKgNM9/D3+uDvkH0PFa7iEb mOeg== X-Google-Smtp-Source: APXvYqzzllbFm5p1RJ6Hv9sdYEOY7jdZkiYuzxv4vZdIzU4+gyWXMgDLOAREt7Tj2iCCice8+nHYSA== X-Received: by 2002:a17:902:24b:: with SMTP id 69mr123385473plc.250.1564712458970; Thu, 01 Aug 2019 19:20:58 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:20:58 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Herbert Xu , "David S . Miller" Subject: [PATCH 30/34] crypt: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:20:01 -0700 Message-Id: <20190802022005.5117-31-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Herbert Xu Cc: David S. Miller Cc: linux-crypto@vger.kernel.org Signed-off-by: John Hubbard --- crypto/af_alg.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 879cf23f7489..edd358ea64da 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -428,10 +428,7 @@ static void af_alg_link_sg(struct af_alg_sgl *sgl_prev, void af_alg_free_sg(struct af_alg_sgl *sgl) { - int i; - - for (i = 0; i < sgl->npages; i++) - put_page(sgl->pages[i]); + put_user_pages(sgl->pages, sgl->npages); } EXPORT_SYMBOL_GPL(af_alg_free_sg); @@ -668,7 +665,7 @@ static void af_alg_free_areq_sgls(struct af_alg_async_req *areq) for_each_sg(tsgl, sg, areq->tsgl_entries, i) { if (!sg_page(sg)) continue; - put_page(sg_page(sg)); + put_user_page(sg_page(sg)); } sock_kfree_s(sk, tsgl, areq->tsgl_entries * sizeof(*tsgl)); From patchwork Fri Aug 2 02:20:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB59313AC for ; Fri, 2 Aug 2019 02:21:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D84D2287C6 for ; Fri, 2 Aug 2019 02:21:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB7EB287CC; Fri, 2 Aug 2019 02:21:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48042287BA for ; Fri, 2 Aug 2019 02:21:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 364856B0282; Thu, 1 Aug 2019 22:21:02 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2BF5A6B0283; Thu, 1 Aug 2019 22:21:02 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECE7C6B0284; Thu, 1 Aug 2019 22:21:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id B13D06B0282 for ; Thu, 1 Aug 2019 22:21:01 -0400 (EDT) Received: by mail-pf1-f199.google.com with SMTP id e25so47143383pfn.5 for ; Thu, 01 Aug 2019 19:21:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=b/YV2nCBRUvj+JHalhe5VKLnhqnMLLZTxEiSQrNBGLQ=; b=hQXlbRXJ25aK5H4XUE0a38vLTkVkQm+eSJIkrk57+VuIEp9bnuqEw1xwoZFz8h3+ru RQhjyIV/JhTDqamCFQyUnAfCHF6ohKUyKU0O7UoDsRhFG1lrB3l6S0Aectol5mvEvdCJ Gw8XEZVKiOAXW0g9gkYzmE+E2eORNS+eCAUHheA/bUURlaqUc1SJAb/tHiOW38NEKMOR yVPwlPVeLrxgllxMB+gR33ucOeL4qAIDBP1cpZBRnccalNRtjkSP1M3Y73P3DRflyibW 7fVys3+nZGWSJrkG5B92VWfU8w8snqUlkuASxEDIFdb75ZtcWcUyxyU6rwWWE+KA7LqO A3cA== X-Gm-Message-State: APjAAAWTRerk+b5fXuP+E+wcauc4Nz2aedTtC46DB28AAfxAyb8IM5HW Q+iUSxHl1EVbgj9uD1rs+Y9IMYYlWmUEujoUwttqBLod2iqVvRFX0ON6qLpBXT3iLbv+wh7b67Y iO0lQtLyuWtkrFuG9Me25T3SvM3SnMfoZ3pJ3igur9up0ylrKMUFbj1456AeWTr7sJw== X-Received: by 2002:a17:90a:17a6:: with SMTP id q35mr1901530pja.118.1564712461405; Thu, 01 Aug 2019 19:21:01 -0700 (PDT) X-Received: by 2002:a17:90a:17a6:: with SMTP id q35mr1901493pja.118.1564712460790; Thu, 01 Aug 2019 19:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712460; cv=none; d=google.com; s=arc-20160816; b=sm71yQksp05r7NrhK9CDS8q4fofyXm8OwW15rmWN7aKoyfeNLZ9DPmqUpdFMFpet0L 2bV4ue9jv8iO88OzgMLJwfAC2t4kBJR+4/EnK7eKdhf2536BowEiRQQ6BTYw3UxgjD+b U8Qz3RfXNGMPq2VHIClEBQrWr3wQNBxvP2L9fn8eOS9audAj8dGLjJZeBYcPkSLSBF3Y JjiYoh1gUmAv9K1mwIwfPzChcOGZlpkwPN2I8aXguq5z/o0tBN3sP4tQU0f1LgXxH6Uz oTJ31Ufj/W3l8ftE1j0E3xRLXa236fA/EUVwWtHs+sur6reu+Y+R64ahMx25ZpeSokBd gklQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=b/YV2nCBRUvj+JHalhe5VKLnhqnMLLZTxEiSQrNBGLQ=; b=N1Uhr4JWqw1cPdtA2WhDqFIfsiakvrG5vgQrDKZvnevh++g/sdMV1ysjT2RMbQFiqP jponWPxt1F6Fcqj9VLtO5DbVSZcaUZiOCo6Ro+CBXkWzCooYk7RNg/9VGq7Xm6ZDGaeV x7B5jEkSyV098Gn9Kv4z0+tOfyHTlItxGurvYAd5h45J4Q6Rb6z4S5BWXwDu/T9rbfz6 IbAOOw/VvomMvWgZNndLzGdvQEbE3FI4y579E3CKVZc1IEK/ObvmqKpefli2NIQy3u7w LmL07mQ9m2z/yT8Bmpo8w5M1FmgPLrq632lCJEKgVSkR9B3uh6vt6dJbcg5iCX0kfa5w SnWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=LoaCL2H2; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y7sor8495141pjv.3.2019.08.01.19.21.00 for (Google Transport Security); Thu, 01 Aug 2019 19:21:00 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=LoaCL2H2; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b/YV2nCBRUvj+JHalhe5VKLnhqnMLLZTxEiSQrNBGLQ=; b=LoaCL2H2RUJBCIOglYnaArkmIVWTYlGIsKjGOYisZuAUApfhu5gEmc6qkNjj0+H7tu P+8Dh9t16ihvD6gplnd7Tc9AK6ZGCZeLjxm8tt5yZaZLJjevhgAQKR5u0bAClFOVBiw3 mudk+AK8dwI6nYLVBSSjbYQjnEo/x77kPGPgsQFzLk0mY0MTwpLYueBrrkls4g4lNcFE 23WeAWQvuXbP3ljk10sU7SrPFsFGjeRWLbXNTJO4ixgqQlxC9gc1Tv3tUxDQgjI0BYi3 8BhTJVYtfR/r0jUz//rNUXMcepW6CTlPDrLR0cTlbj3o8jhk3sRuBiigNZ2CjgqdDsZo Ctuw== X-Google-Smtp-Source: APXvYqwGNmSeCqbGUwEK1nMIVRCwdEn4NOX6aNf7I9lvnteHEiZ+Pa2UbMiy7LcaaaYIQGQbOjX2Vg== X-Received: by 2002:a17:90a:3086:: with SMTP id h6mr1977670pjb.14.1564712460540; Thu, 01 Aug 2019 19:21:00 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.20.59 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:21:00 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Trond Myklebust , Anna Schumaker Subject: [PATCH 31/34] nfs: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:20:02 -0700 Message-Id: <20190802022005.5117-32-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Trond Myklebust Cc: Anna Schumaker Cc: linux-nfs@vger.kernel.org Signed-off-by: John Hubbard Reviewed-by: Calum Mackay --- fs/nfs/direct.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 0cb442406168..b00b89dda3c5 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -278,9 +278,7 @@ ssize_t nfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) static void nfs_direct_release_pages(struct page **pages, unsigned int npages) { - unsigned int i; - for (i = 0; i < npages; i++) - put_page(pages[i]); + put_user_pages(pages, npages); } void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, From patchwork Fri Aug 2 02:20:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071909 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B6E613AC for ; Fri, 2 Aug 2019 02:21:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A9752877B for ; Fri, 2 Aug 2019 02:21:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DBC2287CC; Fri, 2 Aug 2019 02:21:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE2072877B for ; Fri, 2 Aug 2019 02:21:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DBDD86B0284; Thu, 1 Aug 2019 22:21:03 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D22456B0285; Thu, 1 Aug 2019 22:21:03 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A88DA6B0286; Thu, 1 Aug 2019 22:21:03 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 6F4B86B0284 for ; Thu, 1 Aug 2019 22:21:03 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id m17so37490469pgh.21 for ; Thu, 01 Aug 2019 19:21:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=t4E5L+nteFApbv8x9BTzZhAA9CrCHyfc4N+4wDD55sE=; b=Ak2QGkg3Nfvo7mjGH3nWttdH0peZTEB/rNcMSFTpzkvYtFE32qSprIYcdFyIsonqIT oOXnvrHr8SG0Q8O6cwDzPJDmzk2wIVEWWl9qGIzkhSOH0sTZb9IpfZrc6cRuM2mLOneS OUv1MKyw2saC2Ex1IK40gEiD0LbKEpw0LETMteuLndq9CHH2REIUijDt0f8bTJv+NwSU 3MYkjYPj51bD3QysFwyk0YzRBBN0UKYQ2qTb6XKlW4BsnWT440WhIWQnhCQkC526Vsj5 SP8kpnWPwr5ByCP46wg/iJhQkibs653alHb6NMYN4w7kolZRfsGcooST/ObzhmCGOnuA 3sPQ== X-Gm-Message-State: APjAAAWJXkzzx5K75UlvH4Kp3pLEOZAQRzo1LdYmdTA/CydrrafN7Fuz Fq7HuSj36AvUdO6dgk6DHVR4PKqwMdugW+U5flJc2hTtMNP1j4XEBcC9yZwA1f+sefvvvQ84mlV 4umW5nJ9Bo4DKD7wY3xO3RloH7dQtcVHutycCz6HNXG8xHW7qWXhZgCTn2k+pTvSEOA== X-Received: by 2002:a17:902:6b85:: with SMTP id p5mr124695881plk.225.1564712463113; Thu, 01 Aug 2019 19:21:03 -0700 (PDT) X-Received: by 2002:a17:902:6b85:: with SMTP id p5mr124695831plk.225.1564712462319; Thu, 01 Aug 2019 19:21:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712462; cv=none; d=google.com; s=arc-20160816; b=ug0RBwrpEHsKJ/al+Z4+lnvUP8tjgXkM8vDJAVm0ppdFs8rYyqR/MB/f2VX6apQv8u JopGA5KYTOtLJIAdywm7G2FpWioj/62i7Yi511xW1Hl+lbTXQ5r7Uh5cgE6YbINTkkXs jCSbIOkrZDKaMQHBffiH09EtJY6+76Yo5RucmPebV711J7QZPdIvsXiwHC5OJyilAOtN NMCYzh/ULoUu4YXSS/cDoCrsLgAtX00A6/KIx/Bel6V13N5MkiGNhJuRbpINT66/5pnx upkuSbgN8sn5aJcV+TsOuTMYHlpLQB7ETdpt47JA+oR8+Upv2vzMHBY7pq/yo0upf5dj RVRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=t4E5L+nteFApbv8x9BTzZhAA9CrCHyfc4N+4wDD55sE=; b=l/aBVBLF1bdn1HsozAX2EjTszr74L0scCnYK5uHH1VDBB1MQcjSQBB+0tSp6mQns7M 1eT6RgL7Y1PVEpqAryhvzmoMfX9AbHSRsUUe52i0DnJijgRCw/U7jeMbptmE6Z9kKrzV nyEhyOW47UdUAOoETTUd4AN5ToALV2YbxknsKvpLW4Ysmj4aYa7DsJuVTbviVBXv201I tlozE6tqlPdSS/Uw54LshHP3yp9AtHUr0jg1BBOSgVMHryMzV/oq/mesyBuHM8xgFXY3 kTfJlC7yUorox+B7KYtK3h0milklCdz/bg2ZDK2wxNePm+eoMjaKLdCja6U0mJZ8zcUA lSTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hrmJ0pEU; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id o21sor88289337pll.8.2019.08.01.19.21.02 for (Google Transport Security); Thu, 01 Aug 2019 19:21:02 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=hrmJ0pEU; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t4E5L+nteFApbv8x9BTzZhAA9CrCHyfc4N+4wDD55sE=; b=hrmJ0pEUxxlEVbmnkJiCuXB+z0obVkpM5OAxcIB8ex62qKsRGc8GrJbesoMFhr0ezJ BB7gqJEvJ/0j1sMNBYjptk6WEDqh/SuRhAh3YnXCDA+D03E9VD/w0ZTpWsRp/gFtvqDb GPSJBQRO2YGZ2n4ciW9tAFCe3EDjB9OuDXHwxqBfuLFzCDYC5sbEZNesZN0XL0xy/T+d A/rrSMYh6KaPOeAYQGAhhvKvLVo5NyuQKSBc7dnWcPrp/sW9C+D3tHmYcyJ9WgLD0vU4 zE+pn4brWMiLPK0lo9h6ZHMbPaOqGStN6e8qWC9iDeImsGRohVaoMFw5HAYT+EunHz7d Gu7A== X-Google-Smtp-Source: APXvYqwMLKf8AGC5hDWCQUPLqudyxsaLfy2JXIWmRI5mzRP+HqysSD+VYVGt/11B9bnV5geCVBXglQ== X-Received: by 2002:a17:902:20ec:: with SMTP id v41mr122012162plg.142.1564712462015; Thu, 01 Aug 2019 19:21:02 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.21.00 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:21:01 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Greg Kroah-Hartman , Roman Kiryanov Subject: [PATCH 32/34] goldfish_pipe: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:20:03 -0700 Message-Id: <20190802022005.5117-33-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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 qp_release_pages(): it now ultimately calls set_page_dirty_lock(), instead of set_page_dirty(). This is probably more accurate. As Christophe 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: Greg Kroah-Hartman Cc: Roman Kiryanov Signed-off-by: John Hubbard --- drivers/platform/goldfish/goldfish_pipe.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c index cef0133aa47a..2bd21020e288 100644 --- a/drivers/platform/goldfish/goldfish_pipe.c +++ b/drivers/platform/goldfish/goldfish_pipe.c @@ -288,15 +288,12 @@ static int pin_user_pages(unsigned long first_page, static void release_user_pages(struct page **pages, int pages_count, int is_write, s32 consumed_size) { - int i; + bool dirty = !is_write && consumed_size > 0; - for (i = 0; i < pages_count; i++) { - if (!is_write && consumed_size > 0) - set_page_dirty(pages[i]); - put_page(pages[i]); - } + put_user_pages_dirty_lock(pages, pages_count, dirty); } + /* Populate the call parameters, merging adjacent pages together */ static void populate_rw_params(struct page **pages, int pages_count, From patchwork Fri Aug 2 02:20:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBB06746 for ; Fri, 2 Aug 2019 02:21:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDDA12877B for ; Fri, 2 Aug 2019 02:21:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C01F6287C0; Fri, 2 Aug 2019 02:21:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 553922877B for ; Fri, 2 Aug 2019 02:21:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A8B46B0285; Thu, 1 Aug 2019 22:21:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 55AB96B0286; Thu, 1 Aug 2019 22:21:05 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3AA326B0287; Thu, 1 Aug 2019 22:21:05 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id 06C5B6B0285 for ; Thu, 1 Aug 2019 22:21:05 -0400 (EDT) Received: by mail-pf1-f198.google.com with SMTP id 145so47101958pfw.16 for ; Thu, 01 Aug 2019 19:21:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rv0dCo+fqAQ13SgPxACDlFOa16RsKjSPlFe+eBoZNRU=; b=SxjvfLl8cQVq1RO7h1qj6MditM6LX80kP0SAPkpl6K6kXznjiL3eF+cDXc7anZe6G8 xOLfbI8ejKMavJX8NVIxpmjto7c/MElrCE9Zjhurf6Szm+mmjQdlfyO0BehEPD2rlAea pM9O86zJ/VsLMU3GPx9jBZpPQ7S0gyxt35Z53TcwRalKUmsKdUz6H0XV5XC2nAYIO9yN tbyFZOiLMJvI+uCrWKfURyXJeV8RiV90n9Y7zRf+Eop32I3myTEGphpq4KSM6xEfxq0A HcSUwKUFx6aqVtZpxNLaAqr5D2WfSdBWZ0Zta1pTWm4DQ9i36Aok12dHbAxN4dSDS5QR tw6Q== X-Gm-Message-State: APjAAAU0UtNHN9cup7R3yiBEzkFzaqOe5SH5xijFr1pyITMl67GcxCj/ 8AghySOtlgaIGKAEUMxR72MN/aA4Dis1oaoTI3XfLCmooPcmKmyOc32e8XLLw6qV420OWNbO1lo WhlRq96oHelhRmmIRBCjLRoxGtwjqLuFgUlO/ZQBF3gWxd6A4nI8miTKM6Tkbnd/M/w== X-Received: by 2002:a63:ff65:: with SMTP id s37mr79763942pgk.102.1564712464629; Thu, 01 Aug 2019 19:21:04 -0700 (PDT) X-Received: by 2002:a63:ff65:: with SMTP id s37mr79763909pgk.102.1564712464024; Thu, 01 Aug 2019 19:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712464; cv=none; d=google.com; s=arc-20160816; b=hO4T7GV5REKoETiPuL7R/50NSe32GKq99QG7GYYCjk53SkTF0rsRG4CAI1TgqJSRn8 7qGIpSAmlfVt4fpPSjvbuppGxV1eFXpU5UjIt2ipDAB6afc9JBoNA03IvKr4qhcXyZkr tboeXVE+hnieENQ2A6Msy+P5cIpwFsfALGupE40gGWy5iGLJTrHFDsLX9v45t9bEbG78 5r/0ul+FjJBhqnd4KstyZ5K8obsnoHJB7vRsNCqLXqd5eg6Z2tp9HeDfu8jD6Bwd026/ RiTG7Obh/RLgce7DfXef4YJWaHdqgM8Afr2XMHlWKhfbyoGdMnl2bfFAzCrd85gWMkqj PpZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=rv0dCo+fqAQ13SgPxACDlFOa16RsKjSPlFe+eBoZNRU=; b=crcKoRJ4LC1W9Y4b68xnX4fTBDvQi/s5hhN+Mc02wOPicSMBxqmt3E3fmX7DRkZYmI JJnOaBYgh8L56oGfV6qCXftd235BLEbzYYRnCFgFTyz5gHtzlUmbsmjU2pbne+0RogG/ 12fDONIgT025z7Z1Sz0ahzeD7gb5zPYJpHkmsdXCBb9j9TW/EGp4zNUQ6OcGiqqqujYp Mc7nBNEBTbzCTwBSiMwrdGtGV+sXitS+SvsilcYvFCoEpJfFFmnZKSiE6QMM1yXng2Ud bYBsNErx9HWo/gpgpxYEmSsQ2ue+5/JyL+Eh7KgnuRjvCPNEFFfXOhjQzkIIsEfSTR+I zSFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=FnXZWigm; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v11sor8568514pju.18.2019.08.01.19.21.03 for (Google Transport Security); Thu, 01 Aug 2019 19:21:04 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=FnXZWigm; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rv0dCo+fqAQ13SgPxACDlFOa16RsKjSPlFe+eBoZNRU=; b=FnXZWigmXks7P7vrWF7fKqdJ1mEC+gV48nu3UaSpxK4YL8v+ZyKfQNiGbSuus211Io +fy2JCOQXe0u+yVyht7IUnGNiz1ytce226/iQ1Wda7n+sWhgorrLFCh54sw2yd22N9l0 AXL2/cPWN7xjLjU338yB5B7ZEpAB76ymwzaqr46s48M64gK8WOGJ87UIWJj0TMsT00ZG rYH/3SCw5LcEELiN57lLCnYUd8Lx6hylUyDzZKFYq9GvzONQ8cx9AYXJHJgmouhXLCeg 1q2sn/m6YtRZPuqIGm/1JYTBARn6QQkL/1+apRqX4+bW7vcNXDLWp8NZbJWw7fVf637Q Jc5Q== X-Google-Smtp-Source: APXvYqw6pZRI02L0RsJ0l51BCisQWQi/OHFOULF/U1jaQbwym1DWFopp5ASpqFdR23hpYNhrKVILMg== X-Received: by 2002:a17:90a:bf92:: with SMTP id d18mr1939362pjs.128.1564712463758; Thu, 01 Aug 2019 19:21:03 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.21.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:21:03 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim Subject: [PATCH 33/34] kernel/events/core.c: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:20:04 -0700 Message-Id: <20190802022005.5117-34-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: John Hubbard 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"). Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Signed-off-by: John Hubbard --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 0463c1151bae..7be52bbbfe87 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6426,7 +6426,7 @@ static u64 perf_virt_to_phys(u64 virt) phys_addr = page_to_phys(p) + virt % PAGE_SIZE; if (p) - put_page(p); + put_user_page(p); } return phys_addr; From patchwork Fri Aug 2 02:20:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: john.hubbard@gmail.com X-Patchwork-Id: 11071925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 880C414E5 for ; Fri, 2 Aug 2019 02:21:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76EEC2877B for ; Fri, 2 Aug 2019 02:21:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AC96287CB; Fri, 2 Aug 2019 02:21:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A25B2877B for ; Fri, 2 Aug 2019 02:21:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E59B26B0287; Thu, 1 Aug 2019 22:21:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E097F6B0288; Thu, 1 Aug 2019 22:21:06 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF9686B0289; Thu, 1 Aug 2019 22:21:06 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 9838C6B0287 for ; Thu, 1 Aug 2019 22:21:06 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id y66so47106361pfb.21 for ; Thu, 01 Aug 2019 19:21:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cegKTIaYJ+tSle0YiC1yJpybmvJrVZXG5Xryw9OToL0=; b=NNtXbjqLaBnQBdRLndzNGZoQ/ekOvc3276huPEgcODaCJs1bhAXuF+rZaj9C302DEo 1xDft1hXg8Yg1ptpgacv13OIlVAx4ZteKjkj6W8NDAlBaicgriCa/MOFkzN7pNoKILKd QOYm3FgtssjuFGEWmsfqIlgyY0agjLzJT8OfuqJi4DfyLZ6IHfwbmG6ABZwBD7RN8z+Z F+Zc7yzKx0uiv93a/gPdsQDtVQqCxM5Eyd8XaV4auKEuCAw7GwkdLVmLjKr5U4mblS3V pAUg65ql+66Sy34YPdh9nUbCw0K029Lf7/aDD03u/C4dvVmk8iH2VoekJzaJ/a1F46Es 3bIA== X-Gm-Message-State: APjAAAUi+iPF/erXJvFm4lUeppE0nSaN8cZI81+RsCdxMpfL5/EoX6Ru Ebjr8Nz6k02COHS1wOoh6uMytTXSFLUbQEzQcm1qaa8ot8pJSboK1GSuZcPWqDmgPpEc7UU5wA5 LZgydjEfH6pBNzKskrR6ApthPF9w3lejN+tdZyr1R5ZxQSgBZI3EUmuT+8y1pgTFlyA== X-Received: by 2002:a65:6850:: with SMTP id q16mr86409286pgt.423.1564712466190; Thu, 01 Aug 2019 19:21:06 -0700 (PDT) X-Received: by 2002:a65:6850:: with SMTP id q16mr86409242pgt.423.1564712465486; Thu, 01 Aug 2019 19:21:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564712465; cv=none; d=google.com; s=arc-20160816; b=E8DHUJ5kL3zgMxyPV6lPAnMeJujqee2YbstX/lKFoFn6v9wLEg/kHA0biWIEopy3v0 M0B+8aLgjirhWDHDwwN8BN1nNcz7sWxb9eLBAmcsfYWmb1OVoze/49Veu0CHj80cow1S 273omC1a6ZIyankT6RG9jsC9YEJJTjohDBwLGkafqy9hXlaNeTx0TDjh104N4+g5VCuG FlhtwkiFV9IqrcPq19dld/kurSFknw12hzLzVNUT0MN4x7ywUGJ09hVEDj1+dh38qZOV IQ/y1y3JsH3uyHgO6q1neqJ+QTyxSfhHIfY6pKGsxlNrq1S5Em7kY+25qYWwBufa+lKu SYFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=cegKTIaYJ+tSle0YiC1yJpybmvJrVZXG5Xryw9OToL0=; b=x0lJq0I7MeMZI0kTeKWXF+/SSOm4Nt0pah2fbGzcrfjBCz9wv7iI5y2tx8tU0Z4P9w 64aT+TpYxtmGLDLq7PI1DNcLalpOx7P4E+iLoFxTNrSYOSmLUzb0UYuOTq6rqA5NHJd6 sjWtpl9UWRuQjHK49yYxTHtaVjEwdqRBoLyh08NcGuK/HedBMwSw0/rTz9jJ3gR4VjuC GK2hfuAiAvM64j04zA1eu2aoEISb1Bo5Q8C4I49Je+w28KoQjjKC6ywMb0OIl+WayfqF 8UEIlnfa+U0fq0uvWQilq15Lt8vkzH+IC2eRwLi1GyQyfwKIVwq18omzH6KQPwlKnN6s hKWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="DBN1w3/7"; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k5sor8275693pjp.16.2019.08.01.19.21.05 for (Google Transport Security); Thu, 01 Aug 2019 19:21:05 -0700 (PDT) Received-SPF: pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="DBN1w3/7"; spf=pass (google.com: domain of john.hubbard@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.hubbard@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cegKTIaYJ+tSle0YiC1yJpybmvJrVZXG5Xryw9OToL0=; b=DBN1w3/7Hxm2aTYhnTNoj1HADN0/qC4HQ/EIZkVxJXA/K2S11Q3/N9TAattYeDs6aQ J+nm7tV2AKcpGrK2TkCrU1wyclxrRwBj4vymoXpkg4vkH9XlaJfQ55nzl3mveOP2o9MV NUxRk2vipQv8FWXVtFS9aXrUBeQOuTE0Ko4oz4Isj8tPzLI9EqzmjnQsyBDLHQ25vBM5 q3jhgaW+xd3z7DYehUibJdxR/1EjTpgU+Bek0hJIqh1wGhpzFJhljWoUMm0t5/61KoNk q3ATC6nVfWca/Nm/vukTsQm8ST5Kyw83g7ix2hN//xECaTu+OgVyIUA+IQWq3fIPa/3T uZLw== X-Google-Smtp-Source: APXvYqyVNDRGKP1+FIQlU/b+5yAYmGOv3Rdk0fT5tiuKvQ+opVgMWL9GCqpjN6ICYNfQCU9j4FRWrg== X-Received: by 2002:a17:90a:338b:: with SMTP id n11mr1859934pjb.21.1564712465215; Thu, 01 Aug 2019 19:21:05 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u9sm38179744pgc.5.2019.08.01.19.21.03 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 01 Aug 2019 19:21:04 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Andrew Morton Cc: Christoph Hellwig , Dan Williams , Dave Chinner , Dave Hansen , Ira Weiny , Jan Kara , Jason Gunthorpe , =?utf-8?b?SsOpcsO0?= =?utf-8?b?bWUgR2xpc3Nl?= , LKML , 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 Subject: [PATCH 34/34] fs/binfmt_elf: convert put_page() to put_user_page*() Date: Thu, 1 Aug 2019 19:20:05 -0700 Message-Id: <20190802022005.5117-35-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802022005.5117-1-jhubbard@nvidia.com> References: <20190802022005.5117-1-jhubbard@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Ira Weiny 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"). get_dump_page calls get_user_page so put_user_page must be used to match. Signed-off-by: Ira Weiny Signed-off-by: John Hubbard --- fs/binfmt_elf.c | 2 +- fs/binfmt_elf_fdpic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index d4e11b2e04f6..92e4a5ca99d8 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -2377,7 +2377,7 @@ static int elf_core_dump(struct coredump_params *cprm) void *kaddr = kmap(page); stop = !dump_emit(cprm, kaddr, PAGE_SIZE); kunmap(page); - put_page(page); + put_user_page(page); } else stop = !dump_skip(cprm, PAGE_SIZE); if (stop) diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index d86ebd0dcc3d..321724b3be22 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -1511,7 +1511,7 @@ static bool elf_fdpic_dump_segments(struct coredump_params *cprm) void *kaddr = kmap(page); res = dump_emit(cprm, kaddr, PAGE_SIZE); kunmap(page); - put_page(page); + put_user_page(page); } else { res = dump_skip(cprm, PAGE_SIZE); }