linux-kernel - linux-next: manual merge of the kvm-arm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20251113113746.01737ec0@canb.auug.org.au>
Date: Thu, 13 Nov 2025 11:37:46 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christoffer Dall <cdall@...columbia.edu>, Marc Zyngier <maz@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Oliver Upton
 <oupton@...nel.org>, Sascha Bischoff <Sascha.Bischoff@....com>
Subject: linux-next: manual merge of the kvm-arm tree with Linus' tree

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in:

  arch/arm64/kvm/vgic/vgic-v3.c

between commit:

  da888524c393 ("KVM: arm64: vgic-v3: Trap all if no in-kernel irqchip")

from Linus' tree and commit:

  ca30799f7c2d ("KVM: arm64: Turn vgic-v3 errata traps into a patched-in constant")

from the kvm-arm 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/kvm/vgic/vgic-v3.c
index 2f75ef14d339,32654ea51418..000000000000
--- a/arch/arm64/kvm/vgic/vgic-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-v3.c
@@@ -301,21 -504,9 +504,10 @@@ void vcpu_set_ich_hcr(struct kvm_vcpu *
  		return;
  
  	/* Hide GICv3 sysreg if necessary */
 -	if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2)
 +	if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V2 ||
- 	    !irqchip_in_kernel(vcpu->kvm)) {
++	    !irqchip_in_kernel(vcpu->kvm))
  		vgic_v3->vgic_hcr |= (ICH_HCR_EL2_TALL0 | ICH_HCR_EL2_TALL1 |
  				      ICH_HCR_EL2_TC);
- 		return;
- 	}
- 
- 	if (group0_trap)
- 		vgic_v3->vgic_hcr |= ICH_HCR_EL2_TALL0;
- 	if (group1_trap)
- 		vgic_v3->vgic_hcr |= ICH_HCR_EL2_TALL1;
- 	if (common_trap)
- 		vgic_v3->vgic_hcr |= ICH_HCR_EL2_TC;
- 	if (dir_trap)
- 		vgic_v3->vgic_hcr |= ICH_HCR_EL2_TDIR;
  }
  
  int vgic_v3_lpi_sync_pending_status(struct kvm *kvm, struct vgic_irq *irq)

Content of type "application/pgp-signature" skipped