From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3E5F2641DD for ; Mon, 24 Feb 2025 16:56:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740416193; cv=none; b=uN7y6+0Sfx9Fc/pzHCvs+2uTvfaA2tMl4JQzLK3v8FNxhplbRSfmvEtp/iAa8Nu3HUw3kyPwbmbVZ5wZNJ6SLBRkRrgjh3NSacbEA5XizrIHZMaTQ1x/mTQe72jXDkeulrDPn6oYasnO96Vqn0cB5vsyCnrn2CkIWiZRB81ee6Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740416193; c=relaxed/simple; bh=RlWl3fpiF9O9sdm/iMb9TRR2Zh30yDuqbmqk7QeHHkM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iKLDDn8SRng/znswASc1lmALSjTrb/TUUPONDMPCP2+JKSE0uAW2/BY7S+0s72olVdzbBFNLPSI/Z7NRleZmTRnv+MQRkocy+cryWLN12qpxuIM+EnYV8hnm470Rvu9RM1Vde1OBTZduR9dXQfd8OCMTDjCe5jQP3UWDrgiwBSM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=igktQ7ZW; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="igktQ7ZW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740416191; 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=TqnqolcXMjdbgOoHxDkquZtgq0jreZJuwmbRkc4obqU=; b=igktQ7ZWbV61+ylOOQcvYFt5mIHiegnqR9TJc8bTbBtyMplP/dehbAdrH+d1pDVzyD9t/Z xGMqY/IhTSPx1YjOGqf5SIVwTXVeB/NEgKxAkIyXcYWwBh6UzGviDXoQgw3aZmwgEn2y14 wQhPClkSR8AOIqa7yBxoVZfOT/ZBSS0= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-251-umtqGMRLM5msZ_xGp2-n_Q-1; Mon, 24 Feb 2025 11:56:29 -0500 X-MC-Unique: umtqGMRLM5msZ_xGp2-n_Q-1 X-Mimecast-MFC-AGG-ID: umtqGMRLM5msZ_xGp2-n_Q_1740416188 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4399304b329so22521635e9.3 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=eUb4yezNATfe2GF/x0hwleCTJs1ASdc/ytiBVXe34X8apWZlTZmbrKWPQOzQLSDzZg Lw3y4nc6Xv154IgiiVLPEatFBT31TunzcKJJFh2kGYJBOr0TTCfmV6lQk2YuwfdMSA0/ BonhfeKq6ITBu9n2NdBnnxfAE+jIGgHa7Zy+8+I5Ee7GVsEvEoAp/0mZYRi7fDaFrj3P M7sO2HofTYCMI+szt7QzAPBRAJpnlV8K90zMyHNHUANid8CV0YNI54xJU1RGRsiFLWFC L7IT6gurlQ5DlkWOKV7gX8xHCU1ojIjAqGdu/Ins3ezsM/GJ7GA0unRNKzwA2GypRDIr rT5Q== X-Forwarded-Encrypted: i=1; AJvYcCWY9BFa9Rnx9H7C9CtGTFE5s8arPFEj1fxh51VM0NyIBFKYL+y7XwoRtuboVrTFFij6Zj0uj2cSY+Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yxmo7XgDntg8q9URi/SbFwQpRTVBPSzdldGZvsjrhdaTQYFcfqy wgjGtXvMquBHVf/jFzagJOwMPv0XLVHqf+KkFkXGcz9GYDB9j1NQg3D6RcaVV4gHDqrXsQbyg0f gUAGzsmyKkcT1PKLijx7+Hi+2Nb2gn89sOqivkHOxg9hIK5wXgNCMFRtfMQ== X-Gm-Gg: ASbGncsn7HKV81xKGhxwqbOR2dxGrbgofWxI7gaBOh6JsWKBUPFpr5fNEpze8m/x1tt LrHCdpeaWIn0s561vo1T03QxwXQKZroRHxLfPUepNfkMXmjKnqNYSWTioEVvDalHy1JTVkZb2ai Xn5Ta5pHpp12rlgaN58Pxu3noqf3pOssUp8BhD77fP6ea16p7F7Zu+wpRhqXdzV9eUq6NJQQq6z w64y13BKN3+/U0ftKSbTrbLuEC29fCMY/DnF4mcoO31dThvcrl/JOQxCMYWDS6VedeX/u7q7RSA +kbEzMqGl/tIGY7rRLSurzCQYB7Ge2hbrnWMD0lwvA== X-Received: by 2002:adf:e50d:0:b0:38f:2f9f:5249 with SMTP id ffacd0b85a97d-38f6e95b1acmr9525748f8f.19.1740416188293; 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=20Koutn=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> Precedence: bulk X-Mailing-List: linux-api@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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); -- 2.48.1