Skip to contentSkip to conversation

x86/time: minor adjustments to init_pit()

PATCH In review Jan Beulich 3 participants 4 messages Jan 17, 2022 – Jan 25, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/time: minor adjustments to init_pit()

For one, "using_pit" shouldn't be set ahead of the function's last (for now: only) error path. Otherwise "clocksource=pit" on the command line can lead to misbehavior when actually taking that error path.

And then make an implicit assumption explicit: CALIBRATE_FRAC cannot, for example, simply be changed to 10. The way init_pit() works, the upper bound on the calibration period is about 54ms.

---
Really I've noticed this while considering what would happen if someone specified "clocksource=pit" on the shim's command line. Unlike "hpet" and "acpi", "pit" presently wouldn't be (explicitly) ignored. While, aiui, right now the only error path would be taken (due to port 0x61 reads being supposed to get back 0xff), I don't think we can build on that longer term: Seeing what we use port 0x61 for in traps.c, I think sooner or later we will need to have some form of emulation for it. Such emulation is then not unlikely to continuously report 0 in the bit in question. That would leed to an infinite loop here.

xen/arch/x86/time.c +3 -2
@@ -333,8 +333,6 @@ static s64 __init init_pit(struct platfo
     u64 start, end;
     unsigned long count;
 
-    using_pit = true;
-
     /* Set the Gate high, disable speaker. */
     outb((portb & ~0x02) | 0x01, 0x61);
 
@@ -344,6 +342,7 @@ static s64 __init init_pit(struct platfo
      * (LSB and MSB) to begin countdown.
      */
 #define CALIBRATE_LATCH CALIBRATE_VALUE(CLOCK_TICK_RATE)
+    BUILD_BUG_ON(CALIBRATE_LATCH >> 16);
     outb(0xb0, PIT_MODE);                  /* binary, mode 0, LSB/MSB, Ch 2 */
     outb(CALIBRATE_LATCH & 0xff, PIT_CH2); /* LSB of count */
     outb(CALIBRATE_LATCH >> 8, PIT_CH2);   /* MSB of count */
@@ -361,6 +360,8 @@ static s64 __init init_pit(struct platfo
     if ( count == 0 )
         return 0;
 
+    using_pit = true;
+
     return (end - start) * CALIBRATE_FRAC;
 }
 
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Jan Beulich

For one, "using_pit" shouldn't be set ahead of the function's last (for now: only) error path. Otherwise "clocksource=pit" on the command line can lead to misbehavior when actually taking that error path.

And then make an implicit assumption explicit: CALIBRATE_FRAC cannot, for example, simply be changed to 10. The way init_pit() works, the upper bound on the calibration period is about 54ms.

Quoted 10 lines

---
Really I've noticed this while considering what would happen if someone specified "clocksource=pit" on the shim's command line. Unlike "hpet" and "acpi", "pit" presently wouldn't be (explicitly) ignored. While, aiui, right now the only error path would be taken (due to port 0x61 reads being supposed to get back 0xff), I don't think we can build on that longer term: Seeing what we use port 0x61 for in traps.c, I think sooner or later we will need to have some form of emulation for it. Such emulation is then not unlikely to continuously report 0 in the bit in question. That would leed to an infinite loop here.

If we're not already doing it, pv shim really ought to set the FADT hardware reduced bits.  There should be no need to depend on heuristics around ~0.

I do suspect that the emulation for port 0x61 is obsolete enough for us to consider dropping.

~Andrew

#2 lore raw
Quoted 5 lines · Andrew Cooper
Quoted 4 lines · Jan Beulich

For one, "using_pit" shouldn't be set ahead of the function's last (for now: only) error path. Otherwise "clocksource=pit" on the command line can lead to misbehavior when actually taking that error path.

Quoted 7 lines
Quoted 5 lines

And then make an implicit assumption explicit: CALIBRATE_FRAC cannot, for example, simply be changed to 10. The way init_pit() works, the upper bound on the calibration period is about 54ms.

Thanks.

Quoted 11 lines
Quoted 10 lines

---
Really I've noticed this while considering what would happen if someone specified "clocksource=pit" on the shim's command line. Unlike "hpet" and "acpi", "pit" presently wouldn't be (explicitly) ignored. While, aiui, right now the only error path would be taken (due to port 0x61 reads being supposed to get back 0xff), I don't think we can build on that longer term: Seeing what we use port 0x61 for in traps.c, I think sooner or later we will need to have some form of emulation for it. Such emulation is then not unlikely to continuously report 0 in the bit in question. That would leed to an infinite loop here.

Quoted 3 lines

If we're not already doing it, pv shim really ought to set the FADT hardware reduced bits.  There should be no need to depend on heuristics around ~0.

Before forcing this flag onto "others", I guess we'd better first start properly honoring this mode ourselves? Outside of ACPICA code there has been only a single use of this FADT bit so far ...

Quoted 2 lines

I do suspect that the emulation for port 0x61 is obsolete enough for us to consider dropping.

Well, as always - I'm hesitant to drop code which we don't know for sure cannot possibly be of use to anyone anymore, and which also isn't known to cause (significant) harm.

Jan

#3 lore raw
In reply to Andrew Cooper
Quoted 24 lines · Andrew Cooper
Quoted 9 lines · Jan Beulich

For one, "using_pit" shouldn't be set ahead of the function's last (for now: only) error path. Otherwise "clocksource=pit" on the command line can lead to misbehavior when actually taking that error path.

And then make an implicit assumption explicit: CALIBRATE_FRAC cannot, for example, simply be changed to 10. The way init_pit() works, the upper bound on the calibration period is about 54ms.

Quoted 10 lines

---
Really I've noticed this while considering what would happen if someone specified "clocksource=pit" on the shim's command line. Unlike "hpet" and "acpi", "pit" presently wouldn't be (explicitly) ignored. While, aiui, right now the only error path would be taken (due to port 0x61 reads being supposed to get back 0xff), I don't think we can build on that longer term: Seeing what we use port 0x61 for in traps.c, I think sooner or later we will need to have some form of emulation for it. Such emulation is then not unlikely to continuously report 0 in the bit in question. That would leed to an infinite loop here.

Quoted 3 lines

If we're not already doing it, pv shim really ought to set the FADT hardware reduced bits.  There should be no need to depend on heuristics around ~0.

We have talked about setting the hardware reduced flag for PVH, it's however tricky. For once hardware-reduced ACPI mandates the usage of UEFI firmware, which we don't yet fully support for PVH.

And then we cannot set that flag for a PVH dom0, because we use a mix of crafted and native ACPI tables, so we risk that setting the bit creates incompatibilities with the native tables we expose.

Roger.