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 141BEC54FB3 for ; Mon, 26 May 2025 12:20:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 692966B0083; Mon, 26 May 2025 08:20:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 643966B0088; Mon, 26 May 2025 08:20:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5327E6B0089; Mon, 26 May 2025 08:20:16 -0400 (EDT) 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 3A3086B0083 for ; Mon, 26 May 2025 08:20:16 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B189F1CBDF3 for ; Mon, 26 May 2025 12:20:15 +0000 (UTC) X-FDA: 83484966390.20.13A1C74 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 2EEF94000E for ; Mon, 26 May 2025 12:20:12 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=E4a1jF+9; 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=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1748262013; 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=5A2Q+CMJCDRak53L6Qj3+f+0q3AUDd7oUCnA/5x2UK8=; b=JA+n9Bi7PG5lYllwrejNlcxUg1vknAzqCVHsQaZxgrs2ShPdiNR8s1tphHx2wFC1+A3/2j yVlUMa0SDC5dGayOYZfeFd3C52EmZtejNT2naWvOjUU0PDD4hiVz/cjVaPdTACv8hxsfS8 8zhvdglr4EuIW8kXWh7Cbl3hjF4PeUo= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=E4a1jF+9; 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=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1748262013; a=rsa-sha256; cv=none; b=LqNmatmWWC3fedlfxgTH8fqdefU97zkkn8d0U130+/zNjI8508nQFIQllSuXGof6wfRAhN hXhCG2QFHDSjSxAcfUnSfp70WmMIOqKcG4sUTASIcIvE1n+q7Vzsy8G5feZUjH9/fbZ5DA m2CFT0VpXuez6uogE3kr+iicrRh6oZg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748262012; 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:autocrypt:autocrypt; bh=5A2Q+CMJCDRak53L6Qj3+f+0q3AUDd7oUCnA/5x2UK8=; b=E4a1jF+9O2BqG/VFTzAoiff/vYGn5Gbp1gc6hour2yGjeo8gITwruVPEpp0nJfpuIf8bdp S96zDouf2VBOmKN7o5ITfMc7A4sjpO5bAb5WjWTTh1GtnFUZziJIFmzwfvwpPrI7IXOxR2 gzwBf1eigWa5i/Na3B7AN3N7xn8ZEmE= 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-607-PbaNgUyuNf-RlYfaQAzg9w-1; Mon, 26 May 2025 08:20:11 -0400 X-MC-Unique: PbaNgUyuNf-RlYfaQAzg9w-1 X-Mimecast-MFC-AGG-ID: PbaNgUyuNf-RlYfaQAzg9w_1748262010 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-442fa43e018so14324335e9.0 for ; Mon, 26 May 2025 05:20:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748262010; x=1748866810; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=5A2Q+CMJCDRak53L6Qj3+f+0q3AUDd7oUCnA/5x2UK8=; b=dmudLpCummhc/PvLp+0QAnkVGTtpbmOgiHnndIsqC2xPDwtRg9RZd5wmAKWxaysTar 704HUNcaYyqDJPQfBx4TNzT1E2M9LaRgWV2NYLDlztocH4ZJGe1SwOB08Bs1B8kzAXrb 32ZgmPlvepv/yQcGxADg4d3FkH0UyemX8Oano8LcAfP6JS0MUfkUhuIGlIF1WKoyXSb8 F1X91422R+HfETj/75oLQgpqmAxFw4cXVOGSDsHzUgmRaO/YBlwhLi8jwbG4m3al9vv/ MKp3JPlFTXjVnk4KBGLNeoXVnwJE8YpWbu/pYobMiPWKszq4nVlV1Ho90ZtyIQXo11Jn +4Ug== X-Gm-Message-State: AOJu0Yz1HLkhm5k8pL1mATovyeBGtXTMVRgp2Y4tzihtZpY54LuKuVIJ PxrYqyhswSYTme4UKAXoIZ16yjLAM5iK6FrfKICZKsdBeO9L3/bMWp0aS5AATgM+6Kp4J/TbDoi Mh5yv/lkWA6IUe8nsT3syfqUsciWqF7ckoW46cJHRmZoVGFQz3SXE X-Gm-Gg: ASbGncs1hGbr7XvpM22cxgbGnKoV7/OvUHPosnkA1p+LJcpBfCnw8OxohVdRmiyoJc4 w6wFnQ4UuHIYPdN5LbV+G/spFGerbYGTLohbS9DeYXEtcXSMw/ytbe7Ds7i7OwWHmj3FpN2Q0Jl 3wX/OovM62G/CY2Fd+AliZwapBkSDpJCa+BpWxDxSBPe11tqWU+wWBUcB+0rJA9HpN3PQHIOKvd w8CPI+XJJgTDicVwtQjFR3W4knlCDO0ImnxpeEU72USgjuOXZsyLmI2SE0zGec5i3AAPuzpBqoh ErtUByrLsT1RG1Whe3i1ClKZHvKxrv5Wrq0cymNPC+UWPrKTRMy4jMBZnbk9KqndoXvMpa1fg1E auPa2WCg80DPMO/6ey+/rynqzpyIIWFxCZeMouKA= X-Received: by 2002:a05:600c:1d0a:b0:43d:186d:a4bf with SMTP id 5b1f17b1804b1-44c77bf3aa2mr71788755e9.0.1748262009729; Mon, 26 May 2025 05:20:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsRFNLZeMFPpnKb5K07VvovOYpBuMPYMi3n+XwsliI0gPjkXMgXHAQZo9STCl6QJp5lEPW3g== X-Received: by 2002:a05:600c:1d0a:b0:43d:186d:a4bf with SMTP id 5b1f17b1804b1-44c77bf3aa2mr71788385e9.0.1748262009270; Mon, 26 May 2025 05:20:09 -0700 (PDT) Received: from ?IPV6:2003:d8:2f19:6500:e1c1:8216:4c25:efe4? (p200300d82f196500e1c182164c25efe4.dip0.t-ipconnect.de. [2003:d8:2f19:6500:e1c1:8216:4c25:efe4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-447f7bae847sm230898175e9.36.2025.05.26.05.20.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 26 May 2025 05:20:08 -0700 (PDT) Message-ID: <427043ca-ae91-4386-8ffd-aaf164773226@redhat.com> Date: Mon, 26 May 2025 14:20:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/hugetlb: remove redundant folio_test_hugetlb To: yangge1116@126.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, 21cnbao@gmail.com, baolin.wang@linux.alibaba.com, muchun.song@linux.dev, osalvador@suse.de, liuzixing@hygon.cn References: <1747987559-23082-1-git-send-email-yangge1116@126.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <1747987559-23082-1-git-send-email-yangge1116@126.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: IwplhE8FHNqtRSe2ap4iG_XYqQGs6fp_6LtqyjGqNjg_1748262010 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 2EEF94000E X-Stat-Signature: 1w49si5ksrfaipr4kj38zhswm7zjbtat X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1748262012-209862 X-HE-Meta: U2FsdGVkX1/TckRGSCpUkfzkWHegAVy4h4nQz6mKq4B3sleqE2+V4yHqiZkT9POnn8B5Bmw65xLoCX37tlafOiMXk51actqSgKH8Uqr3dL/s+C6My61bFnWm3Esqe8/91qpn+2E3Ar0hJF/SZhhys5ISBQR9cabnNp9240eST0oXYyEjRse44czz1ru1XrTffSPDcEUoNyimaje1XyIxYaOfss9f0dgJGwNhZJrbvPVc5iWqTlU7t48JPRH33KP1NEwgBV5kDOYUmsLI0SRtg/s2e9/lf9hBkkDXv0BagVBK0yFZwou4NGYb9+4weuoJY6tikuma0wpJ15wwSDWPnwVvNidHHhAtJpofWA8LzuRPGhg9AHpTdJ5WKrzEj4xQJH4TwbwRLLhYlcrhZzfRUQHBQdQA3DPqwxkN/uj0/TAs5GZ9O3yEi+trEi8mhmiR2eF9hL+Yst0VHwJRNqJ1xSR/FeXSDnLh2Hy4ynN1mMftJejMZzfsE6tmvszAz/DoOrNIgHfocOwfSntRCEFIMJNuD1Z/IF+FIThgJe+FWaPq09/8SCR7OJq+/HgqJ9UqEI4BKQ/mFwen8oJ+OSDRp/BaG0WsA9gwjU0EZQcqrjiHMEcE06JhCiR78ntUufNfyYDrodfRXU4KLMlMHa8eg/DguH6EUi0ryuLcDTJhzQvQJt6YK6Ov+hBSU2Rg2QZGb/VfXCNOtBTawh+GHVS1uxB71NJYX78IYSs7BcDggSZ7gBdMLpqafh2LJNxdQyPuGGPhS3jBsajG02CRTiE9cYjfJbP0kI1ENK5d/+iVFONDUicbvpegUPZ9ivmLlZhHaxwMAZ94tOlefNlV0EeOD3sazIHS526sUenmMpESWyqIiIANcxujt2Ioq1uRj1BKYLdXfsVUmXVxcXN3RThwvklmHs0aCzO/wVOKr+j9DjsZ9rDVRMgJYRhoWKz5SOEgFmdjrOTbMlkTnjEMVxi 3ITFh3eL eEoBFdh49YQfUBanfVFSm57zzX8tUlEd/HZw4BHJRtOPju01VAet0Qz0x3OjGExzqYD3dP5p6CRn92n9gYfoFzpLrnZGXuSP1/vIOr+lH0VaKqdIEob+SktuldzT33fLTaEKWolHkX9TMpwKjgXrgK8GyLaQ+gp9x+Wyf7Py3I87PF/hcURrInaSPRHPqeoYRVNJSF8ECrnuPrXtqBgcEaUjY843rcidusnQjpHPpxlM+jhpzto9O+NG0Uv5f3lFbdWFOxEyebtFhkAURt9c4o0Xgk8VeI3XajqLFBxnGGDfMG6yTVAbdQ7yqGJhTkm/wXGlVLbOqVP7r+0ZlM/Dy03tCBz8vNwbkLJcz0ZXGTokbDSSN5idDO1NwQfmXWG8DwvTSYMzK5N2wUsa48tBB6hXnyYn/U5DeFd3MA0fE9vUXtWS8MXZRtKx5mqseDdTir18zhSpT8IHkUNdwUOvSlsEFyQWebl2hbd08Pxd1Ivbar2i9nk1FYTbXlUbMlkURJ6Kb64hWAYwdjADVNsGQ1Gup/9lcEBhmk577 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: On 23.05.25 10:05, yangge1116@126.com wrote: > From: Ge Yang > > In the isolate_or_dissolve_huge_folio() function, the folio_test_hugetlb() > function is called to determine whether a folio is a hugetlb folio. > However, in the subsequent alloc_and_dissolve_hugetlb_folio() function, > the folio_test_hugetlb() function is called again to make the same > determination about whether the folio is a hugetlb folio. It appears that > the folio_test_hugetlb() check in the isolate_or_dissolve_huge_folio() > function can be removed. Additionally, a similar issue exists in the > replace_free_hugepage_folios() function, and it should be addressed as > well. > > Suggested-by: Oscar Salvador > Signed-off-by: Ge Yang > --- > mm/hugetlb.c | 51 +++++++++++++-------------------------------------- > 1 file changed, 13 insertions(+), 38 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 6c2e007..6e46f2f 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -2787,20 +2787,24 @@ void restore_reserve_on_error(struct hstate *h, struct vm_area_struct *vma, > /* > * alloc_and_dissolve_hugetlb_folio - Allocate a new folio and dissolve > * the old one > - * @h: struct hstate old page belongs to > * @old_folio: Old folio to dissolve > * @list: List to isolate the page in case we need to > * Returns 0 on success, otherwise negated error. > */ > -static int alloc_and_dissolve_hugetlb_folio(struct hstate *h, > - struct folio *old_folio, struct list_head *list) > +static int alloc_and_dissolve_hugetlb_folio(struct folio *old_folio, > + struct list_head *list) > { > - gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE; > + gfp_t gfp_mask; > + struct hstate *h; > int nid = folio_nid(old_folio); > struct folio *new_folio = NULL; > int ret = 0; > > retry: > + /* > + * The old_folio might have been dissolved from under our feet, so make sure > + * to carefully check the state under the lock. > + */ > spin_lock_irq(&hugetlb_lock); > if (!folio_test_hugetlb(old_folio)) { > /* > @@ -2829,8 +2833,10 @@ static int alloc_and_dissolve_hugetlb_folio(struct hstate *h, > cond_resched(); > goto retry; > } else { > + h = folio_hstate(old_folio); > if (!new_folio) { > spin_unlock_irq(&hugetlb_lock); > + gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE; > new_folio = alloc_buddy_hugetlb_folio(h, gfp_mask, nid, > NULL, NULL); > if (!new_folio) > @@ -2874,35 +2880,20 @@ static int alloc_and_dissolve_hugetlb_folio(struct hstate *h, > > int isolate_or_dissolve_huge_folio(struct folio *folio, struct list_head *list) > { > - struct hstate *h; > int ret = -EBUSY; > > /* > - * The page might have been dissolved from under our feet, so make sure > - * to carefully check the state under the lock. > - * Return success when racing as if we dissolved the page ourselves. > - */ > - spin_lock_irq(&hugetlb_lock); > - if (folio_test_hugetlb(folio)) { > - h = folio_hstate(folio); > - } else { > - spin_unlock_irq(&hugetlb_lock); > - return 0; > - } > - spin_unlock_irq(&hugetlb_lock); > - > - /* > * Fence off gigantic pages as there is a cyclic dependency between > * alloc_contig_range and them. Return -ENOMEM as this has the effect > * of bailing out right away without further retrying. > */ > - if (hstate_is_gigantic(h)) > + if (folio_order(folio) > MAX_PAGE_ORDER) > return -ENOMEM; > > if (folio_ref_count(folio) && folio_isolate_hugetlb(folio, list)) > ret = 0; > else if (!folio_ref_count(folio)) > - ret = alloc_and_dissolve_hugetlb_folio(h, folio, list); > + ret = alloc_and_dissolve_hugetlb_folio(folio, list); > > return ret; > } > @@ -2916,7 +2907,6 @@ int isolate_or_dissolve_huge_folio(struct folio *folio, struct list_head *list) > */ > int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn) > { > - struct hstate *h; > struct folio *folio; > int ret = 0; > > @@ -2925,23 +2915,8 @@ int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn) > while (start_pfn < end_pfn) { > folio = pfn_folio(start_pfn); > > - /* > - * The folio might have been dissolved from under our feet, so make sure > - * to carefully check the state under the lock. > - */ > - spin_lock_irq(&hugetlb_lock); > - if (folio_test_hugetlb(folio)) { > - h = folio_hstate(folio); > - } else { > - spin_unlock_irq(&hugetlb_lock); > - start_pfn++; > - continue; > - } > - spin_unlock_irq(&hugetlb_lock); ^ oh my, that is bad code. Taking the hugetlb_lock for each and ever page in the range. Let me find that code and nack it. > - > if (!folio_ref_count(folio)) { > - ret = alloc_and_dissolve_hugetlb_folio(h, folio, > - &isolate_list); > + ret = alloc_and_dissolve_hugetlb_folio(folio, &isolate_list); And we're still doing that there now? We *really* should have an early folio_test_hugetlb() check and skip whatever has no indication of being related to hugetlb. -- Cheers, David / dhildenb