From patchwork Wed Aug 7 01:33:06 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: 11079795 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 19D071398 for ; Wed, 7 Aug 2019 01:34:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A6992887B for ; Wed, 7 Aug 2019 01:34:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F22C528893; Wed, 7 Aug 2019 01:34:05 +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 6605B2887B for ; Wed, 7 Aug 2019 01:34:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6834A6B000E; Tue, 6 Aug 2019 21:33:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5EECA6B0010; Tue, 6 Aug 2019 21:33: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 3003E6B0266; Tue, 6 Aug 2019 21:33:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id EE2F06B000E for ; Tue, 6 Aug 2019 21:33:56 -0400 (EDT) Received: by mail-pg1-f197.google.com with SMTP id w5so56028586pgs.5 for ; Tue, 06 Aug 2019 18:33: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=VkIZ9MNYeaRKdR8dFo+dHbwqWBHsgbjux0NTtbbQ8Os=; b=NZcNfI7whKxwf28cR21Oh/tbCxj6KLOvBYptJPs6QryGsDUAYTZPPW2KC/8Nof46kp FnWY9nxbqHniBBTjql8ObZdHix9vzI4IBV7zJaYR4xGIp8tOnYIDBEu4v/nhC0O4jIb8 aaJWpQBJKf7BZvPxiy/h7nm1ubedbXJ4r7zN3kAyfNfoiiDdfmjm9JQZHnVOqOnIMUuz 1f4lnWlQVB/eJNmnIqXG9uGfIKUJj1L3yj6HR5dGT04b3ix10K1OSNV/pz5dWrA1/AA2 8NHbqQRy23dcJUNbZ0qqwuOI/f0o8whLz5F7g/2648RiU5HCM8+HUcIDtX7WvfVwllmh 4Rtg== X-Gm-Message-State: APjAAAXLeDfwtVQ00lnBMfD/LdUOsWek2pVtqu52hPPs0/RSeVpkklJ6 gNzC2acSzKO0oN0udfsbaTMYjuWUBqGGD6YaxMuvW95WkzN7fo5E1Ot1PTGJniX6a1wNwh7kymt RoZ1yRMuhRVEO0LrT8yOt5zPZ3IIfBepFF9rnKCEvchBaqxfBQ0WsmQfGFnShGNwshQ== X-Received: by 2002:a17:90a:35e5:: with SMTP id r92mr6083472pjb.34.1565141636650; Tue, 06 Aug 2019 18:33:56 -0700 (PDT) X-Received: by 2002:a17:90a:35e5:: with SMTP id r92mr6083435pjb.34.1565141635996; Tue, 06 Aug 2019 18:33:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565141635; cv=none; d=google.com; s=arc-20160816; b=oJPs2PCguusICjZW8x8w3DC1LUGzXjNWjmcWAFi6p+m8pecjKd2xokArc3XkLgwYRu FXALM01rsN6H3A8dAmU2eZqRvjjdy5rwLR8fIbBFukeqpw+ataMt9nCKab1VjxGOV7KA APYRejHEGvCXjRk8lXjqZBP4dsMD7P2MgXwblJ9JLDqKWn5LalM5SiLHlqDutHpbeSZ7 iSlqr/2787OzzVOKkqr7DhrhlQUvg2eHPxMSRkXpG9DNgETVp7DYXw+YP45JBhJEzAwF WmSz1fY31citGovbbYmVY+olRtHX8NDd55wmZ5BeKA8HFy8ZxThqKM23qwO7LDyhYiuQ 2deA== 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=VkIZ9MNYeaRKdR8dFo+dHbwqWBHsgbjux0NTtbbQ8Os=; b=PO1mTSTz8gTuOzVOH4KGDfqm69iUUg7yVlZGcj/Ys2iEQme3lvsl4DnAxCCdFZ7gZx nQUdpB6Nk40fwtyLq4N/nY84IeaqlSkmPp3Y1/8OVmtfyy8GqkVPKzUXdsjGNDry+ckc I5JGp0qXUgitZzbrA4RemVOsRDPXtYXm/OyxIk4/GYuAC8wTPGIXJ593YL363oWyLG9t WIqU1uP1N6Ow3QcdDSW/VwDTWsN1baNTIFuruW8YGB3SZ5IG2yZ5JfCVLDPavtu7CtfU ATVZv/PHfdjpLOGwHc8pzvJLTJV+r8bQvnarSnSQIpjw52KlhLhBNhsebgjyNMAAQssJ A6aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=WodjfRMN; 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 y7sor27026409pjv.3.2019.08.06.18.33.55 for (Google Transport Security); Tue, 06 Aug 2019 18:33:55 -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=WodjfRMN; 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=VkIZ9MNYeaRKdR8dFo+dHbwqWBHsgbjux0NTtbbQ8Os=; b=WodjfRMNXRpfn8eDFiq237p2GDsP83iVPB5OCq8NqovKXXtmSfGMO2YcZK3qaRiOMq V+1Wp3U4Ouo1tRWYwqfWu9duqPs4fCXrKz87Da9i0IezRC3CosqffIajL738UQ/eBy1Q 8bGkemq1iEa5/xtBXuYNtAC1RV+0n9U9hgutinWmqUfG/v6xBvqP7GCtby2XRnRchtz/ 0cYIJLRbrEXn7xRE/60/clx008LELTPxuZr9t/SYNy+7x5xLG72AD6O6vZ88uF2XgMPR ACpc5Lz6LUvFr+xpSFpVcKN4ZMG15RxRazNc9G/jbrPxZR9s341vQyb0SHXjN70nitnK 1NJw== X-Google-Smtp-Source: APXvYqzbAGNeyGcbWdWkzYvFP0KeX9sV24V25gxtoPIbubmiIgKmQ4weQ/h5itUQb1wb0VhoIYmEzw== X-Received: by 2002:a17:90a:5884:: with SMTP id j4mr6207412pji.142.1565141635740; Tue, 06 Aug 2019 18:33:55 -0700 (PDT) Received: from blueforge.nvidia.com (searspoint.nvidia.com. [216.228.112.21]) by smtp.gmail.com with ESMTPSA id u69sm111740800pgu.77.2019.08.06.18.33.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 18:33: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 , Joerg Roedel , Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" Subject: [PATCH v3 07/41] drm/etnaviv: convert release_pages() to put_user_pages() Date: Tue, 6 Aug 2019 18:33:06 -0700 Message-Id: <20190807013340.9706-8-jhubbard@nvidia.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190807013340.9706-1-jhubbard@nvidia.com> References: <20190807013340.9706-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); } }