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 B3C79C5AD49 for ; Mon, 2 Jun 2025 14:16:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2885F6B02A9; Mon, 2 Jun 2025 10:16:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25FB16B02AB; Mon, 2 Jun 2025 10:16:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 03C916B02AC; Mon, 2 Jun 2025 10:16:33 -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 D9C4C6B02A9 for ; Mon, 2 Jun 2025 10:16:33 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8B3E8160985 for ; Mon, 2 Jun 2025 14:16:33 +0000 (UTC) X-FDA: 83510661066.29.21DAD61 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf03.hostedemail.com (Postfix) with ESMTP id 58C4220003 for ; Mon, 2 Jun 2025 14:16:31 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=190ZZex1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=k7CGi+j4; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=190ZZex1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=k7CGi+j4; spf=pass (imf03.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=1748873791; 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=26hIJaIlsEh8asQLVwhKQAe/u/26xTMmcWw8TsHGbT4=; b=Nlse3Yei6HeMYYNhA4VwDlDE2jZIMPvppYiGHxFlxS+/GMGmfIY0pEj30N4BRmp0vkoN5z jJg//dvOb0RJSFK1/ncaimTqqM5WU+/MJERA4uhgaz7BaFHC8SKyu/kaXB/Ww0Mdn+cbrx DoCDSaiwW2jDv95pO8YJ8K894u7AXzk= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=190ZZex1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=k7CGi+j4; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=190ZZex1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=k7CGi+j4; spf=pass (imf03.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=1748873791; a=rsa-sha256; cv=none; b=SUel2fvCk1xTTt9KEbGdPCXTcT2cK0WbcGjI7g1aF0gMqLgzE+zaHX5/9bg1Nf70haVbU8 Pw8PHakoUWC+6a7Nmu/Wo8RxAjblxBzBQb/WdKL8H6YuEAKFvQx7GMGqc4iv1oq3SOhoFw Dd7UZRjRsvD3z87nSrwGAtLcOAaHjhM= 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 9BD1F21994; Mon, 2 Jun 2025 14:16:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1748873784; 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=26hIJaIlsEh8asQLVwhKQAe/u/26xTMmcWw8TsHGbT4=; b=190ZZex1ahKmfXCarDoa3eHYQvAz6PPVj5936zI85GRurs0Q9B+d3kir3z3XAgpH8LxApV NvLFU344kb2e+vVDWwc65UN3LWw35B9r0MjYxp35tUNcV+9yGK7bG0iOrxnmhvG/4ULJL9 TmXuPt0L3rQQp6YwAerSX22itg6E4DQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1748873784; 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=26hIJaIlsEh8asQLVwhKQAe/u/26xTMmcWw8TsHGbT4=; b=k7CGi+j4q4iY/gg0l89lsFFwp/h5io53f8CRbA2g0X6z+mdJyIFWZlsIwY8k0G7WBrca8h emhnV8sxTSCtHRCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1748873784; 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=26hIJaIlsEh8asQLVwhKQAe/u/26xTMmcWw8TsHGbT4=; b=190ZZex1ahKmfXCarDoa3eHYQvAz6PPVj5936zI85GRurs0Q9B+d3kir3z3XAgpH8LxApV NvLFU344kb2e+vVDWwc65UN3LWw35B9r0MjYxp35tUNcV+9yGK7bG0iOrxnmhvG/4ULJL9 TmXuPt0L3rQQp6YwAerSX22itg6E4DQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1748873784; 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=26hIJaIlsEh8asQLVwhKQAe/u/26xTMmcWw8TsHGbT4=; b=k7CGi+j4q4iY/gg0l89lsFFwp/h5io53f8CRbA2g0X6z+mdJyIFWZlsIwY8k0G7WBrca8h emhnV8sxTSCtHRCA== 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 19E4913AE1; Mon, 2 Jun 2025 14:16:24 +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 yN54AziyPWhqVAAAD6G6ig (envelope-from ); Mon, 02 Jun 2025 14:16:24 +0000 From: Oscar Salvador To: Andrew Morton Cc: Muchun Song , David Hildenbrand , James Houghton , Peter Xu , Gavin Guo , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [RFC PATCH 3/3] mm, hugetlb: Drop unlikelys from hugetlb_fault Date: Mon, 2 Jun 2025 16:16:10 +0200 Message-ID: <20250602141610.173698-4-osalvador@suse.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602141610.173698-1-osalvador@suse.de> References: <20250602141610.173698-1-osalvador@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: gkib7uue8kd3sdgjtqnj8rygg8jchk39 X-Rspamd-Queue-Id: 58C4220003 X-Rspamd-Server: rspam11 X-HE-Tag: 1748873791-277294 X-HE-Meta: U2FsdGVkX182M7VHtYMiCvuxdt+nB0glT0eOjBziSktdzm3Wjn6z1CLl8YC/mF49TzbmWujSL0U7MMvYIx5GlDuk5y5RDPZ87VsjpcNkboN1Z1BzJ04NgGKXeUJd/kaBzz8AiwuFaHQHjdrYB4pXfGbAvazEO2lVrrs61KO0iFAxCiR7kNTLp7nDBWBzKyR8iwTMPwl2yK0NdUAS7c8sDghzzsuad+ebIHJJqbsT+qGGLaXl1oO/12kYMFVDfGGB89/p70gQgu2NKwCf+i3WdmdtjY1gzouhnDAGhSdzNIAwul/7voNT45UGMBAjIOFuO5dEX+ki8URshBesLCXCdIFWrHn+5Fqjx4SKQIewfwRJMFqj1/lJDkYzZWC3GVN8DOYwTfLhZAY0iY/OKVdgAfvhCx+szcqRT79YJK9/MgzPNpJIEDB+6OXLarJtlnfhgprUnOJnhubLevlB85P3BFDa+YeoGqW1kYgq55b9q5bCfoBVBpFCzjcntVrvoFOBJ82gImZTxw5OkRtcXemHh5BCO/2SCzBO4nXpBdir9RscQi7mEmtMmK1/oRkXKtOfcj4744LoYYD7kzFu+2Nmb9t5rx2kz+JOsXR+Fvy41KbebZ/jbKougylnehmoUpZJ0NWG3SodXTd7+kLZFhJyoThLQRLEnXyNBezaijigClWeKOx1he/geNMw66TmH5AqorrFaKnAm/9YJtjYIe3OaPN664COLeR6qdagP6HCwM87dtLA9YH0LhCMSWMqNBzCtRF5dr7PgNqr8MnFeikgBh5eha7cfkrGeVRI7gsXXXN9Cr9xJ+HhOylFd2qK/RILXtW8MQRHCjJ+k2eYgqNlD9Dbz6YsuYpOsAljeUepaV9l2mrywb2HOn2KSQs4qd4vuNoPRNSYJDFcXwb7bHeDibw7Enumg5q/ycxnuWLJ6J8w+XPdsbdOEwYEybmOAUmBKqlZiDeTcfbU9/q2Qhl 4baapz5d YkXhdXuqDYNxsKQuGxicHe8pbWPxLu9B1oDEWNA2GPvVCd0osYuu+HQskIABYczLHShtes1OQe+9NlnWmUAm5KRaAEL6DaZe+nAhNW/yu3DKHWpeHuxNYHHYuOg9dSp5IiuHZgsq9/4FH7PXGAxSoBUZqmiKhK9f1ZBoIWVTAkk/sVr3+1wS1BDjuJfYuM6ir2nwt7VvG0ogBQV6OYC/HVRBr1jBCDDcUzbCP0B7Cj7upDSPtPqoqmE6fEyepyWDqHw3bb1Up17/on5glNkAlAqgDusM001k5w/WqrYEAQa3FmW87UXQKFEoyRQ== 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 without knowing whether the pte was present. The code-flow has changed, and we do not do that anymore, plus they do not bring any advantatge at all. 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 6ef90958839f..02ede63e7e5e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6768,7 +6768,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * or 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 @@ -6779,7 +6779,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.49.0