Support TDX guests on Hyper-V (the x86/tdx part)
Subsystems (5)
Dexuan Cui
maintainerv8 cover Support TDX guests on Hyper-V (the x86/tdx part)
v8 is a rebased version of v7:
v8 is based on tip.git's master branch, which has commit
75d090fd167a ("x86/tdx: Add unaccepted memory support"), so I have to rebase v7 to the commit and post v8.
v7 is based on tip.git's x86/tdx branch.
The two patches (which are based on the latest master branch of the tip tree) are the x86/tdx part of the v6 patchset:
https://lwn.net/ml/linux-kernel/[email protected]/
The other patches of the v6 patchset needs more changes in preparation for the upcoming paravisor support, so let me post the x86/tdx part first.
This v8 patchset addressed Dave's comments on patch 1:
see https://lwn.net/ml/linux-kernel/SA1PR21MB1335736123C2BCBBFD7460C3BF46A@SA1PR21MB1335.namprd21.prod.outlook.com/
Patch 2 is just a repost. There was a race between set_memory_encrypted()
and load_unaligned_zeropad(), which has been fixed by the 3 patches of
Kirill in the tip tree:
3f6819dd192e ("x86/mm: Allow guest.enc_status_change_prepare() to fail") 195edce08b63 ("x86/tdx: Fix race between set_memory_encrypted() and load_unaligned_zeropad()") 94142c9d1bdf ("x86/mm: Fix enc_status_change_finish_noop()")
(see https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/log/?h=x86/tdx)
If you want to view the patchset on github, it is here:
https://github.com/dcui/tdx/commits/decui/upstream-tip/master/tdx/v8-x86-tdx-only
Dexuan Cui (2):
x86/tdx: Retry TDVMCALL_MAP_GPA() when needed x86/tdx: Support vmalloc() for tdx_enc_status_changed()
arch/x86/coco/tdx/tdx.c | 86 ++++++++++++++++++++++++++----- arch/x86/include/asm/shared/tdx.h | 2 + 2 files changed, 76 insertions(+), 12 deletions(-)
Signature · 1 line
2.25.1
Dexuan Cui
maintainerPATCH v8 1/2 x86/tdx: Retry TDVMCALL_MAP_GPA() when needed
GHCI spec for TDX 1.0 says that the MapGPA call may fail with the R10 error code = TDG.VP.VMCALL_RETRY (1), and the guest must retry this operation for the pages in the region starting at the GPA specified in R11.
When a fully enlightened TDX guest runs on Hyper-V, Hyper-V can return the retry error when set_memory_decrypted() is called to decrypt up to 1GB of swiotlb bounce buffers.
---
arch/x86/coco/tdx/tdx.c | 63 +++++++++++++++++++++++++------ arch/x86/include/asm/shared/tdx.h | 2 + 2 files changed, 53 insertions(+), 12 deletions(-)
Changes in v2:
Used __tdx_hypercall() directly in tdx_map_gpa(). Added a max_retry_cnt of 1000.
Renamed a few variables, e.g., r11 -> map_fail_paddr.
Changes in v3:
Changed max_retry_cnt from 1000 to 3.
Changes in v4:
__tdx_hypercall(&args, TDX_HCALL_HAS_OUTPUT) -> __tdx_hypercall_ret() Added Kirill's Acked-by.
Changes in v5:
Added Michael's Reviewed-by.
Changes in v6: None.
Changes in v7:
Addressed Dave's comments:
see https://lwn.net/ml/linux-kernel/SA1PR21MB1335736123C2BCBBFD7460C3BF46A@SA1PR21MB1335.namprd21.prod.outlook.com
Changes in v8:
Rebased to tip.git's master branch.
arch/x86/coco/tdx/tdx.c +51 -12
@@ -703,14 +703,16 @@ static bool tdx_cache_flush_required(void) }/* -* Inform the VMM of the guest's intent for this physical page: shared with -* the VMM or private to the guest. The VMM is expected to change its mapping -* of the page in response. +* Notify the VMM about page mapping conversion. More info about ABI +* can be found in TDX Guest-Host-Communication Interface (GHCI), +* section "TDG.VP.VMCALL<MapGPA>". */ -static bool tdx_enc_status_changed (unsigned long vaddr,int numpages,bool enc) +static bool tdx_map_gpa (phys_addr_t start,phys_addr_t end,bool enc) { -phys_addr_t start =__pa (vaddr); -phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); +const int max_retries_per_page =3 ; +struct tdx_hypercall_args args; +u64 map_fail_paddr, ret; +int retry_count =0 ;if (!enc) {/* Set the shared (decrypted) bits: */
@@ -718,12 +720,49 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) end |=cc_mkdec (0 ); } -/* -* Notify the VMM about page mapping conversion. More info about ABI -* can be found in TDX Guest-Host-Communication Interface (GHCI), -* section "TDG.VP.VMCALL<MapGPA>" -*/ -if (_tdx_hypercall (TDVMCALL_MAP_GPA , start, end - start,0 ,0 )) +while (retry_count < max_retries_per_page) { +memset (&args,0 ,sizeof (args)); + args.r10 =TDX_HYPERCALL_STANDARD ; + args.r11 =TDVMCALL_MAP_GPA ; + args.r12 = start; + args.r13 = end - start; + + ret =__tdx_hypercall_ret (&args); +if (ret !=TDVMCALL_STATUS_RETRY ) +return !ret; +/* +* The guest must retry the operation for the pages in the +* region starting at the GPA specified in R11. R11 comes +* from the untrusted VMM. Sanity check it. +*/ + map_fail_paddr = args.r11; +if (map_fail_paddr < start || map_fail_paddr >= end) +return false; + +/* "Consume" a retry without forward progress */ +if (map_fail_paddr == start) { + retry_count++; +continue ; + } + + start = map_fail_paddr; + retry_count =0 ; + } + +return false; +} + +/* +* Inform the VMM of the guest's intent for this physical page: shared with +* the VMM or private to the guest. The VMM is expected to change its mapping +* of the page in response. +*/ +static bool tdx_enc_status_changed (unsigned long vaddr,int numpages,bool enc) +{ +phys_addr_t start =__pa (vaddr); +phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); + +if (!tdx_map_gpa (start, end, enc))return false;/* shared->private conversion requires memory to be accepted before use */
arch/x86/include/asm/shared/tdx.h +2 -0
@@ -24,6 +24,8 @@#define TDVMCALL_MAP_GPA 0x10001#define TDVMCALL_REPORT_FATAL_ERROR 0x10003 +#define TDVMCALL_STATUS_RETRY 1 +#ifndef __ASSEMBLY__/*
Signature · 1 line
2.25.1
Dexuan Cui
maintainerPATCH v8 2/2 x86/tdx: Support vmalloc() for tdx_enc_status_changed()
In reply to Dexuan CuiWhen a TDX guest runs on Hyper-V, the hv_netvsc driver's netvsc_init_buf() allocates buffers using vzalloc(), and needs to share the buffers with the host OS by calling set_memory_decrypted(), which is not working for vmalloc() yet. Add the support by handling the pages one by one.
--- arch/x86/coco/tdx/tdx.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-)
Changes in v2:
Changed tdx_enc_status_changed() in place.
Changes in v3:
No change since v2.
Changes in v4:
Added Kirill's Co-developed-by since Kirill helped to improve the
code by adding tdx_enc_status_changed_phys().
Thanks Kirill for the clarification on load_unaligned_zeropad()!
Changes in v5:
Added Kirill's Signed-off-by.
Added Michael's Reviewed-by.
Changes in v6: None.
Changes in v7: None.
Note: there was a race between set_memory_encrypted() and load_unaligned_zeropad(), which has been fixed by the 3 patches of Kirill in the x86/tdx branch of the tip tree.
Changes in v8:
Rebased to tip.git's master branch.
arch/x86/coco/tdx/tdx.c +29 -6
@@ -8,6 +8,7 @@#include <linux/export.h> #include <linux/io.h> +#include <linux/mm.h> #include <asm/coco.h> #include <asm/tdx.h> #include <asm/vmx.h> #include <asm/insn.h>
@@ -752,6 +753,19 @@ static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc)return false; } +static bool tdx_enc_status_changed_phys (phys_addr_t start,phys_addr_t end, +bool enc) +{ +if (!tdx_map_gpa (start, end, enc)) +return false; + +/* shared->private conversion requires memory to be accepted before use */ +if (enc) +return tdx_accept_memory (start, end); + +return true; +} +/* * Inform the VMM of the guest's intent for this physical page: shared with * the VMM or private to the guest. The VMM is expected to change its mapping
@@ -759,15 +773,24 @@ static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc)*/ static bool tdx_enc_status_changed (unsigned long vaddr,int numpages,bool enc) { -phys_addr_t start =__pa (vaddr); -phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); +unsigned long start = vaddr; +unsigned long end = start + numpages *PAGE_SIZE ; -if (!tdx_map_gpa (start, end, enc)) +if (offset_in_page (start) !=0 )return false; -/* shared->private conversion requires memory to be accepted before use */ -if (enc) -return tdx_accept_memory (start, end); +if (!is_vmalloc_addr ((void *)start)) +return tdx_enc_status_changed_phys (__pa (start),__pa (end), enc); + +while (start < end) { +phys_addr_t start_pa =slow_virt_to_phys ((void *)start); +phys_addr_t end_pa = start_pa +PAGE_SIZE ; + +if (!tdx_enc_status_changed_phys (start_pa, end_pa, enc)) +return false; + + start +=PAGE_SIZE ; + }return true; }
Signature · 1 line
2.25.1
Re: [PATCH v8 1/2] x86/tdx: Retry TDVMCALL_MAP_GPA() when needed
In reply to Dexuan CuiHi,
Quoted 53 lines · Dexuan Cui
GHCI spec for TDX 1.0 says that the MapGPA call may fail with the R10 error code = TDG.VP.VMCALL_RETRY (1), and the guest must retry this operation for the pages in the region starting at the GPA specified in R11.
When a fully enlightened TDX guest runs on Hyper-V, Hyper-V can return the retry error when
set_memory_decrypted()is called to decrypt up to 1GB of swiotlb bounce buffers.Reviewed-by Michael Kelley <[email protected]>Signed-off-by Dexuan Cui <[email protected]>---
arch/x86/coco/tdx/tdx.c | 63 +++++++++++++++++++++++++------ arch/x86/include/asm/shared/tdx.h | 2 + 2 files changed, 53 insertions(+), 12 deletions(-)Changes in v2:
Used__tdx_hypercall()directly intdx_map_gpa(). Added amax_retry_cntof 1000.
Renamed a few variables, e.g., r11 ->map_fail_paddr.Changes in v3:
Changedmax_retry_cntfrom 1000 to 3.Changes in v4:
__tdx_hypercall(&args, TDX_HCALL_HAS_OUTPUT)->__tdx_hypercall_ret()Added Kirill's Acked-by.Changes in v5:
Added Michael's Reviewed-by.Changes in v6: None.
Changes in v7:
Addressed Dave's comments:
see https://lwn.net/ml/linux-kernel/SA1PR21MB1335736123C2BCBBFD7460C3BF46A@SA1PR21MB1335.namprd21.prod.outlook.comChanges in v8:
Rebased to tip.git's master branch.arch/x86/coco/tdx/tdx.c +0
-3@@ -703,14 +703,16 @@ static bool tdx_cache_flush_required(void) }/* -* Inform the VMM of the guest's intent for this physical page: shared with -* the VMM or private to the guest. The VMM is expected to change its mapping -* of the page in response.
arch/x86/coco/tdx/tdx.c static bool tdx_cache_flush_required(void) · line 712
Quoted 10 lines
arch/x86/coco/tdx/tdx.c +5
-3+* Notify the VMM about page mapping conversion. More info about ABI +* can be found in TDX Guest-Host-Communication Interface (GHCI), +* section "TDG.VP.VMCALL<MapGPA>". */ -static bool tdx_enc_status_changed (unsigned long vaddr,int numpages,bool enc) +static bool tdx_map_gpa (phys_addr_t start,phys_addr_t end,bool enc) { -phys_addr_t start =__pa (vaddr); -phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); +const int max_retries_per_page =3 ;
Add some details about why you chose 3? Maybe you can also use macro for it.
Quoted 22 lines
arch/x86/coco/tdx/tdx.c +9
-6+struct tdx_hypercall_args args; +u64 map_fail_paddr, ret; +int retry_count =0 ;if (!enc) {/* Set the shared (decrypted) bits: */ @@ -718,12 +720,49 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) end |=cc_mkdec (0 ); } -/* -* Notify the VMM about page mapping conversion. More info about ABI -* can be found in TDX Guest-Host-Communication Interface (GHCI), -* section "TDG.VP.VMCALL<MapGPA>" -*/ -if (_tdx_hypercall (TDVMCALL_MAP_GPA , start, end - start,0 ,0 )) +while (retry_count < max_retries_per_page) { +memset (&args,0 ,sizeof (args)); + args.r10 =TDX_HYPERCALL_STANDARD ; + args.r11 =TDVMCALL_MAP_GPA ; + args.r12 = start; + args.r13 = end - start;
arch/x86/coco/tdx/tdx.c static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) · line 738
Quoted 10 lines
arch/x86/coco/tdx/tdx.c +10
-0+ + ret =__tdx_hypercall_ret (&args); +if (ret !=TDVMCALL_STATUS_RETRY ) +return !ret; +/* +* The guest must retry the operation for the pages in the +* region starting at the GPA specified in R11. R11 comes +* from the untrusted VMM. Sanity check it. +*/ + map_fail_paddr = args.r11;
Do you really need map_fail_paddr? Why not directly use args.r11?
Quoted 43 lines
arch/x86/coco/tdx/tdx.c +27
-0+if (map_fail_paddr < start || map_fail_paddr >= end) +return false; + +/* "Consume" a retry without forward progress */ +if (map_fail_paddr == start) { + retry_count++; +continue ; + } + + start = map_fail_paddr; + retry_count =0 ; + } + +return false; +} + +/* +* Inform the VMM of the guest's intent for this physical page: shared with +* the VMM or private to the guest. The VMM is expected to change its mapping +* of the page in response. +*/ +static bool tdx_enc_status_changed (unsigned long vaddr,int numpages,bool enc) +{ +phys_addr_t start =__pa (vaddr); +phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); + +if (!tdx_map_gpa (start, end, enc))return false;/* shared->private conversion requires memory to be accepted before use */ arch/x86/include/asm/shared/tdx.h +2
-0@@ -24,6 +24,8 @@#define TDVMCALL_MAP_GPA 0x10001#define TDVMCALL_REPORT_FATAL_ERROR 0x10003 +#define TDVMCALL_STATUS_RETRY 1 +#ifndef __ASSEMBLY__/*
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
Re: [PATCH v8 2/2] x86/tdx: Support vmalloc() for tdx_enc_status_changed()
In reply to Dexuan CuiHi,
Quoted 10 lines · Dexuan Cui
When a TDX guest runs on Hyper-V, the
hv_netvscdriver'snetvsc_init_buf()allocates buffers usingvzalloc(), and needs to share the buffers with the host OS by callingset_memory_decrypted(), which is not working forvmalloc()yet. Add the support by handling the pages one by one.Co-developed-by Kirill A. Shutemov <[email protected]>Signed-off-by Kirill A. Shutemov <[email protected]>Reviewed-by Michael Kelley <[email protected]>Signed-off-by Dexuan Cui <[email protected]>---
Looks good to me.
Quoted 92 lines
arch/x86/coco/tdx/tdx.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-)Changes in v2:
Changedtdx_enc_status_changed()in place.Changes in v3:
No change since v2.Changes in v4:
Added Kirill's Co-developed-by since Kirill helped to improve the
code by addingtdx_enc_status_changed_phys().Thanks Kirill for the clarification on
load_unaligned_zeropad()!Changes in v5:
Added Kirill's Signed-off-by.
Added Michael's Reviewed-by.Changes in v6: None.
Changes in v7: None.
Note: there was a race betweenset_memory_encrypted()andload_unaligned_zeropad(), which has been fixed by the 3 patches of Kirill in the x86/tdx branch of the tip tree.Changes in v8:
Rebased to tip.git's master branch.arch/x86/coco/tdx/tdx.c +29
-6@@ -8,6 +8,7 @@#include <linux/export.h> #include <linux/io.h> +#include <linux/mm.h> #include <asm/coco.h> #include <asm/tdx.h> #include <asm/vmx.h> #include <asm/insn.h> @@ -752,6 +753,19 @@ static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc)return false; } +static bool tdx_enc_status_changed_phys (phys_addr_t start,phys_addr_t end, +bool enc) +{ +if (!tdx_map_gpa (start, end, enc)) +return false; + +/* shared->private conversion requires memory to be accepted before use */ +if (enc) +return tdx_accept_memory (start, end); + +return true; +} +/* * Inform the VMM of the guest's intent for this physical page: shared with * the VMM or private to the guest. The VMM is expected to change its mapping @@ -759,15 +773,24 @@ static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc)*/ static bool tdx_enc_status_changed (unsigned long vaddr,int numpages,bool enc) { -phys_addr_t start =__pa (vaddr); -phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); +unsigned long start = vaddr; +unsigned long end = start + numpages *PAGE_SIZE ; -if (!tdx_map_gpa (start, end, enc)) +if (offset_in_page (start) !=0 )return false; -/* shared->private conversion requires memory to be accepted before use */ -if (enc) -return tdx_accept_memory (start, end); +if (!is_vmalloc_addr ((void *)start)) +return tdx_enc_status_changed_phys (__pa (start),__pa (end), enc); + +while (start < end) { +phys_addr_t start_pa =slow_virt_to_phys ((void *)start); +phys_addr_t end_pa = start_pa +PAGE_SIZE ; + +if (!tdx_enc_status_changed_phys (start_pa, end_pa, enc)) +return false; + + start +=PAGE_SIZE ; + }return true; }
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
Dexuan Cui
maintainerRE: [PATCH v8 1/2] x86/tdx: Retry TDVMCALL_MAP_GPA() when needed
In reply to Sathyanarayanan KuppuswamyQuoted 4 lines
From: Sathyanarayanan Kuppuswamy
Sent: Tuesday, June 20, 2023 11:31 AMQuoted 2 lines
...
-static bool tdx_enc_status_changed(unsigned long vaddr, int numpages,
Quoted 8 lines
bool enc)
arch/x86/coco/tdx/tdx.c static bool tdx_cache_flush_required(void) · line 712
Quoted 5 lines
arch/x86/coco/tdx/tdx.c +2
-2+static bool tdx_map_gpa (phys_addr_t start,phys_addr_t end,bool enc) { -phys_addr_t start =__pa (vaddr); -phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); +const int max_retries_per_page =3 ;Add some details about why you chose 3? Maybe you can also use macro for it.
It's a small number recommended by Kirill:
https://lwn.net/ml/linux-kernel/[email protected]/
The spec doesn't define a max retry count. Normally I guess a max retry count of 2 should be enough, at least for Hyper-V according to my testing.
Maybe we can add a comment like this:
/* Retrying the hypercall a second time should succeed; use 3 just in case. */
Does this look good to all?
Quoted 36 lines
arch/x86/coco/tdx/tdx.c static bool tdx_enc_status_changed(unsigned long
Quoted 7 lines
arch/x86/coco/tdx/tdx.c +3
-0+struct tdx_hypercall_args args; +u64 map_fail_paddr, ret; +int retry_count =0 ;if (!enc) {/* Set the shared (decrypted) bits: */ @@ -718,12 +720,49 @@ static bool tdx_enc_status_changed(unsigned longvaddr, int numpages, bool enc)
Quoted 15 lines
arch/x86/coco/tdx/tdx.c +6
-6end |=cc_mkdec (0 ); } -/* -* Notify the VMM about page mapping conversion. More info about ABI -* can be found in TDX Guest-Host-Communication Interface (GHCI), -* section "TDG.VP.VMCALL<MapGPA>" -*/ -if (_tdx_hypercall (TDVMCALL_MAP_GPA , start, end - start,0 ,0 )) +while (retry_count < max_retries_per_page) { +memset (&args,0 ,sizeof (args)); + args.r10 =TDX_HYPERCALL_STANDARD ; + args.r11 =TDVMCALL_MAP_GPA ; + args.r12 = start; + args.r13 = end - start;arch/x86/coco/tdx/tdx.c static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) · line 738
Quoted 10 lines
arch/x86/coco/tdx/tdx.c +10
-0+ + ret =__tdx_hypercall_ret (&args); +if (ret !=TDVMCALL_STATUS_RETRY ) +return !ret; +/* +* The guest must retry the operation for the pages in the +* region starting at the GPA specified in R11. R11 comes +* from the untrusted VMM. Sanity check it. +*/ + map_fail_paddr = args.r11;Do you really need
map_fail_paddr? Why not directly use args.r11?
Quoted 2 lines
Review static bool tdx_enc_status_changed(unsigned long · line 740
Quoted 2 lines
(quoted diff) +2
-0+ if (map_fail_paddr < start || map_fail_paddr >= end) + return false;
Originally, I used r11.
Dave says " 'r11' needs a real, logical name":
https://lwn.net/ml/linux-kernel/[email protected]/
Sathyanarayanan Kuppuswamy
Reviewed-byRe: [PATCH v8 1/2] x86/tdx: Retry TDVMCALL_MAP_GPA() when needed
Hi,
Quoted 16 lines · Dexuan Cui
Quoted 4 lines
From: Sathyanarayanan Kuppuswamy
Sent: Tuesday, June 20, 2023 11:31 AMQuoted 2 lines
...
-static bool tdx_enc_status_changed(unsigned long vaddr, int numpages,Quoted 8 lines
bool enc)
arch/x86/coco/tdx/tdx.c static bool tdx_cache_flush_required(void) · line 712
Quoted 5 lines
arch/x86/coco/tdx/tdx.c +2
-2+static bool tdx_map_gpa (phys_addr_t start,phys_addr_t end,bool enc) { -phys_addr_t start =__pa (vaddr); -phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); +const int max_retries_per_page =3 ;Add some details about why you chose 3? Maybe you can also use macro for it.
It's a small number recommended by Kirill:
https://lwn.net/ml/linux-kernel/[email protected]/
Quoted 8 lines
The spec doesn't define a max retry count. Normally I guess a max retry count of 2 should be enough, at least for Hyper-V according to my testing.
Maybe we can add a comment like this:
/* Retrying the hypercall a second time should succeed; use 3 just in case. */
Does this look good to all?
Looks fine to me.
Quoted 37 lines
Quoted 37 lines
arch/x86/coco/tdx/tdx.c static bool tdx_enc_status_changed(unsigned long
Quoted 8 lines
arch/x86/coco/tdx/tdx.c +3
-0+struct tdx_hypercall_args args; +u64 map_fail_paddr, ret; +int retry_count =0 ;if (!enc) {/* Set the shared (decrypted) bits: */ @@ -718,12 +720,49 @@ static bool tdx_enc_status_changed(unsigned longvaddr, int numpages, bool enc)
Quoted 15 lines
arch/x86/coco/tdx/tdx.c +6
-6end |=cc_mkdec (0 ); } -/* -* Notify the VMM about page mapping conversion. More info about ABI -* can be found in TDX Guest-Host-Communication Interface (GHCI), -* section "TDG.VP.VMCALL<MapGPA>" -*/ -if (_tdx_hypercall (TDVMCALL_MAP_GPA , start, end - start,0 ,0 )) +while (retry_count < max_retries_per_page) { +memset (&args,0 ,sizeof (args)); + args.r10 =TDX_HYPERCALL_STANDARD ; + args.r11 =TDVMCALL_MAP_GPA ; + args.r12 = start; + args.r13 = end - start;arch/x86/coco/tdx/tdx.c static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) · line 738
Quoted 10 lines
arch/x86/coco/tdx/tdx.c +10
-0+ + ret =__tdx_hypercall_ret (&args); +if (ret !=TDVMCALL_STATUS_RETRY ) +return !ret; +/* +* The guest must retry the operation for the pages in the +* region starting at the GPA specified in R11. R11 comes +* from the untrusted VMM. Sanity check it. +*/ + map_fail_paddr = args.r11;Do you really need
map_fail_paddr? Why not directly use args.r11?
Quoted 7 lines
Quoted 2 lines
Review static bool tdx_enc_status_changed(unsigned long · line 740
Quoted 2 lines
(quoted diff) +2
-0+ if (map_fail_paddr < start || map_fail_paddr >= end) + return false;Originally, I used r11.
Dave says " 'r11' needs a real, logical name":
https://lwn.net/ml/linux-kernel/[email protected]/
Got it.
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer
Re: [PATCH v8 1/2] x86/tdx: Retry TDVMCALL_MAP_GPA() when needed
In reply to Dexuan CuiQuoted 19 lines · Dexuan Cui
arch/x86/coco/tdx/tdx.c +5
-6-static bool tdx_enc_status_changed (unsigned long vaddr,int numpages,bool enc) +static bool tdx_map_gpa (phys_addr_t start,phys_addr_t end,bool enc) { -phys_addr_t start =__pa (vaddr); -phys_addr_t end =__pa (vaddr + numpages *PAGE_SIZE ); +const int max_retries_per_page =3 ; +struct tdx_hypercall_args args; +u64 map_fail_paddr, ret; +int retry_count =0 ;if (!enc) {/* Set the shared (decrypted) bits: */ @@ -718,12 +720,49 @@ static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) end |=cc_mkdec (0 ); } -/* -* Notify the VMM about page mapping conversion. More info about ABI -* can be found in TDX Guest-Host-Communication Interface (GHCI),
arch/x86/coco/tdx/tdx.c static bool tdx_enc_status_changed(unsigned long vaddr, int numpages, bool enc) · line 729
Quoted 10 lines
arch/x86/coco/tdx/tdx.c +7
-3-* section "TDG.VP.VMCALL<MapGPA>" -*/ -if (_tdx_hypercall (TDVMCALL_MAP_GPA , start, end - start,0 ,0 )) +while (retry_count < max_retries_per_page) { +memset (&args,0 ,sizeof (args)); + args.r10 =TDX_HYPERCALL_STANDARD ; + args.r11 =TDVMCALL_MAP_GPA ; + args.r12 = start; + args.r13 = end - start; +
What's wrong with:
while (retry_count < max_retries_per_page) {
struct tdx_hypercall_args args = {
.r10 = TDX_HYPERCALL_STANDARD,
.r11 = TDVMCALL_MAP_GPA,
.r12 = start,
.r13 = end - start };?
Or maybe with the brackets slightly differently arranged.
Why'd you declare all the variables outside the while() loop anyway?
Dexuan Cui
maintainerRE: [PATCH v8 1/2] x86/tdx: Retry TDVMCALL_MAP_GPA() when needed
Quoted 21 lines
From: Dave Hansen <[email protected]>
Sent: Tuesday, June 20, 2023 4:34 PMReview
Quoted 9 lines
...
(quoted diff) +7
-1- if (_tdx_hypercall(TDVMCALL_MAP_GPA, start, end - start, 0, 0)) + while (retry_count < max_retries_per_page) { + memset(&args, 0, sizeof(args)); + args.r10 = TDX_HYPERCALL_STANDARD; + args.r11 = TDVMCALL_MAP_GPA; + args.r12 = start; + args.r13 = end - start; +What's wrong with:
while (retry_count < max_retries_per_page) { struct tdx_hypercall_args args = { .r10 = TDX_HYPERCALL_STANDARD, .r11 = TDVMCALL_MAP_GPA, .r12 = start, .r13 = end - start };
Quoted 5 lines
?
Or maybe with the brackets slightly differently arranged.
Why'd you declare all the variables outside the
while()loop anyway?
Thanks for the suggestion of making the code compact! I'll apply the below diff, and post v9 tomorrow (trying to not post too frequently...)
arch/x86/coco/tdx/tdx.c +9 -9
@@ -710,9 +710,8 @@ static bool tdx_cache_flush_required(void)*/ static bool tdx_map_gpa (phys_addr_t start,phys_addr_t end,bool enc) { +/* Retrying the hypercall a second time should succeed; use 3 just in case */ const int max_retries_per_page =3 ; -struct tdx_hypercall_args args; -u64 map_fail_paddr, ret;int retry_count =0 ;if (!enc) {
@@ -722,13 +721,14 @@ static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc) }while (retry_count < max_retries_per_page) { -memset (&args,0 ,sizeof (args)); - args.r10 =TDX_HYPERCALL_STANDARD ; - args.r11 =TDVMCALL_MAP_GPA ; - args.r12 = start; - args.r13 = end - start; - - ret =__tdx_hypercall_ret (&args); +struct tdx_hypercall_args args = { + .r10 =TDX_HYPERCALL_STANDARD , + .r11 =TDVMCALL_MAP_GPA , + .r12 = start, + .r13 = end - start }; + +u64 map_fail_paddr; +u64 ret =__tdx_hypercall_ret (&args);if (ret !=TDVMCALL_STATUS_RETRY )return !ret;/*
The function now looks like this:
/*
* Notify the VMM about page mapping conversion. More info about ABI
* can be found in TDX Guest-Host-Communication Interface (GHCI),
* section "TDG.VP.VMCALL<MapGPA>".
*/
static bool tdx_map_gpa(phys_addr_t start, phys_addr_t end, bool enc)
{
/* Retrying the hypercall a second time should succeed; use 3 just in case */
const int max_retries_per_page = 3;
int retry_count = 0;
if (!enc) {
/* Set the shared (decrypted) bits: */
start |= cc_mkdec(0);
end |= cc_mkdec(0);
}
while (retry_count < max_retries_per_page) {
struct tdx_hypercall_args args = {
.r10 = TDX_HYPERCALL_STANDARD,
.r11 = TDVMCALL_MAP_GPA,
.r12 = start,
.r13 = end - start };
u64 map_fail_paddr;
u64 ret = __tdx_hypercall_ret(&args);
if (ret != TDVMCALL_STATUS_RETRY)
return !ret;
/*
* The guest must retry the operation for the pages in the
* region starting at the GPA specified in R11. R11 comes
* from the untrusted VMM. Sanity check it.
*/
map_fail_paddr = args.r11;
if (map_fail_paddr < start || map_fail_paddr >= end)
return false;
/* "Consume" a retry without forward progress */
if (map_fail_paddr == start) {
retry_count++;
continue;
}
start = map_fail_paddr;
retry_count = 0;
}
return false;
}