From: Paolo Bonzini <pbonzini@redhat•com>
To: Mark Brown <broonie@kernel•org>, Sean Christopherson <seanjc@google•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Peter Zijlstra <peterz@infradead•org>
Subject: Re: linux-next: manual merge of the kvm-x86 tree with the tip tree
Date: Tue, 30 Sep 2025 20:13:06 +0200 [thread overview]
Message-ID: <e8907aaf-ff55-4873-849c-91a844494cf7@redhat.com> (raw)
In-Reply-To: <aNEb7o3xrTDQ6JP4@finisterre.sirena.org.uk>
On 9/22/25 11:50, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-x86 tree got a conflict in:
>
> arch/x86/kvm/emulate.c
>
> between commit:
>
> 6204aea36b74c ("KVM: x86: Introduce EM_ASM_1")
>
> from the tip tree and commit:
>
> f8457615b71c6 ("KVM: x86: Don't emulate instructions affected by CET features")
>
> from the kvm-x86 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
This will soon become a conflict between kvm and tip.
Paolo
> diff --cc arch/x86/kvm/emulate.c
> index 796d0c64f9baf,5c5fb6a6f7f92..0000000000000
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@@ -4001,11 -4153,11 +4088,11 @@@ static const struct opcode group4[] =
> };
>
> static const struct opcode group5[] = {
> - F(DstMem | SrcNone | Lock, em_inc),
> - F(DstMem | SrcNone | Lock, em_dec),
> + I(DstMem | SrcNone | Lock, em_inc),
> + I(DstMem | SrcNone | Lock, em_dec),
> - I(SrcMem | NearBranch | IsBranch, em_call_near_abs),
> - I(SrcMemFAddr | ImplicitOps | IsBranch, em_call_far),
> + I(SrcMem | NearBranch | IsBranch | ShadowStack, em_call_near_abs),
> + I(SrcMemFAddr | ImplicitOps | IsBranch | ShadowStack, em_call_far),
> - I(SrcMem | NearBranch | IsBranch, em_jmp_abs),
> + I(SrcMem | NearBranch | IsBranch, em_jmp_abs),
> I(SrcMemFAddr | ImplicitOps | IsBranch, em_jmp_far),
> I(SrcMem | Stack | TwoMemOp, em_push), D(Undefined),
> };
> diff --cc arch/x86/include/asm/cpufeatures.h
> index b2a562217d3ff,8738bd783de22..0000000000000
> --- a/arch/x86/include/asm/cpufeatures.h
> +++ b/arch/x86/include/asm/cpufeatures.h
> @@@ -495,8 -496,7 +496,9 @@@
> #define X86_FEATURE_TSA_SQ_NO (21*32+11) /* AMD CPU not vulnerable to TSA-SQ */
> #define X86_FEATURE_TSA_L1_NO (21*32+12) /* AMD CPU not vulnerable to TSA-L1 */
> #define X86_FEATURE_CLEAR_CPU_BUF_VM (21*32+13) /* Clear CPU buffers using VERW before VMRUN */
> -#define X86_FEATURE_MSR_IMM (21*32+14) /* MSR immediate form instructions */
> +#define X86_FEATURE_IBPB_EXIT_TO_USER (21*32+14) /* Use IBPB on exit-to-userspace, see VMSCAPE bug */
> +#define X86_FEATURE_ABMC (21*32+15) /* Assignable Bandwidth Monitoring Counters */
> ++#define X86_FEATURE_MSR_IMM (21*32+16) /* MSR immediate form instructions */
>
> /*
> * BUG word(s)
> diff --cc arch/x86/include/asm/msr-index.h
> index 718a55d82fe45,717baeba6db3c..0000000000000
> --- a/arch/x86/include/asm/msr-index.h
> +++ b/arch/x86/include/asm/msr-index.h
> @@@ -315,14 -315,15 +315,16 @@@
> #define PERF_CAP_PT_IDX 16
>
> #define MSR_PEBS_LD_LAT_THRESHOLD 0x000003f6
> -
> + #define PERF_CAP_LBR_FMT 0x3f
> #define PERF_CAP_PEBS_TRAP BIT_ULL(6)
> #define PERF_CAP_ARCH_REG BIT_ULL(7)
> #define PERF_CAP_PEBS_FORMAT 0xf00
> + #define PERF_CAP_FW_WRITES BIT_ULL(13)
> #define PERF_CAP_PEBS_BASELINE BIT_ULL(14)
> +#define PERF_CAP_PEBS_TIMING_INFO BIT_ULL(17)
> #define PERF_CAP_PEBS_MASK (PERF_CAP_PEBS_TRAP | PERF_CAP_ARCH_REG | \
> - PERF_CAP_PEBS_FORMAT | PERF_CAP_PEBS_BASELINE)
> + PERF_CAP_PEBS_FORMAT | PERF_CAP_PEBS_BASELINE | \
> + PERF_CAP_PEBS_TIMING_INFO)
>
> #define MSR_IA32_RTIT_CTL 0x00000570
> #define RTIT_CTL_TRACEEN BIT(0)
> diff --cc arch/x86/kvm/emulate.c
> index 796d0c64f9baf,5c5fb6a6f7f92..0000000000000
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@@ -4001,11 -4153,11 +4088,11 @@@ static const struct opcode group4[] =
> };
>
> static const struct opcode group5[] = {
> F(DstMem | SrcNone | Lock, em_inc),
> F(DstMem | SrcNone | Lock, em_dec),
> - I(SrcMem | NearBranch | IsBranch, em_call_near_abs),
> - I(SrcMemFAddr | ImplicitOps | IsBranch, em_call_far),
> + I(SrcMem | NearBranch | IsBranch | ShadowStack, em_call_near_abs),
> + I(SrcMemFAddr | ImplicitOps | IsBranch | ShadowStack, em_call_far),
> - I(SrcMem | NearBranch | IsBranch, em_jmp_abs),
> + I(SrcMem | NearBranch | IsBranch, em_jmp_abs),
> I(SrcMemFAddr | ImplicitOps | IsBranch, em_jmp_far),
> I(SrcMem | Stack | TwoMemOp, em_push), D(Undefined),
> };
next prev parent reply other threads:[~2025-09-30 18:13 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-22 9:50 linux-next: manual merge of the kvm-x86 tree with the tip tree Mark Brown
2025-09-22 11:27 ` Aithal, Srikanth
2025-09-22 11:40 ` Mark Brown
2025-09-22 13:23 ` Mark Brown
2025-09-22 14:04 ` Sean Christopherson
2025-09-30 18:13 ` Paolo Bonzini [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-27 14:22 Mark Brown
2026-05-18 16:10 Mark Brown
2026-03-04 12:21 Mark Brown
2026-03-04 23:10 ` Sean Christopherson
2026-03-05 19:24 ` Nathan Chancellor
2026-03-06 13:24 ` Mark Brown
2026-03-06 22:48 ` Nathan Chancellor
2025-11-25 4:59 Stephen Rothwell
2025-11-25 7:09 ` Borislav Petkov
2025-12-04 5:10 ` Stephen Rothwell
2025-11-20 4:52 Stephen Rothwell
2025-11-20 4:46 Stephen Rothwell
2025-10-20 0:07 Stephen Rothwell
2025-09-19 13:50 Mark Brown
2025-01-06 4:05 Stephen Rothwell
2025-01-09 19:18 ` Sean Christopherson
2025-01-23 3:25 ` Stephen Rothwell
2024-02-07 4:35 Stephen Rothwell
2023-01-19 23:54 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e8907aaf-ff55-4873-849c-91a844494cf7@redhat.com \
--to=pbonzini@redhat$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=seanjc@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox