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 CF223C7115C for ; Fri, 20 Jun 2025 12:30:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D371B6B0096; Fri, 20 Jun 2025 08:30:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D11CE6B0098; Fri, 20 Jun 2025 08:30:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C24986B0099; Fri, 20 Jun 2025 08:30:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B00566B0096 for ; Fri, 20 Jun 2025 08:30:44 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 747FB120AE1 for ; Fri, 20 Jun 2025 12:30:44 +0000 (UTC) X-FDA: 83575712808.17.935AABB Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf10.hostedemail.com (Postfix) with ESMTP id 577FFC001C for ; Fri, 20 Jun 2025 12:30:42 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf10.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=1750422642; 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; bh=uw1pynfE/FAY6khHh06Bt/YrKff2mN3swh+DtymZWZs=; b=O/cGz04nyhJWaKX8tHZRuPPsXwBs/p0rpTND75Q5uEvcwshdWC8OHRHeLSI7+RyabZZUAO cuQV2nogA3nYrCeSphywgJgCIe9pPH+pX9ERwfm/DSDxtBtmAiZEOUPZdjYLYjgFRnIGtF UMLGmb8R66bZOxnsxMEhHc/w+4wKlcs= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf10.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=1750422642; a=rsa-sha256; cv=none; b=vh0+gbabmuUDw/3B0q6PFBneF8rCLeI+Flcv56jw9UQ4z+U4awCQ5K72/NiMOjH5T8VeEd qF8eLHGU77p9+GrIF/7G8vudBIWhcQE23xN/Goj1BWzJeT85s3iTrC5pF2dzklmK7v68RR oFCImjPYtsSJQlrtl910hiTF/uLVqiU= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 877541F38D; Fri, 20 Jun 2025 12:30:30 +0000 (UTC) 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 1077613A99; Fri, 20 Jun 2025 12:30:30 +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 sH9WAWZUVWjNKAAAD6G6ig (envelope-from ); Fri, 20 Jun 2025 12:30:30 +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 v2 5/5] mm,hugetlb: Drop unlikelys from hugetlb_fault Date: Fri, 20 Jun 2025 14:30:14 +0200 Message-ID: <20250620123014.29748-6-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250620123014.29748-1-osalvador@suse.de> References: <20250620123014.29748-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Action: no action X-Rspamd-Queue-Id: 577FFC001C X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: 7ig1eqxag4d6gsrs5ceymewy8jcnhdng X-HE-Tag: 1750422642-594154 X-HE-Meta: U2FsdGVkX19c9mulhCve/nfHcU0MFX85ERMuvIxafS+CyAzhUJH6/OE9MXQ6eoswa6ikauhcmFYM5QLm+STv5ggtknpDCb32O/828KnnNlA4ve4S5UZwdv+GWEj+s4AhTLHOT4eHABhCGFb6em6wprqed0MGDFWW5nncaSYgnjLlw2E3qXJa9OHdKoxjB0ecxne9Hz/GN+g16lByRbm5t6GCYF3nEDC/bVnTAJJLJKXT/3CXkHxKzf9tjlABCOHPmPYAuIWj1h49zQREWLO+sAjH4sQ8kzPEwRSN23rC9XorPFAIreMZOn8RoAkv/EzPHs5o+N3gg25N0RBlMgmU41AMTDuyWrI+Vy7jGDeoD1SYx0kvZX3focawr2gBANyCzvFwSPM07K3LHKwdb7+LYaUWf3WBXiJ+sv6BYw4eOlcWr7aFcAhlDvk7cItABIus+zydrLMr8Eu3qZkeYDfNcTCNDsbvt1rLfFBB4SegqF97YeuYjlGzw4iARiEIanAQHqnRdlke1t5YoVwCpuTlWPGKQya3yGEXuNRV9ekwIHTLxkoqLGDPAoLCe/lj2PkLUmBmr53UeJtnG9WqhWKRx46d71hzXXq145jcTQgQh5Hb523zhf2H9tJNuhhBDzXiqsSYqc/tQV2dOSubNyHWLB9dDIy1S4O3UZqSiMAglSf9PiDirKrz0HGI2gDFIPgV9/SsSMXu2zZpyjIZksqsbaARZnadtKR2bZqEB5EkQuKtk4/Sa15gjgYK81xNYcpRpEnICunIQ/VZKJpcu6OsOZ65c/p0j7O++CQvABlxZZF1U64xNR1q7CgE0Ytsd3IuljSQROHUO3hawZLe7NlJNDagte0PKnWVzPa7BEkarTRWQVTxe/czzIwfXvwJ/nPiz6IW7Z9CGfAogNpBN2/wZpi4znLARK1EwlQAtW6G8zn3AoJzDmYdkPar0RUxHz7Qo6yB2H+yvafDHT4s8Xz NNpKdh9S r3qRHLXXKAyH0tUSyfJhC3jhl+f1dDYtx6uTc07POsEcmIIp+MmKhmfSpqGToSluHyjTTawSLOz+f5cHkr5DQrH0Ytdz4YRSaSSRNtUm2qIffeeVEehMMu1wdJrjT19mUmwzoW+8vmWrKGD2qQq2ge1s+TmbxxoxoCjaXNHN7wG2/79I= 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: The unlikely predates an era where we were checking for hwpoisoned/migration entries prior to checking whether the pte was present. Currently, we check for the pte to be a migration/hwpoison entry after we have checked that is not present, so it must be either one or the other. Signed-off-by: Oscar Salvador --- mm/hugetlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 868ee8ed45c0..1ef554b6934a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6748,7 +6748,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, /* Not present, either a migration or a hwpoisoned entry */ if (!pte_present(vmf.orig_pte)) { - if (unlikely(is_hugetlb_entry_migration(vmf.orig_pte))) { + if (is_hugetlb_entry_migration(vmf.orig_pte)) { /* * Release the hugetlb fault lock now, but retain * the vma lock, because it is needed to guard the @@ -6759,7 +6759,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, mutex_unlock(&hugetlb_fault_mutex_table[hash]); migration_entry_wait_huge(vma, vmf.address, vmf.pte); return 0; - } else if (unlikely(is_hugetlb_entry_hwpoisoned(vmf.orig_pte))) + } else if (is_hugetlb_entry_hwpoisoned(vmf.orig_pte)) ret = VM_FAULT_HWPOISON_LARGE | VM_FAULT_SET_HINDEX(hstate_index(h)); goto out_mutex; -- 2.50.0