Commit 6b9bfb13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_cc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 confidential computing updates from Borislav Petkov:

 - Add shared confidential computing code which will be used by both
   vendors instead of proliferating home-grown solutions for
   technologies (SEV/SNP and TDX) which are pretty similar

* tag 'x86_cc_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/cpa: Generalize __set_memory_enc_pgtable()
  x86/coco: Add API to handle encryption mask
  x86/coco: Explicitly declare type of confidential computing platform
  x86/cc: Move arch/x86/{kernel/cc_platform.c => coco/core.c}
parents 61e2658e 1e8c5971

arch/x86/Kbuild

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_ARCH_HAS_CC_PLATFORM) += coco/



obj-y += entry/



obj-$(CONFIG_PERF_EVENTS) += events/

arch/x86/coco/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

CFLAGS_REMOVE_core.o	= -pg

KASAN_SANITIZE_core.o	:= n

CFLAGS_core.o		+= -fno-stack-protector



obj-y += core.o

arch/x86/kernel/cc_platform.c→arch/x86/coco/core.c

+44 −12
Original line number Diff line number Diff line
@@ -9,18 +9,16 @@ 


#include <linux/export.h>

#include <linux/cc_platform.h>

#include <linux/mem_encrypt.h>



#include <asm/mshyperv.h>

#include <asm/coco.h>

#include <asm/processor.h>



static bool __maybe_unused intel_cc_platform_has(enum cc_attr attr)

static enum cc_vendor vendor __ro_after_init;

static u64 cc_mask __ro_after_init;



static bool intel_cc_platform_has(enum cc_attr attr)

{

#ifdef CONFIG_INTEL_TDX_GUEST

	return false;

#else

	return false;

#endif

}



/*
@@ -74,12 +72,46 @@ static bool hyperv_cc_platform_has(enum cc_attr attr) 


bool cc_platform_has(enum cc_attr attr)

{

	if (sme_me_mask)

	switch (vendor) {

	case CC_VENDOR_AMD:

		return amd_cc_platform_has(attr);



	if (hv_is_isolation_supported())

	case CC_VENDOR_INTEL:

		return intel_cc_platform_has(attr);

	case CC_VENDOR_HYPERV:

		return hyperv_cc_platform_has(attr);



	default:

		return false;

	}

}

EXPORT_SYMBOL_GPL(cc_platform_has);



u64 cc_mkenc(u64 val)

{

	switch (vendor) {

	case CC_VENDOR_AMD:

		return val | cc_mask;

	default:

		return val;

	}

}



u64 cc_mkdec(u64 val)

{

	switch (vendor) {

	case CC_VENDOR_AMD:

		return val & ~cc_mask;

	default:

		return val;

	}

}

EXPORT_SYMBOL_GPL(cc_mkdec);



__init void cc_set_vendor(enum cc_vendor v)

{

	vendor = v;

}



__init void cc_set_mask(u64 mask)

{

	cc_mask = mask;

}

arch/x86/include/asm/coco.h

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

#ifndef _ASM_X86_COCO_H

#define _ASM_X86_COCO_H



#include <asm/types.h>



enum cc_vendor {

	CC_VENDOR_NONE,

	CC_VENDOR_AMD,

	CC_VENDOR_HYPERV,

	CC_VENDOR_INTEL,

};



void cc_set_vendor(enum cc_vendor v);

void cc_set_mask(u64 mask);



#ifdef CONFIG_ARCH_HAS_CC_PLATFORM

u64 cc_mkenc(u64 val);

u64 cc_mkdec(u64 val);

#else

static inline u64 cc_mkenc(u64 val)

{

	return val;

}



static inline u64 cc_mkdec(u64 val)

{

	return val;

}

#endif



#endif /* _ASM_X86_COCO_H */

arch/x86/include/asm/pgtable.h

+7 −6
Original line number Diff line number Diff line
@@ -15,17 +15,12 @@ 
		     cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS)))	\

	 : (prot))



/*

 * Macros to add or remove encryption attribute

 */

#define pgprot_encrypted(prot)	__pgprot(__sme_set(pgprot_val(prot)))

#define pgprot_decrypted(prot)	__pgprot(__sme_clr(pgprot_val(prot)))



#ifndef __ASSEMBLY__

#include <linux/spinlock.h>

#include <asm/x86_init.h>

#include <asm/pkru.h>

#include <asm/fpu/api.h>

#include <asm/coco.h>

#include <asm-generic/pgtable_uffd.h>

#include <linux/page_table_check.h>
@@ -38,6 +33,12 @@ void ptdump_walk_pgd_level_debugfs(struct seq_file *m, struct mm_struct *mm, 
void ptdump_walk_pgd_level_checkwx(void);

void ptdump_walk_user_pgd_level_checkwx(void);



/*

 * Macros to add or remove encryption attribute

 */

#define pgprot_encrypted(prot)	__pgprot(cc_mkenc(pgprot_val(prot)))

#define pgprot_decrypted(prot)	__pgprot(cc_mkdec(pgprot_val(prot)))



#ifdef CONFIG_DEBUG_WX

#define debug_checkwx()		ptdump_walk_pgd_level_checkwx()

#define debug_checkwx_user()	ptdump_walk_user_pgd_level_checkwx()