Skip to contentSkip to conversation

x86/sev: remove duplicated assignment to variable info

PATCH Applied Colin Ian King 2 participants 2 messages May 16, 2022 – May 17, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/sev: remove duplicated assignment to variable info

Variable info is being assigned the same value twice, remove the redundant duplicate. Also assign variable v in the declaration.

Cleans up clang scan warning:
warning: Value stored to 'info' during its initialization is never read [deadcode.DeadStores]

---
 arch/x86/kernel/sev-shared.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/kernel/sev-shared.c +1 -4
index 2b4270d5559e..b478edf43bec 100644
@@ -201,10 +201,7 @@ static enum es_result verify_exception_info(struct ghcb *ghcb, struct es_em_ctxt
 
 	if (ret == 1) {
 		u64 info = ghcb->save.sw_exit_info_2;
-		unsigned long v;
-
-		info = ghcb->save.sw_exit_info_2;
-		v = info & SVM_EVTINJ_VEC_MASK;
+		unsigned long v = info & SVM_EVTINJ_VEC_MASK;
 
 		/* Check if exception information from hypervisor is sane. */
 		if ((info & SVM_EVTINJ_VALID) &&
Signature · 1 line
2.35.1
merge bot Applied
#1 lore raw

[tip: x86/sev] x86/sev: Remove duplicated assignment to variable info

The following commit has been merged into the x86/sev branch of tip:

The following commit has been merged into the x86/sev branch of tip:

Commit-ID:     0621210ab7693e6d50585ca689d95d57df617455
Gitweb:        https://git.kernel.org/tip/0621210ab7693e6d50585ca689d95d57df617455
Author:        Colin Ian King <[email protected]>
AuthorDate:    Mon, 16 May 2022 19:42:15 +01:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Tue, 17 May 2022 12:52:37 +02:00

x86/sev: Remove duplicated assignment to variable info

Variable info is being assigned the same value twice, remove the redundant assignment. Also assign variable v in the declaration.

Cleans up clang scan warning:
warning: Value stored to 'info' during its initialization is never read [deadcode.DeadStores]

No code changed:

# arch/x86/kernel/sev.o:

   text    data     bss     dec     hex filename
  19878    4487    4112   28477    6f3d sev.o.before
  19878    4487    4112   28477    6f3d sev.o.after

md5:
bfbaa515af818615fd01fea91e7eba1b sev.o.before.asm bfbaa515af818615fd01fea91e7eba1b sev.o.after.asm

[ bp: Running the before/after check on sev.c because sev-shared.c
gets included into it. ]

Fixes 597cfe48212a ("x86/boot/compressed/64: Setup a GHCB-based VC Exception handler")
---
 arch/x86/kernel/sev-shared.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/x86/kernel/sev-shared.c +1 -4
index 2b4270d..b478edf 100644
@@ -201,10 +201,7 @@ static enum es_result verify_exception_info(struct ghcb *ghcb, struct es_em_ctxt
 
 	if (ret == 1) {
 		u64 info = ghcb->save.sw_exit_info_2;
-		unsigned long v;
-
-		info = ghcb->save.sw_exit_info_2;
-		v = info & SVM_EVTINJ_VEC_MASK;
+		unsigned long v = info & SVM_EVTINJ_VEC_MASK;
 
 		/* Check if exception information from hypervisor is sane. */
 		if ((info & SVM_EVTINJ_VALID) &&