Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1999722imu; Fri, 14 Dec 2018 04:17:35 -0800 (PST) X-Google-Smtp-Source: AFSGD/XSsWqOO3sFDPVfIv/J7E/c7vK1DFpWsrD9kGsWW4euuT9aafuYKSVBmzE65lzzUZ5HNLng X-Received: by 2002:a63:9749:: with SMTP id d9mr2429018pgo.415.1544789855584; Fri, 14 Dec 2018 04:17:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544789855; cv=none; d=google.com; s=arc-20160816; b=aYHJwekXcU4lPvwg+f+v4NDPHRSekcQCuKCdjYc1AreHrxOG4yeFuoIWJVNee6ZFFK QoSgCU+yG8hfymPn/FUJw8ENb5behLbvJw3Dl9tHJO2TCcF/do4goNepTf0VQOANWKBc fTp/5v8zbF+d7MOQmel+dXuO0hw79t6YmoUYg1H4hqQ3YZK1rFJAy6oFVGJ2fslKaFXB NBHVQ+dQAGo8UDWdcQ1lbaTCDO7mAc8CZWCvsrpH93tb08DUXF1fAuAmvhfSSZn92T00 6Wqf6FjHYSLhJbtf1MRaqOyI19e7DW+AVvz8mV4QrpK84O3dC2LsWjBESjO/Nv/yWrq8 pyQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ibg692hAGl889jmr1FFMy6LyKYu5Cdmqgg3tHymmAwM=; b=EZvTngssDfvPKJVvFcpISF+o8mB3SviXumz0jQvyViXyX4x7g9PGHgv3Fj+rvVt6KW EYxqpP88k+BgMb3jiJtcp+pwLxDnKF7/1gdK+PwIMQO2NVOgzslexqw9ALqpFcgNOKjH YO4IFLDuCvgdUO5GG4VzFFu75VAnAVi6BcuVJxjIh/wq8nxAx3GLCwiIaLHEhA1+U7ul Tku7+G7xxYLuUMjmzejj4nVuUNYRfm7p93HZOElXt2A85cDxhSzfR6GoJfP6HvfKnCaK FHTEPTG3KnoiSicx0yloy3i8AiroXtW84YTCv+XFgs6KEQir8cvbfVJnGsywLEmF40V9 fPrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SJzmHqe0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t11si3696026plo.293.2018.12.14.04.17.21; Fri, 14 Dec 2018 04:17:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=SJzmHqe0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732769AbeLNMQc (ORCPT + 99 others); Fri, 14 Dec 2018 07:16:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:36682 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732757AbeLNMQ3 (ORCPT ); Fri, 14 Dec 2018 07:16:29 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0B6062133F; Fri, 14 Dec 2018 12:16:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544789788; bh=/uZsgQNW9hmBX6r1/lJ81JBZdLY3Ctssma43YpH1rWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SJzmHqe0UMq0Kf2aHbgr7hXMOlTjcDO1Vz38PMTH6uoWIIt6edkD+F0bUnLyp2lcr +gYavQpip/d+Kf6Qok74NgGMzSChyAJw/JhCgDyaxJr4fSThBxdLEalS9gkqqy7G3Z xung0YjerTYtTxxDIvnWdUpTiNFV4dxCpjeBIe2E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lorenzo Stoakes , Michal Hocko , Jan Kara , Linus Torvalds , Ben Hutchings Subject: [PATCH 4.4 77/88] mm: replace get_user_pages_locked() write/force parameters with gup_flags Date: Fri, 14 Dec 2018 13:00:51 +0100 Message-Id: <20181214115708.508349431@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181214115702.151309521@linuxfoundation.org> References: <20181214115702.151309521@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lorenzo Stoakes commit 3b913179c3fa89dd0e304193fa0c746fc0481447 upstream. This removes the 'write' and 'force' use from get_user_pages_locked() and replaces them with 'gup_flags' to make the use of FOLL_FORCE explicit in callers as use of this flag can result in surprising behaviour (and hence bugs) within the mm subsystem. Signed-off-by: Lorenzo Stoakes Acked-by: Michal Hocko Reviewed-by: Jan Kara Signed-off-by: Linus Torvalds [bwh: Backported to 4.4: adjust context] Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- include/linux/mm.h | 3 +-- mm/frame_vector.c | 8 +++++++- mm/gup.c | 12 +++--------- mm/nommu.c | 5 ++++- 4 files changed, 15 insertions(+), 13 deletions(-) --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1203,8 +1203,7 @@ long get_user_pages(struct task_struct * struct vm_area_struct **vmas); long get_user_pages_locked(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, unsigned long nr_pages, - int write, int force, struct page **pages, - int *locked); + unsigned int gup_flags, struct page **pages, int *locked); long __get_user_pages_unlocked(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, unsigned long nr_pages, struct page **pages, unsigned int gup_flags); --- a/mm/frame_vector.c +++ b/mm/frame_vector.c @@ -41,10 +41,16 @@ int get_vaddr_frames(unsigned long start int ret = 0; int err; int locked; + unsigned int gup_flags = 0; if (nr_frames == 0) return 0; + if (write) + gup_flags |= FOLL_WRITE; + if (force) + gup_flags |= FOLL_FORCE; + if (WARN_ON_ONCE(nr_frames > vec->nr_allocated)) nr_frames = vec->nr_allocated; @@ -59,7 +65,7 @@ int get_vaddr_frames(unsigned long start vec->got_ref = true; vec->is_pfns = false; ret = get_user_pages_locked(current, mm, start, nr_frames, - write, force, (struct page **)(vec->ptrs), &locked); + gup_flags, (struct page **)(vec->ptrs), &locked); goto out; } --- a/mm/gup.c +++ b/mm/gup.c @@ -737,18 +737,12 @@ static __always_inline long __get_user_p */ long get_user_pages_locked(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, unsigned long nr_pages, - int write, int force, struct page **pages, + unsigned int gup_flags, struct page **pages, int *locked) { - unsigned int flags = FOLL_TOUCH; - - if (write) - flags |= FOLL_WRITE; - if (force) - flags |= FOLL_FORCE; - return __get_user_pages_locked(tsk, mm, start, nr_pages, - pages, NULL, locked, true, flags); + pages, NULL, locked, true, + gup_flags | FOLL_TOUCH); } EXPORT_SYMBOL(get_user_pages_locked); --- a/mm/nommu.c +++ b/mm/nommu.c @@ -201,9 +201,12 @@ EXPORT_SYMBOL(get_user_pages); long get_user_pages_locked(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, unsigned long nr_pages, - int write, int force, struct page **pages, + unsigned int gup_flags, struct page **pages, int *locked) { + int write = gup_flags & FOLL_WRITE; + int force = gup_flags & FOLL_FORCE; + return get_user_pages(tsk, mm, start, nr_pages, write, force, pages, NULL); }