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; }