From patchwork Thu Aug 29 16:56:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13783456 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 65BE8C87FC8 for ; Thu, 29 Aug 2024 16:57:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 037DB6B0093; Thu, 29 Aug 2024 12:57:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F2A106B0095; Thu, 29 Aug 2024 12:57:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF1A06B0096; Thu, 29 Aug 2024 12:57:26 -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 BE6FC6B0093 for ; Thu, 29 Aug 2024 12:57:26 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 862A7160FA7 for ; Thu, 29 Aug 2024 16:57:26 +0000 (UTC) X-FDA: 82505888892.26.571C54A 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 AEC6840030 for ; Thu, 29 Aug 2024 16:57:24 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="PrWyXNV/"; spf=pass (imf11.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@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=1724950574; 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=s96zD9Isldkc+L1oUyGNWIMTG4igSbKtEM89OEtQ5iM=; b=PDRjRYNxBqRjpheGGG6AQYQz3Q3uc/r02qsY1lpZmpC/7BaRhsBXoIjmx/Wjg84X0i7HGl MoPymV4MV9h+QDGD6+CVhV30GyUNUEBoL3yCie37Q7LisALDzsPLkhRF88utwmIBbthhjE 4zJaan1QhbX4SwkK7YkuamIa2mOOTpI= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="PrWyXNV/"; spf=pass (imf11.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724950574; a=rsa-sha256; cv=none; b=JkbHHoPBNEGJblGsXIbgmKafvKaZEKZBgUle8C+BOX4pAckmlhDK/vEkBjFkMNwVvT0GF6 FB2cy1CAqEnytukUoS3/stJ7Yj4EZEvYT6Pi++lsJWuJkV7Q+jw4qHV8xC/G1+pnSDNumU pkglx63kJQjOyi4QsgvxwBk58/59bUk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724950644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s96zD9Isldkc+L1oUyGNWIMTG4igSbKtEM89OEtQ5iM=; b=PrWyXNV/cR80poWjxf1AYyAvwZCzwhOfyV1F/noPwVjgCbjpsmMHIDAHXHOVvcXv5FK1/W VpOpin1avfqCNWoMqakiWj8e466wWMOT7DnP04oXWkeIFJLwU3gZUpRnDx9IQCd2NZI4Tt GYoLsMBbaqS2vc000bb3+K3Wj0LtiM0= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-679-8IQa2j95PSO4YVvjSC6x9A-1; Thu, 29 Aug 2024 12:57:18 -0400 X-MC-Unique: 8IQa2j95PSO4YVvjSC6x9A-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 689B21955D56; Thu, 29 Aug 2024 16:57:16 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.193.245]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A88031955F21; Thu, 29 Aug 2024 16:57:08 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, x86@kernel.org, linux-fsdevel@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 Subject: [PATCH v1 03/17] mm/rmap: use folio_large_nr_pages() in add/remove functions Date: Thu, 29 Aug 2024 18:56:06 +0200 Message-ID: <20240829165627.2256514-4-david@redhat.com> In-Reply-To: <20240829165627.2256514-1-david@redhat.com> References: <20240829165627.2256514-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Stat-Signature: nt9zz173677kn7i6ysqrsezfpm17rrre X-Rspam-User: X-Rspamd-Queue-Id: AEC6840030 X-Rspamd-Server: rspam02 X-HE-Tag: 1724950644-972107 X-HE-Meta: U2FsdGVkX18UmL5gprJBXv+rmlFEQDjH/mbn1D8nV/tln2JlFtKT6XyIxUoh4lhztA/CTHIgsPGOuheRF+a0ux7+F3ai8l62gaxlUAuFW4p501qMqfJEnBf6NtaERhksNvocPZsYiWZBkMCapQYYnU0BMknjtihxjDX4ptEwO8FAFOqnd0+Mi5TNLV27SejwATCUnZ1hxSLz4cCcchLeHH6uwlzH4LpqHZgJXq2F0Fkl8jY1pgwg990uDZGCLpAmIZC+7w1+eB/5KGrdMud131cbfJ2SKbOZHPYn1ym4ZRzKjWOUXr9NX13Q7JxU93R2b7jGZqScZa0pCS0zHffHDPzKgpF1+TgzC3nMUfSS8Rnmz3GtFFS9jmK/qkbDOEcOTOlQhgBKh+V2A5sN7y1ysYUJVbPV15kJ5DpObLDKZ7ofAsKfi8r7soX+cF6cfrLx5vrOk6s24asJb1i4gkSLqofAsZyRzvFTcImLJDtEhB9owqG2lb9DuW5GgPCpptLleUn/v84HFpKeYjLvbSaN3xLyCHAfS4zZXN+DjGTNXOUD+nMP5BqZp4GHVw9ZccwPZwpDAQqwmN1EAqX/ZNCA4+CKCTB6Ck5H1S16GRyWHsRKoruMVayWuizofI6NoPrVoIeZd91Bv070Z0zlMe3+YCJ+NPttFnQUi/lL0mf6FkEPadqlgHKFcw5yeOTNhWIT4LSB2RfD/YeWP/cO2BlzgluuLt01QwbNKU8b5cjNnIGdyGPQehuN0Tkj1YFCh6qxu4jVOqHpKFyicP5CQGaqu92p9Dc5sH1SBta48gRrIo9Hrd1OyKgGqwvjh22s3uM51M3rE1/EtlfHn2SC//jy6JjwDeCHl5nuZ1mSorx7f4nWbcCtxFw16ST1a0TduWsBpLmjqmDpLcncb3nL9Ytsd0T7EJkVtNpwoN2i3z1s8Uv30LgqV0apd0z5LOCoFzPuZfmF3SX+8T7NqA1CY3p zfLP2xT5 AshZLoW3yIwYSDvLMXRwiZ6QmfmTynu8MQvab238fAOrj8PczbHyZGUCoeNQEXMe1JYznDNgSQmWdHtqB3MCu635sDgypQYwA1kRdcPpO9DZPe6UiLWxu3G0nTde3T4ehzVLRSFqkzCiLTuv71//+ZIudF4G8k324Y2jOLSlzNH57n09UbZjDtuE7GgQGS4B63A8euE2XhthavJBPNRsRGZEZXvyfntSArbPZfXvZMyf9RDO8s0EGEqN1WA+n9bKsnHwCmFXMsqOICKBo0IOXbYEBmbiVrsotpi7PhRg50Z1rl4s9sz/tcs2h7rolghzkKmEVXHpJJMDfhNWy01rv7hVwgw== 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. Signed-off-by: David Hildenbrand Reviewed-by: Kirill A. Shutemov --- mm/rmap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 78529cf0fd668..6594c122a5895 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1184,7 +1184,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_pmdmapped = folio_nr_pages(folio); + *nr_pmdmapped = folio_large_nr_pages(folio); nr = *nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of a remove and another add? */ if (unlikely(nr < 0)) @@ -1418,14 +1418,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 @@ -1443,6 +1440,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); @@ -1456,6 +1454,7 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma, atomic_set(&folio->_large_mapcount, nr - 1); 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); /* increment count (starts at -1) */ @@ -1466,6 +1465,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); } @@ -1557,7 +1559,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_pmdmapped = folio_nr_pages(folio); + nr_pmdmapped = folio_large_nr_pages(folio); nr = nr_pmdmapped - (nr & FOLIO_PAGES_MAPPED); /* Raced ahead of another remove and an add? */ if (unlikely(nr < 0))