Re: [RFC v2 05/32] x86/tdx: Add __tdcall() and __tdvmcall() helper functions

[Kuppuswamy, Sathyanarayanan]

Hi Dave,

On 4/27/21 7:29 AM, Dave Hansen wrote:
> > Do we need to rename the helper functions ?
> >
> > tdvmcall(), tdvmcall_out_r11()
> Yes.
>
> > Also what about output structs?
> >
> > struct tdcall_output
> > struct tdvmcall_output
> Yes, they need sane, straightforward names which are not confusing too.

Following is the rename diff. Please let me know if you agree with the
names used.

diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h
index 6c3c71bb57a0..95a6a6c6061a 100644
--- a/arch/x86/include/asm/tdx.h
+++ b/arch/x86/include/asm/tdx.h

-struct tdcall_output {
+struct tdx_module_output {
        u64 rcx;
        u64 rdx;
        u64 r8;
@@ -19,7 +19,7 @@ struct tdcall_output {
        u64 r11;
 };

-struct tdvmcall_output {
+struct tdx_hypercall_output {
        u64 r11;
        u64 r12;
        u64 r13;
@@ -33,12 +33,12 @@ bool is_tdx_guest(void);
 void __init tdx_early_init(void);

 /* Helper function used to communicate with the TDX module */
-u64 __tdcall(u64 fn, u64 rcx, u64 rdx, u64 r8, u64 r9,
-            struct tdcall_output *out);
+u64 __tdx_module_call(u64 fn, u64 rcx, u64 rdx, u64 r8, u64 r9,
+                     struct tdx_module_output *out);

 /* Helper function used to request services from VMM */
-u64 __tdvmcall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15,
-              struct tdvmcall_output *out);
+u64 __tdx_hypercall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15,
+                   struct tdx_hypercall_output *out);

--- a/arch/x86/kernel/tdx.c
+++ b/arch/x86/kernel/tdx.c
@@ -8,11 +8,11 @@
 /*
  * Wrapper for use case that checks for error code and print warning message.
  */
-static inline u64 tdvmcall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15)
+static inline u64 tdx_hypercall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15)
 {
        u64 err;

-       err = __tdvmcall(fn, r12, r13, r14, r15, NULL);
+       err = __tdx_hypercall(fn, r12, r13, r14, r15, NULL);

        if (err)
                pr_warn_ratelimited("TDVMCALL fn:%llx failed with err:%llx\n",
@@ -24,13 +24,14 @@ static inline u64 tdvmcall(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15)
 /*
  * Wrapper for the semi-common case where we need single output value (R11).
  */
-static inline u64 tdvmcall_out_r11(u64 fn, u64 r12, u64 r13, u64 r14, u64 r15)
+static inline u64 tdx_hypercall_out_r11(u64 fn, u64 r12, u64 r13,
+                                       u64 r14, u64 r15)


--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer