Commit 99e4b0de authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/sev-es: Split vc_decode_insn() 



Split it into two helpers - a user- and a kernel-mode one for
readability. Yes, the original function body is not that convoluted but
splitting it makes following through that code trivial than having to
pay attention to each little difference when in user or in kernel mode.

No functional changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210304174237.31945-13-bp@alien8.de
parent 77e768ec

arch/x86/kernel/sev-es.c

+38 −21
Original line number Diff line number Diff line
@@ -251,13 +251,12 @@ static int vc_fetch_insn_kernel(struct es_em_ctxt *ctxt, 
	return copy_from_kernel_nofault(buffer, (unsigned char *)ctxt->regs->ip, MAX_INSN_SIZE);

}



static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt)

static enum es_result __vc_decode_user_insn(struct es_em_ctxt *ctxt)

{

	char buffer[MAX_INSN_SIZE];

	enum es_result ret;

	int res;



	if (user_mode(ctxt->regs)) {

	res = insn_fetch_from_user_inatomic(ctxt->regs, buffer);

	if (!res) {

		ctxt->fi.vector     = X86_TRAP_PF;
@@ -268,7 +267,18 @@ static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt) 


	if (!insn_decode_from_regs(&ctxt->insn, ctxt->regs, buffer, res))

		return ES_DECODE_FAILED;

	} else {



	ret = ctxt->insn.immediate.got ? ES_OK : ES_DECODE_FAILED;



	return ret;

}



static enum es_result __vc_decode_kern_insn(struct es_em_ctxt *ctxt)

{

	char buffer[MAX_INSN_SIZE];

	enum es_result ret;

	int res;



	res = vc_fetch_insn_kernel(ctxt, buffer);

	if (res) {

		ctxt->fi.vector     = X86_TRAP_PF;
@@ -279,13 +289,20 @@ static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt) 


	insn_init(&ctxt->insn, buffer, MAX_INSN_SIZE, 1);

	insn_get_length(&ctxt->insn);

	}



	ret = ctxt->insn.immediate.got ? ES_OK : ES_DECODE_FAILED;



	return ret;

}



static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt)

{

	if (user_mode(ctxt->regs))

		return __vc_decode_user_insn(ctxt);

	else

		return __vc_decode_kern_insn(ctxt);

}



static enum es_result vc_write_mem(struct es_em_ctxt *ctxt,

				   char *dst, char *buf, size_t size)

{