From patchwork Sun Aug 4 22:48: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: 11075007 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 760661395 for ; Sun, 4 Aug 2019 22:49:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6421728821 for ; Sun, 4 Aug 2019 22:49:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57F502882C; Sun, 4 Aug 2019 22:49:38 +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 3EB372882A for ; Sun, 4 Aug 2019 22:49:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E2C76B000C; Sun, 4 Aug 2019 18:49:30 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 846216B000D; Sun, 4 Aug 2019 18:49:30 -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 5D5F66B000E; Sun, 4 Aug 2019 18:49:30 -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 262D56B000C for ; Sun, 4 Aug 2019 18:49:30 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id u10so45031669plq.21 for ; Sun, 04 Aug 2019 15:49: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=YLPz5BCHjHkg+J9ZI8yxOLwnUAw8CiRxIyzlmsd6bb8=; b=h0w89imON5BoOOI40UTDaGY3Gy3LExJy3YfnBTv6r+ETnpm1RWhSsNpWSMnaY0qA4n xvZakSrohwoUCS9OKlPa1+8dpjN2swfJcdxNcp4kcVmcfD+6NFABIOs0iXUtN+i/NpwU I8BwzPhPLVhHK09X7wlBZEM8Va/BIqb6tPTkQc/ReIxcluhyhaR3Dg8OnQU7qqUd6iJE UmDpjxP/hV3t5BsE1oBRYaBAVrBNYPxZjKj/tqmGhJhVF1pGeeF5lhpB8MlCEFy1Ik/g m/ZDHKSxR9ZtcAgggIst0y1g6kxIDiTgTkb76fCfsLZdTO3UAMVGzcCkxxjOUQmX614h eEWA== X-Gm-Message-State: APjAAAU74AjadlfZj0InsJaYZd8sypHDK1NOSVh0W/iLpdLy0Z1iVLHB /x0kjD1DnVTkmjwg42EvkhVN4K0nc9BYvYBcPXrq369v4tMteKTfctPoSNZ6fQiBH6PG8jWjDIi ztDc7PT9UOzM9ECajnBfBDqYHvvG4ZiRckWu58z9kGKo5h7V0AzsB1D7WPTNp14dVGA== X-Received: by 2002:aa7:8651:: with SMTP id a17mr69597702pfo.138.1564958969785; Sun, 04 Aug 2019 15:49:29 -0700 (PDT) X-Received: by 2002:aa7:8651:: with SMTP id a17mr69597671pfo.138.1564958968903; Sun, 04 Aug 2019 15:49:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564958968; cv=none; d=google.com; s=arc-20160816; b=EKK4V6FUfqgD176OhXlbji0IwrTdxiVsXqEx7l6tQ4h70HeFjIqqgM7oc1m1/oqIqP LPKqfX4Erjw+ZX2Hb6llKMHNg3hptXQ4q4YIziN3ka6VEeEad2ifAEvGs7Siooaqdpc7 hl7qRnkDvHcsHlIvMv/dZ2TtlH+ZD1+WV2j/IBU2uHQCBubCcy5uPLmC5DPMVN+XFB0c kLPfAqYud7pTr3bjrj3EmmzXTY0u5y1lQkHJwe746KP7Bo2l63Qw3zdOIQbVPISOt9PR H7zH34srnDYgd0JfdsULYplkhYSmvco6GJJsU8+yTdWzge05aQPP7yNQcgGuReI/FoE6 bb5w== 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=YLPz5BCHjHkg+J9ZI8yxOLwnUAw8CiRxIyzlmsd6bb8=; b=Qgg0Btb87z/d1W0/N0/KTIjMWjQXFMXYLCXaJf4croqsRAz0DCtAtH+ty4tHNoSCFG K43oLQWs6hqHgnS3Wg1E+AuLnMzepeCyyoVAFlt0OMDha4NB69hFMNn21s9RqHWxoKl7 haqYXhvdJJPjAssWuchZQ9462LuY82RbZ7ZHr+zy3QevQTU8OV7YQSrkQzuyI0lCcpxt iIpcVrABKtR16xOi+cKr0/yedfWGwprSWkN+WXTRVaD/fHtmuFD5rGB1hVa9Z/ZOZH9i 4tu6T5nJ6B72cXkyR+jXS7VD8TjziGJUVqGhUsvnpSaG0+pC4P89MwRxLdfhk3iA7FvI 4tIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=VGrPeNjq; 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 l64sor56323650pgd.60.2019.08.04.15.49.28 for (Google Transport Security); Sun, 04 Aug 2019 15:49:28 -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=VGrPeNjq; 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=YLPz5BCHjHkg+J9ZI8yxOLwnUAw8CiRxIyzlmsd6bb8=; b=VGrPeNjqXUKwD8rPOUJWvgTDjvXlBgpZNgVsAZpGvh41vX88GkAws7QVpEp9tEzYXW EWAxbuchsvglHqS59E2TkHXvzV9QiwRyVicm9YfNC1RSq1Lw+8bSeox7MCzKs4UlTpfP ozXvShoKM7yUTPqi96o4h71oG13jljV2Z5NhvBV41avMLU4Q1BrhH8GwT114cWkCl1MF d261JitS12TLzntNYSyrJZWMAgzBr9+636G4ae4VYGKmmjZF/lcCezF8KGvZPOFySOt6 etVud9nCJxdyVx56j1jluPcIcFoQjayW3OLzqWiVdA46hf2UCQT0Dq3HzUpJLfZuSPrQ 6mhw== X-Google-Smtp-Source: APXvYqzIKv6XtE7UttpMMo5Kx4L8tiNE0k37oAlXEn6wMXua1ZT012h1Fuu1D5Rv1jbsWDQQbHwbnw== X-Received: by 2002:a65:6547:: with SMTP id a7mr112462494pgw.65.1564958968612; Sun, 04 Aug 2019 15:49:28 -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.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 04 Aug 2019 15:49: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 , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie Subject: [PATCH v2 06/34] drm/i915: convert put_page() to put_user_page*() Date: Sun, 4 Aug 2019 15:48:47 -0700 Message-Id: <20190804224915.28669-7-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 is a merge-able version of the fix, because it restricts itself to put_user_page() and put_user_pages(), both of which have not changed their APIs. Later, i915_gem_userptr_put_pages() can be simplified to use put_user_pages_dirty_lock(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index 2caa594322bc..76dda2923cf1 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); @@ -675,7 +675,7 @@ i915_gem_userptr_put_pages(struct drm_i915_gem_object *obj, set_page_dirty_lock(page); mark_page_accessed(page); - put_page(page); + put_user_page(page); } obj->mm.dirty = false;