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 8621FC7EE31 for ; Fri, 27 Jun 2025 10:29:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 293598D000A; Fri, 27 Jun 2025 06:29:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26DA38D0006; Fri, 27 Jun 2025 06:29:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18E3B8D000A; Fri, 27 Jun 2025 06:29:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 088A78D0006 for ; Fri, 27 Jun 2025 06:29:32 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AE9401606B0 for ; Fri, 27 Jun 2025 10:29:31 +0000 (UTC) X-FDA: 83600808942.02.F5E5E62 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf01.hostedemail.com (Postfix) with ESMTP id 8AB9440008 for ; Fri, 27 Jun 2025 10:29:29 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=0d8TrslY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3UGXTVzu; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=0d8TrslY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3UGXTVzu; spf=pass (imf01.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751020169; 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=bq9/EYkAwYHFk8gdnXIfLxkomiePmXJvIrEAfONGHY8=; b=F1i/ur+7KuvZAiZuxzfH0TJRCZ/UBinxRkslrEWwCLsrV721YftPUXPPbA051C0W0i5Pca cgDoUzMpbD6EwwufLM3XXuR5Ct/p0+Arzdfz3OzKAq+1RW4to0tPLqW0G8y4h8cw72H8MG nihdwtCuFVGwkhTCwhgVTYXwvTsptfc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=0d8TrslY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3UGXTVzu; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=0d8TrslY; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3UGXTVzu; spf=pass (imf01.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751020169; a=rsa-sha256; cv=none; b=h5HKwuXCb0MMwt1F/zMfNpnctlMGkrij5SRwD7nIHhzX2IW1pztQnKCfloqTLndgCQq7wi 7gIKl4mFyLmGfxOeaUe594pJhHB2b+pWFd6r8fnJ2hgxNvocH2vIbOBM2xuK3TY82jiVWu rOEwRxsWCejGNYZCC/BfbFFTHARFamk= 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-out1.suse.de (Postfix) with ESMTPS id 39E4F21185; Fri, 27 Jun 2025 10:29:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751020157; 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: in-reply-to:in-reply-to:references:references; bh=bq9/EYkAwYHFk8gdnXIfLxkomiePmXJvIrEAfONGHY8=; b=0d8TrslYkmmCf0STyidG7hJQg4vCw9sjE+xqYEd3ATPU/OG8OkIm2WmeuIvWYT5ex9lajL +/FsIMstxncNk4/yGWfp4BQYNb4O8B9PyNOyeEIWU3ho2lpuu3hryKo7aEbNNnT4dpTMUa 529Ea97vJVRF7eRA2V2sw5rBqx/9AiM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751020157; 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: in-reply-to:in-reply-to:references:references; bh=bq9/EYkAwYHFk8gdnXIfLxkomiePmXJvIrEAfONGHY8=; b=3UGXTVzuc9vmjmW+IYe1gALsOuUWEoOTiCsYmTLYvLqORrccCIeZjl9wag/nM352BS6R3C HH4anUCWN4mwrvDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751020157; 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: in-reply-to:in-reply-to:references:references; bh=bq9/EYkAwYHFk8gdnXIfLxkomiePmXJvIrEAfONGHY8=; b=0d8TrslYkmmCf0STyidG7hJQg4vCw9sjE+xqYEd3ATPU/OG8OkIm2WmeuIvWYT5ex9lajL +/FsIMstxncNk4/yGWfp4BQYNb4O8B9PyNOyeEIWU3ho2lpuu3hryKo7aEbNNnT4dpTMUa 529Ea97vJVRF7eRA2V2sw5rBqx/9AiM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751020157; 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: in-reply-to:in-reply-to:references:references; bh=bq9/EYkAwYHFk8gdnXIfLxkomiePmXJvIrEAfONGHY8=; b=3UGXTVzuc9vmjmW+IYe1gALsOuUWEoOTiCsYmTLYvLqORrccCIeZjl9wag/nM352BS6R3C HH4anUCWN4mwrvDg== 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 B1A0613A8E; Fri, 27 Jun 2025 10:29:16 +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 SIGuKHxyXmgIAgAAD6G6ig (envelope-from ); Fri, 27 Jun 2025 10:29:16 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , Muchun Song , Peter Xu , Gavin Guo , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH v3 3/5] mm,hugetlb: Rename anon_rmap to new_anon_folio and make it boolean Date: Fri, 27 Jun 2025 12:29:02 +0200 Message-ID: <20250627102904.107202-4-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250627102904.107202-1-osalvador@suse.de> References: <20250627102904.107202-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 8AB9440008 X-Stat-Signature: g3wrw4i1jnks5dixaj65ax64mwzyewoa X-Rspam-User: X-HE-Tag: 1751020169-437938 X-HE-Meta: U2FsdGVkX19bGm1cYzdw0IwHIAdIC/T60CFtOmRjNy2wxUZmXejcDf29G6SRYifrRG0owxDnUSXuecM9u6nznIwyIdRr0AV3DxAO0o2n3gphIFekAz3SPvATqL5WmcBu1QiP7CXmD3iBUBZCO+WI560NJiUYzKv7LxK8pnfi6W+00ubc6oHmqtjeU7vZNUtA6Yt2Zu0wUf5PyqAt7/HZAGpltxs96pTDzYul1liYCZSdFt6STExInMqUS/1cdmgrP5sio/YsQwXK4Yxy3KPged8ES5Cd2q9IKFmz5rkNDcVApFGA5neUyXs/a4fqmOlqMMsIN5TGJIhGAhxgUprXFyjkufVwc43s3mUvLgkS1yMqDmdQ1Kkr1bBiwORjBZxCWJkYlMdaDT54+S5MJtFGdPTmqN6N6ya8GXNipUvvDDJwoBSXtFWp//3Xg00FNS596t8wI+lqVvbVuQs+knVnzAgwFfoD6QtJn8/rXO7O6ql7crUFcyVC4alyBKIAKr2S1GWJQgHHTFx+OyGwt1bR2AoW6ptAZ1MFdMwohS9yPROxf/GLredW9NE9ec4RDL9qZ5Yhr06Wx+IoJ1N2jNKwoXo0NjPlfUoabSK67Zd9P3WZ6U3r1S+1oZ9XeDmODGHuIgeyVLO+K6QmVvX8aPbXyrEUu3vhWFuUOI72FCsC/FLIdAsv5qU56555mxOOpvGQkrjY0QFfX1ycY4Ovs9VBd3ohpDX64ENZoJB4ydOwzFV51hnp9zx3nN7Xn8xy6ZpzdjObW4P2YE2Zp7OlliH8Bu12YgXQGPS7UFk/h/ssSrq/7GMQqJap+y+mrZpJzQva70qjhYAiZ1TUfje4pXfXlNFJ0KYWfbB4yfU1rBel9e/nZF4XudFLG2p5Nj+Ma4t6WaoRbQ13em/xXS9kI350KyQPqoKIiWMGho3McugdBMspN1pqanaKPe+U5nBFtIq3LukLLRtvj/XW7cPcDkE FlQrrr1B gT7detNJ9i4y5kSBc2AaN9UKjr28ZghTcV8HbmfMB8GH8mBApbpWIX86Ama/W+hLfCzWXWz69/YlMAjBVNWDt1Zc/2Z6kLXyGHuHxdrtCrHo9JLfEzeoz31I2diW1+6kl+kXMxOefQROxrqj9/YBabMmn42CARagpdUx7qOL6LI8bUii+c2SxJuyN4QCbXqjYZnlHuYBh9H5YKEPaDV9XA7bjfSoNWwMH7G8jiYK+0aA+J3WUplvRsOvSBik21wUHV4qWOG8vrHv9dVbKe1OI52qgy5RJEWQdFfRfWr60wXL4oHYNrtVMkTif9cNAoo31becBowNxskvu0NHkzdyHY5008A== 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: anon_rmap is used to determine whether the new allocated folio is anonymous. Rename it to something more meaningul like new_anon_folio and make it boolean, as we use it like that. While we are at it, drop 'new_pagecache_folio' as 'new_anon_folio' is enough to check whether we need to restore the consumed reservation. Signed-off-by: Oscar Salvador --- mm/hugetlb.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 15113345babb..b110394d8d6e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6427,17 +6427,16 @@ static bool hugetlb_pte_stable(struct hstate *h, struct mm_struct *mm, unsigned static vm_fault_t hugetlb_no_page(struct address_space *mapping, struct vm_fault *vmf) { + u32 hash = hugetlb_fault_mutex_hash(mapping, vmf->pgoff); + bool new_folio, new_anon_folio = false; struct vm_area_struct *vma = vmf->vma; struct mm_struct *mm = vma->vm_mm; struct hstate *h = hstate_vma(vma); vm_fault_t ret = VM_FAULT_SIGBUS; - int anon_rmap = 0; - unsigned long size; + bool folio_locked = true; struct folio *folio; + unsigned long size; pte_t new_pte; - bool new_folio, new_pagecache_folio = false; - u32 hash = hugetlb_fault_mutex_hash(mapping, vmf->pgoff); - bool folio_locked = true; /* * Currently, we are forced to kill the process in the event the @@ -6536,10 +6535,9 @@ static vm_fault_t hugetlb_no_page(struct address_space *mapping, ret = VM_FAULT_SIGBUS; goto out; } - new_pagecache_folio = true; } else { + new_anon_folio = true; folio_lock(folio); - anon_rmap = 1; } } else { /* @@ -6588,7 +6586,7 @@ static vm_fault_t hugetlb_no_page(struct address_space *mapping, if (!pte_same(huge_ptep_get(mm, vmf->address, vmf->pte), vmf->orig_pte)) goto backout; - if (anon_rmap) + if (new_anon_folio) hugetlb_add_new_anon_rmap(folio, vma, vmf->address); else hugetlb_add_file_rmap(folio); @@ -6607,7 +6605,7 @@ static vm_fault_t hugetlb_no_page(struct address_space *mapping, * No need to keep file folios locked. See comment in * hugetlb_fault(). */ - if (!anon_rmap) { + if (!new_anon_folio) { folio_locked = false; folio_unlock(folio); } @@ -6643,7 +6641,8 @@ static vm_fault_t hugetlb_no_page(struct address_space *mapping, backout: spin_unlock(vmf->ptl); backout_unlocked: - if (new_folio && !new_pagecache_folio) + /* We only need to restore reservations for private mappings */ + if (new_anon_folio) restore_reserve_on_error(h, vma, vmf->address, folio); folio_unlock(folio); -- 2.50.0