From patchwork Thu Mar 20 18:34:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 14024355 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 C8E84C28B30 for ; Thu, 20 Mar 2025 18:34:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 96CF9280005; Thu, 20 Mar 2025 14:34:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 91CCD280001; Thu, 20 Mar 2025 14:34:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E558280005; Thu, 20 Mar 2025 14:34:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 6571D280001 for ; Thu, 20 Mar 2025 14:34:14 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C4BBF81864 for ; Thu, 20 Mar 2025 18:34:14 +0000 (UTC) X-FDA: 83242779228.25.3EEE75E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 73D06140017 for ; Thu, 20 Mar 2025 18:34:12 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ehUciUUG; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf09.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=1742495652; 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: references:dkim-signature; bh=yXEpNUNvMJczWLH6F16nUPMt8SelM1hyuMq3p4nEu7Y=; b=M78UbuJZpZKpvg1xvjbdVKzVwR8EyrtmiB/csYheLSI4ucEy7WBEDED1bEDQIdSM3wkNfl ePJtVLkLW4o7mTVL9naT1H3m0cJ+iTuGt/EoJVsa4/npMhp3uroGQKJN85uZtQNQYyAs/t PmM364beArxykfI1LyEDArONlY5LZzw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=ehUciUUG; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf09.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=1742495652; a=rsa-sha256; cv=none; b=VvQhPCNjAo6iEHhW2f2xe2v/vQ/ubcOYlIQRou3LMGB1XkUNn+PnL1r6CXKfOFVVsxZEMU 8D/oaunRwej4rMlFuHcPNdGMMMU2mPyDka7dEfhWgdbWuzfBbJXN8m69ton7ph3HvKwik9 TWhnF4/vKBJh/qNdaHCIMqbXCG+5KoM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742495651; 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; bh=yXEpNUNvMJczWLH6F16nUPMt8SelM1hyuMq3p4nEu7Y=; b=ehUciUUGMGgYRKIVjXzljMz5BQwmr8cRQr29950UgJALjuOtRbXor8BJA3LpIS6pGg1Rwo MIYD4YIMIWW2Kx2SlAImqdkgjbIhb6nMLGGY1tLMDpUulQQX0Q5IHJJ/py5CIT5/moMWXy EkLM5YAK4GFpuUFFt9kefc7YS870iuI= Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-312-t_azOpp_MTy8GxWOO5HBGA-1; Thu, 20 Mar 2025 14:34:10 -0400 X-MC-Unique: t_azOpp_MTy8GxWOO5HBGA-1 X-Mimecast-MFC-AGG-ID: t_azOpp_MTy8GxWOO5HBGA_1742495649 Received: by mail-il1-f197.google.com with SMTP id e9e14a558f8ab-3d458e61faaso10511105ab.0 for ; Thu, 20 Mar 2025 11:34:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742495649; x=1743100449; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yXEpNUNvMJczWLH6F16nUPMt8SelM1hyuMq3p4nEu7Y=; b=uGm5nst5yPlUjz8zbTg8AF1LEWA9o77lPvJA0FgpCoCZ5u8JGRY9IB5WasiEwjlgh8 BtdrZNKR1YXNFHeOicCEOTgo/jbZOkAbAk+encPkyKsqKDeWn9H02NfOLToSkHQ9KZd7 MB3nbeKMJX2Qjbyyt9UTrBh9LF0xKZ8LnYkK9unyJDCcNwEzUpDo4LJJrSW0Zc5ajvAf yaAY4umSozeifEkmaNQZvvWKdgA3NvRKcQTQ3Mu8i1I13vUXObVriG1xn4JmNVzHhxKb MBFIsjK8Q/XwG24K92LbzauueXoVJ9HA2nssyrx40C9SmBZQMT3kI/Jg3Pw/vn1w6qSA G1Hw== X-Gm-Message-State: AOJu0YxWHuRdizJJa71BMAL+ciY2Fj6qSNYUIqfOoagv7Ben5J2oFlZf R46W7SG/KYJvyEho0w5pRMBo1LPsLrYmLT3Q3xMc5nVL/kgFhpzgTklMlj2yegQTuOoOMPpjGMK K7p7uUxnnJAY7JMHNsDGin9kyJv7JYK3kaqaostEqHpnPa/R8zRvWItc/qxtXAeRFklCqlzIJ5j 0Fr+4ocYkHnrJh/BJdoCBI4euEEnCkdQ== X-Gm-Gg: ASbGnctvRWdnnCCQXlhCdVGfqwUgCFwtzzZwEp9TTVOB0c0LaYQ1nTrDfDLMf1OaYmn CfQc5cLbPns3JUcz3jzuhokgMWU3wSrSC/yr0qcO4avX2vbiXJmQl2NuDKGI1Z8bE2HVQjjZYOa 2YRKIa3MM3mwBKFYAcHe5QNmiSFLecAn+TTbtmNMGI5YGoos4gLk1VmZgqziRVnxGjqRKmd+nzb 2F9EAJ9U5JxJAkdCcgk3BycNevQrl9cSWVTNKrUedXGLVWhkij1vhl7KM0vUT0odBhIgmeM7XC9 sVVr X-Received: by 2002:a05:6e02:1848:b0:3d4:2306:fbb6 with SMTP id e9e14a558f8ab-3d58e8f5525mr53116575ab.10.1742495649242; Thu, 20 Mar 2025 11:34:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHqjj87HxkKt58np7yqIa0Leoo/iM8T6oRSnV06QwiZuA50SJhDFlh9/vL8Yy51xEZPNgP+AA== X-Received: by 2002:a05:6e02:1848:b0:3d4:2306:fbb6 with SMTP id e9e14a558f8ab-3d58e8f5525mr53115925ab.10.1742495648712; Thu, 20 Mar 2025 11:34:08 -0700 (PDT) Received: from x1.com ([85.131.185.92]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f2cbdeb818sm44991173.65.2025.03.20.11.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Mar 2025 11:34:08 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton , peterx@redhat.com, Alex Williamson , Donald Dutile , Catalin Marinas , Will Deacon , Keith Busch Subject: [PATCH] mm/arm64: Drop dead code for pud special bit handling Date: Thu, 20 Mar 2025 14:34:05 -0400 Message-ID: <20250320183405.12659-1-peterx@redhat.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: gtbc_3v_sYkZYglniptte0uyRMftFPSr7BYDFpbF41Q_1742495649 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 73D06140017 X-Stat-Signature: 9nmbafmbtbghsr4itx49fqcx3yfkn5at X-Rspam-User: X-HE-Tag: 1742495652-700121 X-HE-Meta: U2FsdGVkX1+hbRDxk8Qn9Iq4Go4OpRNJYCWppGmpOlPRdVF5zjN6GnCN9044+8IkYGIGQi4oDTi/TTCtKFuE6tn95DRWRlmDV5eAu5WHnTxv8W3zZphLFCxfRoBxgjFwogWbCmEXvtyHffY2p4daBzVrf5IHYnyxoqn4mMIXdxr2FyZ8rF8KpltuB2R4Ubbxb/dkoxbupW8WEuw8jIEh57Ln7izZrjNF8tZteV01ouLOVkePFahU7age3uv3d/oXJ45xARHY2Tb0aoqIPQzJoDGb89E3knDkym5QJWQNIs1T0K8zhRQI9ly5qBV9gkhNcsVplnST+OD1mBaJs17CJlbu9JduRriF4fZg0s3IBxpD6x1C2GuQMJV23lNQQmo0CD6vxVVpCNKtIm28u94ucsGf596iMTpu1gEx+ZcyP8rS6kGFL7W0qeVblIU+IEIX8YgG0sugPs0c3jsXkPOVnwgQwhNC7ibJ93QQaviZUsK5Ld7yEO90HZe2ETtVoIoTsW7+roxu4SElgq9Ri5mx67gBhdTlkzQJYHTs1JCXbxeQJVG4Fm7O3LfjMQohp4mlqkpcTvK56wKv0HVZAmDzVUnK6amYVDyKN8bgAUb04N2jcAN+hEJ4nUawgxWBl8w2ExzQT7TJehgvU4tsL+5q+dvmb5gKA4knKYwqEfXtSG4LtgzdzX79u9juZEVI8I1cwrtq5+lBcyGy3kfKXgRz/OA24upSk2/mGABRyyEcWEqInERmOBy6Qi5FQ6J4BBKZ6RKbhNbp1EDZxOjaCKQywaFR3F9V3fDyJ9GWe4CvxD2qSNZyj7X2T20bdQwJX+2tBGBv9NjpFNp6PV6+YyeY0kdelyXj9BzKk5+rpsGuq9sH365uZ5OUuC8xJT4VB8nuc1jL6IqtgUVlZlT2hsB8NR6ZacBWwqYd/2kIrrV/BJR54KZQFgEkPhKtpFIQaQksRUG7Low0s5wZHZK/+kh x08Ki6XB ndAMCZHtoKQCTipubcDJvvRyp804H7lWSQy6t3V+nH+YioU2EFSU2vKGUYpIvS1QCf9VmyvDQNlohU4Wv95+8O2BoNk26W+/stJsCSAFeinZ7oN0vX6J2X2RHPfNNn+R6LjSRfTrFP3BmU3XLLmxg5k/41zDcmCpNLE9OYfVNo+vyi6Eumqcerrc2mQa7+OT0j0U6OxP0ZZVc1gQiNqx2dAClA9oKUvwoqpuL07JgcObCmWKHJ/YuVzPfyncfXUNww3PtRTJDzpN3xxtm+jJy38KfiH6bUbjamltzO8pDYcxLWpAeqBqT6uN5D+cfTONkZVSukgc6x8zDmBGbtpacuVSoC36YmmK+a9q4XeP5r3Resta/zkQaVXaRvRPK2NXMaZUjOcX4XGacuNwunVBCWrs2nT0QiwPUoj3/VQx2Tpls7iobzZtQLw2lXSFtjldWMXiJUrJLTfbbbOfnpn3rMHozfAtMAWp4gRJxg+mB1C0gAaw422IKtcsf+K28nNk8D4heg48NUUPuCcXmvmv19axRyRGq5QcnQiFU86HEA4x06V4LVdzYyxjY+EeHQ73UXDMknXp5hfsKu3Taui2/rinFMcUJHyttNYqX 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: Keith Busch observed some incorrect macros defined in arm64 code [1]. It turns out the two lines should never be needed and won't be exposed to anyone, because aarch64 doesn't select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD, hence ARCH_SUPPORTS_PUD_PFNMAP is always N. The only archs that support THP PUDs so far are x86 and powerpc. Instead of fixing the lines (with no way to test it..), remove the two lines that are in reality dead code, to avoid confusing readers. Fixes tag is attached to reflect where the wrong macros were introduced, but explicitly not copying stable, because there's no real issue to be fixed. So it's only about removing the dead code so far. [1] https://lore.kernel.org/all/Z9tDjOk-JdV_fCY4@kbusch-mbp.dhcp.thefacebook.com/#t Cc: Alex Williamson Cc: Donald Dutile Cc: Catalin Marinas Cc: Will Deacon Fixes: 3e509c9b03f9 ("mm/arm64: support large pfn mappings") Reported-by: Keith Busch Signed-off-by: Peter Xu Reviewed-by: Donald Dutile Reviewed-by: Anshuman Khandual --- arch/arm64/include/asm/pgtable.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 0b2a2ad1b9e8..15211f74b035 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -620,11 +620,6 @@ static inline pmd_t pmd_mkspecial(pmd_t pmd) #define pud_pfn(pud) ((__pud_to_phys(pud) & PUD_MASK) >> PAGE_SHIFT) #define pfn_pud(pfn,prot) __pud(__phys_to_pud_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)) -#ifdef CONFIG_ARCH_SUPPORTS_PUD_PFNMAP -#define pud_special(pte) pte_special(pud_pte(pud)) -#define pud_mkspecial(pte) pte_pud(pte_mkspecial(pud_pte(pud))) -#endif - #define pmd_pgprot pmd_pgprot static inline pgprot_t pmd_pgprot(pmd_t pmd) {