From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45BC7C77B72 for ; Fri, 14 Apr 2023 23:27:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C898B900003; Fri, 14 Apr 2023 19:27:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C387B6B007D; Fri, 14 Apr 2023 19:27:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B00BF900003; Fri, 14 Apr 2023 19:27:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A12FA6B007B for ; Fri, 14 Apr 2023 19:27:22 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6EAE81C6283 for ; Fri, 14 Apr 2023 23:27:22 +0000 (UTC) X-FDA: 80681585124.27.0AF72F7 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by imf08.hostedemail.com (Postfix) with ESMTP id 86387160008 for ; Fri, 14 Apr 2023 23:27:20 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=OrhEO0qz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf08.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681514840; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=d3R4ddapMeyDJ0P0S2alUCXwvGMhQM5Ib//pYtbrG/w=; b=KZggN5aRztybZREjgkEqQP306vnCa3lFnCm7kOmrLmd2IMOlw9fiNyZlr4tDzwc+PvtrF2 9sW6lLPjrCEf3gNcwcH6s7JGWa6wzMKzQ5ijTO91sWVjDXxDHFcCS04r+FEkOrvpKsEBGh Tw6KGOrZzoEhHmUl65feOQWKONdpBZg= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=OrhEO0qz; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf08.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681514840; a=rsa-sha256; cv=none; b=MpcHmP09EiKzXVrVCuCgUmEVR0C4fAVwN7AmG51xV+/vAZ6X/No/UlbAZ08x8pwLO26clD gwsvzDVkhDmY0VA/9rqMe2PZn6i7lQSvolk0g+K+TiUNlgQgeFGB8Zxkh/Bl8BubwrU43S kZ2ybtFHwSmSCidf6aXMF1wdrjFRmSI= Received: by mail-wm1-f47.google.com with SMTP id n19-20020a05600c501300b003f064936c3eso15542680wmr.0 for ; Fri, 14 Apr 2023 16:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681514839; x=1684106839; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d3R4ddapMeyDJ0P0S2alUCXwvGMhQM5Ib//pYtbrG/w=; b=OrhEO0qzchVPk1vo055ED54OMMZb8uC8IB6ty9ne32vA6q3p/i/Loy2O7ARogcpEXP VMVaphBrhp44h5SgSp3DZ86wOIgWT+rI9JuCyEHkx7RN6GDYQPpHsHBCjO6tnFVQMyyk /ZaQuxTZw3jQdBiWDsQEXE1uUxxaMRv7AZ4rX22q46xssdyqszybHP/3DqZ2pThrTZYp nQDLTIniF9Dx4toFV/cVOV+dNRjoeRZdONRyClaNL5yo6fOkNbB4dSCiRnE9kkJ7B/Gb KdRBGi7M2dCX4QLRY2yfCUnIJWmhHw+cyyRH+ios/xJgAd1HGi7TJIf6/qdIk1pzmf24 lsdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681514839; x=1684106839; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d3R4ddapMeyDJ0P0S2alUCXwvGMhQM5Ib//pYtbrG/w=; b=QLpvVr3uzd3gBkJL0ICNOsQ4F193uAN/QgBJOSPbWsFoP0e1M0TO2c9s7sqH3d5+Vi fYJSIscWx7CNiHoB6TuMqAiIHUgvN1KKL2Q6Up26UFqpM9rSG35GC1SeUHwDIUznkdot Ma1oArjPxGy1WTZU+HgE/Pz52d6jF/hUmKsFQ+sAjfYM+AXdrqu/I3FKcIXLw6VRrwLZ DEN4Sx/c4oi7nfLH5EEjELGu7bRjtB5T7LlwYMB/SCfuoW2oCszk7j7WeOcqr/NAzm18 YjVyr/i+xPC5nZrbAclQ2W1+3il21yUqKClMkgzeGM3iLlleqqOCotUh9Mwc7KBtCJXH ANAw== X-Gm-Message-State: AAQBX9dxTNKL5Rs8zLSqp48kRfiVNtJPdixehJGhfoohSSJ/oI0P33n3 CRz6mz5ekwZbMQPZchY03INHqAnF3RI= X-Google-Smtp-Source: AKy350ZbMOF2GsyN1dBdwKcvm/6rU6eKdB1U1gytVyqtzlM1SYX7jaGUQR4cn/FTMHkx57m03U4cxA== X-Received: by 2002:a7b:c7cd:0:b0:3ed:a82d:dffb with SMTP id z13-20020a7bc7cd000000b003eda82ddffbmr5377441wmk.40.1681514838694; Fri, 14 Apr 2023 16:27:18 -0700 (PDT) Received: from lucifer.home (host86-156-84-164.range86-156.btcentralplus.com. [86.156.84.164]) by smtp.googlemail.com with ESMTPSA id f17-20020adff8d1000000b002ef222822d5sm4546656wrq.74.2023.04.14.16.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 16:27:17 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Matthew Wilcox , David Hildenbrand , x86@kernel.org, linux-sgx@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kvm@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Jarkko Sakkinen , "H . Peter Anvin" , Xinhui Pan , David Airlie , Daniel Vetter , Dimitri Sivanich , Arnd Bergmann , Greg Kroah-Hartman , Paolo Bonzini , Lorenzo Stoakes Subject: [PATCH 1/7] mm/gup: remove unused vmas parameter from get_user_pages() Date: Sat, 15 Apr 2023 00:27:13 +0100 Message-Id: X-Mailer: git-send-email 2.40.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 86387160008 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: n7tmmptk1fksms14azr4enh1mo57h963 X-HE-Tag: 1681514840-27437 X-HE-Meta: U2FsdGVkX1/rXMLXMynxOEJQ0P77+uR5klYx5K4dhxU+Mlc3NilREqsQmyRhJXByjNHkfKm5ykY2GkAZQYjPSxZLUcGsjOcBgj0+W7g5BelK2uV+v1lkeR6Bm+wVbigcAR/NJ/oKXurOs+/qbXf6eYYME1lpDL5LfKYYxLGAUI+cuLRfCiqTCS5VyBho821TF4gQJoVmv3hichDwFgPeBV3gu2Qe6mgRfMxF4nAiLsEhk7Fz9/JpSZcYySBk5SmSd6IBOijbF/sosCfQmP9Pvd/Mz0XNJIv9DT/CHfSbjSPB1kw3eA48UAQpqOfAuarrSDgU8QL5PxaAQabIzF8QIlVrRwOhCiPf6OMcQbL9PedrZ2UqcNbseEHbYpSHWFjxvyN1ZLyjZYFphlsi55BsDGZOHiN0pvBIvFMj/8HJAkoAs8jo9CQ2aswhWwmkaxXDw7xSJuFp1UWoj2xSjUhyL1wTZaey0AkB6Q9Ctq71aUVSZ9ZIpHgPV+BNLPFb/BNfJzyRWPaxkC1uL5e01SB8TjXoKXuySWlUEDI6p8mvJZSGTd/F2bgg3fgbLyFFYwGEwu+o3nBMO/Bi/aiejC10oD7HG2TYgoF1yVmy2tXKl1CE63Mt98QZb59VXh6IWi5EifRdcejz2gLjaHCKzgpq60B4N6z31Xou0i8gzrH1UCj9aE1buFDj7xyXda0k/sAbxI84+yW+/JpS9WD8jHEmBAcVi4FEU4aT7xmo7uPD2VxBaLjJA6dpw5OaJgq5NbUMjo9h9C/if21XW7asBXxKiZmEMZzzVFhahCEIxUhdPtOhLoFhd1hKC6Er/JRDnChsw6laFzTyLUWAj48i80JJ7ZtmeobNZbWW6TGaNC9k4MMI21tWwTfuvguEkVbyC2qkTcDrjA6XNRWGpPnhE3dgEsjdwx+71PSY1RZimOZIafKnM+9NPngMuwtA4imozMLV4Seej1uHMjKQbWaU6zc Stfe2r8H 0i15gnvgPBe4j5TaOuKSBdvLfS1bQopN6fedBQs1TV6npChUPZvIlMffKzukVXM5Fv2FjU++MJCxpvTARgE7nT0DeSMGSHBGHO99k9SL4a8qhxxiRaBvhGEWTtqzdLUaM5ex4b0jIfdOXn2gmLaT4YhCWl8rCAcLttB09QohHqCILFXLvUrMuPHOYvKADNtfmo3ijMrmiLf+ct1waf/xkKOwDWb4vvuHiQTWFoEFQvsESGJaefxfp3GpmYkCCuWlctG2CWo1gl5JojPKvx5rIwNaEoaj6NkQyiZQLfib7U4XmPpRM94VCRB9tiVFGEg8zXXwjqOrQXUwo9SZjAI2IJQjTK2Oxj7nEUH/lKPJa6i2OzAza1Iz724sszFOPYBZsLE4068wP77p9NMSV7njuQwPx2IGmN+hQyQjpGjQPaeGmAsb+00qb9jPXhbBluh+1VrkHe1v2t3KPD4bE8VVAYKKXP0yVyXqDkDYo8z+MsK5soqDn9SYMlzEflVDlQwyUW5AA1wYgvjmv+3uUAErIgG6sZFk2NjtHtobR0ac2Kk0LvcHic01fjy8D3kr+0n51nxs6 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: No invocation of get_user_pages() uses the vmas parameter, so remove it. The GUP API is confusing and caveated. Recent changes have done much to improve that, however there is more we can do. Exporting vmas is a prime target as the caller has to be extremely careful to preclude their use after the mmap_lock has expired or otherwise be left with dangling pointers. Removing the vmas parameter focuses the GUP functions upon their primary purpose - pinning (and outputting) pages as well as performing the actions implied by the input flags. This is part of a patch series aiming to remove the vmas parameter altogether. Signed-off-by: Lorenzo Stoakes Suggested-by: Matthew Wilcox (Oracle) --- arch/x86/kernel/cpu/sgx/ioctl.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/misc/sgi-gru/grufault.c | 2 +- include/linux/mm.h | 3 +-- mm/gup.c | 9 +++------ mm/gup_test.c | 5 ++--- virt/kvm/kvm_main.c | 4 ++-- 7 files changed, 11 insertions(+), 16 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c index 21ca0a831b70..5d390df21440 100644 --- a/arch/x86/kernel/cpu/sgx/ioctl.c +++ b/arch/x86/kernel/cpu/sgx/ioctl.c @@ -214,7 +214,7 @@ static int __sgx_encl_add_page(struct sgx_encl *encl, if (!(vma->vm_flags & VM_MAYEXEC)) return -EACCES; - ret = get_user_pages(src, 1, 0, &src_page, NULL); + ret = get_user_pages(src, 1, 0, &src_page); if (ret < 1) return -EFAULT; diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 1e8e287e113c..0597540f0dde 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -362,7 +362,7 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_device *bdev, struct ttm_tt *ttm struct page **pages = ttm->pages + pinned; r = get_user_pages(userptr, num_pages, write ? FOLL_WRITE : 0, - pages, NULL); + pages); if (r < 0) goto release_pages; diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index b836936e9747..378cf02a2aa1 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c @@ -185,7 +185,7 @@ static int non_atomic_pte_lookup(struct vm_area_struct *vma, #else *pageshift = PAGE_SHIFT; #endif - if (get_user_pages(vaddr, 1, write ? FOLL_WRITE : 0, &page, NULL) <= 0) + if (get_user_pages(vaddr, 1, write ? FOLL_WRITE : 0, &page) <= 0) return -EFAULT; *paddr = page_to_phys(page); put_page(page); diff --git a/include/linux/mm.h b/include/linux/mm.h index 5d5ba1556ae9..faeed36c2d04 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2380,8 +2380,7 @@ long pin_user_pages_remote(struct mm_struct *mm, unsigned int gup_flags, struct page **pages, struct vm_area_struct **vmas, int *locked); long get_user_pages(unsigned long start, unsigned long nr_pages, - unsigned int gup_flags, struct page **pages, - struct vm_area_struct **vmas); + unsigned int gup_flags, struct page **pages); long pin_user_pages(unsigned long start, unsigned long nr_pages, unsigned int gup_flags, struct page **pages, struct vm_area_struct **vmas); diff --git a/mm/gup.c b/mm/gup.c index 1f72a717232b..7e454d6b157e 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2251,8 +2251,6 @@ long get_user_pages_remote(struct mm_struct *mm, * @pages: array that receives pointers to the pages pinned. * Should be at least nr_pages long. Or NULL, if caller * only intends to ensure the pages are faulted in. - * @vmas: array of pointers to vmas corresponding to each page. - * Or NULL if the caller does not require them. * * This is the same as get_user_pages_remote(), just with a less-flexible * calling convention where we assume that the mm being operated on belongs to @@ -2260,16 +2258,15 @@ long get_user_pages_remote(struct mm_struct *mm, * obviously don't pass FOLL_REMOTE in here. */ long get_user_pages(unsigned long start, unsigned long nr_pages, - unsigned int gup_flags, struct page **pages, - struct vm_area_struct **vmas) + unsigned int gup_flags, struct page **pages) { int locked = 1; - if (!is_valid_gup_args(pages, vmas, NULL, &gup_flags, FOLL_TOUCH)) + if (!is_valid_gup_args(pages, NULL, NULL, &gup_flags, FOLL_TOUCH)) return -EINVAL; return __get_user_pages_locked(current->mm, start, nr_pages, pages, - vmas, &locked, gup_flags); + NULL, &locked, gup_flags); } EXPORT_SYMBOL(get_user_pages); diff --git a/mm/gup_test.c b/mm/gup_test.c index 8ae7307a1bb6..9ba8ea23f84e 100644 --- a/mm/gup_test.c +++ b/mm/gup_test.c @@ -139,8 +139,7 @@ static int __gup_test_ioctl(unsigned int cmd, pages + i); break; case GUP_BASIC_TEST: - nr = get_user_pages(addr, nr, gup->gup_flags, pages + i, - NULL); + nr = get_user_pages(addr, nr, gup->gup_flags, pages + i); break; case PIN_FAST_BENCHMARK: nr = pin_user_pages_fast(addr, nr, gup->gup_flags, @@ -161,7 +160,7 @@ static int __gup_test_ioctl(unsigned int cmd, pages + i, NULL); else nr = get_user_pages(addr, nr, gup->gup_flags, - pages + i, NULL); + pages + i); break; default: ret = -EINVAL; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index d255964ec331..2d2446df0900 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2474,7 +2474,7 @@ static inline int check_user_page_hwpoison(unsigned long addr) { int rc, flags = FOLL_HWPOISON | FOLL_WRITE; - rc = get_user_pages(addr, 1, flags, NULL, NULL); + rc = get_user_pages(addr, 1, flags, NULL); return rc == -EHWPOISON; } -- 2.40.0