Merge branch into tip/master: 'x86/merge'

Merge branch into tip/master: 'x86/merge'

 # New commits in x86/merge:
    502ad6e5a619 ("x86/msr: Change the function type of native_read_msr_safe()")
    444b46a128cc ("x86/msr: Replace wrmsr(msr, low, 0) with wrmsrq(msr, low)")
    0c2678efed6c ("x86/pvops/msr: Refactor pv_cpu_ops.write_msr{,_safe}()")
    2b7e25301c54 ("x86/xen/msr: Remove the error pointer argument from set_seg()")
    f7998621db69 ("x86/xen/msr: Remove pmu_msr_{read,write}()")
    0cb6f4128a7d ("x86/xen/msr: Remove calling native_{read,write}_msr{,_safe}() in pmu_msr_{read,write}()")
    3204877d05ca ("x86/msr: Convert __rdmsr() uses to native_rdmsrq() uses")
    ed56a309f7e1 ("x86/msr: Add the native_rdmsrq() helper")
    519be7da37b9 ("x86/msr: Convert __wrmsr() uses to native_wrmsr{,q}() uses")
    5afa4cf54518 ("x86/xen/msr: Return u64 consistently in Xen PMC xen_*_read functions")
    795ada52875f ("x86/msr: Convert the rdpmc() macro to an __always_inline function")
    7d9ccde56bc0 ("x86/msr: Rename rdpmcl() to rdpmc()")
    91882511ef90 ("x86/msr: Remove the unused rdpmc() method")
    288a4ff0ad29 ("x86/msr: Move rdtsc{,_ordered}() to <asm/tsc.h>")
    efef7f184f2e ("x86/msr: Add explicit includes of <asm/msr.h>")
    bdfda83a6b59 ("x86/msr: Move the EAX_EDX_*() methods from <asm/msr.h> to <asm/asm.h>")
    c9d8ea9d53d4 ("x86/msr: Rename DECLARE_ARGS() to EAX_EDX_DECLARE_ARGS")
    76deb5452e79 ("x86/msr: Improve the comments of the DECLARE_ARGS()/EAX_EDX_VAL()/EAX_EDX_RET() facility")
    1f4bb068b498 ("x86/bugs: Restructure SRSO mitigation")
    d43ba2dc8eee ("x86/bugs: Restructure L1TF mitigation")
    5ece59a2fca6 ("x86/bugs: Restructure SSB mitigation")
    480e803dacf8 ("x86/bugs: Restructure spectre_v2 mitigation")
    efe313827c98 ("x86/bugs: Restructure BHI mitigation")
    ddfca9430a61 ("x86/bugs: Restructure spectre_v2_user mitigation")
    e3b78a7ad5ea ("x86/bugs: Restructure retbleed mitigation")
    83d4b19331f3 ("x86/bugs: Allow retbleed=stuff only on Intel")
    46d5925b8eb8 ("x86/bugs: Restructure spectre_v1 mitigation")
    9dcad2fb31bd ("x86/bugs: Restructure GDS mitigation")
    2178ac58e176 ("x86/bugs: Restructure SRBDS mitigation")
    6f0960a760eb ("x86/bugs: Remove md_clear_*_mitigation()")
    203d81f8e167 ("x86/bugs: Restructure RFDS mitigation")
    4a5a04e61d7f ("x86/bugs: Restructure MMIO mitigation")
    bdd7fce7a816 ("x86/bugs: Restructure TAA mitigation")
    559c758bc722 ("x86/bugs: Restructure MDS mitigation")
    18ea89eae404 ("x86/sev: Share the sev_secrets_pa value again")
    121c335b36e0 ("x86/boot: Disable jump tables in PIC code")
    ff4c0560ab02 ("x86/asm: Retire RIP_REL_REF()")
    681e2901330c ("x86/boot: Drop RIP_REL_REF() uses from early SEV code")
    a3cbbb4717e1 ("x86/boot: Move SEV startup code into startup/")
    234cf67fc3bd ("x86/sev: Split off startup code from core code")
    b66fcee1574e ("x86/sev: Move noinstr NMI handling code into separate source file")
    092071e0f63c ("vmlinux.lds: Include .data.rel[.local] into .data section")
    0dcc51477b94 ("x86/boot: Remove semicolon from "rep" prefixes")
    eaa607deb29e ("x86/mm: Remove now unused SHARED_KERNEL_PMD")
    99b8f0c54f57 ("x86/mm: Remove duplicated PMD preallocation macro")
    454e65b4fb38 ("x86/mm: Preallocate all PAE page tables")
    82f120010f3b ("x86/mm: Fix up comments around PMD preallocation")
    45fb940563f8 ("x86/mm: Simplify PAE PGD sharing macros")
    eb9c7f00f22d ("x86/mm: Always tell core mm to sync kernel mappings")
    b0cc4d19f198 ("x86/mm: Always "broadcast" PMD setting operations")
    780f97e30930 ("x86/mm: Always allocate a whole page for PAE PGDs")
    4a3fd13054a9 ("perf/x86/intel: Introduce pairs of PEBS static calls")
    acb727e0956a ("perf/x86/intel: Rename x86_pmu.pebs to x86_pmu.ds_pebs")
    d971342d38bf ("perf/x86/intel: Decouple BTS initialization from PEBS initialization")
    25c623f41438 ("perf/x86/intel: Parse CPUID archPerfmonExt leaves for non-hybrid CPUs")
    48d66c89dce1 ("perf/x86/intel: Add PMU support for Clearwater Forest")
    b02b41c827de ("perf/core: Fix event timekeeping merge")
    162c9e3faf58 ("perf/core: Fix event->parent life-time issue")
    2839f393c694 ("perf/core: Fix put_ctx() ordering")
    f6938a562a62 ("perf/core: Fix perf-stat / read()")
    498cb872a111 ("x86/boot/startup: Disable LTO for the startup code")
    d9b79111fd99 ("x86/bugs: Rename mmio_stale_data_clear to cpu_buf_vm_clear")
    3aba0b40cacd ("x86/cpufeatures: Shorten X86_FEATURE_AMD_HETEROGENEOUS_CORES")
    13327fada7ff ("x86/cpufeatures: Shorten X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT")
    282cc5b67623 ("x86/cpufeatures: Clean up formatting")
    dd86a1d013e0 ("x86/bugs: Remove X86_BUG_MMIO_UNKNOWN")
    9fb6938d5534 ("x86/cpuid: Align macro linebreaks vertically")
    0a35c9280a91 ("x86/platform/amd: Move the <asm/amd_node.h> header to <asm/amd/node.h>")
    5bb144e52c66 ("x86/platform/amd: Clean up the <asm/amd/hsmp.h> header guards a bit")
    d96c78684166 ("x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h>")
    bcbb65559532 ("x86/platform/amd: Move the <asm/amd_nb.h> header to <asm/amd/nb.h>")
    861c6b1185fb ("x86/platform/amd: Add standard header guards to <asm/amd/ibs.h>")
    3846389c03a8 ("x86/platform/amd: Move the <asm/amd-ibs.h> header to <asm/amd/ibs.h>")
    e3a52b67f54a ("x86/fpu: Clarify FPU context cacheline alignment")
    8b2a7a7294b3 ("x86/fpu: Use 'fpstate' variable names consistently")
    22aafe3bcb67 ("x86/fpu: Remove init_task FPU state dependencies, add debugging warning for PF_KTHREAD tasks")
    c360bdc593b8 ("x86/fpu: Make sure x86_task_fpu() doesn't get called for PF_KTHREAD|PF_USER_WORKER tasks during exit")
    ec2227e03a46 ("x86/fpu: Push 'fpu' pointer calculation into the fpu__drop() call")
    55bc30f2e34d ("x86/fpu: Remove the thread::fpu pointer")
    cb7ca40a3882 ("x86/fpu: Make task_struct::thread constant size")
    e3bfa3859936 ("x86/fpu: Convert task_struct::thread.fpu accesses to use x86_task_fpu()")
    77fbccede633 ("x86/fpu: Introduce the x86_task_fpu() helper method")
    cbe8e4dab16c ("x86/fpu/xstate: Adjust xstate copying logic for user ABI")
    a758ae2885ea ("x86/fpu/xstate: Adjust XSAVE buffer size calculation")
    15d51a2f6f3f ("x86/fpu/xstate: Introduce xfeature order table and accessor macro")
    031b33ef1a6a ("x86/fpu/xstate: Remove xstate offset check")
    5c3627b6f059 ("perf/x86/intel/bts: Replace offsetof() with struct_size()")
    a5447e92e169 ("x86/msr: Add compatibility wrappers for rdmsrl()/wrmsrl()")
    221df25fdf82 ("x86/sev: Prepare for splitting off early SEV code")
    bee174b27e54 ("x86/boot: Drop RIP_REL_REF() uses from SME startup code")
    7ae089ee75f3 ("x86/boot: Move early SME init code into startup/")
    dafb26f4271b ("x86/boot: Drop RIP_REL_REF() uses from early mapping code")
    dbe0ad775cbb ("x86/boot: Move early kernel mapping code into startup/")
    4cecebf200ef ("x86/boot: Move the early GDT/IDT setup code into startup/")
    bcceba3c72c0 ("x86/asm: Make rip_rel_ptr() usable from fPIC code")
    62e565273993 ("x86/cacheinfo: Standardize header files and CPUID references")
    718f9038acc5 ("x86/cpuid: Remove obsolete CPUID(0x2) iteration macro")
    eef476f15c83 ("x86/msr: Rename 'wrmsrl_cstar()' to 'wrmsrq_cstar()'")
    7cbc2ba7c107 ("x86/msr: Rename 'native_wrmsrl()' to 'native_wrmsrq()'")
    604d15d15ebd ("x86/msr: Rename 'wrmsrl_amd_safe()' to 'wrmsrq_amd_safe()'")
    e2b8af0c6939 ("x86/msr: Rename 'rdmsrl_amd_safe()' to 'rdmsrq_amd_safe()'")
    8e44e83f57c3 ("x86/msr: Rename 'mce_wrmsrl()' to 'mce_wrmsrq()'")
    ebe29309c4d2 ("x86/msr: Rename 'mce_rdmsrl()' to 'mce_rdmsrq()'")
    c895ecdab2e4 ("x86/msr: Rename 'wrmsrl_on_cpu()' to 'wrmsrq_on_cpu()'")
    d7484babd2c4 ("x86/msr: Rename 'rdmsrl_on_cpu()' to 'rdmsrq_on_cpu()'")
    27a23a544a55 ("x86/msr: Rename 'wrmsrl_safe_on_cpu()' to 'wrmsrq_safe_on_cpu()'")
    5e404cb7ac4c ("x86/msr: Rename 'rdmsrl_safe_on_cpu()' to 'rdmsrq_safe_on_cpu()'")
    6fa17efe4544 ("x86/msr: Rename 'wrmsrl_safe()' to 'wrmsrq_safe()'")
    6fe22abacd40 ("x86/msr: Rename 'rdmsrl_safe()' to 'rdmsrq_safe()'")
    78255eb23973 ("x86/msr: Rename 'wrmsrl()' to 'wrmsrq()'")
    c435e608cf59 ("x86/msr: Rename 'rdmsrl()' to 'rdmsrq()'")
    d58c04cf1d70 ("x86/msr: Standardize on 'u32' MSR indices in <asm/msr.h>")
    d8f8aad698b8 ("x86/msr: Harmonize the prototype and definition of do_trace_rdpmc()")
    cd905826cbc8 ("x86/msr: Use u64 in rdmsrl_safe() and paravirt_read_pmc()")
    73bd1e01e98e ("x86/msr: Use u64 in rdmsrl_amd_safe() and wrmsrl_amd_safe()")
    f4138de5e41f ("x86/msr: Standardize on u64 in <asm/msr-index.h>")
    dfe2574ce87e ("x86/msr: Standardize on u64 in <asm/msr.h>")
    35c3151a98a6 ("x86/mm: Consolidate initmem_init()")
    60567e93c05d ("selftests/x86/lam: Fix clean up fds in do_uring() and allocate_dsa_pasid()")
    d02c83d75f9f ("x86/cacheinfo: Properly parse CPUID(0x80000006) L2/L3 associativity")
    d274cde0dbe0 ("x86/cacheinfo: Properly parse CPUID(0x80000005) L1d/L1i associativity")
    1734d98fbcce ("perf/arch: Record sample last_period before updating on the x86 and PowerPC platforms")
    3256a83335a4 ("perf/x86/intel/bts: Rename local bts_buffer variables for clarity")
    d9fa398fe827 ("x86/boot/startup: Disable objtool validation for library code")
    ec980e4facef ("perf/x86/intel: Support auto counter reload")
    1856c6c2f841 ("perf/x86/intel: Add CPUID enumeration for the auto counter reload")
    c9449c8506a5 ("perf: Extend the bit width of the arch-specific flag")
    0a6557938d8f ("perf/x86/intel: Track the num of events needs late setup")
    4dfe3232cc04 ("perf/x86: Add dynamic constraint")
    da916e96e2de ("perf: Make perf_pmu_unregister() useable")
    4da0600edae1 ("perf: Rename perf_event_exit_task(.child)")
    90661365021a ("perf: Unify perf_event_free_task() / perf_event_exit_task_context()")
    3e8671e00e57 ("perf: Simplify perf_event_release_kernel()")
    59f3aa4a3ee2 ("perf: Simplify perf_event_free_task() wait")
    0a00a43b8c20 ("perf: Simplify child event tear-down")
    7ed9138a7282 ("perf: Ensure bpf_perf_link path is properly serialized")
    4f2d1bbc2c92 ("x86/boot: Move the EFI mixed mode startup code back under arch/x86, into startup/")
    5a67da1f49cf ("x86/boot: Move the 5-level paging trampoline into /startup")
    5d4456fc88f7 ("x86/boot/compressed: Merge the local pgtable.h include into <asm/boot.h>")
    0ee07a079202 ("x86/boot: Use __ALIGN_KERNEL_MASK() instead of open coded analogue")
    e37aa1211fbf ("x86/cpuid: Add AMX and SPEC_CTRL dependencies")
    fc1cd60042b3 ("x86/idle: Use MONITOR and MWAIT mnemonics in <asm/mwait.h>")
    a17b37a3f416 ("x86/idle: Change arguments of mwait_idle_with_hints() to u32")
    2fb34b1566a3 ("x86/tlb: Simplify choose_new_asid() and generate better code")
    a72d55dc3bd6 ("x86/idle: Remove CONFIG_AS_TPAUSE")
    19c3dcd953bc ("x86/idle: Remove .s output beautifying delimiters from simpler asm() templates")
    1ae899e41310 ("x86/idle: Standardize argument types for MONITOR{,X} and MWAIT{,X} instruction wrappers on 'u32'")
    1f13c60d84e8 ("x86/idle: Remove MFENCEs for X86_BUG_CLFLUSH_MONITOR in mwait_idle_with_hints() and prefer_mwait_c1_over_halt()")
    1701771d3069 ("x86/mm: Stop prefetching current->mm->mmap_lock on page faults")
    2b00d9031e42 ("x86/mm: Simplify the pgd_leaf() and p4d_leaf() checks a bit")
    c083eff324ed ("x86/mm: Remove the arch-specific p4d_leaf() definition")
    b0510ac74e18 ("x86/mm: Remove the arch-specific pgd_leaf() definition")
    0dd09e215a39 ("x86/cacheinfo: Apply maintainer-tip coding style fixes")
    6c963c42fc19 ("x86/cacheinfo: Introduce cpuid_amd_hygon_has_l3_cache()")
    eeeebc4fc642 ("x86/cacheinfo: Relocate CPUID leaf 0x4 cache_type mapping")
    05d48035e5f6 ("x86/cacheinfo: Extract out cache self-snoop checks")
    fda5f817ae41 ("x86/cacheinfo: Extract out cache level topology ID calculation")
    66122616e212 ("x86/cacheinfo: Separate Intel CPUID leaf 0x4 handling")
    5adfd367589c ("x86/cacheinfo: Separate CPUID leaf 0x2 handling and post-processing logic")
    4772304ee651 ("x86/cpu: Use consolidated CPUID leaf 0x2 descriptor table")
    da23a6259844 ("x86/cacheinfo: Use consolidated CPUID leaf 0x2 descriptor table")
    37aedb806bc6 ("x86/cpu: Consolidate CPUID leaf 0x2 tables")
    543904cdfe1e ("x86/cpu: Use enums for TLB descriptor types")
    e1e6b5714655 ("x86/cacheinfo: Use enums for cache descriptor types")
    7596ab7a107b ("x86/cacheinfo: Clarify type markers for CPUID leaf 0x2 cache descriptors")
    eb1c7c08c5a8 ("x86/cacheinfo: Rename 'struct _cpuid4_info_regs' to 'struct _cpuid4_info'")
    2d56cc872250 ("x86/cacheinfo: Separate Intel and AMD CPUID leaf 0x4 code paths")
    071f4ad6494a ("x86/cacheinfo: Use sysfs_emit() for sysfs attributes show()")
    365e960d296e ("x86/cacheinfo: Move AMD cache_disable_0/1 handling to separate file")
    c58ed2d4da8d ("x86/cacheinfo: Separate amd_northbridge from _cpuid4_info_regs")
    77676e6802a1 ("x86/cacheinfo: Consolidate AMD/Hygon leaf 0x8000001d calls")
    1374ff60ed0d ("x86/cacheinfo: Standardize _cpuid4_info_regs instance naming")
    036a73b51744 ("x86/cacheinfo: Align ci_info_init() assignment expressions")
    7b83e0d2b20b ("x86/cacheinfo: Constify _cpuid4_info_regs instances")
    cf8758205264 ("x86/cacheinfo: Use proper name for cacheinfo instances")
    21e2a452dca3 ("x86/cacheinfo: Properly name amd_cpuid4()'s first parameter")
    ee159792a4db ("x86/cacheinfo: Refactor CPUID leaf 0x2 cache descriptor lookup")
    a078aaa38a23 ("x86/cacheinfo: Use CPUID leaf 0x2 parsing helpers")
    fe78079ec07f ("x86/cpu: Introduce and use CPUID leaf 0x2 parsing helpers")
    09a1da4beb31 ("x86/cacheinfo: Remove CPUID leaf 0x2 parsing loop")
    b5969494c8d8 ("x86/cpu: Remove CPUID leaf 0x2 parsing loop")
    0efb4dc3b084 ("MAINTAINERS: Include the entire kcpuid/ directory under the X86 CPUID DATABASE entry")
    300ba891418a ("tools/x86/kcpuid: Update bitfields to x86-cpuid-db v2.3")
    5e0c3c5e95f0 ("tools/x86/kcpuid: Update bitfields to x86-cpuid-db v2.2")
    f5e7fd685796 ("tools/x86/kcpuid: Update bitfields to x86-cpuid-db v2.1")
    e1dde2f5a4ef ("tools/x86/kcpuid: Update bitfields to x86-cpuid-db v2.0")
    87669e74d848 ("tools/x86/kcpuid: Define Transmeta and Centaur index ranges")
    72383c8274ed ("tools/x86/kcpuid: Filter valid CPUID ranges")
    74d29127f830 ("tools/x86/kcpuid: Consolidate index validity checks")
    f2e2efe9489d ("tools/x86/kcpuid: Extend CPUID index mask macro")
    3151ec059dd1 ("tools/x86/kcpuid: Refactor CPUID range handling for future expansion")
    c479a84488d1 ("tools/x86/kcpuid: Use <cpuid.h> intrinsics")
    0a8f12ccd2e6 ("tools/x86/kcpuid: Use C99-style for loops")
    8984cea5c474 ("tools/x86/kcpuid: Set parse_line() return type to void")
    2b383ca0896f ("tools/x86/kcpuid: Remove unused global variable")
    c061ded035b5 ("tools/x86/kcpuid: Remove unused local variable")
    ce61b6067d8c ("tools/x86/kcpuid: Print correct CPUID output register names")
    6bef74cab03a ("tools/x86/kcpuid: Save CPUID output in an array")
    660c29fe53de ("tools/x86/kcpuid: Simplify usage() handling")
    a866a6775793 ("tools/x86/kcpuid: Exit the program on invalid parameters")
    116edfe173d0 ("tools/x86/kcpuid: Fix error handling")

Signed-off-by: Ingo Molnar <mingo@kernel.org>