From patchwork Sun Aug 4 22:48: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: 11075027 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 414E013A4 for ; Sun, 4 Aug 2019 22:49:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F65628818 for ; Sun, 4 Aug 2019 22:49:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22FB02882A; Sun, 4 Aug 2019 22:49:46 +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 9BAC728818 for ; Sun, 4 Aug 2019 22:49:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 009F86B0266; Sun, 4 Aug 2019 18:49:37 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E395F6B0269; Sun, 4 Aug 2019 18:49: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 C3CE56B026A; Sun, 4 Aug 2019 18:49:36 -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 8CFD16B0266 for ; Sun, 4 Aug 2019 18:49:36 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id 21so52194652pfu.9 for ; Sun, 04 Aug 2019 15:49:36 -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=wKnEf1dGeTf0vHOLp5WCTJvqak8NT8hcLNnzrVdQpMI=; b=jvEugZc15EVL/fL07XEUNllmnvmsve7hEkwsFTJaQ5Sk/LE77C3Rj3iTAacH6BS5dZ Kl6k3nGb3AqaL5w2GSoa8xsASlSAqVsTyjkuEZ1LsuwF+7v22MjHYezzDJm9rMm7ZzJ8 lhIWtv4MnbXSeWA7pE6Fe+7rAGmUCTBz2dClIEMRGRYcZJ71Ec4UqJvHpZ3eNUpR7tkV W2J8tlP6yLGEKs7f6lGAbjO6z3PK1G68mkYjIdW7OcbCBugKkk9+LwNd5P4j9UIDu6Vl n93gEwc7nkSJUp0kYG2DZLWe/gJb50BUZz8gQR5YwABvnMhUgNnosOIZrw1WLtSzEvbx OpYg== X-Gm-Message-State: APjAAAU+KtPRdy5BxdfdflgqrQv2EVNIXW+dPPCSehj9pLQsE0hCleOr loYe+KAi4zaq+vQ8F7943LK0y7Hof1QTk7DkZeFoILftpze3H5OoYBmzNdLzC6b2TdFsqSFbSj1 ZZqIvdnzGJ6uRWLDzbET9o3hWPFIhShZem5kykyIMep6P5G4BHpiPvlgR3i5Dv865jw== X-Received: by 2002:a17:902:7407:: with SMTP id g7mr143190095pll.214.1564958976241; Sun, 04 Aug 2019 15:49:36 -0700 (PDT) X-Received: by 2002:a17:902:7407:: with SMTP id g7mr143190061pll.214.1564958975288; Sun, 04 Aug 2019 15:49:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564958975; cv=none; d=google.com; s=arc-20160816; b=kyKHpq2Dh2xtl/EDuK3kNkv++J1H3VoLE1niZRLPZQ1086YNh+ubH72gAEBScvVHJ3 MvcSlNo82V7aKL7EYLo262Ore4jrf2Nxi5EXnTAytbsr/NGGjKHTkPCcYvSN+Scqw0C4 zH/53t5Co3O9C1KcpDwWKqD7D+056q4rbjm8HMDfWFIQVTeGp6yguG2Up9xwXvwFrESN dROa5CdJNbW+5CqU1n2g1DEKgj3ZHuWGnpnEjW6Nii0CMb6gkf/aRH3uwt6iLJ221d5U SIOkz2boRVORVhzhA7ni6/qGh3zD6QavEgKpA/qWJ+ZQ0tB63zIHJl2T7KuXI8kMxrcJ VhXQ== 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=wKnEf1dGeTf0vHOLp5WCTJvqak8NT8hcLNnzrVdQpMI=; b=EdjQ8Sq7vJ+e3VePnyOGAwjgFCO7a61WTMCv9D+AdGjKO+MWDSfstdCyBzHe7QALZg we+WgD8tOgY6QnieakA1qUVMIU2YajgXD175MoHXNj/yyn54yE34l92C1r53+ZOW+DEu jnzqAK9wHffS2fBbe6kbjV9XqwHRkx2mxRW29a4J3ErvKytX/e6zL1MVSle7dFitFxWx z5DH4BdJH4IyvTY3fN3C9cGC1QJLlQAyYcKqfvkHHW8AJsGyYYM3Ab0nsFHnOWIB0+NU QufyjL99E7/9PGy6P1PuC3pCPCRve15gIPXbXPtlstnQ6A8ItgAM3XL3AMjY+4ihDMDk EZ8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=UAVd4mr7; 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 f32sor18574632pje.11.2019.08.04.15.49.35 for (Google Transport Security); Sun, 04 Aug 2019 15:49:35 -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=UAVd4mr7; 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=wKnEf1dGeTf0vHOLp5WCTJvqak8NT8hcLNnzrVdQpMI=; b=UAVd4mr7vGvTBL1keSKDuwOUviwbBqcp6QKy80u93848ZN8eU6de8F8i32424yePdd zhJ1O4RduGczBUBLeccU6nytEoiOUUwRkUsjuEyue319dSQS2bud/HybqSeEP9UaizKY 00ht31Ehoc2cMo40WzQ9rGK2yX18fybqCo7t+dG1vWpDgDbdQz/Q1YLF3bcEr/VsNC/+ VEsECPXiobaIgfjOirKP1fhQQn2wJJKwgSQoEP5vN1KZqZSBZAcxorwveJr5kCfvgpyC h19lHwiz4dU7jiPcnb0kWz/BIQhyT1yRrfBg3wROHEiu6fO26e4X5u3gRUvcijrb3cqf EWfg== X-Google-Smtp-Source: APXvYqzq3Lz+VjHUVJbOvV+K9KYqaCKO4VLPyE3SqnlHZP1nl3CDkSu6mPMA16qqbAvOmUhc3KYfTA== X-Received: by 2002:a17:90a:1c1:: with SMTP id 1mr15255619pjd.72.1564958975035; Sun, 04 Aug 2019 15:49:35 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id r6sm35946836pjb.22.2019.08.04.15.49.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 04 Aug 2019 15:49:34 -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 , Frank Haverkamp , "Guilherme G . Piccoli" , Arnd Bergmann Subject: [PATCH v2 10/34] genwqe: convert put_page() to put_user_page*() Date: Sun, 4 Aug 2019 15:48:51 -0700 Message-Id: <20190804224915.28669-11-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190804224915.28669-1-jhubbard@nvidia.com> References: <20190804224915.28669-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. Acked-by: Greg Kroah-Hartman Cc: Frank Haverkamp Cc: Guilherme G. Piccoli Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Signed-off-by: John Hubbard --- 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; }