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 356F4C54E66 for ; Wed, 13 Mar 2024 21:47:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91C4780064; Wed, 13 Mar 2024 17:47:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8042280063; Wed, 13 Mar 2024 17:47:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E64680064; Wed, 13 Mar 2024 17:47:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 147A380063 for ; Wed, 13 Mar 2024 17:47:40 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B902C408AC for ; Wed, 13 Mar 2024 21:47:39 +0000 (UTC) X-FDA: 81893353038.12.F24C934 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id C201CC0015 for ; Wed, 13 Mar 2024 21:47:37 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TWnklvQD; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.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=1710366457; 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=xZurg04juSYF/uW9HtnhgkfMM1C/gArxmrpoVNEgvCQ=; b=6hQVDJZ75sEEog+7qaXM1CwIlPoJX0c5jwhGkex3tVxNcf6wq+IqXswXGFAaBeras6eppP rHSOPYKGmdB3jUcXPq8Qs/BPVrhBnjM0utOf7U7pgjF5Jbs2/HxLtu9oB1CgsL5rJMsN6e p4jqBwKtWoxfknAWT1+1K9TayqTLlIk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TWnklvQD; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710366457; a=rsa-sha256; cv=none; b=knSN+eOsNLW1NjWbrx2sDw/JCaaFxE3Jr4jKRrVB1hxNiVlQS4aCka2wLr9FyRGH85K5O8 sSwVn4PWhJdeiwcpgk2lriCKhbLuY+Hiyws93KLs9Rxv45sIftz36VQy3+lI85J47KoKbh 2ftwNwu7o2+HEjOdUWR8t5xZrdPAHrM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710366457; 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=xZurg04juSYF/uW9HtnhgkfMM1C/gArxmrpoVNEgvCQ=; b=TWnklvQD/ct2Gu2pX9ZGuHNdZyQH8QGNydaSgPBLKG/N+RQ/tdSn17Zvj6b2uJjUFQ5+ds mfl6EXHtAY2t3b7pFD2JTBr0bIXshKx2H/Nk+/dt3w9kpBoKqp5JqfBReBEXVYX/yrMF0W zgtLvf57RfPxW/Vt+xnakwoUZxmjA9Y= Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-V1YOXnAnOpOp9TuHuzwkKg-1; Wed, 13 Mar 2024 17:47:34 -0400 X-MC-Unique: V1YOXnAnOpOp9TuHuzwkKg-1 Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-474c751e9baso10166137.0 for ; Wed, 13 Mar 2024 14:47:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710366453; x=1710971253; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xZurg04juSYF/uW9HtnhgkfMM1C/gArxmrpoVNEgvCQ=; b=rPN4CTVH4WLjmKTfwgBhzlaXlKMT+P1Kh9BF/od3yjDDHjlz8mLCnhwCN0otEO1lQM AY+foJdvvhoLo90ysTEkyOssuRmBvhyJiNg73oAB2xmVl9H3xp9XRoVbtBztzReVX1IB ZS4rQlS6B2b8+2AssNz39Y+yo5Qma2KhmMpJAEW4mcBhVvssCe8qA/PwBwIOb0yd2hIY g3btnCqw3vtmpDu8dFGF+8HgOwJPlo2wm6JisqhS76dk/GCSfSiWKfMiivcSPX9tBmVy zIXK3VUSVGmF/bbPrnexJq77H2W4/re9dM34PnlOKtfe4DTkmDP7spjPkYzdnEFHr0kK gEBA== X-Forwarded-Encrypted: i=1; AJvYcCUNOvwzQW0ILYF5FGg2PcKtmmvlvo+BETlq0qV6p6PQLDzlVlNGNH1BMnTD6TO0GxxhrgHvPYQL6Ht1D6tYsCWRRzc= X-Gm-Message-State: AOJu0Yx6PKhqdxtY9F8jVn9XDjcqIPxcuzzeX7uvABWFezXe5JdhoAvL Fmz+9c+1WSWjIMZRDh7LZaoFPENLpPQP1FbAdYSKdcxiOcJIehVszRxgO+knj/hhJj0qUWbqbt5 wdgLsY21FW8YtfKKuFxadC+dxIUjp2BgFfv2VE8E1vg55+obq X-Received: by 2002:a05:6102:5492:b0:474:d28c:2ac5 with SMTP id bk18-20020a056102549200b00474d28c2ac5mr243701vsb.0.1710366453584; Wed, 13 Mar 2024 14:47:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHkTENrzWBEROMNgSFXQjsM78hPZrMM1UORfrrvjF9qoLUGsHb0Hjw+2mHy3NCjFs/y6Z4aCg== X-Received: by 2002:a05:6102:5492:b0:474:d28c:2ac5 with SMTP id bk18-20020a056102549200b00474d28c2ac5mr243694vsb.0.1710366453272; Wed, 13 Mar 2024 14:47:33 -0700 (PDT) Received: from x1n.redhat.com ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id dv10-20020ad44eea000000b0069111c5cdd4sm60114qvb.100.2024.03.13.14.47.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 14:47:32 -0700 (PDT) From: peterx@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org, Matthew Wilcox , linuxppc-dev@lists.ozlabs.org, Christophe Leroy , Andrew Morton , x86@kernel.org, peterx@redhat.com, Mike Rapoport , Muchun Song , sparclinux@vger.kernel.org, Jason Gunthorpe , Mark Salter , Catalin Marinas , Will Deacon Subject: [PATCH 08/13] mm/arm64: Merge pXd_huge() and pXd_leaf() definitions Date: Wed, 13 Mar 2024 17:47:14 -0400 Message-ID: <20240313214719.253873-9-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240313214719.253873-1-peterx@redhat.com> References: <20240313214719.253873-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: C201CC0015 X-Stat-Signature: wt6tp9ke4qbks795akmpdggieowxgtgj X-HE-Tag: 1710366457-205470 X-HE-Meta: U2FsdGVkX197L6Kx7YKZdFdHCMcmiM8zTbrVw7UC1rmxh7knfdURRrQobExyUYpQWDeYI+EeCdsUTxXx+yFO66PuCzsczVul7qzWU+9r+YzjkTBre0HRKNRXw0nddDftCfFWwjDPMp4j4XGKyoHRlAhw1DhDD732YQkr5tLDBX9f++9p4d6oE7qTLJ11wgxipyEhSAJRg8BRvTB5mG45relyWBWmfHj7jDOwbeJUDj4ZsXRUw6fnFx1hRfEIqb+3gfSZ7SPQBbmWJzBx703h1tKo0GZZ7VxbDD7g+RUXeJ31Xnk2FIU0odDyehlf+O8c70ycyxywiAjyDaxNqsZuomvTfPZc/woZdIXCXGEOEttmlMJogMjKxbaQj8QSDlabcpMp0DcF14R4BwFNrwTTEDNtlw7CO/vTEC/NjBNk8H1ItVs4LYLoBHG0/B0jIMQJAzkD6SMySFhH/NzgvjL3MZWjEkODNU45U74OwJnVaeidt2QbkukItNRmm2/x3IVkFCJRk81blEZOibbyST18Qu0XalwyALY41/UTV5hfcFBB/3a+Qo9dGsSfUmdlrAhPPlMxCFqQ10oD+TTgcbN7BNw90NroDtPoRRtrW4/hqswHzdhJZubEcCwC9koya8ys5c7VoVnAJET9jy0HpJkxYo5p2axVxtcWx1+w8UdsuybmvZ/rs+seNpyo/qtWmoPN/8VC2i7clZsPS+08m4ZLgaW3bQOp3LlbEvAj+Htm8Q9fp9MTRb1ylo/BL6jxqvokjCAwmtoV/Z5zVVnKrPjgQsPz2ChsIAimMWadgABd8pC0Et4Imj4J85qdbQgnxpCCXZxxy6edUcCb8eykpYrnu3aQY8MMApsBb1yrfoGMwRsHCu7H1tfT6l4nPWbmXR3F1FSkNQZ6DO5hln8XYfQ/j+feuIsPUsGhWJQpFCwF9IOWFT7Rde2qp7EqJqu4bgPBqAlg7JQ2vb2BPzguTNN DiH4wcXd spzsEh9j+BnnhDo+cipKw2AlF8PJH6Wux1T+wXP/IAfROxlfPVJmrR2HXlRsgTjUIycgQ5GTz1mP61K63LPNychTmFJsk5kOUTSVN+NJazID24uUrcY+DX5EcFJqy/bZjpeQN4lKZ66k51cM= 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, -- 2.44.0