Received: by 2002:a17:90a:9307:0:0:0:0 with SMTP id p7csp3945405pjo; Tue, 3 Mar 2020 09:53:13 -0800 (PST) X-Google-Smtp-Source: ADFU+vtDyjwLSuFCePw+Qr2iTq+9kt55iyLtZKopLTA1Fyhme9uLjlXFEwrl2QESPVoC0fDW7taY X-Received: by 2002:a05:6830:1144:: with SMTP id x4mr4205552otq.59.1583257992943; Tue, 03 Mar 2020 09:53:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583257992; cv=none; d=google.com; s=arc-20160816; b=B+jo75SSf6tsTbnTuEBAaNq09tM2fhXLFhRAqzBOAJKYkV5ub/Ipq2yKqxjsmqtHIw aKh2rqhnvmCgWTbErds6Rpq0aJlKhwPKhgUlQEKRRSDUVYaOK6E1KLCIGHM6LXD/CoAZ 8aNbdsIp1S21oty9COoYxzibtRQbTCELYt17ocJb2C00CBgESabR/orf67Ma3Pi/yqRv BGt1j/slJUusuI7vNks09vMGQ9S50LQpUZ+/z3++GROk14jmaZbDvOTH+vk+drl6GvVJ W7Ltpl/Mgyud9pnSlZy+GsxV/WGjEphAYyXKQSQSbXENkV0Z7yP6nvKBFPoj2ebSWjWL +0kg== 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=dJLXLkc+siaYdXzEI3oph9RCirpQgicz7NqL7xIKo88=; b=PQ+dhBfH2p9dEshy8VAkQYgwL2i876bhNxUGl4zmXAxhFCCcpDrzoEqSDCnRgGgRKg 7GnwmPI5rynir5JFRubakNqKjRL+p97M6a+nbTS57bsScSbkA9kQLkFecJ8OO+YhLCzR vSV37dKlzC6iBLMDUBQSq+6aV0u9Vpy+vzhytf0zjFmOf7aD0UPB80XKSJy4/+Ja+owN 2iO/dutsNdyU9lPqtY6GEjiPZ6EEg1JQkmlaEtmfoNrOtiZliaC8gCz5UJNAu/klE0kQ dufOi1ZU8FUQaaB8tbkFUFEP5gNiqqro87Hqfg2bFMcQ+keRpqFzd2p1tN4UUPtDXa2l y1qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1YHuZyhs; 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 o1si8490255otk.154.2020.03.03.09.53.00; Tue, 03 Mar 2020 09:53:12 -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=1YHuZyhs; 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 S1732122AbgCCRwP (ORCPT + 99 others); Tue, 3 Mar 2020 12:52:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:60438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726368AbgCCRwK (ORCPT ); Tue, 3 Mar 2020 12:52:10 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 CC9DB206D5; Tue, 3 Mar 2020 17:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583257930; bh=wwYAtY6bjKNZ28ZOO+yoynbjZWU+rFBQW1m8byw9ZuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1YHuZyhsrVbzcxVVkMjWVSWJTp0lklt5woKqTmYWKHZ5i4JhebZmOsTC3kZUwyaM5 R0NWX5b8K/9GCpIqjy2qhVUDSblX3q6u7WCSOAQBT2/891dyafw5oaIDLMGvoDfVnF pqY9e8i4zayc0wXcj3jklqBiMDNT9Z7XBTsZgwvE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Hubbard , Leon Romanovsky , Jan Kara , Christoph Hellwig , Alex Williamson , "Aneesh Kumar K.V" , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Daniel Vetter , Dan Williams , Hans Verkuil , Ira Weiny , Jason Gunthorpe , Jason Gunthorpe , Jens Axboe , Jerome Glisse , Jonathan Corbet , "Kirill A. Shutemov" , Mauro Carvalho Chehab , Mike Rapoport , Andrew Morton , Linus Torvalds Subject: [PATCH 5.5 172/176] mm/gup: allow FOLL_FORCE for get_user_pages_fast() Date: Tue, 3 Mar 2020 18:43:56 +0100 Message-Id: <20200303174323.801359431@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174304.593872177@linuxfoundation.org> References: <20200303174304.593872177@linuxfoundation.org> User-Agent: quilt/0.66 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 From: John Hubbard commit f4000fdf435b8301a11cf85237c561047f8c4c72 upstream. Commit 817be129e6f2 ("mm: validate get_user_pages_fast flags") allowed only FOLL_WRITE and FOLL_LONGTERM to be passed to get_user_pages_fast(). This, combined with the fact that get_user_pages_fast() falls back to "slow gup", which *does* accept FOLL_FORCE, leads to an odd situation: if you need FOLL_FORCE, you cannot call get_user_pages_fast(). There does not appear to be any reason for filtering out FOLL_FORCE. There is nothing in the _fast() implementation that requires that we avoid writing to the pages. So it appears to have been an oversight. Fix by allowing FOLL_FORCE to be set for get_user_pages_fast(). Link: http://lkml.kernel.org/r/20200107224558.2362728-9-jhubbard@nvidia.com Fixes: 817be129e6f2 ("mm: validate get_user_pages_fast flags") Signed-off-by: John Hubbard Reviewed-by: Leon Romanovsky Reviewed-by: Jan Kara Cc: Christoph Hellwig Cc: Alex Williamson Cc: Aneesh Kumar K.V Cc: Björn Töpel Cc: Daniel Vetter Cc: Dan Williams Cc: Hans Verkuil Cc: Ira Weiny Cc: Jason Gunthorpe Cc: Jason Gunthorpe Cc: Jens Axboe Cc: Jerome Glisse Cc: Jonathan Corbet Cc: Kirill A. Shutemov Cc: Mauro Carvalho Chehab Cc: Mike Rapoport Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/gup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/gup.c +++ b/mm/gup.c @@ -2415,7 +2415,8 @@ int get_user_pages_fast(unsigned long st unsigned long addr, len, end; int nr = 0, ret = 0; - if (WARN_ON_ONCE(gup_flags & ~(FOLL_WRITE | FOLL_LONGTERM))) + if (WARN_ON_ONCE(gup_flags & ~(FOLL_WRITE | FOLL_LONGTERM | + FOLL_FORCE))) return -EINVAL; start = untagged_addr(start) & PAGE_MASK;