From patchwork Mon Mar 18 20:04:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13595769 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 23F48C54E69 for ; Mon, 18 Mar 2024 20:04:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCAB76B009A; Mon, 18 Mar 2024 16:04:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C2DEE6B009B; Mon, 18 Mar 2024 16:04:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A57346B009C; Mon, 18 Mar 2024 16:04:32 -0400 (EDT) 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 9216B6B009A for ; Mon, 18 Mar 2024 16:04:32 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 71985C09C0 for ; Mon, 18 Mar 2024 20:04:32 +0000 (UTC) X-FDA: 81911237184.30.9E7160B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 55FAB1C001F for ; Mon, 18 Mar 2024 20:04:30 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=B6o8mPGZ; spf=pass (imf20.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.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=1710792270; 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=JXDMCLhq+SpXi29RlzCNqEUhIAFpzfV1ImIXAFsvuS0=; b=Eo3ah1h3AfWQLxy00/QIfgL0452GidBfgL5mbR0C6bU3jC7Pusa0//8LXCWyLDgHtvz9Ne yRUvvax5YK9Qv49qh/6KYGPWerlDUKZ6Zc6lMiSxoXqCgf6QG0FmmwZJRtJ0VhKDzvuJh2 ooY1F0REa4tGU/DcIc+bJ3tZB/j4mVo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710792270; a=rsa-sha256; cv=none; b=8PrKXKJ6caqd3tKanQ92viHPgDaNi/r1cosCAk9WssCWQsnFZ5pQll+ttqvCgXDo3luIaJ JHDWqNp6POyXaeu6bF5fnJdU3+7y84Z06qKp++cIOL0TtLsIusHN5CQYPEMOKYW0rSISr4 cwUxP6BxdWgIBAlEZgnvgSj5zam+UKE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=B6o8mPGZ; spf=pass (imf20.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.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=1710792269; 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=JXDMCLhq+SpXi29RlzCNqEUhIAFpzfV1ImIXAFsvuS0=; b=B6o8mPGZAywSLNnVx1wf8uB8J2Qi0hm7+sL992HCsi3nMSIwlIUeHOWhN0YSA3kEe6TMOy GWeguzk/pUcFIcy3GpY/HCQ0Qrx480cTznfd7Qs63cXajGuZiHp0+leOpVwEFNchEFinke 0aYrB9bQSDalyEhMbmjuDRqM0VU3b8Q= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-9-_LNssHFlPHCPfwzXwaVaSg-1; Mon, 18 Mar 2024 16:04:27 -0400 X-MC-Unique: _LNssHFlPHCPfwzXwaVaSg-1 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-42f30752eb4so15657051cf.1 for ; Mon, 18 Mar 2024 13:04:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710792266; x=1711397066; 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=JXDMCLhq+SpXi29RlzCNqEUhIAFpzfV1ImIXAFsvuS0=; b=EiDr9gYwE27uhsIGaYg8lO5qbuy6s65Dz96oU5s3MJ61IGY1laRHB58X/niHyR7CGN 99NHINFEOsSPmiFveaH640EhiKquBS8awktWM2zxPuac1X/DU+wj1DjwwIEbGIUt8q79 bhps8biaIj0EvVWVwsdtHlHWxhSEDWL2IQj7WdAQuULzSxyyD0fnPAhAhh8gBQNKt+L1 DxoeOVY+FyIorxTaBhSqGhN66jMKrBnxBDzFPk0iqlYRsNHeCHY0xb4ciUQx5NXAWsJZ rJeVK6RHKYOXLiIWZcX/Z0yCMoMfjnUvfpHnaNskd5wwSLpf2ll0XdCub5UckTJqxq8o MuGA== X-Forwarded-Encrypted: i=1; AJvYcCWJHLSzQZ2EJh0BKRVM2ir4QCKCaFmsyvFShlEOVG4vVDDeVTXGsEnnd42HYZJq/8dL/s72bdDkUrpG0xlDECNYJKM= X-Gm-Message-State: AOJu0YwmEo7PV4vlZlJebfcPDpkNmbt4WRb1aHljCgPyLzR4MkB8fPvq hptrlsV7Ca2WD5uukCgjzoE5vwCjnwCOW++KggWU1WZa+XbkRKpvGTnSSW9Mqsv21JTBDgWVxqN JnwTmRDJlQv2D2XAz0f6YRutcrM9t6G6iiEnaZ1DjfN3G8pz7 X-Received: by 2002:ac8:5f91:0:b0:430:c2dc:a5ef with SMTP id j17-20020ac85f91000000b00430c2dca5efmr447851qta.2.1710792266526; Mon, 18 Mar 2024 13:04:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBYHTFmkqNiU+ToXou6wXh4FVDhWI9gJPxxfj+3GqwNDwAz7q/kbYXHDobvjaQIuNomZFyOQ== X-Received: by 2002:ac8:5f91:0:b0:430:c2dc:a5ef with SMTP id j17-20020ac85f91000000b00430c2dca5efmr447812qta.2.1710792266091; Mon, 18 Mar 2024 13:04:26 -0700 (PDT) Received: from x1n.. ([99.254.121.117]) by smtp.gmail.com with ESMTPSA id hj10-20020a05622a620a00b0042ebbc1196fsm3484491qtb.87.2024.03.18.13.04.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 13:04:25 -0700 (PDT) From: peterx@redhat.com To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , x86@kernel.org, Muchun Song , Mike Rapoport , Matthew Wilcox , sparclinux@vger.kernel.org, Jason Gunthorpe , linuxppc-dev@lists.ozlabs.org, Christophe Leroy , linux-arm-kernel@lists.infradead.org, peterx@redhat.com, Mark Salter , Catalin Marinas , Will Deacon , Russell King , Shawn Guo , Krzysztof Kozlowski , Bjorn Andersson , Arnd Bergmann , Konrad Dybcio , Fabio Estevam Subject: [PATCH v2 13/14] mm/arm: Remove pmd_thp_or_huge() Date: Mon, 18 Mar 2024 16:04:03 -0400 Message-ID: <20240318200404.448346-14-peterx@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318200404.448346-1-peterx@redhat.com> References: <20240318200404.448346-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Stat-Signature: n3f35htrcopm8gki7wbpo83zsqrg7zu4 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 55FAB1C001F X-Rspam-User: X-HE-Tag: 1710792270-956082 X-HE-Meta: U2FsdGVkX1/vp+ppWwg6M+bpC48kIVAq8MJ/PECJD7pCCEsrAfAHsyLc/c1BNSzzzVZPbVFUho+OZCuApdLbEnTXiZtyptoUwe6NA3Wbwz5i2U0LQ7bKBKuwLiW35sRztizalvsUAWMxlV1/VUvSQZ3N5nS3COFfdPRDjloMv5GaGmLkDDOIJ5niBLr8f8rftgKRDGojWlIGMOEKa0njDieyhI5iv+3bS0zG0KWwueOEmScrffBDtx0sDfhBDnZQmEuOf2JBv9AZ76deLE+qfWkj/JulYiYEBrSSD6cO/slk9IqNsWMUVSy7e+4A5+/OQxCWAhF7TKHBsirqPbkOzuVXOXpRO+gph7s+2kE+bEfpg7zjSiOd/7rgFYDh0p+P9l8TRSByZOgvQSsWq7FKhWedL8uLTrVSXgEJfQJXpWjkxz/o8+9vXIyMyhJ2XcBs48q2jVfbf6P4mocOXXf88/N+0FSkR+4SG4TzFumXASoisAKhGyFN4yUwd5yUrWc9djmFiBjXsfAMFuPk+WXSEsGDoWi/TTnj19/GtU9pR1hur1iGTomHmTM0u5ykS3Li5978lJ3VDuzphO8vrrHClQi8XLTfjC8j7YE1GG+45JG011Umx5PcDBhM6B7x/LSjwt0wC6FP87hV3WqJkbBvcyDTImdzh90nPBMmdwKxufaxexV9T4zneurLrslwakMQHq+QTQ77L2T8oOQ6U3Xvsc/URirSGLqJGfBjt+lldQ/oAhLZPMsSfls/P4zny20tJpvqE8hTAPbQgJaTpffkMqlk8PONOpQ5+mJYUmOfD6lqkfV/hRemS6yEdtMIESsiWdFBu6HQNPtfansKmAUg3psblsiB5YcHg6gDdBSyZLCByiMGiPxEUOvwXct50nh16cLjaDGnPWG/023cH2gkV7HEsPjQDKYRZHE3BW7tyBqfi4SagPcDLKVaHqK87O21JvyDvg+6QQpXDjLeecw FRy0FVj5 gtgiXabBUKedoxW8ikSrV+s5tbBEnF0XfJCGeGSJgt5C3omF4L8oxNJMZ1y7oycrsoSR1B68+qL71wji2eSGnYmvfr0Lu/b3+OuK6ng4mxO8GU/xPlPddd7qdHObydX6uCyDAvy4p9E1wpV82bpseX6J+fpmsUxGbILqEyQ832m0urCuAGP1s0da7lk/kun6xwLe7jXPCbrupbVsm8t8L7lySgY1PboGmKPsO0cS8a9i1tPP1Rcy7KCHxVdqJhl2/5B/IQIkCjK9hfaqd/6qwIxcOsPsh5+mqw92ztphluhS2Veddn9vrVQ5FinhSPDbW2Yp5jbIyo22JxkT7RIw6VJjZgIs2DCrEIEjfRbvAFsgWleDHlWaqY4jYSqF5eAxzjgcTslMe1odvuQw1lbtGiLjyp2YhuP1D238l/OyyFtOlhEIHztU2wBAvzaVjHvpg4bpiHBs8DpLVcZ0XF85TIs3EiMFxMK83n6KV2MPa20ZBVS0GEYK5bo+5wtMwklz/ElfLtNjtRdAWkcin1BJH6CUQSEEtLFVszT6BVXIiCOc+K+rdg7ZH08ITb4hFEa6y/MVv8ARNtIu6phJ4fckbHUPKZ9cH24P+UWGDlkqomPa+EkgIKNmgPSO4WI+hrMxBQLQlT1ouRSNVz9NzAsyKgNpAtw6vM6iLgXi8u79/u81YW2DHPOEum6dSqO1eih7axX5UD0bHcGFYTUEc9B+ozFRLLtfeGwSsxRB2 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 ARM/ARM64 used to define pmd_thp_or_huge(). Now this macro is completely redundant. Remove it and use pmd_leaf(). Cc: Mark Salter Cc: Catalin Marinas Cc: Will Deacon Cc: Russell King Cc: Shawn Guo Cc: Krzysztof Kozlowski Cc: Bjorn Andersson Cc: Arnd Bergmann Cc: Konrad Dybcio Cc: Fabio Estevam Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu --- arch/arm/include/asm/pgtable-2level.h | 1 - arch/arm/include/asm/pgtable-3level.h | 1 - arch/arm/lib/uaccess_with_memcpy.c | 4 ++-- arch/arm64/include/asm/pgtable.h | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index 4245c2e74720..6b5392e20f41 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -241,7 +241,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) * define empty stubs for use by pin_page_for_write. */ #define pmd_hugewillfault(pmd) (0) -#define pmd_thp_or_huge(pmd) (0) #endif /* __ASSEMBLY__ */ diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h index 9e3c44f0aea2..fa5939eb9864 100644 --- a/arch/arm/include/asm/pgtable-3level.h +++ b/arch/arm/include/asm/pgtable-3level.h @@ -190,7 +190,6 @@ static inline pte_t pte_mkspecial(pte_t pte) #define pmd_dirty(pmd) (pmd_isset((pmd), L_PMD_SECT_DIRTY)) #define pmd_hugewillfault(pmd) (!pmd_young(pmd) || !pmd_write(pmd)) -#define pmd_thp_or_huge(pmd) (pmd_leaf(pmd) || pmd_trans_huge(pmd)) #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define pmd_trans_huge(pmd) (pmd_val(pmd) && !pmd_table(pmd)) diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c index 2f6163f05e93..c0ac7796d775 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -56,10 +56,10 @@ pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp) * to see that it's still huge and whether or not we will * need to fault on write. */ - if (unlikely(pmd_thp_or_huge(*pmd))) { + if (unlikely(pmd_leaf(*pmd))) { ptl = ¤t->mm->page_table_lock; spin_lock(ptl); - if (unlikely(!pmd_thp_or_huge(*pmd) + if (unlikely(!pmd_leaf(*pmd) || pmd_hugewillfault(*pmd))) { spin_unlock(ptl); return 0; diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index c4efa47fed5f..a580068a6564 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -512,8 +512,6 @@ static inline pmd_t pmd_mkinvalid(pmd_t pmd) return pmd; } -#define pmd_thp_or_huge(pmd) (pmd_leaf(pmd) || pmd_trans_huge(pmd)) - #define pmd_write(pmd) pte_write(pmd_pte(pmd)) #define pmd_mkhuge(pmd) (__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))