From patchwork Wed Mar 6 10:41:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13583880 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 52A1EC54E41 for ; Wed, 6 Mar 2024 10:43:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E2F9B6B0082; Wed, 6 Mar 2024 05:43:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE0266B0096; Wed, 6 Mar 2024 05:43:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA7B26B00A6; Wed, 6 Mar 2024 05:43:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B50C76B0082 for ; Wed, 6 Mar 2024 05:43:12 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 92746120459 for ; Wed, 6 Mar 2024 10:43:12 +0000 (UTC) X-FDA: 81866277024.06.F199E7C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf08.hostedemail.com (Postfix) with ESMTP id E40D3160019 for ; Wed, 6 Mar 2024 10:43:10 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CpTT+gFD; spf=pass (imf08.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709721790; 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=xZurg04juSYF/uW9HtnhgkfMM1C/gArxmrpoVNEgvCQ=; b=Ptg18d1t2liIpQ53NrBhPWuIxjvdQ8pNdxi8uiQ/MkscNI+wtzmXpH12rGwCETBc9k1oBH tWjKaAva1kKrKUvIKa6NaWNaEULLm+gkqbY9bdImoCH1xLpsjGIFtB5S99PFxybOaUbB0I Ri/IUcTQ5fIgApVqADbFQSUJIQouorc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709721790; a=rsa-sha256; cv=none; b=pHWvApi/DgornWSwLFcJFS1R27Hrm+mQKEHwHwf4n155xa8K5s1lEXrOsBX1rxQJIg7Ugx HlMRwf9LIlxauk8Q+Wpeu+YmX+oIKNyvW1BspLxk/8NtrvDhsEPo1PnAeYkFvor+yK0CV4 4WTF3oh1eYc3JeUQ3q6MGS2CDtoUFo0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CpTT+gFD; spf=pass (imf08.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709721789; 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=xZurg04juSYF/uW9HtnhgkfMM1C/gArxmrpoVNEgvCQ=; b=CpTT+gFDFHdZsNHw9svmtJhTBir+8SlkK0yrwilbVRhPQDrPDIS2h8ltBpW4IN9IM89Qjh EjqIKq7niYdTLdzKi7h1NtqcKJFB7raXNynj/aTjatjkKyXPu5EjPABdTQO6l+I27eiBkT qu0T4FsDSQZSjUDM7I2bvxdXb9qyCQ0= 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-392-yz4Oyb-YMiytY0-QZ4ib3A-1; Wed, 06 Mar 2024 05:43:02 -0500 X-MC-Unique: yz4Oyb-YMiytY0-QZ4ib3A-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 79C4B3C0DF76; Wed, 6 Mar 2024 10:43:01 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45DD5111DCFF; Wed, 6 Mar 2024 10:42:53 +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, Mark Salter , Catalin Marinas , Will Deacon Subject: [PATCH RFC 08/13] mm/arm64: Merge pXd_huge() and pXd_leaf() definitions Date: Wed, 6 Mar 2024 18:41:42 +0800 Message-ID: <20240306104147.193052-9-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-Stat-Signature: wf5usprfyjnpnrqx4symno14xg1crq8r X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: E40D3160019 X-Rspam-User: X-HE-Tag: 1709721790-985340 X-HE-Meta: U2FsdGVkX18XoS1TOepjLUbd1XZrqqryqUv2QgIgCYqwG9gl5CZE+gRcFRCzXW0a6Nsf0rybHNRKiNdDfcO0lOB65Day8XJZmtbRwlHQz9YxlHDrgi2aHPDX4JAppGo+zHoSqdFWxtKA16DZniR/t/OALWvsWtDDEqY0XY8TNjQgmVlAyeZLWzkzyUT+6zQzXcHKwmGg1Sm9IIrbB9oJ8nztbuqMr0+wds0Yn6Y/anpkQEXdObAsunXCJbCFyO5fQkmnQIYOQVEzZtyxLiLnVRfPJJFWVumpTk7GGuKcWFuz3BjNRxOiwOE//8mnA/shOXRM6A4ZtBb6D7DqrYOBtROv8zyGf3U77/QxutwXlT/0nhrOz1nzu4CGEuceEsTD8b4A5Dyp2J0wTEpE1BUrzhjjMsPNgI2dQia/0RFH7Y/USBwp2jzl9lBMUlXcHxbNGDD2B0GJkqj4ZngiVY2OIzgHm58bWcMGU3Dfmc1x6X+ZsQent5bXjug0Yfj9yAzWOUW29vENbsYwwaVSUMwd9MbOKgU96Y2IgKXYuzE1u4hKdO1m1g8lGL87xDlakP+JtwPxYr/j2I4sE5epfKmFPXJ93OUfkIfjEe38rGNJSlSWgdEUBARSRe0su0fn498AnmiYAn/4ZQILGNLqfVwtoeLuYood+QXgg4MXLw7j542OFWY5WW4qjtATAKVcColLsE+bN1n4u6D1nq3d3ke5af01HP2ZeYZM1S4Rxobgaa+IrX5yTBMlU/2TYCV1dPlrwXjvzZ2m0GC5CQXiqnsoaasXwLoDXd4Aup3a8mkOMvHSA4zQfFy6XDszH0hCRwc+CigAaIx66GfVVSzqdDf07Swr0GF9vnVUmgiWZWy5ilCd72ABsuH53j/KK2+qKiCxuSi8JyDK2Y8e4wIcw4J8ij8jRtzBBLow4mXISS6/dJeOYIgBeJw0sIt5BDIjnm7o4HqfbdFq6ke5DrLCqyz yXlukpIh kCR6a2h75GiZ9hL3yXuobO0qBkrY2rcRw5K1Ghr5D+Iu2rMgMNHyfL9HvhlGiKSvncPoXvmVCkMfqnCxqSfaEFBsfNMgFovbgJMsQrtRc6uj3WlR3Z4YeXKLGH8ap8imuPsd3VLBlwwy7gxUEsD1X66FQqtpTAzazVJg0/vZSGO1bnPJ4T9/uSHVezogiT+/ZMD1D634LyxbhCkhQuW8XbrEPWvhzhRArJjff/GXtXBqnqBk9BTDfVgzfYwbWM+ImUIAh2LhT4UGmBrZWOEQrOTTOeArH1VFvHU15EgLewaX+L3mGLFbCw/Q6i91+CcrQ1fo0d2L8/0tjVhg/u1WZV0QdtC7n2dd8cNMeKwmz85iSLFZcoUE5l8izUWPbwNkLgraseJX0TED4G1c= 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 Unlike most archs, aarch64 defines pXd_huge() and pXd_leaf() slightly differently. Redefine the pXd_huge() with pXd_leaf(). There used to be two traps for old aarch64 definitions over these APIs that I found when reading the code around, they're: (1) 4797ec2dc83a ("arm64: fix pud_huge() for 2-level pagetables") (2) 23bc8f69f0ec ("arm64: mm: fix p?d_leaf()") Define pXd_huge() with the current pXd_leaf() will make sure (2) isn't a problem (on PROT_NONE checks). To make sure it also works for (1), we move over the __PAGETABLE_PMD_FOLDED check to pud_leaf(), allowing it to constantly returning "false" for 2-level pgtables, which looks even safer to cover both now. Cc: Muchun Song Cc: Mark Salter Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu --- arch/arm64/include/asm/pgtable.h | 4 ++++ arch/arm64/mm/hugetlbpage.c | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 401087e8a43d..14d24c357c7a 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -704,7 +704,11 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) #define pud_none(pud) (!pud_val(pud)) #define pud_bad(pud) (!pud_table(pud)) #define pud_present(pud) pte_present(pud_pte(pud)) +#ifndef __PAGETABLE_PMD_FOLDED #define pud_leaf(pud) (pud_present(pud) && !pud_table(pud)) +#else +#define pud_leaf(pud) false +#endif #define pud_valid(pud) pte_valid(pud_pte(pud)) #define pud_user(pud) pte_user(pud_pte(pud)) #define pud_user_exec(pud) pte_user_exec(pud_pte(pud)) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 0f0e10bb0a95..1234bbaef5bf 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -81,16 +81,12 @@ bool arch_hugetlb_migration_supported(struct hstate *h) int pmd_huge(pmd_t pmd) { - return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT); + return pmd_leaf(pmd); } int pud_huge(pud_t pud) { -#ifndef __PAGETABLE_PMD_FOLDED - return pud_val(pud) && !(pud_val(pud) & PUD_TABLE_BIT); -#else - return 0; -#endif + return pud_leaf(pud); } static int find_num_contig(struct mm_struct *mm, unsigned long addr,