From patchwork Sun Mar 30 12:17:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032906 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 A8812C36013 for ; Sun, 30 Mar 2025 12:17:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 871AD280009; Sun, 30 Mar 2025 08:17:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7FC4C280004; Sun, 30 Mar 2025 08:17:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 653D8280009; Sun, 30 Mar 2025 08:17:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3FE24280004 for ; Sun, 30 Mar 2025 08:17:55 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9D3B9576CD for ; Sun, 30 Mar 2025 12:17:55 +0000 (UTC) X-FDA: 83278118910.17.83050AF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id D8B35C0007 for ; Sun, 30 Mar 2025 12:17:53 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hg3lIVra; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337073; a=rsa-sha256; cv=none; b=p78fFl9kiYMEsSERLLpDrT5cppoSKxz13MROEWeMWHbmF+/yjQcRNZ/PIuDFUtpsBL+MKy gn9nOd9ZURX2PAWRLW6sFsRsevDsrFsdXu7H3BbfPoT56wxcxiPOKdjo3WG6Smb/BOKSTT PFlzvR/CTdX0uGhAgETbqzouH0bCjo8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hg3lIVra; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743337073; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SMo4jBzg968VcT1tEVh1MekL7DuKyZ/p1dzOuEaPw7g=; b=RIXbhUtvsy8WyWsv7n7n4EJY1Xfs0kpAGwJFAZuX5MOAeeqm0lfOHEYxlTkmkIeX6zx/Bi bUgiTpdFKcFmzAf3AfX1eowqYOz7FAiJsS4rytdi6ii+BlHlgKlCHCqAdF7bBOxm1yhTKk 8p97QxCFI8474/lB0T7XF73pJQvx8MU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SMo4jBzg968VcT1tEVh1MekL7DuKyZ/p1dzOuEaPw7g=; b=Hg3lIVraLVxl7b6vI+SQT1LMRlrhxLoN8ScimIjg8jv8fPjVCfl9czDV/V0ZIeiWMWw8k1 aQCdaUwZH5lONauE9Zw7Vn3WiTXJVUdgg2fe5GQojFBK062lAycUAJAD1Y5IDdMF/6RKvS l7dJ5vnoJ+JL+Ps7YimbfUsDP0UIZ34= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-170-q4F2WwCWPOek5DYDs2vaGQ-1; Sun, 30 Mar 2025 08:17:51 -0400 X-MC-Unique: q4F2WwCWPOek5DYDs2vaGQ-1 X-Mimecast-MFC-AGG-ID: q4F2WwCWPOek5DYDs2vaGQ_1743337070 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 21841196D2D2; Sun, 30 Mar 2025 12:17:50 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.17]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B2190180094A; Sun, 30 Mar 2025 12:17:46 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 6/7] x86/mm: remove p4d_leaf definition Date: Sun, 30 Mar 2025 20:17:16 +0800 Message-ID: <20250330121718.175815-7-bhe@redhat.com> In-Reply-To: <20250330121718.175815-1-bhe@redhat.com> References: <20250330121718.175815-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Queue-Id: D8B35C0007 X-Stat-Signature: yjxrkn81gsxhkqb64yxszbp65qiafwb7 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1743337073-24685 X-HE-Meta: U2FsdGVkX1/42/HbNhqc+r9Gz4ws2ARE9MinXSaXfjLvWtMVTacARzy6WWvyedhHwbmmV6Gu+mZSbWAnTB1dE/gJUDmVL9FILcyFkHP1XeeGZdpddCHjdEzJzXKnYWVfzslXSyoRG01s5+Bch8G1ObmINUpGqqN9m+hBoeYbZRbKnsUXVjtS0kHT3c+/IjDPUyEGPqQau0ph0UPqSavMqttybXX9Kv3klnbVs09zlb5U8M6aTdrhoUiHDqHRvKsasgNLThtNuntf9tGnyZWzCk6MLshJy1MVWDWdZ9kvNQKShgHrjWms4ZprB4xXZ/kTkwtRC8Ih16t3A0v+3tvHkIuIN/+KLO+VORMphCPMtcmgOwIJDbtfWvNNmQusxU115moms7HkiWf6rocvw/DBCt5JsN5TL9ry12DtgiPuMs6YQ0h9mFT0GnRpmaY3ZJLxvhPifW7DVC5ms7ku39bz3y0RdkA/u5KB/iGgIrF7BDJHuVY9ZCss1wNohN9w50TH2do7mWwhcaBYDO7fQnaQumxSC0zSzIMnb+MvcYfV7cgZYKMiMfTdlQLva8LoHebg82K6bP0P7JMSEWPPaY4tgAeWqxh400/acGNrSjWTGrs8vrzfAzCvAadosjkhYYvCXWhK2e9hE9URO8IlojcUDR8ru3/7NEelfa/V/3zF3MIpl8GRachdXJncaE/m9v88qScJDK69+Vyiagqk9081IpJUFkyppcKyyfFhVTyjZjj15TWlaTTKuXW9myEkR/NpiUoZ54QUvZrpYJrzpvbCiUolBShApIMtqnjxf3sBJwPzXhcP5F29hhYuVkV+ifWuAq0uDRaoAU+TzsQGp2yujjabHesU0oD0U2yDJSFrKG7dCcoJRn5gXl3egpOhz4b+C7qElH8Yn2V15tQ+DnIkeLnFIOjrnHgDe4jaVaokXvdwz43JVXAp/ZeaJAVZR8hbYWITYDt4Ln6SIc0VOzl VC910NbK x1kUuczJpqRZtAp59JhUeB8kpFNAJk8NIE/HrEtphQj9NyY0qjGPJJhxW7xj3ryChHRI0KGkz99QuaOsnxd523KY/Upx9LOj0VWezGS2dxddDVDnr3VzBtfQiTw7PmqGhACUUhfOmKY6/S8njvBcY1+/7Ek03311CVfK6laVAZpGD5+JVDyPzmlMVzaZnWnw+zoVK/XsgqVFM0lIA/gAMRwrW6t+IQjNV5iXE2lfSdTotzarVEuFywBkwUK3nqjwT5UscU8vJUd7H08iza4n/f5z1aAB25pAq359QA8ABIhBi5Q9/eq5AE9KX0IGUGwfZAzGF8uNWpC5yxWxTfUwdpp8nvhvePu9orcSH4s6nac7poEfuCOwbgHF4HHUxyoIu7pDt 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: There's no p4d huge page support yet, let's use the generic definition. And also update the BUILD_BUG_ON() in pti_user_pagetable_walk_pmd() because p4d_leaf() returns boolean value. Signed-off-by: Baoquan He --- arch/x86/include/asm/pgtable.h | 7 ------- arch/x86/mm/pti.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 5f4fcc0eea17..5ddba366d3b4 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -292,13 +292,6 @@ static inline unsigned long pgd_pfn(pgd_t pgd) return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT; } -#define p4d_leaf p4d_leaf -static inline bool p4d_leaf(p4d_t p4d) -{ - /* No 512 GiB pages yet */ - return 0; -} - #define pte_page(pte) pfn_to_page(pte_pfn(pte)) #define pmd_leaf pmd_leaf diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index c2e1de40136f..190299834011 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -206,7 +206,7 @@ static pmd_t *pti_user_pagetable_walk_pmd(unsigned long address) if (!p4d) return NULL; - BUILD_BUG_ON(p4d_leaf(*p4d) != 0); + BUILD_BUG_ON(p4d_leaf(*p4d)); if (p4d_none(*p4d)) { unsigned long new_pud_page = __get_free_page(gfp); if (WARN_ON_ONCE(!new_pud_page))