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 0EC57C77B72 for ; Fri, 14 Apr 2023 23:27:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F03F900004; Fri, 14 Apr 2023 19:27:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A1086B007D; Fri, 14 Apr 2023 19:27:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 868A0900004; Fri, 14 Apr 2023 19:27:35 -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 7754C6B007B for ; Fri, 14 Apr 2023 19:27:35 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4E1AF1A049A for ; Fri, 14 Apr 2023 23:27:35 +0000 (UTC) X-FDA: 80681585670.01.6F31972 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by imf11.hostedemail.com (Postfix) with ESMTP id 762B14001E for ; Fri, 14 Apr 2023 23:27:33 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=TQhDiOv0; spf=pass (imf11.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.42 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=1681514853; 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=1VJscWXDoV805lUglV9Lx4G4y0RL2KQ+qVhOtcQn4So=; b=uuoH863FfWNtaFCVTJSFHBCJwUvR4BI7MQEtRRZsIe9D/5PvYDOwu7esLGVA/Ij8MokzcP x4T9IbcQggIVTzgN8wdufZz0SCD7OjGsuL7p0KOs74MubAFXTyxHuxIi2mHU3dsrREPzij 5brJ1XDSw27if2IwXfYxVCZigvgqZkM= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=TQhDiOv0; spf=pass (imf11.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.42 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=1681514853; a=rsa-sha256; cv=none; b=WpjFq+RT0L8G+gwBnXgJzHleqcpsiVJRMsvGjhRwff1OXHZ5UCpBloOpv9+xgKms6AMi7Z soxXrdgq9mW4Vqei13KEcuiZ5E7MD7OaE6Jx357jsV7S/eva8FJ6pKC6bQzy3zAEVbuSXE Vm1McpIS1hj2IHp/bftdD6IH3NFwOjc= Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3f169350e6cso19065e9.1 for ; Fri, 14 Apr 2023 16:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681514852; x=1684106852; 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=1VJscWXDoV805lUglV9Lx4G4y0RL2KQ+qVhOtcQn4So=; b=TQhDiOv0KwrX1cl+HMRY/m9AlRUvTYmjRVKkUqK7mY3kxSUGxZiTt8OYrLUmUeyCKW oAUQJOGgCStHEvZfAYU02YzPBy26VHk1lJviLsUEA6XAPswuM4D05Dp+mfBQIJ+XfaX7 1QujcskdwR8bLgjh1lu+JhFW63rvse6gXWwLjCkbo7iYN74NDaNkhM7Lie2u9dYw/jOj lG4gRmfBXpDCu/JYCZVyYhoUuPl+LjI+gbL/TJWPjqP7lOVKGKftL3cndCs5fGFAXuyW WjyPGFoN1jOK6Qkr4qiCPERBiYVC40Ip8Nxzn7FSB+NU4/YlO4xATw65tFgRiSl2He4f PI5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681514852; x=1684106852; 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=1VJscWXDoV805lUglV9Lx4G4y0RL2KQ+qVhOtcQn4So=; b=COj/5wjgjy4nmP/vd72AiGcNHO5rONhzKCb8GWHER04pZ/Ls158FI2fxwwde9XGhfd 1QN/Ds7rBwyQV8JRnHM3blAvXvuQrsRhEQoH45bn0TdMLKIkhZYs4cTnpVS/GkHXPsNI vRgi9ah8eIGemf+aa+AbiKVoAFgVd3L4fdvUSAawBfKv+t9Fj+N28PHnQB8I3zCvfVjm eX8xu+WsYzaJC0rxr1T4P2zuSiyVAekrcDxxD+hnVRYc1fdYXfyTwuU83y1sK2dZagq7 tSl1g5MyX6L+CzBMVgHqgBiOmykYMGfe3uI4llqUF0tUMYzcjOdTLFhpe3kvAaTQiQCl Xkyg== X-Gm-Message-State: AAQBX9dld8McDnQyX0kitZZhNEp/RtZtaK72X9cpIvLCRUEDOhcqdLsz bsanZhvVlUNFtAtks0+AYjGJfYsHYR4= X-Google-Smtp-Source: AKy350btVgvfuTZx4LLwP2D/aSmexxkQWIDKHhEHiIOChilrQmlVnxBaZQKRLjJJ40FW9Avxwpik5Q== X-Received: by 2002:adf:e506:0:b0:2ef:9837:6b2b with SMTP id j6-20020adfe506000000b002ef98376b2bmr255643wrm.21.1681514851612; Fri, 14 Apr 2023 16:27:31 -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 s9-20020a5d6a89000000b002cf1c435afcsm4550694wru.11.2023.04.14.16.27.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 16:27:30 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , iommu@lists.linux.dev Cc: Matthew Wilcox , David Hildenbrand , kvm@vger.kernel.org, Jason Gunthorpe , Kevin Tian , Joerg Roedel , Will Deacon , Robin Murphy , Alex Williamson , Lorenzo Stoakes Subject: [PATCH 2/7] mm/gup: remove unused vmas parameter from pin_user_pages_remote() Date: Sat, 15 Apr 2023 00:27:23 +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-Server: rspam07 X-Rspamd-Queue-Id: 762B14001E X-Rspam-User: X-Stat-Signature: 3dnfab5qpuysj45bpfh8u39obzh1hwn8 X-HE-Tag: 1681514853-326550 X-HE-Meta: U2FsdGVkX19aXRuvLt50Fb1KOwuoMr2htHzqF1iGWfTDhNObJPRMUqKRlbggObNEk4b+InPWanxYt8cLG6KrwhZfxGv1H0i+h1DfVT6f5yb3+V/u0VjguxX8q4KtUjTEFBVOwiYbOyuT7MGs4KhYgEaKNlfeSxRweukkNwrUDNJk3cCdu6Mt39VKQntw+iKpI+ViqSp7dgm9iBUSKezqLz6fzQ+5FrD6akQfkahZYrwKiuhDryRfnrtHViWP+8We01irM3e9iK/GgQwg9RSp1ykfMJwlQ6FS7at10BPtrpwGoykJUTvCQWnQLlzfVTsdWdcL745hTIZFOnE4EtR9X8s0nWcyR4pSe6PF97s2T4ex149qVawUecAtnYMg35mhheYvf/WMegCMAbtO0VW/ii7S/I/1+JYzwWXoRNVAqhkTmt73CweqN6dN6XMt8wiAPrjKStWlZfCWQC0i0padhUYIrJjZIhdwKkhHSHotzKpecbct7isY9XPz7ODlr8We8VV0HmrI3jZVKakMBKky9hG+AFXc5K0PzPGLwTmbcpE2OSGy8qWywEl/2Su0ykN4wuFZ4vEZASfr6vcGCjobYTMcfnPKEeHj8Bid5S7MYlCkMqKlH5PlP57N8JCgcgH4orKRAm9MQv/lekYUXZbRANISIwZTCi1lwRxt5PPpCfBcXqJHxUnSn8+AtMFn/2/9Y5CPhzWQwZp2eNIEexuVxQKxa37JZJY73jN9ZxTjs4BenCIa62YUb24nBl0KERlGfMBIWxx80v14ngiNqRjYhra8EIeuIeSAyfvYjFaBVFjDHqjThP9W+83bliYJi2ZyeexO5ZkSyXgXTBMIl0RhMLF0nPd5x5YCnm3e0vAFJf+RrL4MsEFF7vL0gJGvBVJcumoY6IMm+End0QJTrO8fkPV4ZxrroG0vOaQ0dtONxaRvMjGHH9edBnVCtoT+og2MknPSIMJxQGFnx0jGqh/ Td97c+bu 5vgqjJaFI87blmaldq5ofRQkNE56rkpHXw4g06PoWruxDG7hRMBqn1VdGslhVodGMfKLpTSGfUpaX9Wl+xN+wlbVZD7zihPvGgGktEd7LxEx0ogXYYxWZiIMvJUsTC6m3IArWjndiDaWNEW91a1lCmCS082SlaN2wiVG26krnNAUI+miRw7xeFY9wrzSi8PtkCdZ/8L1NkVY6qA6/5etjzGC5wYd7UR0heB2rsWc0Nd0BC0/F9zN7KT8LzPwONYJ6CubS6ABc5vEykmXLBTeS14Kf+nkK5gvPGuGIxZOVMs39layzq9GMPp2w5JbjECFTA8rXiIh82HbHzPqBktwiZI+67kSiHpGvFIfNuK1oEE+YWpgHem4SJFiT/XKEXBCPErsIQ3kdAGB77axRCyPU8kBjOMvVdLtV5dFY6Whao7mIUwYMzqwQhCFB/+Mv4Y2DvrfQKQfWPVuAXwAB1A7l9p6PROaGdg7vUzOcz5Fj3ep3eyhBRAySEIbCzaoaAgzwd7Gx 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 pin_user_pages_remote() uses the vmas parameter, so remove it. This forms part of a larger patch set eliminating the use of the vmas parameters altogether. Signed-off-by: Lorenzo Stoakes --- drivers/iommu/iommufd/pages.c | 4 ++-- drivers/vfio/vfio_iommu_type1.c | 2 +- include/linux/mm.h | 2 +- mm/gup.c | 8 +++----- mm/process_vm_access.c | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/iommu/iommufd/pages.c b/drivers/iommu/iommufd/pages.c index f8d92c9bb65b..9d55a2188a64 100644 --- a/drivers/iommu/iommufd/pages.c +++ b/drivers/iommu/iommufd/pages.c @@ -786,7 +786,7 @@ static int pfn_reader_user_pin(struct pfn_reader_user *user, user->locked = 1; } rc = pin_user_pages_remote(pages->source_mm, uptr, npages, - user->gup_flags, user->upages, NULL, + user->gup_flags, user->upages, &user->locked); } if (rc <= 0) { @@ -1787,7 +1787,7 @@ static int iopt_pages_rw_page(struct iopt_pages *pages, unsigned long index, rc = pin_user_pages_remote( pages->source_mm, (uintptr_t)(pages->uptr + index * PAGE_SIZE), 1, (flags & IOMMUFD_ACCESS_RW_WRITE) ? FOLL_WRITE : 0, &page, - NULL, NULL); + NULL); mmap_read_unlock(pages->source_mm); if (rc != 1) { if (WARN_ON(rc >= 0)) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 493c31de0edb..e6dc8fec3ed5 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -562,7 +562,7 @@ static int vaddr_get_pfns(struct mm_struct *mm, unsigned long vaddr, mmap_read_lock(mm); ret = pin_user_pages_remote(mm, vaddr, npages, flags | FOLL_LONGTERM, - pages, NULL, NULL); + pages, NULL); if (ret > 0) { int i; diff --git a/include/linux/mm.h b/include/linux/mm.h index faeed36c2d04..513d5fab02f1 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2378,7 +2378,7 @@ long get_user_pages_remote(struct mm_struct *mm, long pin_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 get_user_pages(unsigned long start, unsigned long nr_pages, unsigned int gup_flags, struct page **pages); long pin_user_pages(unsigned long start, unsigned long nr_pages, diff --git a/mm/gup.c b/mm/gup.c index 7e454d6b157e..931c805bc32b 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -3093,8 +3093,6 @@ EXPORT_SYMBOL_GPL(pin_user_pages_fast); * @gup_flags: flags modifying lookup behaviour * @pages: array that receives pointers to the pages pinned. * Should be at least nr_pages long. - * @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. @@ -3109,14 +3107,14 @@ EXPORT_SYMBOL_GPL(pin_user_pages_fast); long pin_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_PIN | FOLL_TOUCH | FOLL_REMOTE)) return 0; - return __gup_longterm_locked(mm, start, nr_pages, pages, vmas, + return __gup_longterm_locked(mm, start, nr_pages, pages, NULL, locked ? locked : &local_locked, gup_flags); } diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c index 78dfaf9e8990..0523edab03a6 100644 --- a/mm/process_vm_access.c +++ b/mm/process_vm_access.c @@ -104,7 +104,7 @@ static int process_vm_rw_single_vec(unsigned long addr, mmap_read_lock(mm); pinned_pages = pin_user_pages_remote(mm, pa, pinned_pages, flags, process_pages, - NULL, &locked); + &locked); if (locked) mmap_read_unlock(mm); if (pinned_pages <= 0) -- 2.40.0