linux-kernel - linux-next: manual merge of the hyperv tree with the tip-fixes 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: <20250515181414.354d8ef7@canb.auug.org.au>
Date: Thu, 15 May 2025 18:14:14 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Wei Liu <wei.liu@...nel.org>, Thomas Gleixner <tglx@...utronix.de>, Ingo
 Molnar <mingo@...nel.org>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra
 <peterz@...radead.org>
Cc: Ashish Kalra <ashish.kalra@....com>, "Borislav Petkov (AMD)"
 <bp@...en8.de>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>, Roman Kisel
 <romank@...ux.microsoft.com>
Subject: linux-next: manual merge of the hyperv tree with the tip-fixes tree

Hi all,

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

  arch/x86/coco/sev/core.c

between commit:

  d2062cc1b1c3 ("x86/sev: Do not touch VMSA pages during SNP guest memory kdump")

from the tip-fixes tree and commit:

  266a5698a408 ("arch/x86: Provide the CPU number in the wakeup AP callback")

from the hyperv 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/x86/coco/sev/core.c
index fae73ae5a486,7780d55d1833..000000000000
--- a/arch/x86/coco/sev/core.c
+++ b/arch/x86/coco/sev/core.c
@@@ -869,12 -1166,26 +869,12 @@@ static void *snp_alloc_vmsa_page(int cp
  	return page_address(p + 1);
  }

- static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned long start_ip)
 -static void snp_cleanup_vmsa(struct sev_es_save_area *vmsa, int apic_id)
 -{
 -	int err;
 -
 -	err = snp_set_vmsa(vmsa, NULL, apic_id, false);
 -	if (err)
 -		pr_err("clear VMSA page failed (%u), leaking page\n", err);
 -	else
 -		free_page((unsigned long)vmsa);
 -}
 -
+ static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned long start_ip, unsigned int cpu)
  {
  	struct sev_es_save_area *cur_vmsa, *vmsa;
 -	struct ghcb_state state;
  	struct svsm_ca *caa;
 -	unsigned long flags;
 -	struct ghcb *ghcb;
  	u8 sipi_vector;
- 	int cpu, ret;
+ 	int ret;
  	u64 cr4;

  	/*

Content of type "application/pgp-signature" skipped