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 ACE57C77B7F for ; Fri, 27 Jun 2025 10:29:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 59FC88D0006; Fri, 27 Jun 2025 06:29:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 551B88D0013; 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 4683C8D0006; Fri, 27 Jun 2025 06:29:32 -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 2FB2B8D0013 for ; Fri, 27 Jun 2025 06:29:32 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EC8D21D74EE for ; Fri, 27 Jun 2025 10:29:31 +0000 (UTC) X-FDA: 83600808942.22.BAD004D Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf01.hostedemail.com (Postfix) with ESMTP id C05B44000B 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="sHhER//3"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=jSc8xpIH; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="sHhER//3"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=jSc8xpIH; spf=pass (imf01.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 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=1751020170; 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=kfi8/l69UuNC8lJU7DgbzOuhvxfNUkN/vTlkmP1mOoE=; b=PfZkZbGil8TmZfpt19kL+4r1lxtl8ts+UrgUQyhRy/LCUfKJmnAmQHkS4F4e4RasDPy68/ 9yzmjUJNuwYvz43vgEU/E5GVEtbWcqD0IO0YO6Nq0IDv0uIlxRq4wWY1bFS7y9utZxXh3i dr6TGGIDRtYmmuOU2mHjjZ6NYK1XEMc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751020170; a=rsa-sha256; cv=none; b=MNK3sp0ZSX8TLbYlCuLUdf+OstcMoJQBpmP97Dy54THArYCUWx3hTMmxZ+nWri2YS25hbN 9crVENDLNOI3A9fz3iL/ziNgsQuA5yNyxFTOgSBZYb8irb2YbC9o+CX3e/VubjyB9yPAtP Q+/oUOCEBIw0n4U92ELRqyWnCT/exS0= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="sHhER//3"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=jSc8xpIH; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="sHhER//3"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=jSc8xpIH; spf=pass (imf01.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de 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 64CA41F441; Fri, 27 Jun 2025 10:29:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751020158; 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=kfi8/l69UuNC8lJU7DgbzOuhvxfNUkN/vTlkmP1mOoE=; b=sHhER//3GH862S3JMnhCJeTtFLSEHJMOWm/MExazrOAbpCVX+1Bx/pZTiCY/KN5lrf/WsV aiO/VxgxAGthlKn9k/GSW/9SUiuXIwr66IkeEEiivtYSpdCu1l2mSScoyROgozHCt/05Yr Yk21vOJ71appP356AQTMKW/SQyLCEk4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751020158; 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=kfi8/l69UuNC8lJU7DgbzOuhvxfNUkN/vTlkmP1mOoE=; b=jSc8xpIHdSpHpvhTXFG2YZY5CsodQ+lEbZ9WZbVjjCLkuh6b7kCUKYqqWOOAwUTtRbo3LS WDbwfVqHxdgGjuAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1751020158; 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=kfi8/l69UuNC8lJU7DgbzOuhvxfNUkN/vTlkmP1mOoE=; b=sHhER//3GH862S3JMnhCJeTtFLSEHJMOWm/MExazrOAbpCVX+1Bx/pZTiCY/KN5lrf/WsV aiO/VxgxAGthlKn9k/GSW/9SUiuXIwr66IkeEEiivtYSpdCu1l2mSScoyROgozHCt/05Yr Yk21vOJ71appP356AQTMKW/SQyLCEk4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1751020158; 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=kfi8/l69UuNC8lJU7DgbzOuhvxfNUkN/vTlkmP1mOoE=; b=jSc8xpIHdSpHpvhTXFG2YZY5CsodQ+lEbZ9WZbVjjCLkuh6b7kCUKYqqWOOAwUTtRbo3LS WDbwfVqHxdgGjuAA== 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 E109413786; Fri, 27 Jun 2025 10:29:17 +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 gCIaNH1yXmgIAgAAD6G6ig (envelope-from ); Fri, 27 Jun 2025 10:29:17 +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 5/5] mm,hugetlb: Drop unlikelys from hugetlb_fault Date: Fri, 27 Jun 2025 12:29:04 +0200 Message-ID: <20250627102904.107202-6-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-Action: no action X-Rspamd-Queue-Id: C05B44000B X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: 9ha4zxz7ss5jkqpo69us54zu5si6htem X-HE-Tag: 1751020169-19202 X-HE-Meta: U2FsdGVkX1924zLUMSQ3TbTavsRJ8rXlt28iQarMppW+ulJIvYBSbqxCkTasHXgGj5Ntsm0hszsRLtt6Vj53XqAgspGjKdyDJ3Vd/A8ttyNQ7BekG0eibp6Dztfx5SDXLQG3aP1m1Gpqh2vD8rswMNwVU3rR3FGc3cVVm8keXOF5OklP00t4yh4iN9sB17o91KaZbI0ex5y2ytNiKhu2ZxqRXOQ4eArgHhO12FHmc29/rBWmFWw50pjhlCmzVi42AyIkUHVMO7SE+vkXA/TvPrECHsNoSQjfYu1ywBFqygvrS3AIaVH9uEYugY85R8/wlrbh1G5rdA4Q0GzgnKm/1te9HL8/Fa0/EMXordI/ttK4N+SE6CZYrh7gInsGECq7O+MdfGJLTy4mQupAT6Yjf+e6VHELyGOtIu7zcReog2k8dDhNsW8tpIKEm0B6nzBuyyLAXs8D1gp78THgI/Cb2PoTEGNv/dVSzntQ2EmTmavew3VgSft19/0Su9MXu28BTqjWjU0pzPr1py9bINSvCHskGA7wErPrYq6MFBnAyDn6LDywgWRo7e01sxLLrmre5EculGOyx41BWtluoDzu6My+wWZCVFACIMZO8iYr+8KBpigGuwvetjDB7PKHJtspGESkPfGA/yq1BNXmiNlVKetT3ZlLiiJFdv/ffUqf1UpoV7SGK7zQ5E4gORkdyPUL/7Jh1BT4IFBkvmZDUqMLuM3ouMthL1t8b3shP80rVD7W76C9Us5gRZC6LovCPvPYDgzUQP1QMaaJHr1TIu9p5Rs9FZ6XqxG4X9Bo0h6ijZ3LPxu0Am4RgVF4yNYxqwQB20NYUh+NYlBL3snfu0ZG3jora2geUL+wQ42tgPHpMaFli5w7S3uitUFDBCst8rGgOsl0Ryt7YTyx2dJIT6N7dfFvdfX0sIqLXxpG8GvPFJbMgSIGL1ga2FYhDbeTHRdp9DCDkBXNkw93IvoG0lE eBXgbL37 IRYekiLJPHmFUpu4sA9JGnMHH8Msd0gByj5GY75mRO2h+wtaWmwJu2x5oERNU9sHLfhjB1aIkxDwOhosF2TrziQUsIqdqyOtC5XJx4NIDf2bcgSDzmx3AfzGaNFveKfV2PJdvDUY+HwBiRGWkC8Yudk1GvZyYAHZFVk9T0+MvRsbMzzaVAx/oCKIEHQp6P6HY4NQQxaETmRsRPJIWDdwec79d2bfoIDRPaqCDNvrLOLJQJMdx6TXvVl68zs2nVRVj7sJWtpkTJ5JOsC9Miy4sGIR3bWdR2hh4aPV/u0T1nXD7sSTDqljnBNVKzHw02xdkt9UnFA8gV+zRWt8nciSt/tfv6A== 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 0a6a519fabe5..64d628755b7f 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6749,7 +6749,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 @@ -6760,7 +6760,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