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 X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1F39C433EF for ; Tue, 21 Sep 2021 18:10:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7C71B61184 for ; Tue, 21 Sep 2021 18:10:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7C71B61184 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZXyV+ImZNgqLYSsllfEwYmNjD47XCZHrOUGMM8Tys78=; b=dK2jc1r15uipGl hYwM3Ps3+0TfUPIeBjIhdak2qYhU26X0wf5I15cwkTbDT4B6o4z1n6+vkpNDzs5O2IOiNvJfAyVwn E/WEGG+4cNAsQd820+18z1RWUYED1Vlj3emvWfCElSAg6Dn6WIqERMHfnLsyyvrGWqHK4ZNxhdnWW 0tmfFEjLhiGUCCwp+KnShyRXdFPUwV/fqVUjMHgafrXliZjAuRAVVGCpnk/CiUR29QiYWWhi0c8Eh 1YRFeYV4A2D+2+ir1Zt+RIfJoBM1qwuPk0baHslNVASrHgS6CdGYou8cvNdvpv1umu0TL0SX9FTJY FMdbnFEets26/+YckLmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mSkBv-005SD9-MB; Tue, 21 Sep 2021 18:08:27 +0000 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mSkBq-005SBV-CN for linux-arm-kernel@lists.infradead.org; Tue, 21 Sep 2021 18:08:24 +0000 Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 351B8402CE for ; Tue, 21 Sep 2021 18:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1632247698; bh=8Gus38wXqUPxQ+1U2uAwnnnnbcENO/mabgdypkSL7R0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=RyR1ltdqR/eUj/QooEqLvkBULx8yT1v5Xs5bkTgrT042108Tl3l3Bh2osJauso0ef fCJgfTFry9iDDvS4oOnVEQfIwcmisCJc4QEdT8u96RQS+hWT2M+fmn5z0z8dPMmLC3 M6Vt85eHFdq+hNOjPb//SaXcjvdRuKpEGj6XtijX7Qpd6m+sBCWhuy5Y8Q96GOM9TD ssLHypFbpSpE6r9AbZDQj3JZpWlPcuAeNhk9NHEX3VJVJGhZ6R/wne35DJ/Ms2/+Fm 9Os9u3g4trSpjR1IahdzxxkaPbqhRQnvTK0lh+2rFEArb+vv0lvDw9C3hqSGG+6KNZ 5VhfShEV4oexA== Received: by mail-io1-f71.google.com with SMTP id p71-20020a6b8d4a000000b005d323186f7cso44245981iod.17 for ; Tue, 21 Sep 2021 11:08:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=8Gus38wXqUPxQ+1U2uAwnnnnbcENO/mabgdypkSL7R0=; b=bm/aUY/ExXy6tAIqEnnSyboykzyvx8ff1tG4rYJPbjeABJTN/NeDlErFx2pl96JQ03 jWnlnVcKEb/x8J+6dqsHSSfGEQej6LEJGhgtmNFiH2aaaB/JBrjjEHwEuFJtIbXfMykf KdBCEC6AHlgY7OZa5uu/yffPD9jSjJ0is2B10rZV+HIKnSqaU9Npn/X/d7+7fCyrU3jm d2bmOjzFmYQb8SOiLJ70jeZHKCq2js9yxeWF1wamIbBD1DF/l8CnOWk40Fk0B4r2niu+ 5hE461kytCgh37ZULT0ElTA9FkMfZ/T+oxL/OYCJJwEqra/EEIoQ4K88XTbgTpYD+EFY FdSg== X-Gm-Message-State: AOAM531SEpW/K7BsUC6SPkGyk/dDqwBfNB+ULmA/uhjULQVYh7HPgCE4 MKSnIZjsFhz/XOrmzyl6pvyhdmpCYUHdAkozYfBd/QDEPPqKLlY1bB+Zirg1VSg/+JsGsC7zh3m s6/6DaTx6o7NQjeoQ4GqDpbohEo0BlvI7Px8z2Xm7rmVBJqU8EB+R X-Received: by 2002:a92:d38b:: with SMTP id o11mr22631207ilo.310.1632247695644; Tue, 21 Sep 2021 11:08:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzziu4XA8gb0oeRn8JZuZN8AypYnB37pzo0v+uKEumwXOGJAfJhk4L6hBInlaEdeDvY6xGqg== X-Received: by 2002:a92:d38b:: with SMTP id o11mr22631181ilo.310.1632247695255; Tue, 21 Sep 2021 11:08:15 -0700 (PDT) Received: from xps13.dannf (c-71-56-235-36.hsd1.co.comcast.net. [71.56.235.36]) by smtp.gmail.com with ESMTPSA id l25sm10421179iob.41.2021.09.21.11.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:08:14 -0700 (PDT) Date: Tue, 21 Sep 2021 12:08:11 -0600 From: dann frazier To: Mark Brown Cc: Catalin Marinas , Will Deacon , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] arm64: Generate cpucaps.h Message-ID: References: <20210428121231.11219-1-broonie@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210428121231.11219-1-broonie@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210921_110822_615810_3C198F66 X-CRM114-Status: GOOD ( 36.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Apr 28, 2021 at 01:12:31PM +0100, Mark Brown wrote: > The arm64 code allocates an internal constant to every CPU feature it can > detect, distinct from the public hwcap numbers we use to expose some > features to userspace. Currently this is maintained manually which is an > irritating source of conflicts when working on new features, to avoid this > replace the header with a simple text file listing the names we've assigned > and sort it to minimise conflicts. Thanks for doing this Mark, speaking as someone who has had to backport a lot of these patches to a distro kernel :) > As part of doing this we also do the Kbuild hookup required to hook up > an arch tools directory and to generate header files in there. > > This will result in a renumbering and reordering of the existing constants, > since they are all internal only the values should not be important. The > reordering will impact the order in which some steps in enumeration handle > features but the algorithm is not intended to depend on this and I haven't > seen any issues when testing. Unfortunately I believe I've hit a regression[*] due to such an ordering dependency. UNMAP_KERNEL_AT_EL0 currently needs to be processed after WORKAROUND_CAVIUM_27456. ThunderX systems are incompatible with KPTI, so unmap_kernel_at_el0() bails if WORKAROUND_CAVIUM_27456 is set. Because of the sorting, WORKAROUND_CAVIUM_27456 will not yet have been considered when unmap_kernel_at_el0() checks for it, so the kernel tries to run w/ KPTI - and quickly falls over. I've verified that reordering cpucaps to move WORKAROUND_CAVIUM_27456 just above UNMAP_KERNEL_AT_EL0 restores the old behavior. I'm not sure of the right way to address this - perhaps unmap_kernel_at_el0() could check cavium_erratum_27456_cpus[] directly instead of keying on the ARM64_WORKAROUND_CAVIUM_27456 cap? -dann [*] https://bugs.launchpad.net/bugs/1942633 > Due to the UAO cpucap having been removed in > the past we end up with ARM64_NCAPS being 1 smaller than it was before. > > Signed-off-by: Mark Brown > --- > arch/arm64/Makefile | 3 ++ > arch/arm64/include/asm/Kbuild | 2 + > arch/arm64/include/asm/cpucaps.h | 74 -------------------------------- > arch/arm64/tools/Makefile | 22 ++++++++++ > arch/arm64/tools/cpucaps | 65 ++++++++++++++++++++++++++++ > arch/arm64/tools/gen-cpucaps.awk | 40 +++++++++++++++++ > 6 files changed, 132 insertions(+), 74 deletions(-) > delete mode 100644 arch/arm64/include/asm/cpucaps.h > create mode 100644 arch/arm64/tools/Makefile > create mode 100644 arch/arm64/tools/cpucaps > create mode 100755 arch/arm64/tools/gen-cpucaps.awk > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > index 7ef44478560d..b52481f0605d 100644 > --- a/arch/arm64/Makefile > +++ b/arch/arm64/Makefile > @@ -175,6 +175,9 @@ vdso_install: > $(if $(CONFIG_COMPAT_VDSO), \ > $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 $@) > > +archprepare: > + $(Q)$(MAKE) $(build)=arch/arm64/tools kapi > + > # We use MRPROPER_FILES and CLEAN_FILES now > archclean: > $(Q)$(MAKE) $(clean)=$(boot) > diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild > index 73aa25843f65..64202010b700 100644 > --- a/arch/arm64/include/asm/Kbuild > +++ b/arch/arm64/include/asm/Kbuild > @@ -4,3 +4,5 @@ generic-y += mcs_spinlock.h > generic-y += qrwlock.h > generic-y += qspinlock.h > generic-y += user.h > + > +generated-y += cpucaps.h > diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h > deleted file mode 100644 > index b0c5eda0498f..000000000000 > --- a/arch/arm64/include/asm/cpucaps.h > +++ /dev/null > @@ -1,74 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > -/* > - * arch/arm64/include/asm/cpucaps.h > - * > - * Copyright (C) 2016 ARM Ltd. > - */ > -#ifndef __ASM_CPUCAPS_H > -#define __ASM_CPUCAPS_H > - > -#define ARM64_WORKAROUND_CLEAN_CACHE 0 > -#define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE 1 > -#define ARM64_WORKAROUND_845719 2 > -#define ARM64_HAS_SYSREG_GIC_CPUIF 3 > -#define ARM64_HAS_PAN 4 > -#define ARM64_HAS_LSE_ATOMICS 5 > -#define ARM64_WORKAROUND_CAVIUM_23154 6 > -#define ARM64_WORKAROUND_834220 7 > -#define ARM64_HAS_NO_HW_PREFETCH 8 > -#define ARM64_HAS_VIRT_HOST_EXTN 11 > -#define ARM64_WORKAROUND_CAVIUM_27456 12 > -#define ARM64_HAS_32BIT_EL0 13 > -#define ARM64_SPECTRE_V3A 14 > -#define ARM64_HAS_CNP 15 > -#define ARM64_HAS_NO_FPSIMD 16 > -#define ARM64_WORKAROUND_REPEAT_TLBI 17 > -#define ARM64_WORKAROUND_QCOM_FALKOR_E1003 18 > -#define ARM64_WORKAROUND_858921 19 > -#define ARM64_WORKAROUND_CAVIUM_30115 20 > -#define ARM64_HAS_DCPOP 21 > -#define ARM64_SVE 22 > -#define ARM64_UNMAP_KERNEL_AT_EL0 23 > -#define ARM64_SPECTRE_V2 24 > -#define ARM64_HAS_RAS_EXTN 25 > -#define ARM64_WORKAROUND_843419 26 > -#define ARM64_HAS_CACHE_IDC 27 > -#define ARM64_HAS_CACHE_DIC 28 > -#define ARM64_HW_DBM 29 > -#define ARM64_SPECTRE_V4 30 > -#define ARM64_MISMATCHED_CACHE_TYPE 31 > -#define ARM64_HAS_STAGE2_FWB 32 > -#define ARM64_HAS_CRC32 33 > -#define ARM64_SSBS 34 > -#define ARM64_WORKAROUND_1418040 35 > -#define ARM64_HAS_SB 36 > -#define ARM64_WORKAROUND_SPECULATIVE_AT 37 > -#define ARM64_HAS_ADDRESS_AUTH_ARCH 38 > -#define ARM64_HAS_ADDRESS_AUTH_IMP_DEF 39 > -#define ARM64_HAS_GENERIC_AUTH_ARCH 40 > -#define ARM64_HAS_GENERIC_AUTH_IMP_DEF 41 > -#define ARM64_HAS_IRQ_PRIO_MASKING 42 > -#define ARM64_HAS_DCPODP 43 > -#define ARM64_WORKAROUND_1463225 44 > -#define ARM64_WORKAROUND_CAVIUM_TX2_219_TVM 45 > -#define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM 46 > -#define ARM64_WORKAROUND_1542419 47 > -#define ARM64_HAS_E0PD 48 > -#define ARM64_HAS_RNG 49 > -#define ARM64_HAS_AMU_EXTN 50 > -#define ARM64_HAS_ADDRESS_AUTH 51 > -#define ARM64_HAS_GENERIC_AUTH 52 > -#define ARM64_HAS_32BIT_EL1 53 > -#define ARM64_BTI 54 > -#define ARM64_HAS_ARMv8_4_TTL 55 > -#define ARM64_HAS_TLB_RANGE 56 > -#define ARM64_MTE 57 > -#define ARM64_WORKAROUND_1508412 58 > -#define ARM64_HAS_LDAPR 59 > -#define ARM64_KVM_PROTECTED_MODE 60 > -#define ARM64_WORKAROUND_NVIDIA_CARMEL_CNP 61 > -#define ARM64_HAS_EPAN 62 > - > -#define ARM64_NCAPS 63 > - > -#endif /* __ASM_CPUCAPS_H */ > diff --git a/arch/arm64/tools/Makefile b/arch/arm64/tools/Makefile > new file mode 100644 > index 000000000000..932b4fe5c768 > --- /dev/null > +++ b/arch/arm64/tools/Makefile > @@ -0,0 +1,22 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +gen := arch/$(ARCH)/include/generated > +kapi := $(gen)/asm > + > +kapi-hdrs-y := $(kapi)/cpucaps.h > + > +targets += $(addprefix ../../../,$(gen-y) $(kapi-hdrs-y)) > + > +PHONY += kapi > + > +kapi: $(kapi-hdrs-y) $(gen-y) > + > +# Create output directory if not already present > +_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') > + > +quiet_cmd_gen_cpucaps = GEN $@ > + cmd_gen_cpucaps = mkdir -p $(dir $@) && \ > + $(AWK) -f $(filter-out $(PHONY),$^) > $@ > + > +$(kapi)/cpucaps.h: $(src)/gen-cpucaps.awk $(src)/cpucaps FORCE > + $(call if_changed,gen_cpucaps) > diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps > new file mode 100644 > index 000000000000..21fbdda7086e > --- /dev/null > +++ b/arch/arm64/tools/cpucaps > @@ -0,0 +1,65 @@ > +# SPDX-License-Identifier: GPL-2.0 > +# > +# Internal CPU capabilities constants, keep this list sorted > + > +BTI > +HAS_32BIT_EL0 > +HAS_32BIT_EL1 > +HAS_ADDRESS_AUTH > +HAS_ADDRESS_AUTH_ARCH > +HAS_ADDRESS_AUTH_IMP_DEF > +HAS_AMU_EXTN > +HAS_ARMv8_4_TTL > +HAS_CACHE_DIC > +HAS_CACHE_IDC > +HAS_CNP > +HAS_CRC32 > +HAS_DCPODP > +HAS_DCPOP > +HAS_E0PD > +HAS_EPAN > +HAS_GENERIC_AUTH > +HAS_GENERIC_AUTH_ARCH > +HAS_GENERIC_AUTH_IMP_DEF > +HAS_IRQ_PRIO_MASKING > +HAS_LDAPR > +HAS_LSE_ATOMICS > +HAS_NO_FPSIMD > +HAS_NO_HW_PREFETCH > +HAS_PAN > +HAS_RAS_EXTN > +HAS_RNG > +HAS_SB > +HAS_STAGE2_FWB > +HAS_SYSREG_GIC_CPUIF > +HAS_TLB_RANGE > +HAS_VIRT_HOST_EXTN > +HW_DBM > +KVM_PROTECTED_MODE > +MISMATCHED_CACHE_TYPE > +MTE > +SPECTRE_V2 > +SPECTRE_V3A > +SPECTRE_V4 > +SSBS > +SVE > +UNMAP_KERNEL_AT_EL0 > +WORKAROUND_834220 > +WORKAROUND_843419 > +WORKAROUND_845719 > +WORKAROUND_858921 > +WORKAROUND_1418040 > +WORKAROUND_1463225 > +WORKAROUND_1508412 > +WORKAROUND_1542419 > +WORKAROUND_CAVIUM_23154 > +WORKAROUND_CAVIUM_27456 > +WORKAROUND_CAVIUM_30115 > +WORKAROUND_CAVIUM_TX2_219_PRFM > +WORKAROUND_CAVIUM_TX2_219_TVM > +WORKAROUND_CLEAN_CACHE > +WORKAROUND_DEVICE_LOAD_ACQUIRE > +WORKAROUND_NVIDIA_CARMEL_CNP > +WORKAROUND_QCOM_FALKOR_E1003 > +WORKAROUND_REPEAT_TLBI > +WORKAROUND_SPECULATIVE_AT > diff --git a/arch/arm64/tools/gen-cpucaps.awk b/arch/arm64/tools/gen-cpucaps.awk > new file mode 100755 > index 000000000000..18737a1ce044 > --- /dev/null > +++ b/arch/arm64/tools/gen-cpucaps.awk > @@ -0,0 +1,40 @@ > +#!/bin/awk -f > +# SPDX-License-Identifier: GPL-2.0 > +# gen-cpucaps.awk: arm64 cpucaps header generator > +# > +# Usage: awk -f gen-cpucaps.awk cpucaps.txt > + > +# Log an error and terminate > +function fatal(msg) { > + print "Error at line " NR ": " msg > "/dev/stderr" > + exit 1 > +} > + > +# skip blank lines and comment lines > +/^$/ { next } > +/^#/ { next } > + > +BEGIN { > + print "#ifndef __ASM_CPUCAPS_H" > + print "#define __ASM_CPUCAPS_H" > + print "" > + print "/* Generated file - do not edit */" > + cap_num = 0 > + print "" > +} > + > +/^[vA-Z0-9_]+$/ { > + printf("#define ARM64_%-30s\t%d\n", $0, cap_num++) > + next > +} > + > +END { > + printf("#define ARM64_NCAPS\t\t\t\t%d\n", cap_num) > + print "" > + print "#endif" > +} > + > +# Any lines not handled by previous rules are unexpected > +{ > + fatal("unhandled statement") > +} _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel