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 E8AF8C7115B for ; Tue, 17 Jun 2025 15:44:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3277C6B00AD; Tue, 17 Jun 2025 11:44:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B1406B00AE; Tue, 17 Jun 2025 11:44:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 102E76B00AF; Tue, 17 Jun 2025 11:44:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EEF386B00AD for ; Tue, 17 Jun 2025 11:44:20 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C5C2D160535 for ; Tue, 17 Jun 2025 15:44:20 +0000 (UTC) X-FDA: 83565314280.23.36CB4EF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 5961740002 for ; Tue, 17 Jun 2025 15:44:18 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="S2X/L524"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750175058; a=rsa-sha256; cv=none; b=6Imomzx08vA0P5t14qhFyUB2GCgP+uPSJhfJA0waBzvGubciUagwOSADVL9wRu0YzUt/bW mcfAgJ+lYVZuzBhihlFGqP5TL2Vjb3h/wJBDbKxIwLqaLjQKV6yjYZMyjVGUViAOVrq23q v74s50kB9TvFBNhYai0zR8jyS3lS09E= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="S2X/L524"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750175058; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mWxrDUiAyufMO24k5ZrEJY14fbMO3RlCzXis3T5vcIs=; b=7RhYbv7zUAtcd2ypIcDtPMFIN5wOQGxeegVrmbOgdS8ngea/gsVNERUoqLGSxcO7DCv8yP oCZkMf+aXXC42lfwFkY9fw+XPtS4ThmRYzIK2XpxvzU2+ods5o5UY0FGtLC6R2AS+1IOHj MaJcZjA5G4ceffyGwQFyw4IqlUX7LN4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750175057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mWxrDUiAyufMO24k5ZrEJY14fbMO3RlCzXis3T5vcIs=; b=S2X/L524FOwA7UhMQoh6HtC9lrEunpueILYnvZ4+qik48/b4hKdmomRi1pzmPEjJ17mUhg Mi29UShRC+klAk1/vsjXOLP035qL5GS8cX/UeYBkAVwJmysodZBF3zUEXHh5sFd3x/ecNA Nfhl+cRyWOE2px8h7dgUl8SOWl1v2RY= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-PKRcbNADNi-w3-MAdw_NqQ-1; Tue, 17 Jun 2025 11:44:16 -0400 X-MC-Unique: PKRcbNADNi-w3-MAdw_NqQ-1 X-Mimecast-MFC-AGG-ID: PKRcbNADNi-w3-MAdw_NqQ_1750175056 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-451d3f03b74so38632425e9.3 for ; Tue, 17 Jun 2025 08:44:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750175055; x=1750779855; 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=mWxrDUiAyufMO24k5ZrEJY14fbMO3RlCzXis3T5vcIs=; b=ZZ4PHU857w+whTQ8WWsEkFNrAQkn9UDiXt+KHxJ87mdrdJnO7D1qtKBuDmm4B4iXsb uCxd/qxa+D1fbxPHyOYo2GTrwYENdJS3tuHx3ryMvILYIUIedtvCtDTTb5iGHblzpP/o oJkAYGmnXtEYEZ6/yC5R7+Aep6nMJUzUxvxKNCMqY0FnyLJPm7f3N2DnxjuxUUi+glS/ JypgqhBoPIbDzkJBPMBx09ayRkL6pQssmlW+KImDVBOgmaTGumNvqnJU0O5DhfvhjFNZ V1pfc7nLbgj7B2iNKSn4VhJPgqiZlg8T+7utxNi79drxdLKz/avX+00oG1OQaPndnazd tS9A== X-Forwarded-Encrypted: i=1; AJvYcCU04p8cxX89quiSygheB8rvkcnbha6JM1z1voa3TCSR8B90/J56TdFdiahXCIP/Fd2JL74LRnde7g==@kvack.org X-Gm-Message-State: AOJu0Yyc5iU9kKU/2zWpPX7RDJP530n+fV+gvveNtIMxq18yWkDruBoj OIuq1nWb0M8w8xqhv3uFpfsaMnlX3ID5KMa0FblWnrqM/mF9Y9KPPoNAOq6v657GLPg/O75+VAM 2FZPnEf+zZY9g5D1Fb/kG66sRzf3sRFR44q5qCXuVrfNyftcgZgLw X-Gm-Gg: ASbGncuIb2TFNU3yD45z6dER4HbCsudrnMJBfckil6n1khSHR+e60jPPvfB4md4dPxg 2OmI+gcw3tLScAjjo9mur4MeHvEwHL2+R+vNIcmiD9VOEIqtwQGPc27YUimWsRxso9BqYIW9RU5 A2ozykG+FQ5f89YQ7o5KK2X3iccQFo17bMlZGPSYWjbEhX/qjWQN8gm/5BIGc5m7vQj2UjCWkpu /m/MVpJpVdvdLXvpWVP66F+8Pb+2/e5PSebm00JJMA7UyNvR9TxYgb/379uJza33QfPfev8W9to BtfNoNZcxj9k9qiAhDQb64l1NsoDsG+K4LqdsWbgfWTvoHyXa/ngk5w8DkUWTYmggKV5OHChOek SlCWUvg== X-Received: by 2002:a05:600c:35cc:b0:453:23fe:ca86 with SMTP id 5b1f17b1804b1-4533ca466e5mr128888045e9.4.1750175055502; Tue, 17 Jun 2025 08:44:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFxLp1jc85N2QDOuW7BFdm+pgJpsU2NEtjPimOvIk95HaJi7jSUq03BgBarqHz3clTjH8a/dA== X-Received: by 2002:a05:600c:35cc:b0:453:23fe:ca86 with SMTP id 5b1f17b1804b1-4533ca466e5mr128887725e9.4.1750175055093; Tue, 17 Jun 2025 08:44:15 -0700 (PDT) Received: from localhost (p200300d82f3107003851c66ab6b93490.dip0.t-ipconnect.de. [2003:d8:2f31:700:3851:c66a:b6b9:3490]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e14fc8bsm179773215e9.28.2025.06.17.08.44.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Jun 2025 08:44:14 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, nvdimm@lists.linux.dev, David Hildenbrand , Andrew Morton , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Dan Williams , Alistair Popple , Matthew Wilcox , Jan Kara , Alexander Viro , Christian Brauner , Zi Yan , Baolin Wang , Lorenzo Stoakes , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jann Horn , Pedro Falcato Subject: [PATCH RFC 12/14] mm: drop addr parameter from vm_normal_*_pmd() Date: Tue, 17 Jun 2025 17:43:43 +0200 Message-ID: <20250617154345.2494405-13-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617154345.2494405-1-david@redhat.com> References: <20250617154345.2494405-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: G9MBBbqwaF9obZLQjuoMgnUNk4XcwzLveRQa4eWVsYY_1750175056 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: 5961740002 X-Rspamd-Server: rspam10 X-Stat-Signature: yk9a8r6i88p4h6mb39iyu9zdzdoonccp X-HE-Tag: 1750175058-935950 X-HE-Meta: U2FsdGVkX1+2lnxgL1Ef4Rk/Jp8LrxnJ4FXi5+Nz7N2WHs47xglLEwPkle6UiXo5Rqy2yp3m2z+Zu1Z7/gRkMENI4Kct0B7bET4SxeJtJkxeB9ClcbmIouvh27yseEZVjojynL+i83PJHFPkTt9/7r2RZbhIqqZMVxAZd3XFpmF2FjZ/s191wueGvXqvtBMxiQCXRhMOnKpV5Kivp/I8J5BblBdblHhM0flOdZeJeSjT0NGQihGtTf4wuYI2r+t7ArME0wxUsWx2BHX698RFv6btf81uR+AnBsxIgdAygqXd/Q3ZYBVpnnJTBOl+u2QcsYYxaKAir7RHW2kak5OPDT2oo2maYkLSoPxMVi3mkK1/1m59nK9QTytSfDjdANNkWntcDv70lbiRMHEHFfMYF6axRfrrHWl1o0vB2huS5Z2sXAmoDRqMW6UA4IDmZeFlwYV3SiowcxOTkOroowQsGCVzMRLlGnmcf019wj3Iv6SGGnvSy6A/gvfNsYZDj5FZ9vTwYH5l+/hBENq0c3/59UF67ZWd7qNkEJgbqsIYSIijQq+hW2HpfQI7mPmsTRFJkw2L/upIX6g43SuNMCyFpq0x7WUBatWBh7z5x/qfrmoYeAwBsQPCEd4CcAFiLLhD8cGcTsN7By+cxr/wrz3vZkjjEfKGtBIPWe8lMpZqAL3gM+bxzgx5+8oASzfyrReP6yb9ycMBtQJ3yqXFdL/Go9DvrKq8qFik8hI3uAFeJTUvQsCDejWlBmUqcggFZmqtyAF+IwPEJsT8fg7TUGIcis8l9c9IkqfrtJ2+t5w0orNr6gdExLmEGlzezmWJi1/2sCEoKysEKmeADbqsrohNbGyudQVcpWWwW5OVtonaPhc38quI7Iug4y5QzGaKSN9OF9xx05HB80yK3kz/FHq+cYDb1vMEUsPQXwbr4BxjltTBA1BFbFpaIL/1eWTGeKUMx1LRJds2ituNCq4jnEf oKtir5a/ qdwxevXJIqo/cSAGFOWWoGO/Kdv/6gw25dtayRe5QCJN8hin/csPmdV1PmkyHiO1H+FN9gVPH4CX222W77J+LyRKHkrVKHIbZz0y7FzdJX5K3C+BeIiRxRDJ/7/h63O6+5/HXPUmSgx+0Tt39FPX6IFY2DrSVi4Hq/PtvRPckdo10iqw0ejXbQ7zjfSBxISJ91pa7wVTmSlYRLP8W96K2VSnpzrqLIXsXzMxLkVewG6tXUljHrLnbaihIVj1eYCt0jbDmCgQBVmYzmdBQLZ2H0ySN8uNahhjEjMUaOewnxQBirIsKmVa0pjrWvnXMyWIWo+f/KY/RBQfiVijygDIST6fcqg6oc39y6nuE0TrYnz81711sbCo7MCPdUTIR8OvPIUZUI5XC01EJWM/8llVh49SVYjS6M4332q+6FjuEDSt/E+JNF+ghP9Y8bE9ZCqBBZkiJ+7c5q8kfHOt4/UF5c8k2mmYWN4IUvR1cJ4S9HL0ynjOSmbDw/z5neHeGT1QyMtK6jI4ab2QhkKklhWDnwlJYQOCM7vuJW6Ox 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: List-Subscribe: List-Unsubscribe: No longer required, let's drop it. Signed-off-by: David Hildenbrand --- fs/proc/task_mmu.c | 6 +++--- include/linux/mm.h | 6 ++---- mm/huge_memory.c | 4 ++-- mm/memory.c | 8 +++----- mm/pagewalk.c | 2 +- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index c4ad3083bbfa0..36ef67cdf7a3b 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -861,7 +861,7 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr, struct folio *folio; if (pmd_present(*pmd)) { - page = vm_normal_page_pmd(vma, addr, *pmd); + page = vm_normal_page_pmd(vma, *pmd); present = true; } else if (unlikely(thp_migration_supported() && is_swap_pmd(*pmd))) { swp_entry_t entry = pmd_to_swp_entry(*pmd); @@ -2177,7 +2177,7 @@ static unsigned long pagemap_thp_category(struct pagemap_scan_private *p, categories |= PAGE_IS_WRITTEN; if (p->masks_of_interest & PAGE_IS_FILE) { - page = vm_normal_page_pmd(vma, addr, pmd); + page = vm_normal_page_pmd(vma, pmd); if (page && !PageAnon(page)) categories |= PAGE_IS_FILE; } @@ -2942,7 +2942,7 @@ static struct page *can_gather_numa_stats_pmd(pmd_t pmd, if (!pmd_present(pmd)) return NULL; - page = vm_normal_page_pmd(vma, addr, pmd); + page = vm_normal_page_pmd(vma, pmd); if (!page) return NULL; diff --git a/include/linux/mm.h b/include/linux/mm.h index 3f52871becd3f..ef709457c7076 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2359,10 +2359,8 @@ struct folio *vm_normal_folio(struct vm_area_struct *vma, unsigned long addr, pte_t pte); struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_t pte); -struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, - unsigned long addr, pmd_t pmd); -struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, - pmd_t pmd); +struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, pmd_t pmd); +struct page *vm_normal_page_pmd(struct vm_area_struct *vma, pmd_t pmd); void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, unsigned long size); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 67220c30e7818..bf2aed8d92ec2 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1994,7 +1994,7 @@ static inline bool can_change_pmd_writable(struct vm_area_struct *vma, if (!(vma->vm_flags & VM_SHARED)) { /* See can_change_pte_writable(). */ - page = vm_normal_page_pmd(vma, addr, pmd); + page = vm_normal_page_pmd(vma, pmd); return page && PageAnon(page) && PageAnonExclusive(page); } @@ -2033,7 +2033,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) can_change_pmd_writable(vma, vmf->address, pmd)) writable = true; - folio = vm_normal_folio_pmd(vma, haddr, pmd); + folio = vm_normal_folio_pmd(vma, pmd); if (!folio) goto out_map; diff --git a/mm/memory.c b/mm/memory.c index ace9c59e97181..34f961024e8e6 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -663,8 +663,7 @@ struct folio *vm_normal_folio(struct vm_area_struct *vma, unsigned long addr, } #ifdef CONFIG_PGTABLE_HAS_HUGE_LEAVES -struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, - pmd_t pmd) +struct page *vm_normal_page_pmd(struct vm_area_struct *vma, pmd_t pmd) { unsigned long pfn = pmd_pfn(pmd); @@ -676,10 +675,9 @@ struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, return vm_normal_page_pfn(vma, pfn); } -struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, - unsigned long addr, pmd_t pmd) +struct folio *vm_normal_folio_pmd(struct vm_area_struct *vma, pmd_t pmd) { - struct page *page = vm_normal_page_pmd(vma, addr, pmd); + struct page *page = vm_normal_page_pmd(vma, pmd); if (page) return page_folio(page); diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 648038247a8d2..0edb7240d090c 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -944,7 +944,7 @@ struct folio *folio_walk_start(struct folio_walk *fw, spin_unlock(ptl); goto pte_table; } else if (pmd_present(pmd)) { - page = vm_normal_page_pmd(vma, addr, pmd); + page = vm_normal_page_pmd(vma, pmd); if (page) { goto found; } else if ((flags & FW_ZEROPAGE) && -- 2.49.0