Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 749d088b authored by Minfei Huang's avatar Minfei Huang Committed by Paolo Bonzini
Browse files

pvclock: Add CPU barriers to get correct version value 



Protocol for the "version" fields is: hypervisor raises it (making it
uneven) before it starts updating the fields and raises it again (making
it even) when it is done.  Thus the guest can make sure the time values
it got are consistent by checking the version before and after reading
them.

Add CPU barries after getting version value just like what function
vread_pvclock does, because all of callees in this function is inline.

Fixes: 502dfeff
Cc: stable@vger.kernel.org
Signed-off-by: default avatarMinfei Huang <mnghuan@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4c2e07c6

arch/x86/include/asm/pvclock.h

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ unsigned __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src, 
	u8 ret_flags;



	version = src->version;

	/* Make the latest version visible */

	smp_rmb();



	offset = pvclock_get_nsec_offset(src);

	ret = src->system_time + offset;

arch/x86/kernel/pvclock.c

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src) 


	do {

		version = __pvclock_read_cycles(src, &ret, &flags);

		/* Make sure that the version double-check is last. */

		smp_rmb();

	} while ((src->version & 1) || version != src->version);



	return flags & valid_flags;
@@ -80,6 +82,8 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) 


	do {

		version = __pvclock_read_cycles(src, &ret, &flags);

		/* Make sure that the version double-check is last. */

		smp_rmb();

	} while ((src->version & 1) || version != src->version);



	if (unlikely((flags & PVCLOCK_GUEST_STOPPED) != 0)) {