On Thu, 21 Jun 2018, Pavel Tatashin wrote:
> If architecture does not support exact boot time, it is challenging to
> estimate boot time without having a reference to the current persistent
> clock value. Yet, we cannot read the persistent clock time again, because
> this may lead to math discrepancies with the caller of read_boot_clock64()
> who have read the persistent clock at a different time.
>
> This is why it is better to provide two values simultaneously: the
> persistent clock value, and the boot time.
>
> Thus, we replace read_boot_clock64() with:
> read_persistent_wall_and_boot_offset(wall_time, boot_offset)
>
> Where wall_time is returned by read_persistent_clock()
> And boot_offset is wall_time - boot time
>
> We calculate boot_offset using the current value of local_clock() so
> architectures, that do not have a dedicated boot_clock but have early
> sched_clock(), such as SPARCv9, x86, and possibly more will benefit from
> this change by getting a better and more consistent estimate of the boot
> time without need for an arch specific implementation.
Again. You are doing 5 things in one patch.
> /**
> - * read_boot_clock64 - Return time of the system start.
> + * read_persistent_wall_and_boot_offset - Read persistent clock, and also offset
> + * from the boot.
> *
> * Weak dummy function for arches that do not yet support it.
> - * Function to read the exact time the system has been started.
> - * Returns a timespec64 with tv_sec=0 and tv_nsec=0 if unsupported.
> - *
> - * XXX - Do be sure to remove it once all arches implement it.
> + * wall_time - current time as returned by persistent clock
> + * boot_offset - offset that is defined as wall_time - boot_time
> + * The default function calculates offset based on the current value of
> + * local_clock(). This way architectures that support sched_clock() but don't
> + * support dedicated boot time clock will provide the best estimate of the
> + * boot time.
> */
> -void __weak read_boot_clock64(struct timespec64 *ts)
> +void __weak __init
> +read_persistent_wall_and_boot_offset(struct timespec64 *wall_time,
> + struct timespec64 *boot_offset)
> {
> - ts->tv_sec = 0;
> - ts->tv_nsec = 0;
> + read_persistent_clock64(wall_time);
> + *boot_offset = ns_to_timespec64(local_clock());
Introduce the default function with
*boot_offset = 0;
And then in a follow up patch, add the local_clock() magic to it. This 'oh
lets do all in one just because we can' is just wrong. It's harder to
review and its bad for bisection because you cannot differentiate whether
the wreckage comes from the timekeeping_init() conversion or the magic new
functionality in read_persistent_wall_and_boot_offset().
That said, I like the local_clock() idea itself, but it might wreckage some
architecture(s), so we need to watchout for that.
> /* Flag for if timekeeping_resume() has injected sleeptime */
> @@ -1521,28 +1527,28 @@ static bool persistent_clock_exists;
> */
> void __init timekeeping_init(void)
> {
> + struct timespec64 wall_time, boot_offset, wall_to_mono;
> struct timekeeper *tk = &tk_core.timekeeper;
> struct clocksource *clock;
> unsigned long flags;
> - struct timespec64 now, boot, tmp;
> -
> - read_persistent_clock64(&now);
> - if (!timespec64_valid_strict(&now)) {
> - pr_warn("WARNING: Persistent clock returned invalid value!\n"
> - " Check your CMOS/BIOS settings.\n");
> - now.tv_sec = 0;
> - now.tv_nsec = 0;
> - } else if (now.tv_sec || now.tv_nsec)
> - persistent_clock_exists = true;
>
> - read_boot_clock64(&boot);
> - if (!timespec64_valid_strict(&boot)) {
> - pr_warn("WARNING: Boot clock returned invalid value!\n"
> - " Check your CMOS/BIOS settings.\n");
> - boot.tv_sec = 0;
> - boot.tv_nsec = 0;
> + read_persistent_wall_and_boot_offset(&wall_time, &boot_offset);
> + if (timespec64_valid_strict(&wall_time) &&
> + timespec64_to_ns(&wall_time)) {
Can you please have an explicit ts_to_ns(wall) > 0 there? I know it's
implied in timespec64_valid_strict(), but it makes this code more obvious.
> + persistent_clock_exists = true;
> + } else {
> + pr_warn("Persistent clock returned invalid value");
> + wall_time = (struct timespec64){0};
> }
>
> + if (timespec64_compare(&wall_time, &boot_offset) < 0)
> + boot_offset = (struct timespec64){0};
> +
> + /* We want set wall_to_mono, so the following is true:
See: https://lkml.kernel.org/r/CA+55aFyQYJerovMsSoSKS7PessZBr4vNp-3QUUwhqk4A4_jcbg@xxxxxxxxxxxxxx
> + * wall time + wall_to_mono = boot time
> + */
> + wall_to_mono = timespec64_sub(boot_offset, wall_time);
> +
> raw_spin_lock_irqsave(&timekeeper_lock, flags);
Thanks,
tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
