Commit b5fa1f91 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Make __vcpu_sys_reg() a pure rvalue operand 



Now that we don't have any use of __vcpu_sys_reg() as a lvalue,
remove the in-place update, and directly return the sanitised
value.

Reviewed-by: default avatarMiguel Luis <miguel.luis@oracle.com>
Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20250603070824.1192795-5-maz@kernel.org


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent b61fae4e

arch/arm64/include/asm/kvm_host.h

+5 −5
Original line number Diff line number Diff line
@@ -1130,13 +1130,13 @@ u64 kvm_vcpu_apply_reg_masks(const struct kvm_vcpu *, enum vcpu_sysreg, u64); 
	} while (0)



#define __vcpu_sys_reg(v,r)						\

	(*({								\

	({								\

		const struct kvm_cpu_context *ctxt = &(v)->arch.ctxt;	\

		u64 *__r = __ctxt_sys_reg(ctxt, (r));			\

		u64 __v = ctxt_sys_reg(ctxt, (r));			\

		if (vcpu_has_nv((v)) && (r) >= __SANITISED_REG_START__)	\

			*__r = kvm_vcpu_apply_reg_masks((v), (r), *__r);\

		__r;							\

	}))

			__v = kvm_vcpu_apply_reg_masks((v), (r), __v);	\

		__v;							\

	})



u64 vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, int reg);

void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg);