From patchwork Sun Aug 4 22:48: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: 11075025 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 6ACE517E5 for ; Sun, 4 Aug 2019 22:49:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5869F28818 for ; Sun, 4 Aug 2019 22:49:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BD0728821; Sun, 4 Aug 2019 22:49:44 +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 740AD2882A for ; Sun, 4 Aug 2019 22:49:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 473C36B0010; Sun, 4 Aug 2019 18:49:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 424B66B0266; Sun, 4 Aug 2019 18:49:35 -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 13F946B0269; Sun, 4 Aug 2019 18:49:35 -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 D042A6B0010 for ; Sun, 4 Aug 2019 18:49:34 -0400 (EDT) Received: by mail-pg1-f199.google.com with SMTP id k20so51397563pgg.15 for ; Sun, 04 Aug 2019 15:49: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=5vxuyadJL7U7uLaLdbmi0wM48++CcjfxvCZKqh2vh4A=; b=YuoCUNnZTFr3/PdfI9AtpUEkRjnrCnQHlvgGT3Sg1wrIqtx8vHwHirPfr8BCys2pSV b16iGoVhcrzurrD5hBFG5XT2cXPI2UopDtCxe19PID6D+Dlp3Yx8KK2HCa6soI2rKZhS Rc9KzVBEv4gUusr2kig/3aFWuKDT9sV5W4NcwLB3XzazpoJOC+2w2BXQDkA/G1RiwDVV W2HRlMVjc41/QauQl6JifxTQ1UbSjHLMsgiP8q3PcMcfHzmQKn4wmimcDdMKIZ54LiJG zYyUv1OVNEa6N5dEVhSWPulNhf5e27ZhOcKzTLKtyQkpT2vUeJuzxu9kG85l6Q3hLM0L GaIg== X-Gm-Message-State: APjAAAXAmk3F42/lQ0Z/XLoX08F+fFriA0ccCNMHyYrrFl+cLSey9rYI fOXuTGAd0wb1EZ2BgcgEJde40f7Qg+/NsCcLhWeLimcVhCmoovyukN+CKSXqWFmmt+srZyiW9fg eKnRYB6yq1hEM0HOddnwoiPax09L7+A+8vj0U7shXpDaqpMOXWQGmeDbbyoIFrEL+mw== X-Received: by 2002:a62:1883:: with SMTP id 125mr70079535pfy.178.1564958974548; Sun, 04 Aug 2019 15:49:34 -0700 (PDT) X-Received: by 2002:a62:1883:: with SMTP id 125mr70079512pfy.178.1564958973671; Sun, 04 Aug 2019 15:49:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564958973; cv=none; d=google.com; s=arc-20160816; b=xlSq75hFC726sPUOg+sBBBkrKAf/3AdS0L4md3zmeBCHRyFEVd9dlizkmx35dEJoE4 kffzo9WuV0tZgsjE0/22pUFu2wgFpsJD9U+xYaLdjBAR0OjhufbAb0MTNKEyAJWGMXUh zIy9CQLLfJF2Lf71f7fj7utIFSe2RckEuZnnRxBzv7L8ZcTd8IAsEw6wbgBajc7P/ajG MQwZpQ1KXyVEbZtE/KbycFKp6AEKKnqy+hHcgQ8cNg3eiEl0Ogi22YQxO6LJhoavC80u yANtpVR6vmhcbMQWGnLfq4yWwi55Oi3J6avkDoQMxdpz+a9DDiP3E0Ijvld1B03Tkshv iRYA== 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=lETFCUPqQixT1LJPJLO0rinuD3ErYk69bpyb9RqnW62IKdDSC5NASLohI8kpkrX2Zn mPtby0ABuuhYFmm1/QZ4yLE+dAnCqN4NV9123wTv8IA0PXGlgfMnb6MJXr8Gwo2+dYJY t3pzYbJ+U4rYBMmhpsENlZaZsiGlmbqawspA4GHoqf9NWRzqUJnFzVBcfM/rhy962xZg 2l1JuFCr2JLMG/Eq5d2+xOu5EBKZ0hsFzXjB9bX9DZPcuv1DJawJU0vCgcKNsoEVglOL M+lJQvBVw3tqpAtWpsRkIJwiHTAvha6apuTUkVmvbfL1jjvVQxkTKpYNlcaOzuS9Bkzs Nkow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SmLYPFHm; 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 125sor37422609pgi.63.2019.08.04.15.49.33 for (Google Transport Security); Sun, 04 Aug 2019 15:49:33 -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=SmLYPFHm; 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=SmLYPFHmKN1uE643ZHBnB9dNk1rkYQS38le9bhNsjkuijth7hTQM++IPMv3pLW0TEI 7/x46VCEIatXmkV3w2KshE0imX/kUzrth+ucng6DZOKNE0opT13YpOAAUVZVUjGyDlRy PB2Ml2hj6K3sDNS5iK8QIe0u19usMs5R4F7ygDzoCAKAQPcQlfC/e9zMHKVg/PGP6KNH jH8S8rBi9/AhB/tXE8C3wWfrNrkZfmcdnxjHGl0d8mZOAczH5is/McK+cj5KFruHwe2c MlwNgBe4BfI2d4CuM85b0u6u4v6w/IVsnWdV3/DEzbLrJ3+c49m+Mf//mO5waQdOc/o0 4mBA== X-Google-Smtp-Source: APXvYqx8ZWVr6MlzhqOcGh2E3H/RsN7D9i6b3t0CUjOfGBvpDNUsLBn0LfDPCNpJqri3cJedM4xZQw== X-Received: by 2002:a63:1b56:: with SMTP id b22mr16835931pgm.265.1564958973404; Sun, 04 Aug 2019 15:49:33 -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.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 04 Aug 2019 15:49: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 , Mauro Carvalho Chehab , Kees Cook , Hans Verkuil , Sakari Ailus , Robin Murphy , Souptick Joarder Subject: [PATCH v2 09/34] media/v4l2-core/mm: convert put_page() to put_user_page*() Date: Sun, 4 Aug 2019 15:48:50 -0700 Message-Id: <20190804224915.28669-10-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"). 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; }