|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [XEN PATCH 3/3] automation: Update ECLAIR analysis configuration
On Fri, 14 Feb 2025, Nicola Vetrini wrote:
> The Xen configurations for the ARM64 and X86_64 ECLAIR analyses
> is currently held in fixed files under
> 'automation/eclair_analysis/xen_{arm,x86}_config'. The values
> of the configuration options there are susceptible to going stale
> due to configuration option changes.
>
> To enhance maintainability, the configuration under analysis is
> derived from the respective architecture's defconfig, with suitable
> changes added via EXTRA_XEN_CONFIG.
>
> Signed-off-by: Nicola Vetrini <nicola.vetrini@xxxxxxxxxxx>
Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> ---
> This patch should be applied on top of the other two in the series to
> ensure that the CI has no failures related to clean guidelines.
>
> Note that any out of date values taken by configuration options
> currently in xen_*_config were determined to be benign with respect to
> the analysis results, but this wasn't the right approach in the long
> term.
> ---
> automation/eclair_analysis/prepare.sh | 8 +-
> automation/eclair_analysis/xen_arm_config | 141 ---------------------
> automation/eclair_analysis/xen_x86_config | 143 ----------------------
> automation/gitlab-ci/analyze.yaml | 68 ++++++++++
> 4 files changed, 73 insertions(+), 287 deletions(-)
> delete mode 100644 automation/eclair_analysis/xen_arm_config
> delete mode 100644 automation/eclair_analysis/xen_x86_config
>
> diff --git a/automation/eclair_analysis/prepare.sh
> b/automation/eclair_analysis/prepare.sh
> index 3a646414a392..4285ff26de54 100755
> --- a/automation/eclair_analysis/prepare.sh
> +++ b/automation/eclair_analysis/prepare.sh
> @@ -25,18 +25,20 @@ fi
> export XEN_TARGET_ARCH
>
> if [ "$1" = "X86_64" ]; then
> - CONFIG_FILE="${script_dir}/xen_x86_config"
> XEN_TARGET_ARCH=x86_64
> elif [ "$1" = "ARM64" ]; then
> - CONFIG_FILE="${script_dir}/xen_arm_config"
> XEN_TARGET_ARCH=arm64
> else
> fatal "Unknown configuration: $1"
> fi
>
> (
> + make -C xen defconfig
> + if [[ -n "${EXTRA_XEN_CONFIG}" ]]; then
> + echo "${EXTRA_XEN_CONFIG}" >> xen/.config
> + fi
> +
> ./configure
> - cp "${CONFIG_FILE}" xen/.config
> make clean
> find . -type f -name "*.safparse" -print -delete
> "${script_dir}/build.sh" "$1"
> diff --git a/automation/eclair_analysis/xen_arm_config
> b/automation/eclair_analysis/xen_arm_config
> deleted file mode 100644
> index ef140ceb7383..000000000000
> --- a/automation/eclair_analysis/xen_arm_config
> +++ /dev/null
> @@ -1,141 +0,0 @@
> -CONFIG_CC_IS_GCC=y
> -CONFIG_GCC_VERSION=90400
> -CONFIG_CLANG_VERSION=0
> -CONFIG_LD_IS_GNU=y
> -CONFIG_CC_HAS_VISIBILITY_ATTRIBUTE=y
> -CONFIG_ARM_64=y
> -CONFIG_ARM=y
> -CONFIG_ARCH_DEFCONFIG="arch/arm/configs/arm64_defconfig"
> -
> -# UBSAN
> -CONFIG_UBSAN=n
> -
> -#
> -# Architecture Features
> -#
> -CONFIG_ARM64_SVE=n
> -CONFIG_64BIT=y
> -CONFIG_NR_CPUS=4
> -# CONFIG_ACPI is not set
> -CONFIG_ARM_EFI=y
> -CONFIG_GICV3=y
> -CONFIG_HAS_ITS=y
> -CONFIG_HVM=y
> -# CONFIG_NEW_VGIC is not set
> -CONFIG_SBSA_VUART_CONSOLE=y
> -CONFIG_ARM_SSBD=y
> -CONFIG_HARDEN_BRANCH_PREDICTOR=y
> -CONFIG_TEE=n
> -CONFIG_OPTEE=n
> -CONFIG_FFA=n
> -# CONFIG_STATIC_SHM is not set
> -# end of Architecture Features
> -
> -#
> -# ARM errata workaround via the alternative framework
> -#
> -CONFIG_ARM64_ERRATUM_827319=y
> -CONFIG_ARM64_ERRATUM_824069=y
> -CONFIG_ARM64_ERRATUM_819472=y
> -CONFIG_ARM64_ERRATUM_843419=y
> -CONFIG_ARM64_ERRATUM_832075=y
> -CONFIG_ARM64_ERRATUM_834220=y
> -CONFIG_ARM64_ERRATUM_1508412=y
> -CONFIG_ARM_ERRATUM_858921=y
> -CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
> -CONFIG_ARM64_ERRATUM_1286807=y
> -# end of ARM errata workaround via the alternative framework
> -
> -CONFIG_ARM64_HARDEN_BRANCH_PREDICTOR=y
> -# CONFIG_ALL_PLAT is not set
> -# CONFIG_QEMU is not set
> -# CONFIG_RCAR3 is not set
> -CONFIG_MPSOC=y
> -# CONFIG_NO_PLAT is not set
> -CONFIG_MPSOC_PLATFORM=y
> -
> -#
> -# Common Features
> -#
> -CONFIG_GRANT_TABLE=y
> -CONFIG_HAS_ALTERNATIVE=y
> -CONFIG_HAS_DEVICE_TREE=y
> -CONFIG_HAS_FAST_MULTIPLY=y
> -CONFIG_HAS_PDX=y
> -CONFIG_HAS_PMAP=y
> -# CONFIG_MEM_ACCESS is not set
> -CONFIG_STATIC_MEMORY=y
> -
> -#
> -# Speculative hardening
> -#
> -CONFIG_SPECULATIVE_HARDEN_ARRAY=y
> -# end of Speculative hardening
> -
> -# CONFIG_HYPFS is not set
> -CONFIG_IOREQ_SERVER=y
> -# CONFIG_EFI_SET_VIRTUAL_ADDRESS_MAP is not set
> -# CONFIG_XSM is not set
> -# CONFIG_ARGO is not set
> -
> -#
> -# Schedulers
> -#
> -# CONFIG_SCHED_CREDIT is not set
> -CONFIG_SCHED_CREDIT2=y
> -# CONFIG_SCHED_RTDS is not set
> -# CONFIG_SCHED_ARINC653 is not set
> -CONFIG_SCHED_NULL=y
> -CONFIG_SCHED_CREDIT2_DEFAULT=y
> -# CONFIG_SCHED_NULL_DEFAULT is not set
> -CONFIG_SCHED_DEFAULT="credit2"
> -# end of Schedulers
> -
> -CONFIG_BOOT_TIME_CPUPOOLS=y
> -# CONFIG_LIVEPATCH is not set
> -# CONFIG_ENFORCE_UNIQUE_SYMBOLS is not set
> -CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS=y
> -CONFIG_CMDLINE=""
> -CONFIG_DOM0_MEM=""
> -CONFIG_DTB_FILE=""
> -# CONFIG_TRACEBUFFER is not set
> -# end of Common Features
> -
> -#
> -# Device Drivers
> -#
> -# CONFIG_HAS_NS16550 is not set
> -CONFIG_HAS_CADENCE_UART=y
> -# CONFIG_HAS_IMX_LPUART is not set
> -# CONFIG_HAS_MVEBU is not set
> -# CONFIG_HAS_MESON is not set
> -CONFIG_HAS_PL011=y
> -# CONFIG_HAS_SCIF is not set
> -CONFIG_SERIAL_TX_BUFSIZE=16384
> -CONFIG_HAS_PASSTHROUGH=y
> -CONFIG_ARM_SMMU=y
> -CONFIG_ARM_SMMU_V3=y
> -# CONFIG_IPMMU_VMSA is not set
> -CONFIG_IOMMU_FORCE_PT_SHARE=y
> -# end of Device Drivers
> -
> -CONFIG_EXPERT=y
> -CONFIG_UNSUPPORTED=y
> -
> -#
> -# Debugging Options
> -#
> -CONFIG_DEBUG=y
> -CONFIG_FRAME_POINTER=y
> -CONFIG_COVERAGE=y
> -CONFIG_DEBUG_LOCK_PROFILE=y
> -CONFIG_DEBUG_LOCKS=y
> -CONFIG_PERF_COUNTERS=y
> -CONFIG_PERF_ARRAYS=y
> -CONFIG_VERBOSE_DEBUG=y
> -CONFIG_DEVICE_TREE_DEBUG=y
> -CONFIG_SCRUB_DEBUG=y
> -CONFIG_DEBUG_TRACE=y
> -CONFIG_XMEM_POOL_POISON=y
> -CONFIG_DEBUG_INFO=y
> -# end of Debugging Options
> diff --git a/automation/eclair_analysis/xen_x86_config
> b/automation/eclair_analysis/xen_x86_config
> deleted file mode 100644
> index abc44d43e108..000000000000
> --- a/automation/eclair_analysis/xen_x86_config
> +++ /dev/null
> @@ -1,143 +0,0 @@
> -CONFIG_CC_IS_GCC=y
> -CONFIG_GCC_VERSION=90400
> -CONFIG_CLANG_VERSION=0
> -CONFIG_LD_IS_GNU=y
> -CONFIG_CC_HAS_VISIBILITY_ATTRIBUTE=y
> -CONFIG_X86_64=y
> -CONFIG_X86=y
> -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
> -CONFIG_CC_HAS_INDIRECT_THUNK=y
> -CONFIG_HAS_AS_CET_SS=y
> -CONFIG_HAS_CC_CET_IBT=y
> -
> -CONFIG_REQUIRE_NX=n
> -
> -#
> -# Architecture Features
> -#
> -CONFIG_64BIT=y
> -CONFIG_NR_CPUS=16
> -CONFIG_NR_NUMA_NODES=2
> -# CONFIG_PV is not set
> -CONFIG_HVM=y
> -# CONFIG_XEN_SHSTK is not set
> -# CONFIG_XEN_IBT is not set
> -# CONFIG_SHADOW_PAGING is not set
> -# CONFIG_BIGMEM is not set
> -# CONFIG_HVM_FEP is not set
> -# CONFIG_TBOOT is not set
> -CONFIG_XEN_ALIGN_DEFAULT=y
> -# CONFIG_XEN_ALIGN_2M is not set
> -CONFIG_X2APIC_PHYSICAL=y
> -# CONFIG_XEN_GUEST is not set
> -# CONFIG_HYPERV_GUEST is not set
> -# CONFIG_MEM_PAGING is not set
> -# CONFIG_MEM_SHARING is not set
> -# end of Architecture Features
> -
> -#
> -# Common Features
> -#
> -CONFIG_COMPAT=y
> -CONFIG_CORE_PARKING=y
> -CONFIG_GRANT_TABLE=y
> -CONFIG_ALTERNATIVE_CALL=y
> -CONFIG_ARCH_MAP_DOMAIN_PAGE=y
> -CONFIG_GENERIC_BUG_FRAME=y
> -CONFIG_HAS_ALTERNATIVE=y
> -CONFIG_HAS_COMPAT=y
> -CONFIG_HAS_EX_TABLE=y
> -CONFIG_HAS_FAST_MULTIPLY=y
> -CONFIG_HAS_IOPORTS=y
> -CONFIG_HAS_KEXEC=y
> -CONFIG_HAS_PDX=y
> -CONFIG_HAS_SCHED_GRANULARITY=y
> -CONFIG_HAS_UBSAN=y
> -CONFIG_MEM_ACCESS_ALWAYS_ON=y
> -CONFIG_MEM_ACCESS=y
> -CONFIG_NEEDS_LIBELF=y
> -CONFIG_NUMA=y
> -
> -#
> -# Speculative hardening
> -#
> -CONFIG_INDIRECT_THUNK=y
> -CONFIG_SPECULATIVE_HARDEN_ARRAY=y
> -CONFIG_SPECULATIVE_HARDEN_BRANCH=y
> -# end of Speculative hardening
> -
> -# CONFIG_HYPFS is not set
> -CONFIG_IOREQ_SERVER=y
> -# CONFIG_KEXEC is not set
> -# CONFIG_EFI_SET_VIRTUAL_ADDRESS_MAP is not set
> -# CONFIG_XENOPROF is not set
> -# CONFIG_XSM is not set
> -# CONFIG_ARGO is not set
> -
> -#
> -# Schedulers
> -#
> -# CONFIG_SCHED_CREDIT is not set
> -CONFIG_SCHED_CREDIT2=y
> -# CONFIG_SCHED_RTDS is not set
> -# CONFIG_SCHED_ARINC653 is not set
> -CONFIG_SCHED_NULL=y
> -CONFIG_SCHED_CREDIT2_DEFAULT=y
> -# CONFIG_SCHED_NULL_DEFAULT is not set
> -CONFIG_SCHED_DEFAULT="credit2"
> -# end of Schedulers
> -
> -# CONFIG_LIVEPATCH is not set
> -# CONFIG_ENFORCE_UNIQUE_SYMBOLS is not set
> -# CONFIG_SUPPRESS_DUPLICATE_SYMBOL_WARNINGS is not set
> -CONFIG_CMDLINE=""
> -CONFIG_DOM0_MEM=""
> -# CONFIG_TRACEBUFFER is not set
> -# end of Common Features
> -
> -#
> -# Device Drivers
> -#
> -CONFIG_ACPI=y
> -CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
> -CONFIG_ACPI_NUMA=y
> -CONFIG_HAS_NS16550=y
> -CONFIG_HAS_EHCI=y
> -CONFIG_SERIAL_TX_BUFSIZE=16384
> -# CONFIG_XHCI is not set
> -CONFIG_HAS_CPUFREQ=y
> -CONFIG_HAS_PASSTHROUGH=y
> -CONFIG_AMD_IOMMU=y
> -# CONFIG_INTEL_IOMMU is not set
> -# CONFIG_IOMMU_QUARANTINE_NONE is not set
> -CONFIG_IOMMU_QUARANTINE_BASIC=y
> -# CONFIG_IOMMU_QUARANTINE_SCRATCH_PAGE is not set
> -CONFIG_HAS_PCI=y
> -CONFIG_HAS_PCI_MSI=y
> -CONFIG_VIDEO=y
> -CONFIG_VGA=y
> -CONFIG_HAS_VPCI=y
> -# end of Device Drivers
> -
> -CONFIG_EXPERT=y
> -CONFIG_UNSUPPORTED=y
> -CONFIG_ARCH_SUPPORTS_INT128=y
> -
> -#
> -# Debugging Options
> -#
> -CONFIG_DEBUG=y
> -# CONFIG_CRASH_DEBUG is not set
> -CONFIG_GDBSX=y
> -CONFIG_FRAME_POINTER=y
> -# CONFIG_COVERAGE is not set
> -# CONFIG_DEBUG_LOCK_PROFILE is not set
> -CONFIG_DEBUG_LOCKS=y
> -# CONFIG_PERF_COUNTERS is not set
> -CONFIG_VERBOSE_DEBUG=y
> -CONFIG_SCRUB_DEBUG=y
> -# CONFIG_UBSAN is not set
> -# CONFIG_DEBUG_TRACE is not set
> -CONFIG_XMEM_POOL_POISON=y
> -CONFIG_DEBUG_INFO=y
> -# end of Debugging Options
> diff --git a/automation/gitlab-ci/analyze.yaml
> b/automation/gitlab-ci/analyze.yaml
> index 02e0ea692c66..35ff3620cf8e 100644
> --- a/automation/gitlab-ci/analyze.yaml
> +++ b/automation/gitlab-ci/analyze.yaml
> @@ -40,6 +40,36 @@ eclair-x86_64:
> LOGFILE: "eclair-x86_64.log"
> VARIANT: "X86_64"
> RULESET: "monitored"
> + EXTRA_XEN_CONFIG: |
> + CONFIG_AMD=y
> + CONFIG_INTEL=n
> + CONFIG_AMD_SVM=y
> + CONFIG_INTEL_VMX=n
> + CONFIG_NR_CPUS=16
> + CONFIG_NR_NUMA_NODES=2
> + CONFIG_PV=n
> + CONFIG_XEN_IBT=n
> + CONFIG_XEN_SHSTK=n
> + CONFIG_SHADOW_PAGING=n
> + CONFIG_HVM_FEP=n
> + CONFIG_TBOOT=n
> + CONFIG_HYPFS=n
> + CONFIG_KEXEC=n
> + CONFIG_ARGO=y
> + CONFIG_SCHED_CREDIT=n
> + CONFIG_SCHED_RTDS=n
> + CONFIG_SCHED_ARINC653=n
> + CONFIG_LIVEPATCH=n
> + CONFIG_TRACEBUFFER=n
> + CONFIG_INTEL_IOMMU=n
> + CONFIG_EXPERT=y
> + CONFIG_DEBUG=y
> + CONFIG_GDBSX=n
> + CONFIG_FRAME_POINTER=n
> + CONFIG_SELF_TESTS=n
> + CONFIG_DEBUG_LOCKS=n
> + CONFIG_SCRUB_DEBUG=n
> + CONFIG_XMEM_POOL_POISON=n
>
> eclair-ARM64:
> extends: .eclair-analysis:triggered
> @@ -47,6 +77,44 @@ eclair-ARM64:
> LOGFILE: "eclair-ARM64.log"
> VARIANT: "ARM64"
> RULESET: "monitored"
> + EXTRA_XEN_CONFIG: |
> + CONFIG_NR_CPUS=16
> + CONFIG_GICV2=n
> + CONFIG_GICV3=y
> + CONFIG_VGICV2=n
> + CONFIG_HAS_ITS=y
> + CONFIG_HWDOM_VUART=n
> + CONFIG_STATIC_SHM=y
> + CONFIG_STATIC_EVTCHN=y
> + CONFIG_STATIC_MEMORY=y
> + CONFIG_SCMI_SMC=n
> + CONFIG_PARTIAL_EMULATION=n
> + CONFIG_HYPFS=n
> + CONFIG_IOREQ_SERVER=y
> + CONFIG_XSM=n
> + CONFIG_ARGO=y
> + CONFIG_SCHED_CREDIT=n
> + CONFIG_SCHED_RTDS=n
> + CONFIG_SCHED_ARINC653=n
> + CONFIG_BOOT_TIME_CPUPOOLS=y
> + CONFIG_TRACEBUFFER=n
> + CONFIG_HAS_CADENCE_UART=n
> + CONFIG_HAS_NS16550=n
> + CONFIG_HAS_IMX_LPUART=n
> + CONFIG_HAS_MVEBU=n
> + CONFIG_HAS_MESON=n
> + CONFIG_HAS_OMAP=n
> + CONFIG_HAS_SCIF=n
> + CONFIG_HAS_LINFLEX=n
> + CONFIG_ARM_SMMU=n
> + CONFIG_ARM_SMMU_V3=y
> + CONFIG_EXPERT=y
> + CONFIG_DEBUG=y
> + CONFIG_FRAME_POINTER=n
> + CONFIG_SELF_TESTS=n
> + CONFIG_DEBUG_LOCKS=n
> + CONFIG_SCRUB_DEBUG=n
> + CONFIG_XMEM_POOL_POISON=n
>
> .eclair-analysis:on-schedule:
> extends: .eclair-analysis
> --
> 2.43.0
>
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |