Commit c2b353ae authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Borislav Petkov (AMD)

x86/tdx: Refactor try_accept_one()

Rework try_accept_one() to return accepted size instead of modifying
'start' inside the helper. It makes 'start' in-only argument and
streamlines code on the caller side.
Suggested-by: default avatarBorislav Petkov <bp@alien8.de>
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/r/20230606142637.5171-9-kirill.shutemov@linux.intel.com
parent ff40b576
...@@ -713,18 +713,18 @@ static bool tdx_cache_flush_required(void) ...@@ -713,18 +713,18 @@ static bool tdx_cache_flush_required(void)
return true; return true;
} }
static bool try_accept_one(phys_addr_t *start, unsigned long len, static unsigned long try_accept_one(phys_addr_t start, unsigned long len,
enum pg_level pg_level) enum pg_level pg_level)
{ {
unsigned long accept_size = page_level_size(pg_level); unsigned long accept_size = page_level_size(pg_level);
u64 tdcall_rcx; u64 tdcall_rcx;
u8 page_size; u8 page_size;
if (!IS_ALIGNED(*start, accept_size)) if (!IS_ALIGNED(start, accept_size))
return false; return 0;
if (len < accept_size) if (len < accept_size)
return false; return 0;
/* /*
* Pass the page physical address to the TDX module to accept the * Pass the page physical address to the TDX module to accept the
...@@ -743,15 +743,14 @@ static bool try_accept_one(phys_addr_t *start, unsigned long len, ...@@ -743,15 +743,14 @@ static bool try_accept_one(phys_addr_t *start, unsigned long len,
page_size = 2; page_size = 2;
break; break;
default: default:
return false; return 0;
} }
tdcall_rcx = *start | page_size; tdcall_rcx = start | page_size;
if (__tdx_module_call(TDX_ACCEPT_PAGE, tdcall_rcx, 0, 0, 0, NULL)) if (__tdx_module_call(TDX_ACCEPT_PAGE, tdcall_rcx, 0, 0, 0, NULL))
return false; return 0;
*start += accept_size; return accept_size;
return true;
} }
/* /*
...@@ -788,21 +787,22 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) ...@@ -788,21 +787,22 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc)
*/ */
while (start < end) { while (start < end) {
unsigned long len = end - start; unsigned long len = end - start;
unsigned long accept_size;
/* /*
* Try larger accepts first. It gives chance to VMM to keep * Try larger accepts first. It gives chance to VMM to keep
* 1G/2M SEPT entries where possible and speeds up process by * 1G/2M Secure EPT entries where possible and speeds up
* cutting number of hypercalls (if successful). * process by cutting number of hypercalls (if successful).
*/ */
if (try_accept_one(&start, len, PG_LEVEL_1G)) accept_size = try_accept_one(start, len, PG_LEVEL_1G);
continue; if (!accept_size)
accept_size = try_accept_one(start, len, PG_LEVEL_2M);
if (try_accept_one(&start, len, PG_LEVEL_2M)) if (!accept_size)
continue; accept_size = try_accept_one(start, len, PG_LEVEL_4K);
if (!accept_size)
if (!try_accept_one(&start, len, PG_LEVEL_4K))
return false; return false;
start += accept_size;
} }
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment