From patchwork Wed Mar 6 10:41:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13583877 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 EF903C54E41 for ; Wed, 6 Mar 2024 10:42:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 864466B00A2; Wed, 6 Mar 2024 05:42:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7ED0D6B00A3; Wed, 6 Mar 2024 05:42:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68CD96B00A4; Wed, 6 Mar 2024 05:42:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 4A3AB6B00A2 for ; Wed, 6 Mar 2024 05:42:45 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1B4EEA0EA8 for ; Wed, 6 Mar 2024 10:42:45 +0000 (UTC) X-FDA: 81866275890.25.5E66D3E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 6539E4001B for ; Wed, 6 Mar 2024 10:42:42 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=R812D10y; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709721762; 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=dXyJDuJosTa0kFBnhKvW1aqbtapsaxz0OHU+bPr+fnc=; b=vCp7GDiS+e39a7BBwVAWpiYc9k4zVO36Ua768L7PMv7wxxO8WHq4RKJ0Z6C7JiVF8bf6N1 cF4F7saGm50a+XmKFLT877LBRFXzEiyThM1jk2tk4Xl0XYxLbdLegTp6oJ4zycOpR82k57 TphodOnH7o2V9YIIF86ZiLllcdoJPlY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=R812D10y; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf11.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709721762; a=rsa-sha256; cv=none; b=qJdeid+J2K2T0a9s3QyEXa2rz3T8jrEfcJ0lf/z4Ghre6/voEGiuBG+Bw0v0xJne2FgWHE A028ODXBfkbX4gy0og3X+WLnlM/ZHn1naQ5clAxeAj/VMPQnDBrQppPp1yrvRw8D4vdzFJ v0n7RPTrp6CZ5b9cXHlXAXF7leDrS8s= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709721760; h=from:from:reply-to:subject:subject: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=dXyJDuJosTa0kFBnhKvW1aqbtapsaxz0OHU+bPr+fnc=; b=R812D10ytOvKsfCtDnbpm/T6YR68+MBQ1r43EzdYjP+WBKUFNYthJ5Aqv3kowBtaqHFMo6 1IHZHQS3ku8Je8vAK36216oTx+1yqVfjFEjFI9zzRq5juMNkGVrZ2X/VrtrYPDBperyYx0 vcYHC5lB3Ok/pPWAJ2n+xzpdpAZK81g= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-204-DuM7_ICQNPWc0Qhye-aEuA-1; Wed, 06 Mar 2024 05:42:34 -0500 X-MC-Unique: DuM7_ICQNPWc0Qhye-aEuA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 068C21C05AED; Wed, 6 Mar 2024 10:42:34 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id D10DC111DCFF; Wed, 6 Mar 2024 10:42:26 +0000 (UTC) From: peterx@redhat.com To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org, Andrew Morton , Muchun Song , Jason Gunthorpe , peterx@redhat.com, Matthew Wilcox , Mike Rapoport , Christophe Leroy , x86@kernel.org, sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "David S . Miller" , Andreas Larsson Subject: [PATCH RFC 05/13] mm/sparc: Change pXd_huge() behavior to exclude swap entries Date: Wed, 6 Mar 2024 18:41:39 +0800 Message-ID: <20240306104147.193052-6-peterx@redhat.com> In-Reply-To: <20240306104147.193052-1-peterx@redhat.com> References: <20240306104147.193052-1-peterx@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 6539E4001B X-Stat-Signature: ameyx38zbjzrkx8fsa9qng5fu487c1ph X-HE-Tag: 1709721762-404115 X-HE-Meta: U2FsdGVkX18wL/kXmhte+9FamnSIvQZwaMjqF8MLloTD2fh0a+/XLEOooLr+f2izqUDdjEx8vEnce2T4+OY5rI2OgF5nB2kGKRg6eyNX4fvcloNAKtbzntBWyN8KSgYfC9h7xRmULEtlb9v1oautPwy3HNvV3dPnpEKVZO8GZNx/UP3dgGg0fBTMC/EOMDss2nsnCQPV16jnbS/L9xwAvf4glnE1RL8PkdXzFMe5u9/7WggOW1vrvvRdmTp02ZeT0Ywl57WT4jwPrTFQjrT3GZ8m2PJ19Fc8pf8WljokCNvNU2dJucBjulHRcKsW6EMDyb65JqktX5n7RmNbUP2wlMD6VEY2NePi1wq6GJTw1Eng3Q5GNNVYZB/cihfACk+cS+TeKyhE7ioB9+3mMA8vuItUoFJswqTsP/Xqxi2QbTwFJ79NU9w1B6SXeKEmBydxnDc/qMTezolAM83nShVxzdRsfjm/Kn1BetRvEx800+6UiNF4ddfdNpfeRTdycsCjTLzylXZgOQf7mSgOGHUx4um/lUBD+2Ju5f5Cl1PJ8TRsHn3TdyAn0625PV4oyHdt+dpXG/CV9dUnHMjG1r19K+Hs0Lln46hFpze189ulN2Q4hD3A6cM8PtZjGlKioBDJPaIoPRSKbKxGSUxmX11ZmxGuQjNQAy6VXXBTHRpW76x+fp6LT2ddScufc4qlA91APx9vHVdVDptyxGMGcDQm8iRaBT/2WciO6d6J8+QGT1vLO9jBpf1CsrwYnUes9Gfn2gA6Afi9VWJC38vXmtfQHgUX6ETrHe3GHJhoLwuRGLS7zEwvYheOIvFZM2V2ZvL2WIwMSb1BVbwhev/OXxP6SNG/MZ/6tfZULH8rg+GPp2pjEOb30v71mR9s5rCE2y6kxEZIRnfPwfq7VFvtp2vgA0EQuosoKl52e56QmRzXjd1/y8GwX8Pp2inJKs41kcACW6EC3p73dXoaeoeMhUY xZs+/NJz F7Y3JA6YniaAwu/r+p+c0PSwAeT0yEWeQe9zHDExNqk/cQgH3qAj19pnsVBaR1JB3aZMDro/jtCNq0mNyZNaeJ1jIkaDdRNi4594/h2q3qxkSODz11m9rOjC/Paizp5GBtiCqTf5XAZg1b6QVffpXjh7isXi2x4rOu/q83un3/0FctYZ6vmgKe3PiXd2pf4//WaPLbAHwgEAdDYQ9wkcufhyvTO29JCzQx495SqtbHLZNaVZoVEUMnxySYddwsECytkAuiNSZf9Q097Tir2bL8fygYrLvkEC2BEwA4fo/lJJNYsaeLnHodD0zFgaGFIZgxAXTF9Y9nNFImFFjIkepCXN4RUY5l59QNb+lWw/MXoqnlwe+hig+d2ZcHPFGT1tQ9WzWh3BEE8/AOQ8= 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: From: Peter Xu Please refer to the previous patch on the reasoning for x86. Now sparc is the only architecture that will allow swap entries to be reported as pXd_huge(). After this patch, all architectures should forbid swap entries in pXd_huge(). Cc: David S. Miller Cc: Andreas Larsson Cc: sparclinux@vger.kernel.org Signed-off-by: Peter Xu --- arch/sparc/mm/hugetlbpage.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c index b432500c13a5..d31c2cec35c9 100644 --- a/arch/sparc/mm/hugetlbpage.c +++ b/arch/sparc/mm/hugetlbpage.c @@ -409,14 +409,12 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, int pmd_huge(pmd_t pmd) { - return !pmd_none(pmd) && - (pmd_val(pmd) & (_PAGE_VALID|_PAGE_PMD_HUGE)) != _PAGE_VALID; + return pmd_leaf(pmd);; } int pud_huge(pud_t pud) { - return !pud_none(pud) && - (pud_val(pud) & (_PAGE_VALID|_PAGE_PUD_HUGE)) != _PAGE_VALID; + return pud_leaf(pud); } static void hugetlb_free_pte_range(struct mmu_gather *tlb, pmd_t *pmd,