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 4952FC77B76 for ; Sat, 15 Apr 2023 12:09:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CF52E6B007B; Sat, 15 Apr 2023 08:09:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CA4B76B007D; Sat, 15 Apr 2023 08:09:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF8036B007E; Sat, 15 Apr 2023 08:09:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A08086B007B for ; Sat, 15 Apr 2023 08:09:30 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6B04D160170 for ; Sat, 15 Apr 2023 12:09:30 +0000 (UTC) X-FDA: 80683505700.07.5B7DBD3 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by imf29.hostedemail.com (Postfix) with ESMTP id 82E4F120013 for ; Sat, 15 Apr 2023 12:09:28 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ldmw31Rq; spf=pass (imf29.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681560568; 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=W0l2+WhOTuhsjrgo5218GoveeiorDwRw7Vzzp86RCdQ=; b=m5WUde+VnUD9itDr/syYwIDmDw1uLBBWVfE74rVqxAD1DRqVPdKjSb3Hdvb/hSn76uWrpt V9gFJZnyXX2MepJ1iaCDcsvidJKKbUQDeTxSDOd3vfd4MbPDC2UX9C/hNopbJA6vvsZLgj p9KBZX7cGA0uI3jxUgjDp/k6teJTzzk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ldmw31Rq; spf=pass (imf29.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681560568; a=rsa-sha256; cv=none; b=HehN4SKnixLmer6ur4UVjy3QhAeZm/Oi+U41U1dCxNXo5sDDhC0PpoUxSa9gw9uspxBaGL d1i0jUjupUNw/pbSLdxyQCEglYhnSy+LNsUwbONdoy6ajJIhi0auTPTWkQDHq2kClQo2u3 FP4HnkMGqktMr8rslp63Asd4NJD9c/0= Received: by mail-wm1-f48.google.com with SMTP id v10so4945318wmn.5 for ; Sat, 15 Apr 2023 05:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681560567; x=1684152567; 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=W0l2+WhOTuhsjrgo5218GoveeiorDwRw7Vzzp86RCdQ=; b=ldmw31RqwDsq19kNUyAGwCe6feARcBsKOWHer9UDyhHpXBW86bINZ4rpI99CYQXM3+ JERVDUA0BVrG5md+jDxa0acQWcQavONMHScc6SB/3xaQzbenQK0QpbQbIkLpaLP9jAfG e/8lzW37JCyFs7Z17XxvJnEXXn7RIxRDv594gU7u7JgSZMJp9Uy9WDSppvCABKPg9q6P 6lgN2qvP2iE7QGZPWYRob5VjTGLMpqT1ukkX4auc09mbz9UYoKDOMgZczOt3ZuXY57kC GvCT2JFtQmnaasrqUJ6+X5DcdjMmScBCDHnK/ROGEGVUOw13vr7fvIAtwDo3nrFrASqg 40qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681560567; x=1684152567; 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=W0l2+WhOTuhsjrgo5218GoveeiorDwRw7Vzzp86RCdQ=; b=duBkBiHF3DRy7cFjhcEHqAcrYl7U4e/XE7L/qyYqOj+HL+F/3Rziat+iaqHdjLR1Wz BIYCAi3WS9NZ4L8Kulb+oVKYEeVL0h8uRi8s8qlOkTc7hn9xf6CGcRjdpvDkkKO6+bGy O6Vkgg0tAWjBO8NIr4ah9hWx+C1yMHMseCyZQ2MLQGaxDrRWRssCspN8VE+xxJNAq2x9 HRo69O6W/fgtYhl0A3qHMWlZrluEP2rxRKo4QMBBPSFy2AyAcmu7NYQiF3oNe+b3b1Us LbOC5fmIYpyXV4Vh2D6KADwXJ3CrvDnrT9k2JNHkwZhH3gtiOiBjSiKCL8Y6aW1By0BY RW+g== X-Gm-Message-State: AAQBX9fxPZnHd63Ce10yehD0n94k5kysK7xo5N5SueyQ/R7tNIKNLT0w V6EuG1p4PPORjqWlB3WrKy3mbFrMhA0LuA== X-Google-Smtp-Source: AKy350a3KTToXZy6mk4WHVMLQX+oM6Sg5f2Asfiie67hTn0jXqMQSjIUSB1JD5MwmpH2ws8BySgnig== X-Received: by 2002:a7b:c7c9:0:b0:3f1:6ecf:537 with SMTP id z9-20020a7bc7c9000000b003f16ecf0537mr672424wmk.33.1681560567358; Sat, 15 Apr 2023 05:09:27 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id q21-20020a05600c46d500b003f03d483966sm10428181wmo.44.2023.04.15.05.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 05:09:26 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Matthew Wilcox , David Hildenbrand , linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-security-module@vger.kernel.org, Catalin Marinas , Will Deacon , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sven Schnelle , Eric Biederman , Kees Cook , Alexander Viro , Christian Brauner , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kentaro Takeda , Tetsuo Handa , Paul Moore , James Morris , "Serge E . Hallyn" , Paolo Bonzini , Lorenzo Stoakes Subject: [PATCH v3 3/7] mm/gup: remove vmas parameter from get_user_pages_remote() Date: Sat, 15 Apr 2023 13:09:24 +0100 Message-Id: <523f0764f4979276a6d4b89cbad9af9124e4bf0a.1681558407.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 82E4F120013 X-Stat-Signature: omw5c8bk134tcbxjf7gxowtmkb69o89t X-Rspam-User: X-HE-Tag: 1681560568-236766 X-HE-Meta: U2FsdGVkX1/iou6vsKRGGxFLn8Us0UgmxisH+2lOJo252Z91/2fRiRamiymsn9ZXC0AUW6JfMHo3HgPktBlvrqb7shYTTpcCG60ZyDNMWQ4/Ra9+3XYtJOANVw3ISceoSGqjORUBKZcCuzly6XLefo/gl9uhJbjnC41UknklVC4CJdKCPxZR2yQDkX/FGh1+G2SPbMBZZ8FP6OZT6ZFYjECUQfZkicNmcAOlzQOlTdRvUC7zkJ+GvRNMADekXCAs75ncsf8CsEj0CDjez8mTgSSM7pIcLArZI8zBrxKPb0dOtB9SJRS02d0Hu4rl6KWWFWQ7D6OI4UTcxHY4EbEKhVETERGVpYMpb7h9ik52lEChnolNfeo93LG7BZ78HTUEAliGBxZF6jlRng6kwWtFqs9SbfUH47vnNgci/wWoOnCg3k5VAiDVUuO/wWlpJYRuoeHkcFewIvRiDPAW/9dhOX5T9dGkokXxzqqviIycbkDM/1UPyNjt8l0jsrjPHxT5AEbHbSwK43y/yNkfNVsqo9FYqvh/INvEdTGr5kqpThf0rElDk09wDNwKr3W7k94trcd5ONAmMsecmtaTwt6w0+UixEUghtbX/SIedA2F6KaF5leq7KGaUtuDBBkCulmRLyZMZdXXnQJlov2pyA05ppjbuUjwAkMb0/m+Kq0BJSWZVXU4smIsh4iqSfNF8Apnsj9Y4yj8o6w7Dw1GQNECe88c7ZOl7oz31Zd85J/2jx+gdkDxXmM5Lvvpwh9cYHy/LddH5OqWjeWyygMu647JlLpRHpSigU3JrT9xwUn+NSL1Bo2YNgsXw0r8dBeBamsIK2Wvn+DqOVYZag5+ww5GLaleVusvDYyxH4niHdVMLznkkk6hI0t0HRlitkUN0KLMoyRtIjFFvko9PXaO/Egffvscz6XJ+98VusjPQExv+ExsYfTN3GaHMrHZ+/X/RKD/8BPfGKk4aJcFqqV5Zvv gFjLGQrP leXnmfvD/p/OG8j+Pnqvxidi0ABf4m5c0l2p12WsxULQSgJzOcRMp+VpFQ8OqDELZs9AIH6b6B0HAOvwu/D0xa8QwlrsUOMBKdkQat0lP/OB6pXCWj06PT0yJ1i6PqJIlX0p4tTtpZrLh2MqRfEb+vXQeA2tvRNICED+sE6tz7c7rW358CCWhMRhOk6cwALfiODSpsIZxHifs4DNcPdkmz+4FWh6gTeKcVa5LromJ5LgCf+sAWlszS+k7oWV+pH0WjaBlFNKW/FoBF8jSUmDlfvYt+PMPozmd/QtFcw92VMxkG0exEn4W9YtXyOxXaypjMoPxElTB42w1HP2I/xGP39sFr39/QOOi2DNon3QBUXrx3MtwH9uHl2cBnZ8/05Gb9KzAqftTRayIky2csOSVfNR8j90BjyrOE9tr/LmlcpiMzcJ9t/hBgk/NxI2km6clP8sY3X/MWA+vgNa50wsb0fqF+JNHV169Sr/3tnqRx3gSopBv3FTa1SDoOQ== 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: The only instances of get_user_pages_remote() invocations which used the vmas parameter were for a single page which can instead simply look up the VMA directly. In particular:- - __update_ref_ctr() looked up the VMA but did nothing with it so we simply remove it. - __access_remote_vm() was already using vma_lookup() when the original lookup failed so by doing the lookup directly this also de-duplicates the code. This forms part of a broader set of patches intended to eliminate the vmas parameter altogether. Signed-off-by: Lorenzo Stoakes --- arch/arm64/kernel/mte.c | 7 ++++--- arch/s390/kvm/interrupt.c | 2 +- fs/exec.c | 2 +- include/linux/mm.h | 2 +- kernel/events/uprobes.c | 14 +++++++++----- mm/gup.c | 12 ++++-------- mm/memory.c | 8 ++++++-- mm/rmap.c | 2 +- security/tomoyo/domain.c | 2 +- virt/kvm/async_pf.c | 3 +-- 10 files changed, 29 insertions(+), 25 deletions(-) diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index f5bcb0dc6267..904785697e91 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -419,7 +419,6 @@ long get_mte_ctrl(struct task_struct *task) static int __access_remote_tags(struct mm_struct *mm, unsigned long addr, struct iovec *kiov, unsigned int gup_flags) { - struct vm_area_struct *vma; void __user *buf = kiov->iov_base; size_t len = kiov->iov_len; int ret; @@ -432,12 +431,13 @@ static int __access_remote_tags(struct mm_struct *mm, unsigned long addr, return -EIO; while (len) { + struct vm_area_struct *vma; unsigned long tags, offset; void *maddr; struct page *page = NULL; ret = get_user_pages_remote(mm, addr, 1, gup_flags, &page, - &vma, NULL); + NULL); if (ret <= 0) break; @@ -448,7 +448,8 @@ static int __access_remote_tags(struct mm_struct *mm, unsigned long addr, * would cause the existing tags to be cleared if the page * was never mapped with PROT_MTE. */ - if (!(vma->vm_flags & VM_MTE)) { + vma = vma_lookup(mm, addr); + if (WARN_ON_ONCE(!vma) || !(vma->vm_flags & VM_MTE)) { ret = -EOPNOTSUPP; put_page(page); break; diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 9250fde1f97d..c19d0cb7d2f2 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -2777,7 +2777,7 @@ static struct page *get_map_page(struct kvm *kvm, u64 uaddr) mmap_read_lock(kvm->mm); get_user_pages_remote(kvm->mm, uaddr, 1, FOLL_WRITE, - &page, NULL, NULL); + &page, NULL); mmap_read_unlock(kvm->mm); return page; } diff --git a/fs/exec.c b/fs/exec.c index 87cf3a2f0e9a..d8d48ee15aac 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -219,7 +219,7 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, */ mmap_read_lock(bprm->mm); ret = get_user_pages_remote(bprm->mm, pos, 1, gup_flags, - &page, NULL, NULL); + &page, NULL); mmap_read_unlock(bprm->mm); if (ret <= 0) return NULL; diff --git a/include/linux/mm.h b/include/linux/mm.h index ec9875c59f6d..1bfe73a2b6d3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2374,7 +2374,7 @@ extern int __access_remote_vm(struct mm_struct *mm, unsigned long addr, long get_user_pages_remote(struct mm_struct *mm, unsigned long start, unsigned long nr_pages, unsigned int gup_flags, struct page **pages, - struct vm_area_struct **vmas, int *locked); + int *locked); long pin_user_pages_remote(struct mm_struct *mm, unsigned long start, unsigned long nr_pages, unsigned int gup_flags, struct page **pages, diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 59887c69d54c..c5ed6bb340f7 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -365,7 +365,6 @@ __update_ref_ctr(struct mm_struct *mm, unsigned long vaddr, short d) { void *kaddr; struct page *page; - struct vm_area_struct *vma; int ret; short *ptr; @@ -373,7 +372,7 @@ __update_ref_ctr(struct mm_struct *mm, unsigned long vaddr, short d) return -EINVAL; ret = get_user_pages_remote(mm, vaddr, 1, - FOLL_WRITE, &page, &vma, NULL); + FOLL_WRITE, &page, NULL); if (unlikely(ret <= 0)) { /* * We are asking for 1 page. If get_user_pages_remote() fails, @@ -475,10 +474,16 @@ int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, gup_flags |= FOLL_SPLIT_PMD; /* Read the page with vaddr into memory */ ret = get_user_pages_remote(mm, vaddr, 1, gup_flags, - &old_page, &vma, NULL); + &old_page, NULL); if (ret <= 0) return ret; + vma = vma_lookup(mm, vaddr); + if (WARN_ON_ONCE(!vma)) { + ret = -EINVAL; + goto put_old; + } + ret = verify_opcode(old_page, vaddr, &opcode); if (ret <= 0) goto put_old; @@ -2027,8 +2032,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr) * but we treat this as a 'remote' access since it is * essentially a kernel access to the memory. */ - result = get_user_pages_remote(mm, vaddr, 1, FOLL_FORCE, &page, - NULL, NULL); + result = get_user_pages_remote(mm, vaddr, 1, FOLL_FORCE, &page, NULL); if (result < 0) return result; diff --git a/mm/gup.c b/mm/gup.c index 931c805bc32b..9440aa54c741 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -2165,8 +2165,6 @@ static bool is_valid_gup_args(struct page **pages, struct vm_area_struct **vmas, * @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. * @locked: pointer to lock flag indicating whether lock is held and * subsequently whether VM_FAULT_RETRY functionality can be * utilised. Lock must initially be held. @@ -2181,8 +2179,6 @@ static bool is_valid_gup_args(struct page **pages, struct vm_area_struct **vmas, * * The caller is responsible for releasing returned @pages, via put_page(). * - * @vmas are valid only as long as mmap_lock is held. - * * Must be called with mmap_lock held for read or write. * * get_user_pages_remote walks a process's page tables and takes a reference @@ -2219,15 +2215,15 @@ static bool is_valid_gup_args(struct page **pages, struct vm_area_struct **vmas, long get_user_pages_remote(struct mm_struct *mm, unsigned long start, unsigned long nr_pages, unsigned int gup_flags, struct page **pages, - struct vm_area_struct **vmas, int *locked) + int *locked) { int local_locked = 1; - if (!is_valid_gup_args(pages, vmas, locked, &gup_flags, + if (!is_valid_gup_args(pages, NULL, locked, &gup_flags, FOLL_TOUCH | FOLL_REMOTE)) return -EINVAL; - return __get_user_pages_locked(mm, start, nr_pages, pages, vmas, + return __get_user_pages_locked(mm, start, nr_pages, pages, NULL, locked ? locked : &local_locked, gup_flags); } @@ -2237,7 +2233,7 @@ EXPORT_SYMBOL(get_user_pages_remote); long get_user_pages_remote(struct mm_struct *mm, unsigned long start, unsigned long nr_pages, unsigned int gup_flags, struct page **pages, - struct vm_area_struct **vmas, int *locked) + int *locked) { return 0; } diff --git a/mm/memory.c b/mm/memory.c index 8ddb10199e8d..310bfb910378 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5591,7 +5591,9 @@ int __access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf, struct page *page = NULL; ret = get_user_pages_remote(mm, addr, 1, - gup_flags, &page, &vma, NULL); + gup_flags, &page, NULL); + vma = vma_lookup(mm, addr); + if (ret <= 0) { #ifndef CONFIG_HAVE_IOREMAP_PROT break; @@ -5600,7 +5602,6 @@ int __access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf, * Check if this is a VM_IO | VM_PFNMAP VMA, which * we can access using slightly different code. */ - vma = vma_lookup(mm, addr); if (!vma) break; if (vma->vm_ops && vma->vm_ops->access) @@ -5610,6 +5611,9 @@ int __access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf, break; bytes = ret; #endif + } else if (unlikely(!vma)) { + VM_WARN_ON_ONCE(1); + break; } else { bytes = len; offset = addr & (PAGE_SIZE-1); diff --git a/mm/rmap.c b/mm/rmap.c index ba901c416785..756ea8a9bb90 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2324,7 +2324,7 @@ int make_device_exclusive_range(struct mm_struct *mm, unsigned long start, npages = get_user_pages_remote(mm, start, npages, FOLL_GET | FOLL_WRITE | FOLL_SPLIT_PMD, - pages, NULL, NULL); + pages, NULL); if (npages < 0) return npages; diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c index 31af29f669d2..ac20c0bdff9d 100644 --- a/security/tomoyo/domain.c +++ b/security/tomoyo/domain.c @@ -916,7 +916,7 @@ bool tomoyo_dump_page(struct linux_binprm *bprm, unsigned long pos, */ mmap_read_lock(bprm->mm); ret = get_user_pages_remote(bprm->mm, pos, 1, - FOLL_FORCE, &page, NULL, NULL); + FOLL_FORCE, &page, NULL); mmap_read_unlock(bprm->mm); if (ret <= 0) return false; diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c index 9bfe1d6f6529..e033c79d528e 100644 --- a/virt/kvm/async_pf.c +++ b/virt/kvm/async_pf.c @@ -61,8 +61,7 @@ static void async_pf_execute(struct work_struct *work) * access remotely. */ mmap_read_lock(mm); - get_user_pages_remote(mm, addr, 1, FOLL_WRITE, NULL, NULL, - &locked); + get_user_pages_remote(mm, addr, 1, FOLL_WRITE, NULL, &locked); if (locked) mmap_read_unlock(mm); -- 2.40.0