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 ACC43C36010 for ; Fri, 11 Apr 2025 13:24:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53EB12801B5; Fri, 11 Apr 2025 09:24:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C6D92801B6; Fri, 11 Apr 2025 09:24:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 373E82801B5; Fri, 11 Apr 2025 09:24:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 15D072801B5 for ; Fri, 11 Apr 2025 09:24:17 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 88A34140238 for ; Fri, 11 Apr 2025 13:24:18 +0000 (UTC) X-FDA: 83321831796.15.5AB9ECE Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf30.hostedemail.com (Postfix) with ESMTP id 6416C80013 for ; Fri, 11 Apr 2025 13:24:16 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ISL5ezpp; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=FS+2gLcY; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=TuEcIBvW; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3a1WGECd; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf30.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744377856; a=rsa-sha256; cv=none; b=7XkRsK7JU7aVrP/cfr5nlIBwcoOx3IsomC+0IOMIJdTMYWdkBKSq+LQgR5pz51VdEQ9+hX m7ygeUUNfXQBHbHKw0NLT+I5k6qrdxa8MN5Ms0oDh2b41+mDwLvq2vms0lwKkKJVSM7a8T NjJQRrsmkDfq7ia+y7AqYUUp3SU4S2g= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ISL5ezpp; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=FS+2gLcY; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=TuEcIBvW; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3a1WGECd; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf30.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744377856; 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:references:dkim-signature; bh=4AMEw1tWZpURru036L+e2j7ZovNefda2/24QrSQM4TU=; b=VPhygcBPHHoEQmm0m4/hbofqPmldzORO90Ca4uBK61MY4K47pa4/Cb3NsA5aHsc1pVot4p M6g6ksGPwPUU/iCzWZwpFuBUY9uzANYEpo+RG9RkJOQ9Q53Xpzz954DxZREjvMgROtgdZa RoC+MgRqkFHdpbwHPNKZfzgkSyAb6Yo= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E5EC11F453; Fri, 11 Apr 2025 13:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744377855; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4AMEw1tWZpURru036L+e2j7ZovNefda2/24QrSQM4TU=; b=ISL5ezppAjuwjng05fVYTszbIsf/IItvX5srUYRw93FAHy72h5AILSAO/jhQHktE5+YFPJ YUwGE58NEiLqh98IpO2kOxnUF9VRlE8Uff/XZtoVcquoaRxA3qn7rHAfOfgsH0oUmKql8B 0v23fjTHRAVuHl3F0MKb6N2dPGWYifg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744377855; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4AMEw1tWZpURru036L+e2j7ZovNefda2/24QrSQM4TU=; b=FS+2gLcYFUkbEJf/5ayjE23HdLcmwwuGTsAwhDeCrHlcgxvDKdzf+5+GjJJWETbGiCWiVb B8RQ6YwgtxDtNYAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1744377854; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4AMEw1tWZpURru036L+e2j7ZovNefda2/24QrSQM4TU=; b=TuEcIBvW1b8CdMZgqur/Ycx6N0J21Ru5O73HkCnldRTMHgw8VXNKTgugLblybzo58SWolf OVTRfVb+HEvi4hRG2hk18LNpXMRexDg75Ppc+8eXPSdPy520hOPD5II0eJunN5mMy6OA6i fBS6kahSXneioirDuRqyPckO3Z5jlsQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1744377854; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4AMEw1tWZpURru036L+e2j7ZovNefda2/24QrSQM4TU=; b=3a1WGECdhHO6F4dypJ0m2MAn+N9+hGr4ino+iXpIkYJ14Kl8P5nGBP88+uz0Aq2RX28ipS DgQxSkvmLMy05XCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 680F413886; Fri, 11 Apr 2025 13:24:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 1lGwFv4X+WcLdQAAD6G6ig (envelope-from ); Fri, 11 Apr 2025 13:24:14 +0000 From: Oscar Salvador To: Andrew Morton Cc: Muchun Song , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vlastimil Babka , Matthew Wilcox , Oscar Salvador Subject: [PATCH] mm,hugetlb: Allocate frozen pages in alloc_buddy_hugetlb_folio Date: Fri, 11 Apr 2025 15:23:59 +0200 Message-ID: <20250411132359.312708-1-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 6416C80013 X-Stat-Signature: m16ryrcsdben7nrmcmu7itkfdoz6u64d X-HE-Tag: 1744377856-703295 X-HE-Meta: U2FsdGVkX19B9f00+vco47Nt0nruYrEUMVY0sgep1dVUSTxu1rGC4/rxtspcFFaEaeS6/XlTqEwbJVf5VLRVoo9w205WLNLuEATczIztVgIgPTvIp02NSlSkOHU5rQosUp+Ozy6HgMze7mun7CZe1z1P7akfVzU4NKMsY95rgue7Vgpzv+rYSNp0/Ps/Pj/yr6Mw+XNSyPBUrHFzCshzhpcVHtsn4j3dO8JcdfHVFXY2aijAummGa6rzGdtBD7AP1RH69rTCrDx273EkN7azmMHba5hrlREx+/bKJvjprPUzK2sP+c9Ir6IDNo202iM2A0g1zr8T8WSIfdxs+OErmwR9iC/Xoyotl0Q2SuvvYeYP+6o57mLNfjA4JCDY+D9OHBYdQOE5ZO6OY4HLMA2vgL4F9LxzThZLXqBCwIHSjoG2tlYeo+rmN4Z4cO5384yjBD1C0/OD1oYISYere9BOPEW8VOqs2D1+24HjVQf22Y0G02Y8THfQid7QGdARnV0t6wcuZZQhN7i9G824k+/O0JFpCJr0TfWKUCljkv1V0jEIV38RTU7ypvTAlseqEFAZPs3LvENHlhyVSG6i/QkMNAa21AK+SpRJjy/DgUmI0b+vHO+VB6Q07NltvwQMQ6GhVQbetgRNhT51zSvO3CHNo1SG6ZXkNa9wmUgwsAVIAHPoWFXrak1RjeemgDZ2a0oymn1xEzig3gNyRKFbR1YWH2a7nin12VN5CQDoHz/HID16UnDGM1O4js3hbrtbE6MjHRdRV53U5iyEAQnvyW0cuHlHHUZfk5nxlWUklzlef49pymSVmoHz8rZpJ+L9YwGurVB4tjIZNLRfCAJCHhzpmai1MD164LYVo6GHjjACtnZteljMCz9nt/OZe/D2yP3yRXKIak0BTSI4Og2/EslTeilL+Nhzc8xrhMmv+rVq/oT0+CH37AYJKAbDHe2ra/CnbZfS4Ob/q1mrdpbzayV 2832lIUn sM5svgdxcZ0l9eKiExPffS6jXNHA5W01iM1d7IDS8pfW3RiCq36vhVmnLKuWdglVipYH9KgCNxgGdRUDEi6beTfBrOLx2QGUP1S283pafrCKiOfQZVMHYUWukQ7MB6DoEifhPrEZSJEu8PQFWMeAfqn35Ms/+KuwIxJPhGpgQZojsvsAV326xze0rWp/AbvFHuvbPvplDWgbR1I6H6Oo6kDa3j/qn3mMbyW1QppMGUPog8HueAtVCEBxbQCvimHCeSV/6ogE5Hd+yF+IWvI3sfTm9sPebnq/+b+3bsVnTlR1xMcwWYuaeoCdi5w== X-Bogosity: Ham, tests=bogofilter, spamicity=0.001346, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: alloc_buddy_hugetlb_folio() allocates a rmappable folio, then strips the rmappable part and freezes it. We can simplify all that by allocating frozen pages directly. Suggested-by: Vlastimil Babka Signed-off-by: Oscar Salvador --- mm/hugetlb.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e3e6ac991b9c..83fa2b9f6fc4 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1950,7 +1950,6 @@ static struct folio *alloc_buddy_hugetlb_folio(struct hstate *h, int order = huge_page_order(h); struct folio *folio; bool alloc_try_hard = true; - bool retry = true; /* * By default we always try hard to allocate the folio with @@ -1965,22 +1964,8 @@ static struct folio *alloc_buddy_hugetlb_folio(struct hstate *h, gfp_mask |= __GFP_RETRY_MAYFAIL; if (nid == NUMA_NO_NODE) nid = numa_mem_id(); -retry: - folio = __folio_alloc(gfp_mask, order, nid, nmask); - /* Ensure hugetlb folio won't have large_rmappable flag set. */ - if (folio) - folio_clear_large_rmappable(folio); - if (folio && !folio_ref_freeze(folio, 1)) { - folio_put(folio); - if (retry) { /* retry once */ - retry = false; - goto retry; - } - /* WOW! twice in a row. */ - pr_warn("HugeTLB unexpected inflated folio ref count\n"); - folio = NULL; - } + folio = (struct folio *)__alloc_frozen_pages(gfp_mask, order, nid, nmask); /* * If we did not specify __GFP_RETRY_MAYFAIL, but still got a -- 2.49.0