From patchwork Sun Mar 30 12:17:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 14032905 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 3862BC28B20 for ; Sun, 30 Mar 2025 12:17:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17F19280008; Sun, 30 Mar 2025 08:17:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10875280004; Sun, 30 Mar 2025 08:17:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEADA280008; Sun, 30 Mar 2025 08:17:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CD638280004 for ; Sun, 30 Mar 2025 08:17:52 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F166AB9ED2 for ; Sun, 30 Mar 2025 12:17:52 +0000 (UTC) X-FDA: 83278118784.07.F1CB4BE Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 3C8E012000B for ; Sun, 30 Mar 2025 12:17:51 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bMoOmwn2; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743337071; a=rsa-sha256; cv=none; b=vAS0YFbeqpelQlUEz5jsN4k3NkfUesf0KYVDMTgALWerMa5anOV1P/bYX37B+aZM6DbR+l tKw4LdEilNSr0Qiqt+6GyBSPaZed94c9+he9QIpnuoABP1Q0TxU0Ltdc0Oo3h/PuFT06GU EGqeXOMK82yje4aXkbHqppExI6Q9/IA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=bMoOmwn2; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1743337071; 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=7ECEhQdPvPexYB/Ok4Vzz5g2XDSSP0HaL/jTvOM1baE=; b=n97Pw3Ps0/zIHXGhj5Qaae5N66TocLp1+qeWnLh4Drzt2xdtxc2O8X6vRxB3JF0k6RanoM Xvlvt7pKBSy6aFX3UXPweZDsl5gQOffiMGaAtMrZYTFFQksCvuFhH/NyYa03T0dDLgzYvD QufiA7KvPHZvmmg6cXsuBEocL6nSq3Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743337070; 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=7ECEhQdPvPexYB/Ok4Vzz5g2XDSSP0HaL/jTvOM1baE=; b=bMoOmwn2Qv/FS2WjhI/GNKZgrV7B4H4mWkIfMLGSVJnbzm4M8DR4VZdKYi5zd7FF5fVKmW SImsn5DWns+2HDUxNalIUAIpzgFueFCSAkxtarTK05skSgDtkIbUOThaBPw/+GEv7r8N2q 7GHTVyjoCIfa2t1UOgz4CZ8vQG3pki0= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-541-SWtT2QNYNkS5LbpE4fkmHA-1; Sun, 30 Mar 2025 08:17:46 -0400 X-MC-Unique: SWtT2QNYNkS5LbpE4fkmHA-1 X-Mimecast-MFC-AGG-ID: SWtT2QNYNkS5LbpE4fkmHA_1743337065 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A71F11809CA3; Sun, 30 Mar 2025 12:17:45 +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 0F745180094A; Sun, 30 Mar 2025 12:17:42 +0000 (UTC) From: Baoquan He To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baoquan He Subject: [PATCH 5/7] x86/mm: remove pgd_leaf definition in arch Date: Sun, 30 Mar 2025 20:17:15 +0800 Message-ID: <20250330121718.175815-6-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-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 3C8E012000B X-Stat-Signature: w11rerdjopqgnir95rk78xdy5chm9q1a X-HE-Tag: 1743337071-719473 X-HE-Meta: U2FsdGVkX1/805rNFMrQrWUOxYfmTgn4uxgQeumhi1c3y7d+8KK2bZEGUs173goh4k3J3atVl+oRv28YsAkTvT6JsWL4CkSHAvzMFu6beCGaMRRUtLDXI4ZmMRRUIwyS2uCRPl9FKTMyM+nh8Gg+l0CEecDUs0w725gQMZnG2OFimmpgZJs5MbmS8xZubEDpSyJJcwKAqFKmNbXkGd7M40eMiuE5OuHBcQ6ZpfrDuSY8Wa1Vgr4+R04yo6o0EwMPm0kNS38/krQF886OVV9uM32JY8tMSJUP0clzjfli5U7CnZAw1dpukwQNUuwKXJRBwKF9nyE9Gg7iO1LsNf7yzJa7eJ5ve423VVMKmgkpd9wTJYTbNCRSwtfaFJnVGinB30cjY42PJOzWhG8Raw3zNOF7Tx6PfGqaREBOjrDt5bk2blNunqCnUxBYe0zOBHqTEph21XV/6eMJqYvZ8SVZA4vPqgUEcE9U3YuefpntutAZgx9F9BrlRS5bgM7e7KgRFNMYr7KQOM2micjP2+30RLfRbs8uUczT99RZ5CZxVWcE4kZe7sanM1Q013POzx8C766LOJYpGiQOdKtq5AYQYXV3vXyTbbNT1mbEmGaQGtojKjfvmKQ/htziL4JEGsRfQWwa4RRKuxVDWN+fcpHcUBzEJEbmsLJWr0i+lF68mwptWzGXIVCT195anyfvU3K2xUMmUEgoe/T0wUo97TLzUig2ngEpDd7H0A0r7YYiubjtiitYr+0ATDIqZUe99mjhX3W62AP9viit5wOfbE8sT+abMqH7vijdn53RcLZ2sV15BB2HiKFajn8T/psmt9PHYPz80NaL/aF0scw/D8Ubd7kDYvsc/CaMBQwOICu6Hwi5l7rs62MOwIbJ7LWL4Ph9wh6ihwcWgGiqOCa7ie+BlCR7KZZhpM8qyr/y5ayIPMaECGP5D8MtZXvpmS6urT9hQmb9pq26n+29xdlQ28a F79rkERl T78eH3VO7nzXxRSmB6aMDFQ6mF32vG05o3UWJan49E2C1yJGwrnDVPKnG40l3x0yPvrtaft29JQlUPESehdIejpBFxjM7FDi/tAOvehDITb4RebFDSgbc+UIMIfUQDqF+zq+kD/yv0AHbhG+/aWbLe7QqW2yuyGuGBHK7QsBnQk0lFz4M0S3kIIwBCitbo7H9a1JB15nOwEPsN/U56itZN4SifhnPTuU+HuCAxBob8pQDqhaxWM0jugwWt9947sQjpe4ZDtRdjs+9NsU48fud/kyMilMSeTXpuyDC8Vy9h20MCFvVa6ZkwpEvDz/ngqX9DKZeZ06CFxTKGTg1nKsM6VcEHgqVRtBpTTV+oq5cUihEBHnRajpiZl66eYn61oll/Rqb 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: pgd huge page is not supported yet, let's use the generic definition in linux/pgtable.h. And also update the BUILD_BUG_ON() checking for pgd_leaf() in pti_user_pagetable_walk_p4d() because pgd_leaf() returns boolean value. Signed-off-by: Baoquan He --- arch/x86/include/asm/pgtable.h | 3 --- arch/x86/mm/pti.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 7bd6bd6df4a1..5f4fcc0eea17 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1472,9 +1472,6 @@ static inline bool pgdp_maps_userspace(void *__ptr) return (((ptr & ~PAGE_MASK) / sizeof(pgd_t)) < PGD_KERNEL_START); } -#define pgd_leaf pgd_leaf -static inline bool pgd_leaf(pgd_t pgd) { return false; } - #ifdef CONFIG_MITIGATION_PAGE_TABLE_ISOLATION /* * All top-level MITIGATION_PAGE_TABLE_ISOLATION page tables are order-1 pages diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index 5f0d579932c6..c2e1de40136f 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -185,7 +185,7 @@ static p4d_t *pti_user_pagetable_walk_p4d(unsigned long address) set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(new_p4d_page))); } - BUILD_BUG_ON(pgd_leaf(*pgd) != 0); + BUILD_BUG_ON(pgd_leaf(*pgd)); return p4d_offset(pgd, address); }