From patchwork Mon Feb 24 16:55:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13988504 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 C8F2DC021BB for ; Mon, 24 Feb 2025 16:56:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A00ED6B00A0; Mon, 24 Feb 2025 11:56:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9AFB16B00A1; Mon, 24 Feb 2025 11:56:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7DAEC6B00A2; Mon, 24 Feb 2025 11:56:36 -0500 (EST) 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 5BCAD6B00A0 for ; Mon, 24 Feb 2025 11:56:36 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A7E4EB6E57 for ; Mon, 24 Feb 2025 16:56:35 +0000 (UTC) X-FDA: 83155441950.01.1035186 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 70D1340010 for ; Mon, 24 Feb 2025 16:56:33 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Y+psJHEr; spf=pass (imf11.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740416193; a=rsa-sha256; cv=none; b=juDaAExN7SMe/SjxxybaySCNuqkmqisfDASl9HZ3gdaunbIQ2Z0RfVIln9rdmjQLF+GM82 wvicSKlt2XBjlwLFdoJj8QIItJ6QmStDdvTxieGhPaGqhz8+Pr/Jt2Z31wRJYYhds59En6 K4OASzqGhd2ZiXYL+9e/QVn5ro/PML8= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Y+psJHEr; spf=pass (imf11.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740416193; 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=Kz/CLDpJzBRuVTGxU+n3DFa2fPKJ34/3K7JYhqZyMCiqYB75BXgUhpwXH5K7b99O+8XOJf paQ+KH6wEEuX7dhEWvaUbYwH5TrqwyUmfVojIwFPLb9r5pHBXQOnYRzswfMGQJzY7JT+4A zU/IFiR0ENF4UWZxXGRHL3lapqQTjP0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740416192; 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=Y+psJHErEitDzn5R9xGERMXsH3nnTw+2eHmP81esVSwdj4v/y2TQofUw0crHEVu2p3klO5 BjlQJejvbY/bf76M5+IOAcAXUN+IDUPtLsXKFKiTc6IR7d4Et45oocR/KIylBRs6OEe8EC 57Qv/IfiKOaBpF/Ad0oCSq6xRbiQbfg= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-505-gieVFSQ_PxGX-heaTvTaAQ-1; Mon, 24 Feb 2025 11:56:29 -0500 X-MC-Unique: gieVFSQ_PxGX-heaTvTaAQ-1 X-Mimecast-MFC-AGG-ID: gieVFSQ_PxGX-heaTvTaAQ_1740416188 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43988b9ecfbso22627235e9.0 for ; Mon, 24 Feb 2025 08:56:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740416188; x=1741020988; 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=SaaEGCV/DA9du53+x2KC1b5F8utZB8tDAC/somZ8LGQH3fsUsY2Km0rdkQRKS6CKag sTqx9+K0V0OcmnLWEMVkpAFIQWrzeahRdUJ6nOs3jIz/bbVcBtT8aDdPPqkJJm1LPBiB Kw57qcq2AODvJOPfc2OwoTaXnSZ5Dz2sgWxk3cqttRhMktboOESNPv4Ywkd8y5OR1yHh F5paSy1JemC/CIyS62S/pppt6t54rb5X8wvmf//iCjFZq7LzIjs5YjJPKpDws0ledWWo RRNger3iGjFxJs5pg1xO+30m6rOQEYsEOWrbjvRNlUQ5CP1Q4p4b9pAT19MUYJsgCuf0 aptg== X-Forwarded-Encrypted: i=1; AJvYcCW5gIZq/zfx0Udqx6INARJAajKuLi1EAJYrdOeBmCCymTMTKxANbNdZ10pzo6YMO9mB+0h+7USNhg==@kvack.org X-Gm-Message-State: AOJu0YxK0YRwyL6LUNSRnvjzhyAXKze6wre2Vi2dcoBbMdjZl/b9vH1+ r2ngwPWkusAihT4zDaMgl12853qNuUqdxtPDx7roO4GqxElSZAnhIfmQipvEpd4PRhogKW2j9Yw KKww8YLIW+LaUut44XO9jRW9vSDucu5JZfYyTIO62KtRK2Ahxso7RHPnaYBE= X-Gm-Gg: ASbGnct7PB8V5/fu5c7nlKdHABW73FHoEKc33h0XKkWkdyDU1KEdW7xwHIGLswwJnuK QL5K5Wpz2DBY2OHBeKAuceplA3M5kDbFw/APVtwKe66xZI7nFYiR6Ma+3CPvW88nEWjf30GzD/c HY6GTWSM8gBuSJBFNSanl8+WqR1UpvWkKPDxSB+TyBtZD7E56BZP4KZgAbP98s7vdINRZSk8//v kBURaRQM5qDvdfKbQ1Gps04gjaOhVwMncu2b+nlGPfvLZlhXQ9Jw3bmmsaDTj74KNgWH4m5qp0Z pJTe7eJAPqmDSuUCnj7TQOb8AbwjhcyiOKqLAEsB4w== X-Received: by 2002:adf:e50d:0:b0:38f:2f9f:5249 with SMTP id ffacd0b85a97d-38f6e95b1acmr9525759f8f.19.1740416188298; Mon, 24 Feb 2025 08:56:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFpYW1I6Rdgq9wh83UDsQAXL1XjDcZxKn17wlosPtiSthbm9EkXmkPxjrqhOMZ4wG7mJ1LrA== X-Received: by 2002:adf:e50d:0:b0:38f:2f9f:5249 with SMTP id ffacd0b85a97d-38f6e95b1acmr9525729f8f.19.1740416187961; Mon, 24 Feb 2025 08:56:27 -0800 (PST) Received: from localhost (p4ff234b6.dip0.t-ipconnect.de. [79.242.52.182]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f259f8121sm31621063f8f.88.2025.02.24.08.56.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 08:56:27 -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 v2 11/20] mm/rmap: use folio_large_nr_pages() in add/remove functions Date: Mon, 24 Feb 2025 17:55:53 +0100 Message-ID: <20250224165603.1434404-12-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224165603.1434404-1-david@redhat.com> References: <20250224165603.1434404-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: wEysZjVMvYgjTtUaamFUrw9TE0Di6LlV8RqzTOG2NUk_1740416188 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Stat-Signature: nyau6hey7d4iaow8o35qnausgq1q7fei X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 70D1340010 X-Rspam-User: X-HE-Tag: 1740416193-23223 X-HE-Meta: U2FsdGVkX19nJRF1YEa17IPoQz7TXXip/HVT6KUwyfKP2w6dZM3SMz5P7IfAlDItzrIbdEP++EOrbHB+Xov8yeMxpSWhwrIXHqCaVDj9kIEl/bXqgjjS2ygiO5oXqtudf8z5T/DhZ0z3vrYJIX0Etne2Kxrno0Dj08UrMzK+jnLODurgUhfh05uZQNaN+wI4ukdrYkGKuRMhcW28ej74xO3vPrarzetKXy7/PUovp9O2swbRt9A99eqfDoIGgyNxQUJPUC6At0vwxSJ+FpnM9SgAGj/pBHAFN7Bn5ir5lJXAdn1Arn51tcSntJWmhEC3TPDlJ9f0zzbMpw7oogI8JF2eC2JhspOJmxCxlfusdrgJR1PCHk8w52dNwI/7X7r0rDWzavQFRJgw1ByuaEMNGDkVTdoLTpKBwrsID+QJTa0mu5gEH9rq/fvTpL6C/zTVXlNU4IgSwyDumqtKzc5Q/3h6Pae97UtvZOUCqSOFV+9QCFKLeRJLPL6CVBwubX3dyBcSGLMkUwVcTTNuVcH5ghG1YT9RcIOHWZFHsd34fBAIrUaKkBntI3ABP6Kt1bonlJNbIeAzsh2t5bUqAj+l7GsGp36kF2MJDrxw2x8FrNa5y5qP5veB81jGeDk2O4+LhAeIKejhLaXAlPwyFc7HtUho/it/9bwQlK5BB2XuxC10NQxtUAQYIb7rvPVF48nxWvK9p1R0jm5l25oC0EfWW8VuoS63CjuJKZbHba2334Afh/eFJwrp6r7ToUQOWWporw6TY/V9zGtjdkg6MwgXu1IkLETdEhuoJTJZ2WN25VFwnbNTB45qPGnpsvlgMvc15lfey7SPz/V/eGiBoVhnL2uq7T0CpV+CuYrKfH33/lIl66mXNBQJPiPYi8Jdv4vgMy44naA5KDRm6lbfCq2D/Avjp+Wi22GTrU7+cW4lSFOVH51X7e44ML4Kxn3EepKj3eY9xXGSma/Z9e1W73E LCa2Jrj2 kRiXLK3kgM9j2es/CrplZfyTvOJ5XAZxlGkjEWFQMqFIoxVz12oZxvgGHNECUpEZrCxxYfsf1KsFNFOBsf+0jrx+byw4xyZyFsueK08ytv2jfJoqH0gbEPouIK50pUTg35UhhGiaE9MOj7cku4jNnD5bfm39bxO5azhgbFRJoybf42goWHt0NRKHZGd1sn1lDwYr+oQCDvNgUfbgcanPTOmpGmPRRg6sFK++Yy3UZ/gEzCs7lbUnFt+PJMLlelx/4fgsjlhH5quR3K4TzSPKp31yld4pLc0NGBthZwANXnjV7TK3KsD1Ifb/5/j/b5r5iU8Am7mN9ljJBbbd2Z2eZc9hCweNmA2kQIxjuMpAiOziifZRJm63X94/PQp9LZ2cG4zH8jokX9D9bz6fAyqVv6Ygr6YWPkf45p57uRgqRBTfXumdS+hyryALxkwiNko7BFw8dsIIH/kxlUOAJnQlqGpSZRetsg1dnt0wx4NSJzqvzWkawsOavxrHHBRtlfiewczd1un7x8F8z7lE2cHJsyhdcod6IbxuGgNverc60KqPUCule+dW5D+THgvxq45xN7wep 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);