Unverified Commit 4d73d129 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12279 [OLK-6.6]HYGON: CSV3 patch series part 2 (Support launch, run, migrate CSV3 guest) 

Merge Pull Request from: @hanliyang 
 
CSV3 patch series part 2 (Support launch, run, migrate CSV3 guest)

issue:
https://gitee.com/open_euler/dashboard?issue_id=IAYGKY

We support launch, run, and migrate CSV3 guest by KVM. The user space VMM request KVM ioctl
interface to create, run, migrate a CSV3 guest. This patch series introduce command identifier
and KVM ioctl interface for CSV3 guest management.

For a CSV3 guest, the linux kernel must detect that the CSV3 feature is active in the guest. When
the page enc/dec status has changed in the CSV3 guest, it must notify PSP to record it by CSV3
secure call. This patch series add CSV3 detection support in the guest linux kernel, and add CSV3
secure call interface to support CSV3 guest to change page enc/dec status. 
 
Link:https://gitee.com/openeuler/kernel/pulls/12279

 

Reviewed-by: default avatarWenkuan Wang <wenkuan.wang@amd.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 95bc6947 2d76a6f0

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ ifdef CONFIG_X86_64 
	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/mem_encrypt.o

	vmlinux-objs-y += $(obj)/pgtable_64.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev.o

	vmlinux-objs-$(CONFIG_HYGON_CSV) += $(obj)/csv.o

endif



vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o

arch/x86/boot/compressed/csv.c

0 → 100644
+87 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Hygon CSV Support

 *

 * Copyright (C) Hygon Info Technologies Ltd.

 */



#include "misc.h"



#undef __init

#undef __initdata

#undef __pa

#define __init

#define __initdata

#define __pa(x)	((unsigned long)(x))



#include <asm/csv.h>

#include <asm/cpuid.h>



/* Include code for early secure calls */

#include "../../kernel/csv-shared.c"



static unsigned int csv3_enabled __section(".data");

static unsigned int csv3_secure_call_init;



void csv_update_page_attr(unsigned long address, pteval_t set, pteval_t clr)

{

	if (!csv3_enabled)

		return;



	if ((set | clr) & _PAGE_ENC) {

		if (set & _PAGE_ENC)

			csv3_early_secure_call_ident_map(__pa(address), 1,

							 CSV3_SECURE_CMD_ENC);



		if (clr & _PAGE_ENC)

			csv3_early_secure_call_ident_map(__pa(address), 1,

							 CSV3_SECURE_CMD_DEC);

	}

}



/* Invoke it before jump to real kernel in case secure call pages are not mapped

 * in the identity page table.

 *

 * If no #VC happens, there is no identity mapping in page table for secure call

 * pages. And page fault is not supported in the early stage when real kernel is

 * running. As a result, CSV3 guest will shutdown when access secure call pages

 * by then.

 */

void csv_init_secure_call_pages(void *boot_params)

{

	if (!csv3_enabled || csv3_secure_call_init)

		return;



	/*

	 * boot_params may be not sanitized, but it's OK to access e820_table

	 * field.

	 */

	csv3_scan_secure_call_pages(boot_params);

	csv3_early_secure_call_ident_map(0, 0, CSV3_SECURE_CMD_RESET);

	csv3_secure_call_init = 1;

}



void csv_set_status(void)

{

	unsigned int eax;

	unsigned int ebx;

	unsigned int ecx;

	unsigned int edx;



	eax = 0;

	native_cpuid(&eax, &ebx, &ecx, &edx);



	/* HygonGenuine */

	if (ebx == CPUID_VENDOR_HygonGenuine_ebx &&

	    ecx == CPUID_VENDOR_HygonGenuine_ecx &&

	    edx == CPUID_VENDOR_HygonGenuine_edx &&

	    sme_me_mask) {

		unsigned long low, high;



		asm volatile("rdmsr\n" : "=a" (low), "=d" (high) :

			"c" (MSR_AMD64_SEV));



		if (low & MSR_CSV3_ENABLED)

			csv3_enabled = 1;

	}

}

arch/x86/boot/compressed/csv.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Hygon CSV header for early boot related functions.

 *

 * Copyright (C) Hygon Info Technologies Ltd.

 *

 * Author: Liyang Han <hanliyang@hygon.cn>

 */



#ifndef BOOT_COMPRESSED_CSV_H

#define BOOT_COMPRESSED_CSV_H



#ifdef CONFIG_HYGON_CSV



void csv_set_status(void);

void csv_init_secure_call_pages(void *boot_params);



void csv_update_page_attr(unsigned long address, pteval_t set, pteval_t clr);



#else



static inline void csv_set_status(void) { }

static inline void csv_init_secure_call_pages(void *boot_params) { }



static inline void csv_update_page_attr(unsigned long address,

					pteval_t set, pteval_t clr) { }



#endif



#endif	/* BOOT_COMPRESSED_CSV_H */

arch/x86/boot/compressed/head_64.S

+20 −0
Original line number Diff line number Diff line
@@ -397,6 +397,16 @@ SYM_CODE_START(startup_64) 
	movq	%r15, %rdi

	call	sev_enable

#endif

#ifdef CONFIG_HYGON_CSV

	/*

	 * Check CSV active status. The CSV and CSV2 guest are indicated by

	 * MSR_AMD64_SEV_ENABLED_BIT and MSR_AMD64_SEV_ES_ENABLED_BIT in MSR

	 * register 0xc0010131, respectively.

	 * The CSV3 guest is indicated by MSR_CSV3_ENABLED in MSR register

	 * 0xc0010131.

	 */

	call	csv_set_status

#endif



	/* Preserve only the CR4 bits that must be preserved, and clear the rest */

	movq	%cr4, %rax
@@ -468,6 +478,16 @@ SYM_FUNC_START_LOCAL_NOALIGN(.Lrelocated) 
	movq	%r15, %rdi

	call	initialize_identity_maps



#ifdef CONFIG_HYGON_CSV

	/*

	 * If running as a CSV3 guest, secure call pages must be mapped in

	 * the identity page table before jumping to the decompressed kernel.

	 * Scan secure call pages here in safe.

	 */

	movq	%r15, %rdi

	call	csv_init_secure_call_pages

#endif



/*

 * Do the extraction, and jump to the new kernel..

 */

arch/x86/boot/compressed/ident_map_64.c

+3 −0
Original line number Diff line number Diff line
@@ -298,6 +298,9 @@ static int set_clr_page_flags(struct x86_mapping_info *info, 
	if ((set | clr) & _PAGE_ENC) {

		clflush_page(address);



		/* On CSV3, notify secure processor to manage page attr changes */

		csv_update_page_attr(address, set, clr);



		/*

		 * If the encryption attribute is being cleared, change the page state

		 * to shared in the RMP table.