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 3F92FC77B76 for ; Sat, 15 Apr 2023 12:09:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C58FD6B0078; Sat, 15 Apr 2023 08:09:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C09066B007B; Sat, 15 Apr 2023 08:09:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A82BD6B007D; Sat, 15 Apr 2023 08:09:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 955D26B0078 for ; Sat, 15 Apr 2023 08:09:27 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 637BD120153 for ; Sat, 15 Apr 2023 12:09:27 +0000 (UTC) X-FDA: 80683505574.18.A6453C4 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by imf07.hostedemail.com (Postfix) with ESMTP id 7EE3F4001E for ; Sat, 15 Apr 2023 12:09:25 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=GsxnOitY; spf=pass (imf07.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.52 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=1681560565; 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=J+LSahXs7vXHVGQn1uT2igLaiQzqbh9LfXfVKe7mEnQ=; b=WpCoAZssPgKkSzOZDL6ehSHYYT8ukK3KUeiWKYhymyXbTQqEimuk6uRwpRVkrBMycTKgIA V9AtWITUDO4MyP/ieOKaBk+2f0YT4GywAucgw3LXVLj/iobPN7Lsp0MjFlx6cre6ooKnxu W91lNddehceqgofx06MRr3WEyoYjTK4= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=GsxnOitY; spf=pass (imf07.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.52 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=1681560565; a=rsa-sha256; cv=none; b=0b1gl2ryZJ49Vskqv033fL3aa/FqOLUZ4rdZvdmnCOaTsyrd6RMAD9R9GCiy7nLb2oMBHS YhWHWeI4NsVLN98gfQGPz99wiDP1r+vUWgUglXXr/N/Twd0XBHT2i7ECjwfII+y1cAMdZG etthpu9I0YIBlPaB7jf276g0qs4UYj8= Received: by mail-wm1-f52.google.com with SMTP id iw7-20020a05600c54c700b003f16fce55b5so70171wmb.0 for ; Sat, 15 Apr 2023 05:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681560564; x=1684152564; 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=J+LSahXs7vXHVGQn1uT2igLaiQzqbh9LfXfVKe7mEnQ=; b=GsxnOitYpi73oLhTi6FjVEXHbNNB2I1m+LTWchC6U9ognod3QRNbzxwZCHEWBtDhe1 6DkMMTmq001Yy+AOQ7R1KYIg7r1GVSrp1RMbGkRCFI5uJbbDiUh2Osw1wBbs/Lrj5r8b c88Clz1Eewi+NicYztqrNHk93PEk1mE/B1kj0IjymWDErCqKvYUQtGrzh9lI3TOMC0Zr AdzXrOUeAelvmsbu2JOIKoGC6gAidmka43ibRiAwKHjzsNMmoAzks5fQgfTZiEyBp/NZ tepv+9YlS6JIp0PWTA2p88c2oQslYAzfhDr188x7TBPTSZ88a5WAWUA6TFGit6GgjSLG QKIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681560564; x=1684152564; 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=J+LSahXs7vXHVGQn1uT2igLaiQzqbh9LfXfVKe7mEnQ=; b=bsIe0Oi1YJ3HFjIFBdfoWdm5PP7U/CW7xotwjyRWLLazJFKhJk+CkofXLifzwyQ+pq pKVJaq5YnHBUPtbd0seyJ/H5qy/jke2jGvX0q3oGIVnSiBVbGIhr8DQ6kIiLHtZzzb7y 3nG7gTlDSjGfPWnMk7kDFVIrrmDcw0l8QIBbV3IrlEnkLxenfloEdbOzXPoZqxkoJ9Oc C5FQMS3nSejyxsZ7VIfwSXEzPwL1f69yOCuamjoFZlIij7hUXLMGtHCRPDUXMF12y4vI gCLRxzkmYuHOooc2O8FUZlMqntz6crlDIa87VATLTCmDxqtop0Tbpv4YrUP7JFY6goi4 FxUQ== X-Gm-Message-State: AAQBX9cybTUqbh5zjP4WHkgVtBzqX+DAGvhNmWlYRm1e7hsdJ6L4LUQq 7XLXuCh13gVrMwMKSMhRh7PCZ3dby41VJw== X-Google-Smtp-Source: AKy350aKB0tm+8SA/HZcPhTfSTG7LR/yw/OdGCM9lH11ZxILot8tUnno6Y2e/17DZKVXVtbkRaIQaA== X-Received: by 2002:a7b:cd88:0:b0:3f0:44d1:3ba5 with SMTP id y8-20020a7bcd88000000b003f044d13ba5mr6453227wmj.5.1681560563832; Sat, 15 Apr 2023 05:09:23 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id p22-20020a05600c205600b003f16f362ae7sm631546wmg.21.2023.04.15.05.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Apr 2023 05:09:23 -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 v3 2/7] mm/gup: remove unused vmas parameter from pin_user_pages_remote() Date: Sat, 15 Apr 2023 13:09:21 +0100 Message-Id: <59022490ef05da7310e6abd7f42df933bebdda2a.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: rspam07 X-Rspamd-Queue-Id: 7EE3F4001E X-Rspam-User: X-Stat-Signature: pfz9swoua5w66bfuzrsdzt4kakhofqfh X-HE-Tag: 1681560565-173035 X-HE-Meta: U2FsdGVkX18m/909nsTh/k1ZGNknWb9YyTfEl7Eb2xCEGlgvz7TP3UxDYvcYppt2LWsstSogYRiOiqtfzA7UyhB69lP7iWeRbDyB/gXPSeg0XRo3aJ0LVhgCJhb3Yn1fijTs5QW1oVWALSrZYY9QplTJRqns9OYD2s1xDPOh3nWGN0pi2msHMyO34kzuLet9P/7bWwU3sX51Opxj6zsltS/bLy/Ci1gEIbwH9dio4rfGpaAbA8AvJ477aAXrXGLtri/MC2/ywFU+BV8GE7qvsN/SEAL7nqKoY6DdtXY8UioYVp2YAmZrlkOp/hUq83J8ezpjE7BQMLH6fo7k/2is0zIjXI2R56iykFj5E8p7CeL7vT8VTR5hXecwvWw3t7e+vMY0mN02i4J5GhmvqeU0nYC0FaGl4Bj9VPi/G4pmAhWCmBmQfZdPrl43C0SQhCaS5BfQhNoIwfs5wjFp3Pg8JEjhaRHqsCPGKPdmyHL1kvBsfjvC1sQykUWilTX624hrAmUzb+Xy/6HxfRtQaRFmXj0pTuuKssLDu/mGZEo2/Ta2+beFsetUwQaEmZCNWkkwyfSJLDt+2oIzF3vtmzLKZhYV5wVo5TW06hzFR6Gnv0cCpgRy4P1Dob1pgDQ3Ci7E0pDuFJ9EinJqUf/TFPSyZLMmRdgjtRo76f0zx8J/K6a8U6tu6pFALEmybIVsnWycHMvM9QMQ2segPscV68JPbKIx7M7y036vhXo1pzF5OQuM+nDgSrb37RR4eCC4YUcGzELy2bB+WxxdSSYXQwe84+bynL5I14I2//oMnK9OATkt99ESwaJC/nbxPgtCmOo5+6fXu4sHA9WZwXT8/C4PEFpCVQQ4HqGjQlkD6rVw2z8UPuLFp6L8LXZiO15pq/eZEKC6TkgdyufjwdRcD4P50MGgO+g0l+hGPgl1eOUKR7HwWcJlgqfnXNrNcfvO0jLdidWoSvtQOs4HL2DFfQB m/yR3GLe FeSteZNTW1JBHRsxhAd7oJwoC9XIsM28oOBW4J8tY+2uzoo+1NZHN5W9XC00k96mQyzjbSlmc7mfZsvbmcezsfEUvFycSjdf7rq8EOdttW/msnLLg+3UWMydAZeM3cq4FCb8mQZYRtPBOGXApv2W/Tix4S4nIFsZYiWfZUi/bCMYdM0LOV8rcXGVR3T+yy5VHGw0UHrJMcdJq/e8/F9To9+QDT+QD71Evpom/50wfyVStb02GNFFR7Agc4FbSUY0wMrFpal1GNHfM/jIYKQ60Ieyfxrm0FRT6asPOTDJ8dmH7JAi014WBRlFb2U4DO5WY6uVpIv9DY+YteYuBs/reBqDNV98VgXaQoh2oD2WoLOXK8h6QAbahzh5nYLVNVVcYbq1uZzZrEIErsxEf+4VoMKBCiUr3XoLYp5O475y76Z6UQ9B74xKuE/06kfPtqxF/g9jJtfkUJb/SuW0K/J3nRPHtKD6uSP7gRrosTtIrCPnEYtspaUlN6F9JOQ== 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 b14cc4972d0b..ec9875c59f6d 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