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

Commit b01578de authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

x86: pvclock: make sure rdtsc doesnt speculate out of region 



Originally from Jeremy Fitzhardinge.

pvclock_get_time_values, which contains the memory barriers
will be removed by next patch.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 7069ed67

arch/x86/kernel/pvclock.c

+2 −2
Original line number Diff line number Diff line
@@ -97,10 +97,10 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) 


	do {

		version = pvclock_get_time_values(&shadow, src);

		barrier();

		rdtsc_barrier();

		offset = pvclock_get_nsec_offset(&shadow);

		ret = shadow.system_timestamp + offset;

		barrier();

		rdtsc_barrier();

	} while (version != src->version);



	if ((valid_flags & PVCLOCK_TSC_STABLE_BIT) &&