From patchwork Sun Oct 1 16:00:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13405430 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 48FA8E748F5 for ; Sun, 1 Oct 2023 16:00:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF60A6B018E; Sun, 1 Oct 2023 12:00:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7F3D6B018F; Sun, 1 Oct 2023 12:00:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F99E6B0190; Sun, 1 Oct 2023 12:00:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9024E6B018E for ; Sun, 1 Oct 2023 12:00:14 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 573EF140154 for ; Sun, 1 Oct 2023 16:00:14 +0000 (UTC) X-FDA: 81297354348.02.9C84A0A Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by imf12.hostedemail.com (Postfix) with ESMTP id 5B32A40020 for ; Sun, 1 Oct 2023 16:00:12 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=kHtaxQYm; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf12.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.41 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=1696176012; 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=pfhqMS4SBWNsRFumL7f2VoNpk2TCo8ZgiAHTNGqiqHs=; b=Pc76vCnxX8mFxTStH02KWTLnYy7d/IcV8n4rvsiXVYXvdZE/594Yzc+iKWtqvJxkpEXzZ/ YKEu30KIQqP2qamM2WvJH5o7TnuZ0POjiH9C6WRd370r3Ouw1/V6as3MYv3TYCM47yc7zS d7aKZ2ltZusyl4sSVnVfpVkZnMA7UHc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=kHtaxQYm; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf12.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696176012; a=rsa-sha256; cv=none; b=AdGxBK89bj2VFy9p/slroLVeX3CRmOYRMEd6MA3j4lLh/u876QI1aZzQt3NGDAKqAGHWYQ Ia97u0eKaZzMF/sAZfL/ltshr7PN06OWQUrS0+zC6+IveVfJRStpoUpZESCbRhYKZJDho2 nb+DToMtdFP49HSnn18HRWwBy8fJ7rQ= Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-406618d0992so18458745e9.0 for ; Sun, 01 Oct 2023 09:00:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696176011; x=1696780811; darn=kvack.org; 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=pfhqMS4SBWNsRFumL7f2VoNpk2TCo8ZgiAHTNGqiqHs=; b=kHtaxQYmXZ+UwtFHooV9y0l869tnVPa3p7/C6SgG6befJLWRGJ9FMLPGvEh0AcFkng 1E9hvFtq2HTxpGXN4cSj9bRHjHaan/kd4f8sy2zh2VEEwWbfgDr+HCygVi1hqGsFHujT bnaJqWeOrCpxTmzIKSoqvc3hv1s32vG7HPL++ya2dgsNi4Ekakinwf2PXbc0xlFQhRg+ NpX9dImGIatZDzsnq0dRN41fBwnaY6gtfDrSuPjy60F284/9AxV1vOcgJalA0jL9cLYi W3xlXn6BwmUtbfzg7JLTp3g2z17K/AlX0dnSS8nJI5Pd9cyxuagm5sx1Pnw6N3UoD4Ar nIaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696176011; x=1696780811; 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=pfhqMS4SBWNsRFumL7f2VoNpk2TCo8ZgiAHTNGqiqHs=; b=m4pRinuexNU28dEu+SNqd5kC6EvYv0xj98qPYYgCblov9q4MAjBEokUCKN4+J+J1eW 5Hqk1F2aH19VKxb5pW8h1JLbvyivKUs0NMbDSqI3TQ0XVtQR1Qo945Box4C9JUKe77Vx ZPsQUGg0bUJ7KJ2EAn6RnclT/2fReIrYrlJ4LPeonAV6ysFfGmR/yk/NH1LK0rDmZ5Yi mJGwJcXsWYoaLlge+eMLwfpDeScaSeShDbCooIa8rEbUSnUbCS9TS3eGGbfHIYqZBRol oXFYU7bk1Qk3ObBgYb6W7M2/ZRuWcKUs7U7upHQAILhFKaN329BFKzajr/7aDUX5B80x Oz/w== X-Gm-Message-State: AOJu0YzJx6lJNll3ZPhi9KtlXI7CTW9leY2PXQv0skAMTZ2vWYYQdoU7 +ZpGnjBmKsOI6kAazoRhQc1yDZFqgbk= X-Google-Smtp-Source: AGHT+IEII6JdFJg8xpbvXnmUnQWjv6hpexCp5q2DqxZ8O7FssanDUSfov88XVS8L+47c6qXHvBvGoQ== X-Received: by 2002:a7b:cd15:0:b0:401:c52c:5ed9 with SMTP id f21-20020a7bcd15000000b00401c52c5ed9mr8350531wmj.32.1696176010384; Sun, 01 Oct 2023 09:00:10 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id s16-20020a05600c045000b0040536dcec17sm5487695wmb.27.2023.10.01.09.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Oct 2023 09:00:09 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Catalin Marinas , Will Deacon , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland Cc: Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Oleg Nesterov , Richard Cochran , Jason Gunthorpe , John Hubbard , Arnd Bergmann , Lorenzo Stoakes Subject: [PATCH 1/4] mm: make __access_remote_vm() static Date: Sun, 1 Oct 2023 17:00:02 +0100 Message-ID: <70436dcf596565770e604a4fc4e8f27a14c85166.1696174961.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 5B32A40020 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 9e6ryxom394qkysudht99qu1h8ohpxjb X-HE-Tag: 1696176012-219874 X-HE-Meta: U2FsdGVkX18Y2EqOemu0IZuKWtPS5IYKZbYztHfZDxVxLaF7mR2N3NZf9keyp9kFt/sCmhp1wy8Kl/ev4LW1hkRPSqME2rYLAtX8g+yLyob606ewmgJOgsKO/izx61d1jW8pxoq88DBP4Liq8fgk2nrDK1bMY7scRKTU4Liyw1I/jKLw9fc+Jl3hwIZtfKET/wp2MsrY5z73fGKqtcSUJb/6mW06BYjOaG5nMFDheMKQZkadKsjknFUG5s0KoBWpEwCnXUp1U74se7W2vOdljAZ03cTUau4uVABn3KGA4Zpgp78G0edSFoFE24cj5rAQq+qqsHWWTXpNVc14pyIw/4JuihS2q8FyPg2dRzD+T0s7SYa2QfGNBkVxmpX0bmc81FEc6ahdalKT88WK60jeRFIzmHgHNiBj19ONLWAdwrfClTUSG+UksWvJaDdvYTStJCqKJs7YMNotOFbQXP3lzTihKIfM+LUN4UrENXNymRN/0r7eLNoS9e0/rhunaWfFGaUurS8A8X74syoNyNZCviZzFRjpkPLB9wMnkHm0XsujnI1QppfcV3V+yyp+gB3TvfCC0d4vFQ5vuTVvKgjfLy/pFH52pKQ0kC5HoGxhyy4KOYCac4mDFmSD0Vpao8y9uugUY+DHaXw9WBJ/YkK4rmVbivZVO2oPmrjfaod81TvzNMXYvSf9hrdq7lfHtZkqp/meEVaaCZs3epGsri2CGyp+GomwbTZd64cRt+0l+K6MA3YwdoYAovTi2oIVvYTTVmveTqQTni3AyIzrE443899KC0FmLCpfXjMcPTO58jCJrilwFibD+OtXJeUQ0B2a3IAU1inwc2AXZL79jB6Cyd5bgQ40I22NZp5NoNGwTSMZ2aFQOW7qBXVyvyEchgd6x3Pys3lBJXYSobahDfhGoTHjoiSODCFrB2aj1Qw/1wXyY2uJQiITVBEllXPk68lpDVP4Bis1bw/EkbbUt0A auPSCAZH nmuwTBQIc5oaccU+/4OyAJZeBrBjnxpq7qNieKQBWmJG+qknPACn4JVrXk1h3LFuBwmT2YSJQAy7VWib4683McAMKIxvwi9UOfkWt+p/KCzDIyXF4TeFpk/SMnz9VGhgZ7SD35XBv1LgEiuFYmfJLcosRK/86k/K2OT8T1WuHG85fndCoi5naNJJ8Yp2KvL9NF+bbg639incvYSVHvP3SzVCnJJYMC/BTQjdHWfcDrnL4wjcm1FcrC/BMPbB1U7m9jsMDnbDrqcXhBdFhoH9x/xEU5p7Qir4x8ESoYFNl7RVVy22jQxdUSvB0+KdJikQh02f6UFan1Y77eKTyUjK6otEjOvaH37UI9034NFgqHCxiomEEmQe4DzGwq+rHXg8mGmW+9v1m5RzwEunfiWjFC4uanHaRPbSPzf+Xi17rKw9A6vuKKGFhCKp2Iw5v7mNUL7TCukWn/adoU/Seb+y4bnzFbvGO2ms63mKz 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: access_remote_vm() passes through parameters to __access_remote_vm() directly, so remove the __access_remote_vm() function from mm.h aand use access_remote_vm() in the one caller that needs it (ptrace_access_vm()). This allows future adjustments to the GUP-internal __access_remote_vm() function while keeping the access_remote_vm() function stable. Signed-off-by: Lorenzo Stoakes Reviewed-by: David Hildenbrand Reviewed-by: Jason Gunthorpe --- include/linux/mm.h | 2 -- kernel/ptrace.c | 2 +- mm/memory.c | 4 ++-- mm/nommu.c | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 52c40b3d0813..7b89f7bd420d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2415,8 +2415,6 @@ extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, unsigned int gup_flags); extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf, int len, unsigned int gup_flags); -extern int __access_remote_vm(struct mm_struct *mm, unsigned long addr, - void *buf, int len, unsigned int gup_flags); long get_user_pages_remote(struct mm_struct *mm, unsigned long start, unsigned long nr_pages, diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 443057bee87c..d8b5e13a2229 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -59,7 +59,7 @@ int ptrace_access_vm(struct task_struct *tsk, unsigned long addr, return 0; } - ret = __access_remote_vm(mm, addr, buf, len, gup_flags); + ret = access_remote_vm(mm, addr, buf, len, gup_flags); mmput(mm); return ret; diff --git a/mm/memory.c b/mm/memory.c index d4820802b01b..e2743aa95b56 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5881,8 +5881,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys); /* * Access another process' address space as given in mm. */ -int __access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf, - int len, unsigned int gup_flags) +static int __access_remote_vm(struct mm_struct *mm, unsigned long addr, + void *buf, int len, unsigned int gup_flags) { void *old_buf = buf; int write = gup_flags & FOLL_WRITE; diff --git a/mm/nommu.c b/mm/nommu.c index 7f9e9e5a0e12..f9553579389b 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1651,8 +1651,8 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, } EXPORT_SYMBOL(filemap_map_pages); -int __access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf, - int len, unsigned int gup_flags) +static int __access_remote_vm(struct mm_struct *mm, unsigned long addr, + void *buf, int len, unsigned int gup_flags) { struct vm_area_struct *vma; int write = gup_flags & FOLL_WRITE;