From patchwork Mon Jul 9 08:05:54 2018 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: 10513833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C12F6032A for ; Mon, 9 Jul 2018 08:06:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C788289F0 for ; Mon, 9 Jul 2018 08:06:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50C0F28A54; Mon, 9 Jul 2018 08:06:40 +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 D619128A55 for ; Mon, 9 Jul 2018 08:06:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B879D6B027F; Mon, 9 Jul 2018 04:06:37 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B3A336B0280; Mon, 9 Jul 2018 04:06:37 -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 9D84E6B0281; Mon, 9 Jul 2018 04:06:37 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-yw0-f200.google.com (mail-yw0-f200.google.com [209.85.161.200]) by kanga.kvack.org (Postfix) with ESMTP id 663E96B027F for ; Mon, 9 Jul 2018 04:06:37 -0400 (EDT) Received: by mail-yw0-f200.google.com with SMTP id u1-v6so18853936ywg.6 for ; Mon, 09 Jul 2018 01:06:37 -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; bh=l2+WL8Rrlts600OCqicqhny0TcWAgvVOfv4W3BQrKIQ=; b=q4w+xdURWmSUnQxWpm6HZ1TDo3NKI1R70WCNA61fwiyh8cbVrnZjHdR80lPDYNS2hM 4j/ymraQwzFt4Q5gyy2DcGrgFBssvrT0Z65F2+WsylNUjHi0oieGC1xMK6jXA0nkjNNY KhAwKxg000NilK4rS9tYG6xNIvElhtasgIPOZHTs81PSSmrbjN8I6jWPGHRdPNbnQbsV BQYAxn5gjNPwn1MXiBX818M4fRx837a2sF3DsHkbuqzIXWJoY56cfSX0AliUFwKESm1X /Y2BlliLGkdzFu8K6J0dWnR4zK6KjiLc3iGYlTYRfEw6eHVdJ/uuS+jEG7kaiRjvAHP3 YoFw== X-Gm-Message-State: APt69E1k3uZVKpS1GTAOjpLPZCo8a2wiRHNmYF+5anoGv1zZKnc6t+9u xCq1gdCVANqRfq27OEXFGCTrsa3V2nzJzhUE9OPLwSwG+SeIi2UI60//21gTP2L75Gy1Sjp84rb iRbleVjqaeMhac4ft4Te9R5ta9Q2qPeT6OprY+6iAH/B5Vv3w7/IV9GDpZiWDAc32IkElUfe8EF Wjt4HCKUp7UAF7b0nxrfpmltsLZ74hgwmOyRy//nuk2oEwXO1LyHTSlE2ERl4K8NV6IOKNzTyok L46XEl7zRM1QX0a/JxeuMzVH9RsDvYMx877UTrU5kscHS+WshisG0p3Xt8DwdVji3oqgVNAuRdU +/li5FmymrM6eM7eAQ3wY0Nj9mOlSPT5p6uacGkQttGTKbqbfQwc28NEReOOcguJz05deuRKFD7 G X-Received: by 2002:a0d:d949:: with SMTP id b70-v6mr9770921ywe.396.1531123597169; Mon, 09 Jul 2018 01:06:37 -0700 (PDT) X-Received: by 2002:a0d:d949:: with SMTP id b70-v6mr9770900ywe.396.1531123596211; Mon, 09 Jul 2018 01:06:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531123596; cv=none; d=google.com; s=arc-20160816; b=WfHzDHnth+14ylY9EJB/ZTKOIMnH2vvrEcl6VIANrLaLo3KKckS4Cq6Q2hT0/iSVle SXjbPzt9Ps4TGOXlEsFiXppjt6jgstXXKTdsJsILiSbOhoOh6ohM3nwYZC4y2zNNRLmp 24JyivzIdG58ZV4R3EyJ4uLWCSSPH/vPCZ7xws27eghXV66VWGSrX4LtBNKunKofDji6 qB2AVp/WTRriSipSzQueswE0Oq69g0xTy992HY0Jzn/gGgRyGoScHyt132uIO0RlPcKM uzfHcTQk+CGtUnYDpW/j+5d7kDTdckouAKhPhZE1GJ8fhSIXtcd97wJxPMzR/vdxxXb2 uVdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=l2+WL8Rrlts600OCqicqhny0TcWAgvVOfv4W3BQrKIQ=; b=K0pLTM1yjzTDeMPTAL3SN7BPvRgTSPRA9ds41bVeQkoiqm1VYhxbTqcOl1mpWt9TMn RMtwivunjcb1KEPaze/j8NsZ+gUKIsxUab0h+5tI/zklWf37XZ4G6uhjHQqucM2Nndsn 5sQlq1h7XErl9criDQp3AmG2btqJqfNX/sTfX1DvlmLKBljdXk25KNxveKXMCS7RyezL idfjaqeYvkohWBMVUL5vbYTjO7rebS6yWBVF0otX3ni9nnQWs4rObn9JdqVZZpqpCkqr h6uYjIBqgdCIE79467ALP5h4wrum7NxlvJstNZUr+jbI4ISBpaSl/Wny8AXiFR3LQ6Jm anYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=RaLiZYv3; 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 s144-v6sor4311351ybc.58.2018.07.09.01.06.36 for (Google Transport Security); Mon, 09 Jul 2018 01:06:36 -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=RaLiZYv3; 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; bh=l2+WL8Rrlts600OCqicqhny0TcWAgvVOfv4W3BQrKIQ=; b=RaLiZYv39bsHaziAru4/noM+SDyHObOMsrsJgUL4YlK4Glsi7kGTSqUkwBauUPrrQi WUFQGfOv/TUhm8+tp5lIY1pjLsOJZqNRhuvh9e9qBGHF/bv/K48/fsYQFK9AJGTkBTW6 d+cVUdUi/x4z6j3ot1KI7hMqlQXsza4x7Ue8A31N2M/wUj39oI5IQYvJYH6paLlul3x1 yrrjgsli6JraA7kPqSVCgyUaj1ng8IQlKq23Q/USZQjLKiIkPktbQ4cPvIDQ/n0EYBpG XZMmg5ZXPk9/3avGATYgVU8IjPJDyUbjqi1ls5gEmTY1RbBW2i3kdHKoTA3As7qNPw1/ /ldA== X-Google-Smtp-Source: AAOMgpdOwqQpiUPkW27UmGytBiJQqrFk6dn7J0w18f9b/lbKUB4ZpN+/KH9EbMUKn2n/lyf0LTbc1g== X-Received: by 2002:a25:2b06:: with SMTP id r6-v6mr3351455ybr.380.1531123595969; Mon, 09 Jul 2018 01:06:35 -0700 (PDT) Received: from sandstorm.nvidia.com ([2600:1700:43b0:3120:feaa:14ff:fe9e:34cb]) by smtp.gmail.com with ESMTPSA id w64-v6sm6339514ywe.46.2018.07.09.01.06.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jul 2018 01:06:35 -0700 (PDT) From: john.hubbard@gmail.com X-Google-Original-From: jhubbard@nvidia.com To: Matthew Wilcox , Michal Hocko , Christopher Lameter , Jason Gunthorpe , Dan Williams , Jan Kara , Al Viro Cc: linux-mm@kvack.org, LKML , linux-rdma , linux-fsdevel@vger.kernel.org, John Hubbard Subject: [PATCH 2/2] goldfish_pipe/mm: convert to the new put_user_page() call Date: Mon, 9 Jul 2018 01:05:54 -0700 Message-Id: <20180709080554.21931-3-jhubbard@nvidia.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180709080554.21931-1-jhubbard@nvidia.com> References: <20180709080554.21931-1-jhubbard@nvidia.com> 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 code that retains pages via get_user_pages*(), release those pages via the new put_user_page(), instead of put_page(). Also: rename release_user_pages(), to avoid a naming conflict with the new external function of the same name. CC: Al Viro Signed-off-by: John Hubbard --- drivers/platform/goldfish/goldfish_pipe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c index 3e32a4c14d5f..3ab871c22a88 100644 --- a/drivers/platform/goldfish/goldfish_pipe.c +++ b/drivers/platform/goldfish/goldfish_pipe.c @@ -331,7 +331,7 @@ static int pin_user_pages(unsigned long first_page, unsigned long last_page, } -static void release_user_pages(struct page **pages, int pages_count, +static void __release_user_pages(struct page **pages, int pages_count, int is_write, s32 consumed_size) { int i; @@ -339,7 +339,7 @@ static void release_user_pages(struct page **pages, int pages_count, for (i = 0; i < pages_count; i++) { if (!is_write && consumed_size > 0) set_page_dirty(pages[i]); - put_page(pages[i]); + put_user_page(pages[i]); } } @@ -409,7 +409,7 @@ static int transfer_max_buffers(struct goldfish_pipe *pipe, *consumed_size = pipe->command_buffer->rw_params.consumed_size; - release_user_pages(pages, pages_count, is_write, *consumed_size); + __release_user_pages(pages, pages_count, is_write, *consumed_size); mutex_unlock(&pipe->lock);