From patchwork Mon Mar 3 16:30:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13999202 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 3EE30C282CD for ; Mon, 3 Mar 2025 16:31:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E174B280003; Mon, 3 Mar 2025 11:31:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DA03E28000C; Mon, 3 Mar 2025 11:31:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF215280003; Mon, 3 Mar 2025 11:31:02 -0500 (EST) 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 6236728000C for ; Mon, 3 Mar 2025 11:31:02 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8AC121C887E for ; Mon, 3 Mar 2025 16:31:01 +0000 (UTC) X-FDA: 83180779122.12.42194DC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 8BC2F140032 for ; Mon, 3 Mar 2025 16:30:58 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DgQt16XG; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.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=1741019458; 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=TqnqolcXMjdbgOoHxDkquZtgq0jreZJuwmbRkc4obqU=; b=REJhy+HSgJvQFbhc7f2OXPRlbewNCMjr1gmgkKDA0u532LazDY8mOpDoQUwrH04xmQ9aJy WO56oPuew3opFf/fB75+014t1DZdPbjUqNASXK0MHBqSJMBy68FKbevis5K+kyQhd00+R5 b38QDnVjVl5HcUZvKiiVgNPc0ZqF6oo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DgQt16XG; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.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=1741019458; a=rsa-sha256; cv=none; b=AaXO7ddPX0Wje8ht0tf+vGhXJh1FJOhhjpXn4WOgftTdR1BwOqzoHwUO4csJ1VOw1jb/zn DSDYdl0WBUY3GunFAVNIEZAQLl6ejcXEyU7q8VG8StofJKmx7qe5i4Whn3VZ5VLADK948s xsztWTa6DKWseIUYQH79H+ZFS+d25WM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741019457; 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=TqnqolcXMjdbgOoHxDkquZtgq0jreZJuwmbRkc4obqU=; b=DgQt16XG5pb48JKEAu8P382hlc+KvTjNcyr0nkKj5Xd4CiM8I8eggfqxzED/k1UE8c7rQH JfMkbiIIVSLEgQMsyCgtkP+aeEq1uI/vquuOizhnt+6qJ40gCGdTnXWun9Hm5MMdlY49Lm VPwG/OJeo9miSodOqMKju7MDHKGvX2c= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-567-tlwA82M3OJS0M_YqWLVHFA-1; Mon, 03 Mar 2025 11:30:44 -0500 X-MC-Unique: tlwA82M3OJS0M_YqWLVHFA-1 X-Mimecast-MFC-AGG-ID: tlwA82M3OJS0M_YqWLVHFA_1741019444 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-390ddebcbd1so2897381f8f.2 for ; Mon, 03 Mar 2025 08:30:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741019443; x=1741624243; 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=TqnqolcXMjdbgOoHxDkquZtgq0jreZJuwmbRkc4obqU=; b=H0/iGJAm7dBeP3+YhQ8+EZRfmkNdn1SPwVF39vbACJ96wL55PI60XlryNftOWp0rMx e/utJ3UvViqJIUqu+h2TTiHkvL6zAInaLcggssmzChOaveoLSMsUsNYgysQNOnFt1lJC 5jPYsoqdr57EJ6J/lPf1s9bkf4ztNNnspIYbuyUVR0a5BFnCGYbzU4uM6F0EOrGFDUwx HSEE4sVtZUqOx5PCSCHyuq5OjHVA+u64cGfqTrGD5wreWgn5bEogRXUmslHq9rlvl0q2 pWhN4LXBybI1xpPEK/9fUQEDc6pJBHaAmq+FgMzUubm2pbvo8it5u/FNR0YMCgJV88RN fWHg== X-Forwarded-Encrypted: i=1; AJvYcCVQkf1Jt4e0BC1hTktxWax2gvdA8vqbI9KXGvY1wIhhWFA85zzmPnFJvxuj1cPvLq6XCOE6iy3PCQ==@kvack.org X-Gm-Message-State: AOJu0YwF5YpKx5NM5HKJTCsMPKbQ7iPSBVPqUbg/oOOX2EJ/3q7058rh OLxFEZJJHoZQ5QfmNFHM8oTqNX521smYe7+nH5mQsfkJjntEvODw3yeXuA9GN+oicrnFuRSFEjA epCadIj8S+8cI2jeP72FcLi8mQNYfJOn+5Qa5qcuSFXjAC3D8 X-Gm-Gg: ASbGnctlGMkSd72dTvlKsfh5yAZ2l8xNCmBQtnuzJJ6DsK0laDADEpNJ27n+R8yNBV4 OmEl9Bt7Ym20n9TbwgR92e/9CFR4JVRxhkegyHWv9HKdOKhmd/QXcaUIxBgTGZD1fFe73USsr6r GtKFE6LlSXfa2AQs4rmcV7L4eiMgaRp2wYgaSsAEcspLPabAPVMXnBkn1YhDWvgHeheFPZ3+wuA mB+wj2AyQfbb2zMYLYuQ4BJ3IvKVTCvAOPlGRQp2getSDVGLFkrvUbCZBOh+auzOpUoZuD7NeJc zHt+0nwfhUMo5Bico5PffRRRnKltX+rpCM+GmEjTHrsTCfntXZG08iQyBJk3g+TJMlA479H6l/D L X-Received: by 2002:a05:6000:1fa3:b0:390:f400:2083 with SMTP id ffacd0b85a97d-390f400227cmr11383303f8f.0.1741019443578; Mon, 03 Mar 2025 08:30:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IGnhjPORrAR9y+RvgL1OaYsuXRTyHneFQKcSCvW+9sKqMuJZykkJsayBSNel9nRS5Z27sSgaA== X-Received: by 2002:a05:6000:1fa3:b0:390:f400:2083 with SMTP id ffacd0b85a97d-390f400227cmr11383264f8f.0.1741019443130; Mon, 03 Mar 2025 08:30:43 -0800 (PST) Received: from localhost (p200300cbc7349600af274326a2162bfb.dip0.t-ipconnect.de. [2003:cb:c734:9600:af27:4326:a216:2bfb]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43bc032d049sm46650855e9.5.2025.03.03.08.30.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Mar 2025 08:30:42 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Tejun Heo , Zefan Li , Johannes Weiner , =?utf-8?q?Michal_Koutn=C3=BD?= , Jonathan Corbet , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Muchun Song , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , "Kirill A. Shutemov" Subject: [PATCH v3 11/20] mm/rmap: use folio_large_nr_pages() in add/remove functions Date: Mon, 3 Mar 2025 17:30:04 +0100 Message-ID: <20250303163014.1128035-12-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250303163014.1128035-1-david@redhat.com> References: <20250303163014.1128035-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: aWzdm0OIBqDcJhhx9T_U3dmskpRaUHzHpoOX64ulgKg_1741019444 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8BC2F140032 X-Rspam-User: X-Stat-Signature: r6man7acnc884r8cxz6yr5qzczcqpaqi X-HE-Tag: 1741019458-180594 X-HE-Meta: U2FsdGVkX18jBlZhJRvugZTkmn9hJfa568z/nQA8NgllMHhpjA4j+ynh1Op1Be6Xp+xOWq29p5Rh5Uc4Nwbv5r1SWjhSS4JcnNu7exrdSWX4OEhILLwnWmJ2omOFW9ZZcRWsO5iJinR2xJmMBsTrRDMjCXSsxag4cS3lj+h5x9ebDM10jI1qSrozAjEGP5P3tATD5ughQP085a0LNvMtlvcxipGQ1m82T0kKEJZfkxl1hpI3cFQkxV5JNHaPSVaoyRIpo2m6BMhQhtcXxaLCaBoBXlYSnZVm8LO+oZ1HVG1JChmeC53r7+fCif6yzvJcbvhBbpSkb9zb1bMJliwrah2kog6R7sRXygrLnZGlODrIASKQFSrUXeLHTxPBvwOtIsEhvMPF8VzED5UcxV8a+1uqkmnMpS3kLd6tIJAPrKY9rxBjIm5ZK2YYqmJYE4EOXy+Eu8Z6jCtQfXNFjFPKb1InLQE6Km4A65H5PxKeEWimIrhHFlApVb42enJ2Ih0FCI1xJJ28nPUoxoo9Vk07s+eCCXM03HcqGVqi2pPakAS50/HCUqGKSNg2BSI2oCma4O1Me9IwsdaqR5A8x6WGAzRqV2J4co+NCgsoDUnffEub5rdZLQEaQ6Sa21HidZZnXHeEAzIef+OgQjDk6pEP8CHjyvHu2mm/rLRxzO0GD0bXJLN8Ci4RuN5zR+LXCodPu+opLJNzuhj0QhxGv1JwLIbW0wWyqeJD3Gyka+dNdv9lqMAmJXldkgUH7vzQqyoy/TyULe6jCmoSNrOgDZtuTFKo+9kgXPtKyd4k7wQJiKX+eU1RitHot2gQcqeYha+OBmrUYLrnUttEZlAvccXIqDy7msHjh7FSm1goZdvxgvCCvBvlDHCfQRuO0cw7GGmQ+5ZWchORow4s8fjlCbDZcm0iiegMyCg372f6INMwH+OrlffOxmpHs+4Iis0TESaFlV3nOS/+vz51ldU3I9o B2l9zXs5 fELjVu0maWwv/g2QywiGuwf740a81qEQcFp43xKQX1HYGAe4UQT3jc+xhEZ9CEKKCpl9eaF9qJMyefQ+7gN/jy/r9xEQoM8OsHooS25MHXf5GbkJrRNUYoE8GxeiS9sv+RXGWDPb9p4QKR3SyYfGCfW9EdhFAEsUxUnKF6o5EGdrI6npnm8F9BPwXar4V1Ol08Ln34JBMfekxzLS+wXtGI1rzt9u32cIl2lOE4XwTKrou4xrxDueNSNV3Tt5dWQSZs0WhLOd7tTwDwL46NQdjle1nZYxQOqRkg9Kc9Hwc05JDT8phHNuf6cd6aImPggL42T+amFthGCWk//jrp/PbZIVLRtao8KsvYwUaUY1vhhPMs1BaUFBLLtjdHL7z+roVSKtVdYyxM378neyY1eJgfnL2vbOHnti+CY2JKuno+CqtRWNb9GoXNuZ8C14MYfqqgySvkiFc2NZ3yq2TIVZYQwZurGxtdhnkFx25R1UnM8LSOqv6clQK+SfcY96vVVFZSq91UegFVmiN2ygs5aBJpBM2Qf4E46CLqk0pev8X/qVnUb4= 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: Let's just use the "large" variant in code where we are sure that we have a large folio in our hands: this way we are sure that we don't perform any unnecessary "large" checks. While at it, convert the VM_BUG_ON_VMA to a VM_WARN_ON_ONCE. Maybe in the future there will not be a difference in that regard between large and small folios; in that case, unifying the handling again will be easy. E.g., folio_large_nr_pages() will simply translate to folio_nr_pages() until we replace all instances. Reviewed-by: Kirill A. Shutemov Signed-off-by: David Hildenbrand --- mm/rmap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 08846b7eced60..c9922928616ee 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1274,7 +1274,7 @@ static __always_inline unsigned int __folio_add_rmap(struct folio *folio, if (first) { nr = atomic_add_return_relaxed(ENTIRELY_MAPPED, mapped); if (likely(nr < ENTIRELY_MAPPED + ENTIRELY_MAPPED)) { - nr_pages = folio_nr_pages(folio); + nr_pages = folio_large_nr_pages(folio); /* * We only track PMD mappings of PMD-sized * folios separately. @@ -1522,14 +1522,11 @@ void folio_add_anon_rmap_pmd(struct folio *folio, struct page *page, void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, unsigned long address, rmap_t flags) { - const int nr = folio_nr_pages(folio); const bool exclusive = flags & RMAP_EXCLUSIVE; - int nr_pmdmapped = 0; + int nr = 1, nr_pmdmapped = 0; VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio); VM_WARN_ON_FOLIO(!exclusive && !folio_test_locked(folio), folio); - VM_BUG_ON_VMA(address < vma->vm_start || - address + (nr << PAGE_SHIFT) > vma->vm_end, vma); /* * VM_DROPPABLE mappings don't swap; instead they're just dropped when @@ -1547,6 +1544,7 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, } else if (!folio_test_pmd_mappable(folio)) { int i; + nr = folio_large_nr_pages(folio); for (i = 0; i < nr; i++) { struct page *page = folio_page(folio, i); @@ -1559,6 +1557,7 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, folio_set_large_mapcount(folio, nr, vma); atomic_set(&folio->_nr_pages_mapped, nr); } else { + nr = folio_large_nr_pages(folio); /* increment count (starts at -1) */ atomic_set(&folio->_entire_mapcount, 0); folio_set_large_mapcount(folio, 1, vma); @@ -1568,6 +1567,9 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, nr_pmdmapped = nr; } + VM_WARN_ON_ONCE(address < vma->vm_start || + address + (nr << PAGE_SHIFT) > vma->vm_end); + __folio_mod_stat(folio, nr, nr_pmdmapped); mod_mthp_stat(folio_order(folio), MTHP_STAT_NR_ANON, 1); } @@ -1681,7 +1683,7 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, if (last) { nr = atomic_sub_return_relaxed(ENTIRELY_MAPPED, mapped); if (likely(nr < ENTIRELY_MAPPED)) { - nr_pages = folio_nr_pages(folio); + nr_pages = folio_large_nr_pages(folio); if (level == RMAP_LEVEL_PMD) nr_pmdmapped = nr_pages; nr = nr_pages - (nr & FOLIO_PAGES_MAPPED);