leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/kvm/svm: Force-inline GHCB accessors

Browse Source 
In order to fix:

  vmlinux.o: warning: objtool: __sev_es_nmi_complete()+0x4c: call to ghcb_set_sw_exit_code() leaves .noinstr.text section

Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220324183607.31717-3-bp@alien8.de
This commit is contained in:
Borislav Petkov
2022-03-23 21:52:44 +01:00
parent e87f4152e5
commit 6b91ec4ad2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/include/asm/svm.h
View File

@@ -444,23 +444,23 @@ struct vmcb {
(offsetof(struct vmcb_save_area, field) / sizeof(u64)) (offsetof(struct vmcb_save_area, field) / sizeof(u64))
#define DEFINE_GHCB_ACCESSORS(field) \ #define DEFINE_GHCB_ACCESSORS(field) \
static inline bool ghcb_##field##_is_valid(const struct ghcb *ghcb) \ static __always_inline bool ghcb_##field##_is_valid(const struct ghcb *ghcb) \
{ \ { \
return test_bit(GHCB_BITMAP_IDX(field), \ return test_bit(GHCB_BITMAP_IDX(field), \
(unsigned long *)&ghcb->save.valid_bitmap); \ (unsigned long *)&ghcb->save.valid_bitmap); \
} \ } \
\ \
static inline u64 ghcb_get_##field(struct ghcb *ghcb) \ static __always_inline u64 ghcb_get_##field(struct ghcb *ghcb) \
{ \ { \
return ghcb->save.field; \ return ghcb->save.field; \
} \ } \
\ \
static inline u64 ghcb_get_##field##_if_valid(struct ghcb *ghcb) \ static __always_inline u64 ghcb_get_##field##_if_valid(struct ghcb *ghcb) \
{ \ { \
return ghcb_##field##_is_valid(ghcb) ? ghcb->save.field : 0; \ return ghcb_##field##_is_valid(ghcb) ? ghcb->save.field : 0; \
} \ } \
\ \
static inline void ghcb_set_##field(struct ghcb *ghcb, u64 value) \ static __always_inline void ghcb_set_##field(struct ghcb *ghcb, u64 value) \
{ \ { \
__set_bit(GHCB_BITMAP_IDX(field), \ __set_bit(GHCB_BITMAP_IDX(field), \
(unsigned long *)&ghcb->save.valid_bitmap); \ (unsigned long *)&ghcb->save.valid_bitmap); \