x86/asm: Remove the __iomem annotation of movdir64b()'s dst argument
PATCH 1/1 x86/asm: Remove the __iomem annotation of movdir64b()'s dst argument
Commit e56d28df2f66 ("x86/virt/tdx: Configure global KeyID on all packages") causes below sparse check warning:
arch/x86/virt/vmx/tdx/tdx.c:683:27: warning: incorrect type in argument 1 (different address spaces)
arch/x86/virt/vmx/tdx/tdx.c:683:27: expected void [noderef] __iomem *dst
arch/x86/virt/vmx/tdx/tdx.c:683:27: got void *
The reason is TDX must use the MOVDIR64B instruction to convert TDX private memory (which is normal RAM but not MMIO) back to normal. The TDX code uses existing movdir64b() helper to do that, but the first argument @dst of movdir64b() is annotated with __iomem.
When movdir64b() was firstly introduced in commit 0888e1030d3e ("x86/asm: Carve out a generic movdir64b() helper for general usage"), it didn't have the __iomem annotation. But this commit also introduced the same "incorrect type" sparse warning because the iosubmit_cmds512(), which was the solo caller of movdir64b(), has the __iomem annotation.
This was later fixed by commit 6ae58d871319 ("x86/asm: Annotate movdir64b()'s dst argument with __iomem"). That fix was reasonable because until TDX code the movdir64b() was only used to move data to MMIO location, as described by the commit message:
... The current usages send a 64-bytes command descriptor to an MMIO location (portal) on a device for consumption. When future usages for the MOVDIR64B instruction warrant a separate variant of a memory to memory operation, the argument annotation can be revisited.
Now TDX code uses MOVDIR64B to move data to normal memory so it's time to revisit.
The SDM says the destination of MOVDIR64B is "memory location specified in a general register", thus it's more reasonable that movdir64b() does not have the __iomem annotation on the @dst.
Remove the __iomem annotation from the @dst argument of movdir64b() to fix the sparse warning in TDX code. Similar to memset_io(), introduce a new movdir64b_io() to cover the case where the destination is an MMIO location, and change the solo caller iosubmit_cmds512() to use the new movdir64b_io().
In movdir64b_io() explicitly use __force in the type casting otherwise there will be below sparse warning:
warning: cast removes address space '__iomem' of expression
--- arch/x86/include/asm/io.h | 2 +- arch/x86/include/asm/special_insns.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
arch/x86/include/asm/io.h +1 -1
@@ -379,7 +379,7 @@ static inline void iosubmit_cmds512(void __iomem *dst, const void *src,const u8 *end = from + count *64 ;while (from < end) { -movdir64b (dst, from); +movdir64b_io (dst, from); from +=64 ; } }
arch/x86/include/asm/special_insns.h +7 -2
@@ -224,10 +224,10 @@ static inline void serialize(void) }/* The dst parameter must be 64-bytes aligned */ -static inline void movdir64b (void __iomem *dst,const void *src) +static inline void movdir64b (void *dst,const void *src) {const struct {char _[64 ]; } *__src = src; -struct {char _[64 ]; }__iomem *__dst = dst; +struct {char _[64 ]; } *__dst = dst;/* * MOVDIR64B %(rdx), rax.
@@ -245,6 +245,11 @@ static inline void movdir64b(void __iomem *dst, const void *src) : "m" (*__src), "a" (__dst), "d" (__src)); } +static inline void movdir64b_io (void __iomem *dst,const void *src) +{ +movdir64b ((void __force *)dst, src); +} +/** * enqcmds - Enqueue a command in supervisor (CPL0) mode * @dst: destination, in MMIO space (must be 512-bit aligned)
base-commit: 83e1bdc94f32dcf52dfcd2025acc7a2b9376b1e8
Signature · 1 line
2.43.0
Quoted 44 lines · Kai Huang
Commit
e56d28df2f66("x86/virt/tdx: Configure global KeyID on all packages") causes below sparse check warning:
arch/x86/virt/vmx/tdx/tdx.c:683:27: warning: incorrect type in argument 1 (different address spaces)
arch/x86/virt/vmx/tdx/tdx.c:683:27: expected void [noderef]__iomem*dst
arch/x86/virt/vmx/tdx/tdx.c:683:27: got void *The reason is TDX must use the MOVDIR64B instruction to convert TDX private memory (which is normal RAM but not MMIO) back to normal. The TDX code uses existing
movdir64b()helper to do that, but the first argument @dst ofmovdir64b()is annotated with__iomem.When
movdir64b()was firstly introduced in commit0888e1030d3e("x86/asm: Carve out a genericmovdir64b()helper for general usage"), it didn't have the__iomemannotation. But this commit also introduced the same "incorrect type" sparse warning because theiosubmit_cmds512(), which was the solo caller ofmovdir64b(), has the__iomemannotation.This was later fixed by commit
6ae58d871319("x86/asm: Annotate movdir64b()'s dst argument with__iomem"). That fix was reasonable because until TDX code themovdir64b()was only used to move data to MMIO location, as described by the commit message:... The current usages send a 64-bytes command descriptor to an MMIO location (portal) on a device for consumption. When future usages for the MOVDIR64B instruction warrant a separate variant of a memory to memory operation, the argument annotation can be revisited.
Now TDX code uses MOVDIR64B to move data to normal memory so it's time to revisit.
The SDM says the destination of MOVDIR64B is "memory location specified in a general register", thus it's more reasonable that
movdir64b()does not have the__iomemannotation on the @dst.Remove the
__iomemannotation from the @dst argument ofmovdir64b()to fix the sparse warning in TDX code. Similar tomemset_io(), introduce a newmovdir64b_io()to cover the case where the destination is an MMIO location, and change the solo calleriosubmit_cmds512()to use the newmovdir64b_io().In
movdir64b_io()explicitly use__forcein the type casting otherwise there will be below sparse warning:
Quoted 6 lines
warning: cast removes address space '
__iomem' of expressionFixes e56d28df2f66 ("x86/virt/tdx: Configure global KeyID on all packages")Reported-by kernel test robot <[email protected]>Signed-off-by Kai Huang <[email protected]>
Quoted 49 lines
--- arch/x86/include/asm/io.h | 2 +- arch/x86/include/asm/special_insns.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)arch/x86/include/asm/io.h +1
-1@@ -379,7 +379,7 @@ static inline void iosubmit_cmds512(void __iomem *dst, const void *src,const u8 *end = from + count *64 ;while (from < end) { -movdir64b (dst, from); +movdir64b_io (dst, from); from +=64 ; } }arch/x86/include/asm/special_insns.h +7
-2@@ -224,10 +224,10 @@ static inline void serialize(void) }/* The dst parameter must be 64-bytes aligned */ -static inline void movdir64b (void __iomem *dst,const void *src) +static inline void movdir64b (void *dst,const void *src) {const struct {char _[64 ]; } *__src = src; -struct {char _[64 ]; }__iomem *__dst = dst; +struct {char _[64 ]; } *__dst = dst;/* * MOVDIR64B %(rdx), rax. @@ -245,6 +245,11 @@ static inline void movdir64b(void __iomem *dst, const void *src) : "m" (*__src), "a" (__dst), "d" (__src)); } +static inline void movdir64b_io (void __iomem *dst,const void *src) +{ +movdir64b ((void __force *)dst, src); +} +/** * enqcmds - Enqueue a command in supervisor (CPL0) mode * @dst: destination, in MMIO space (must be 512-bit aligned) base-commit:
83e1bdc94f32dcf52dfcd2025acc7a2b9376b1e8
Quoted 44 lines · Kai Huang
Commit
e56d28df2f66("x86/virt/tdx: Configure global KeyID on all packages") causes below sparse check warning:
arch/x86/virt/vmx/tdx/tdx.c:683:27: warning: incorrect type in argument 1 (different address spaces)
arch/x86/virt/vmx/tdx/tdx.c:683:27: expected void [noderef]__iomem*dst
arch/x86/virt/vmx/tdx/tdx.c:683:27: got void *The reason is TDX must use the MOVDIR64B instruction to convert TDX private memory (which is normal RAM but not MMIO) back to normal. The TDX code uses existing
movdir64b()helper to do that, but the first argument @dst ofmovdir64b()is annotated with__iomem.When
movdir64b()was firstly introduced in commit0888e1030d3e("x86/asm: Carve out a genericmovdir64b()helper for general usage"), it didn't have the__iomemannotation. But this commit also introduced the same "incorrect type" sparse warning because theiosubmit_cmds512(), which was the solo caller ofmovdir64b(), has the__iomemannotation.This was later fixed by commit
6ae58d871319("x86/asm: Annotate movdir64b()'s dst argument with__iomem"). That fix was reasonable because until TDX code themovdir64b()was only used to move data to MMIO location, as described by the commit message:... The current usages send a 64-bytes command descriptor to an MMIO location (portal) on a device for consumption. When future usages for the MOVDIR64B instruction warrant a separate variant of a memory to memory operation, the argument annotation can be revisited.
Now TDX code uses MOVDIR64B to move data to normal memory so it's time to revisit.
The SDM says the destination of MOVDIR64B is "memory location specified in a general register", thus it's more reasonable that
movdir64b()does not have the__iomemannotation on the @dst.Remove the
__iomemannotation from the @dst argument ofmovdir64b()to fix the sparse warning in TDX code. Similar tomemset_io(), introduce a newmovdir64b_io()to cover the case where the destination is an MMIO location, and change the solo calleriosubmit_cmds512()to use the newmovdir64b_io().In
movdir64b_io()explicitly use__forcein the type casting otherwise there will be below sparse warning:
Quoted 6 lines
warning: cast removes address space '
__iomem' of expressionFixes e56d28df2f66 ("x86/virt/tdx: Configure global KeyID on all packages")Reported-by kernel test robot <[email protected]>Signed-off-by Kai Huang <[email protected]>
Signature · 1 line
Kiryl Shutsemau / Kirill A. Shutemov
Quoted 44 lines · Kai Huang
Commit
e56d28df2f66("x86/virt/tdx: Configure global KeyID on all packages") causes below sparse check warning:
arch/x86/virt/vmx/tdx/tdx.c:683:27: warning: incorrect type in argument 1 (different address spaces)
arch/x86/virt/vmx/tdx/tdx.c:683:27: expected void [noderef]__iomem*dst
arch/x86/virt/vmx/tdx/tdx.c:683:27: got void *The reason is TDX must use the MOVDIR64B instruction to convert TDX private memory (which is normal RAM but not MMIO) back to normal. The TDX code uses existing
movdir64b()helper to do that, but the first argument @dst ofmovdir64b()is annotated with__iomem.When
movdir64b()was firstly introduced in commit0888e1030d3e("x86/asm: Carve out a genericmovdir64b()helper for general usage"), it didn't have the__iomemannotation. But this commit also introduced the same "incorrect type" sparse warning because theiosubmit_cmds512(), which was the solo caller ofmovdir64b(), has the__iomemannotation.This was later fixed by commit
6ae58d871319("x86/asm: Annotate movdir64b()'s dst argument with__iomem"). That fix was reasonable because until TDX code themovdir64b()was only used to move data to MMIO location, as described by the commit message:... The current usages send a 64-bytes command descriptor to an MMIO location (portal) on a device for consumption. When future usages for the MOVDIR64B instruction warrant a separate variant of a memory to memory operation, the argument annotation can be revisited.
Now TDX code uses MOVDIR64B to move data to normal memory so it's time to revisit.
The SDM says the destination of MOVDIR64B is "memory location specified in a general register", thus it's more reasonable that
movdir64b()does not have the__iomemannotation on the @dst.Remove the
__iomemannotation from the @dst argument ofmovdir64b()to fix the sparse warning in TDX code. Similar tomemset_io(), introduce a newmovdir64b_io()to cover the case where the destination is an MMIO location, and change the solo calleriosubmit_cmds512()to use the newmovdir64b_io().In
movdir64b_io()explicitly use__forcein the type casting otherwise there will be below sparse warning:
Quoted 6 lines
warning: cast removes address space '
__iomem' of expressionFixes e56d28df2f66 ("x86/virt/tdx: Configure global KeyID on all packages")Reported-by kernel test robot <[email protected]>Signed-off-by Kai Huang <[email protected]>
Quoted 52 lines
--- arch/x86/include/asm/io.h | 2 +- arch/x86/include/asm/special_insns.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)arch/x86/include/asm/io.h +1
-1@@ -379,7 +379,7 @@ static inline void iosubmit_cmds512(void __iomem *dst, const void *src,const u8 *end = from + count *64 ;while (from < end) { -movdir64b (dst, from); +movdir64b_io (dst, from); from +=64 ; } }arch/x86/include/asm/special_insns.h +7
-2@@ -224,10 +224,10 @@ static inline void serialize(void) }/* The dst parameter must be 64-bytes aligned */ -static inline void movdir64b (void __iomem *dst,const void *src) +static inline void movdir64b (void *dst,const void *src) {const struct {char _[64 ]; } *__src = src; -struct {char _[64 ]; }__iomem *__dst = dst; +struct {char _[64 ]; } *__dst = dst;/* * MOVDIR64B %(rdx), rax. @@ -245,6 +245,11 @@ static inline void movdir64b(void __iomem *dst, const void *src) : "m" (*__src), "a" (__dst), "d" (__src)); } +static inline void movdir64b_io (void __iomem *dst,const void *src) +{ +movdir64b ((void __force *)dst, src); +} +/** * enqcmds - Enqueue a command in supervisor (CPL0) mode * @dst: destination, in MMIO space (must be 512-bit aligned) base-commit:
83e1bdc94f32dcf52dfcd2025acc7a2b9376b1e8--
2.43.0