MIPS: KVM: Refactor added offsetof()s (088ec208) · Commits · 戴 / test

When calculating the offsets into the commpage for dynamically translated mtc0/mfc0 guest instructions, multiple offsetof()s are added together to find the offset of the specific register in the mips_coproc, within the commpage. Simplify each of these cases to a single offsetof() to find the offset of the specific register within the commpage. Signed-off-by:

James Hogan <james.hogan@imgtec.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Gleb Natapov <gleb@kernel.org> Cc: linux-mips@linux-mips.org Cc: kvm@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/11888/ Signed-off-by:

Ralf Baechle <ralf@linux-mips.org>

arch/mips/kvm/dyntrans.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -86,10 +86,8 @@ int kvm_mips_trans_mfc0(uint32_t inst, uint32_t opc, struct kvm_vcpu vcpu)
		} else {
		mfc0_inst = LW_TEMPLATE;
		mfc0_inst \|= ((rt & 0x1f) << 16);
		mfc0_inst \|=
		offsetof(struct mips_coproc,
		reg[rd][sel]) + offsetof(struct kvm_mips_commpage,
		cop0);
		mfc0_inst \|= offsetof(struct kvm_mips_commpage,
		cop0.reg[rd][sel]);
		}

		if (KVM_GUEST_KSEGX(opc) == KVM_GUEST_KSEG0) {
		@@ -123,9 +121,7 @@ int kvm_mips_trans_mtc0(uint32_t inst, uint32_t opc, struct kvm_vcpu vcpu)
		sel = inst & 0x7;

		mtc0_inst \|= ((rt & 0x1f) << 16);
		mtc0_inst \|=
		offsetof(struct mips_coproc,
		reg[rd][sel]) + offsetof(struct kvm_mips_commpage, cop0);
		mtc0_inst \|= offsetof(struct kvm_mips_commpage, cop0.reg[rd][sel]);

		if (KVM_GUEST_KSEGX(opc) == KVM_GUEST_KSEG0) {
		kseg0_opc =

Admin message