x86/rtc: provide mediated access to RTC for PVH dom0
PATCH v2 1/1 x86/rtc: provide mediated access to RTC for PVH dom0
Mediated access to the RTC was provided for PVHv1 dom0 using the PV code paths (guest_io_{write/read}), but those accesses where never implemented for PVHv2 dom0. This patch provides such mediated accesses to the RTC for PVH dom0, just like it's provided for a classic PV dom0.
Pull out some of the RTC logic from guest_io_{read/write} into specific helpers that can be used by both PV and HVM guests. The setup of the handlers for PVH is done in rtc_init, which is already used to initialize the fully emulated RTC.
Without this a Linux PVH dom0 will read garbage when trying to access the RTC, and one vCPU will be constantly looping in rtc_timer_do_work.
Note that such issue doesn't happen on domUs because the ACPI NO_CMOS_RTC flag is set in FADT, which prevents the OS from accessing the RTC. Also the X86_EMU_RTC flag is not set for PVH dom0, as the accesses are not emulated but rather forwarded to the physical hardware.
No functional change expected for classic PV dom0.
---
for-4.14 reasoning: the fix is mostly isolated to PVH dom0, and as such the risk is very low of causing issues to other guests types, but without this fix one vCPU when using a Linux dom0 will be constantly looping over rtc_timer_do_work with 100% CPU usage, at least when using Linux 4.19 or newer.
---
Changes since v1:
- Share the code with PV.
- Add access checks to the IO ports.
--- xen/arch/x86/hvm/rtc.c | 34 ++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 28 +++------------ xen/arch/x86/time.c | 59 +++++++++++++++++++++++++++++++ xen/include/asm-x86/mc146818rtc.h | 3 ++ 4 files changed, 100 insertions(+), 24 deletions(-)
xen/arch/x86/hvm/rtc.c +34 -0
@@ -22,6 +22,7 @@* IN THE SOFTWARE. */ +#include <asm/iocap.h> #include <asm/mc146818rtc.h> #include <asm/hvm/vpt.h> #include <asm/hvm/io.h>
@@ -808,10 +809,43 @@ void rtc_reset(struct domain *d) s->pt.source = PTSRC_isa; } +/* RTC mediator for HVM hardware domain. */ +static int hw_rtc_io (int dir,unsigned int port,unsigned int size, +uint32_t *val) +{ +if ( dir ==IOREQ_READ ) + *val = ~0 ; + +if ( size !=1 ) + { +gdprintk (XENLOG_WARNING ,"bad RTC access size (%u)\n" , size); +return X86EMUL_OKAY ; + } +if ( !ioports_access_permitted (current->domain, port, port) ) + { +gdprintk (XENLOG_WARNING ,"access to RTC port %x not allowed\n" , port); +return X86EMUL_OKAY ; + } + +if ( dir ==IOREQ_WRITE ) +rtc_guest_write (port, *val); +else + *val =rtc_guest_read (port); + +return X86EMUL_OKAY ; +} +void rtc_init (struct domain *d) {RTCState *s =domain_vrtc (d); +if (is_hardware_domain (d) ) + { +/* Hardware domain gets mediated access to the physical RTC. */ +register_portio_handler (d,RTC_PORT (0 ),2 , hw_rtc_io); +return ; + } +if ( !has_vrtc (d) )return ;
xen/arch/x86/pv/emul-priv-op.c +4 -24
@@ -280,19 +280,10 @@ static uint32_t guest_io_read(unsigned int port, unsigned int bytes, { sub_data =pv_pit_handler (port,0 ,0 ); } - else if ( port == RTC_PORT(0) ) - { - sub_data = currd->arch.cmos_idx; - } - else if ( (port == RTC_PORT(1)) && + else if ( (port == RTC_PORT(0) || port == RTC_PORT(1)) && ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { -unsigned long flags; - -spin_lock_irqsave (&rtc_lock, flags); -outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); - sub_data =inb (RTC_PORT (1 )); -spin_unlock_irqrestore (&rtc_lock, flags); + sub_data =rtc_guest_read (port); } else if ( (port == 0xcf8) && (bytes == 4) ) {
@@ -413,21 +404,10 @@ static void guest_io_write(unsigned int port, unsigned int bytes, {pv_pit_handler (port, (uint8_t )data,1 ); } - else if ( port == RTC_PORT(0) ) - { - currd->arch.cmos_idx = data; - } - else if ( (port == RTC_PORT(1)) && + else if ( (port == RTC_PORT(0) || port == RTC_PORT(1)) && ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { -unsigned long flags; - -if ( pv_rtc_handler ) -pv_rtc_handler (currd->arch.cmos_idx &0x7f , data); -spin_lock_irqsave (&rtc_lock, flags); -outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); -outb (data,RTC_PORT (1 )); -spin_unlock_irqrestore (&rtc_lock, flags); +rtc_guest_write (port, data); } else if ( (port == 0xcf8) && (bytes == 4) ) {
xen/arch/x86/time.c +59 -0
71 lines not on this page · raw message
xen/include/asm-x86/mc146818rtc.h +3 -0
@@ -110,4 +110,7 @@ outb_p((val),RTC_PORT(1)); \#define RTC_IRQ 8 +unsigned int rtc_guest_read (unsigned int port); +void rtc_guest_write (unsigned int port,unsigned int data); +#endif /* _ASM_MC146818RTC_H */
Signature · 1 line
2.26.2
Quoted 21 lines · Roger Pau Monne
Mediated access to the RTC was provided for PVHv1 dom0 using the PV code paths (guest_io_{write/read}), but those accesses where never implemented for PVHv2 dom0. This patch provides such mediated accesses to the RTC for PVH dom0, just like it's provided for a classic PV dom0.
Pull out some of the RTC logic from guest_io_{read/write} into specific helpers that can be used by both PV and HVM guests. The setup of the handlers for PVH is done in
rtc_init, which is already used to initialize the fully emulated RTC.Without this a Linux PVH dom0 will read garbage when trying to access the RTC, and one vCPU will be constantly looping in
rtc_timer_do_work.Note that such issue doesn't happen on domUs because the ACPI
NO_CMOS_RTCflag is set in FADT, which prevents the OS from accessing the RTC. Also theX86_EMU_RTCflag is not set for PVH dom0, as the accesses are not emulated but rather forwarded to the physical hardware.
Quoted 3 lines
No functional change expected for classic PV dom0.
Signed-off-by Roger Pau Monné <[email protected]>
Quoted 29 lines
-----Original Message-----
From: Roger Pau Monne <[email protected]>
Sent: 05 June 2020 12:03
To: [email protected]
Cc: [email protected]; Roger Pau Monne <[email protected]>; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>
Subject: [PATCH for-4.14 v2] x86/rtc: provide mediated access to RTC for PVH dom0Mediated access to the RTC was provided for PVHv1 dom0 using the PV code paths (guest_io_{write/read}), but those accesses where never implemented for PVHv2 dom0. This patch provides such mediated accesses to the RTC for PVH dom0, just like it's provided for a classic PV dom0.
Pull out some of the RTC logic from guest_io_{read/write} into specific helpers that can be used by both PV and HVM guests. The setup of the handlers for PVH is done in
rtc_init, which is already used to initialize the fully emulated RTC.Without this a Linux PVH dom0 will read garbage when trying to access the RTC, and one vCPU will be constantly looping in
rtc_timer_do_work.Note that such issue doesn't happen on domUs because the ACPI
NO_CMOS_RTCflag is set in FADT, which prevents the OS from accessing the RTC. Also theX86_EMU_RTCflag is not set for PVH dom0, as the accesses are not emulated but rather forwarded to the physical hardware.
Quoted 3 lines
No functional change expected for classic PV dom0.
Signed-off-by Roger Pau Monné <[email protected]>
Quoted 214 lines
---
for-4.14 reasoning: the fix is mostly isolated to PVH dom0, and as such the risk is very low of causing issues to other guests types, but without this fix one vCPU when using a Linux dom0 will be constantly looping overrtc_timer_do_workwith 100% CPU usage, at least when using Linux 4.19 or newer.
---
Changes since v1:
- Share the code with PV.
- Add access checks to the IO ports.--- xen/arch/x86/hvm/rtc.c | 34 ++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 28 +++------------ xen/arch/x86/time.c | 59 +++++++++++++++++++++++++++++++ xen/include/asm-x86/mc146818rtc.h | 3 ++ 4 files changed, 100 insertions(+), 24 deletions(-)xen/arch/x86/hvm/rtc.c +34
-0@@ -22,6 +22,7 @@* IN THE SOFTWARE. */ +#include <asm/iocap.h> #include <asm/mc146818rtc.h> #include <asm/hvm/vpt.h> #include <asm/hvm/io.h> @@ -808,10 +809,43 @@ void rtc_reset(struct domain *d) s->pt.source = PTSRC_isa; } +/* RTC mediator for HVM hardware domain. */ +static int hw_rtc_io (int dir,unsigned int port,unsigned int size, +uint32_t *val) +{ +if ( dir ==IOREQ_READ ) + *val = ~0 ; + +if ( size !=1 ) + { +gdprintk (XENLOG_WARNING ,"bad RTC access size (%u)\n" , size); +return X86EMUL_OKAY ; + } +if ( !ioports_access_permitted (current->domain, port, port) ) + { +gdprintk (XENLOG_WARNING ,"access to RTC port %x not allowed\n" , port); +return X86EMUL_OKAY ; + } + +if ( dir ==IOREQ_WRITE ) +rtc_guest_write (port, *val); +else + *val =rtc_guest_read (port); + +return X86EMUL_OKAY ; +} +void rtc_init (struct domain *d) {RTCState *s =domain_vrtc (d); +if (is_hardware_domain (d) ) + { +/* Hardware domain gets mediated access to the physical RTC. */ +register_portio_handler (d,RTC_PORT (0 ),2 , hw_rtc_io); +return ; + } +if ( !has_vrtc (d) )return ;xen/arch/x86/pv/emul-priv-op.c +4
-24@@ -280,19 +280,10 @@ static uint32_t guest_io_read(unsigned int port, unsigned int bytes, { sub_data =pv_pit_handler (port,0 ,0 ); } - else if ( port == RTC_PORT(0) ) - { - sub_data = currd->arch.cmos_idx; - } - else if ( (port == RTC_PORT(1)) && + else if ( (port == RTC_PORT(0) || port == RTC_PORT(1)) && ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { -unsigned long flags; - -spin_lock_irqsave (&rtc_lock, flags); -outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); - sub_data =inb (RTC_PORT (1 )); -spin_unlock_irqrestore (&rtc_lock, flags); + sub_data =rtc_guest_read (port); } else if ( (port == 0xcf8) && (bytes == 4) ) {@@ -413,21 +404,10 @@ static void guest_io_write(unsigned int port, unsigned int bytes, {pv_pit_handler (port, (uint8_t )data,1 ); } - else if ( port == RTC_PORT(0) ) - { - currd->arch.cmos_idx = data; - } - else if ( (port == RTC_PORT(1)) && + else if ( (port == RTC_PORT(0) || port == RTC_PORT(1)) && ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { -unsigned long flags; - -if ( pv_rtc_handler ) -pv_rtc_handler (currd->arch.cmos_idx &0x7f , data); -spin_lock_irqsave (&rtc_lock, flags); -outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); -outb (data,RTC_PORT (1 )); -spin_unlock_irqrestore (&rtc_lock, flags); +rtc_guest_write (port, data); } else if ( (port == 0xcf8) && (bytes == 4) ) {xen/arch/x86/time.c +59
-0@@ -27,6 +27,7 @@#include <xen/keyhandler.h> #include <xen/guest_access.h> #include <asm/io.h> +#include <asm/iocap.h> #include <asm/msr.h> #include <asm/mpspec.h> #include <asm/processor.h> @@ -1110,6 +1111,64 @@ static unsigned long get_cmos_time(void)return mktime (rtc.year, rtc.mon, rtc.day, rtc.hour, rtc.min, rtc.sec); } +/* Helpers for guest accesses to the physical RTC. */ +unsigned int rtc_guest_read (unsigned int port) +{ +const struct domain *currd = current->domain; +unsigned long flags; +unsigned int data = ~0 ; + +ASSERT (port ==RTC_PORT (0 ) || port ==RTC_PORT (1 )); +if ( !ioports_access_permitted (currd, port, port) ) + { +ASSERT_UNREACHABLE (); +return data; + } + +switch ( port ) + { +case RTC_PORT (0 ): + data = currd->arch.cmos_idx; +break ; + +case RTC_PORT (1 ): +spin_lock_irqsave (&rtc_lock, flags); +outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); + data =inb (RTC_PORT (1 )); +spin_unlock_irqrestore (&rtc_lock, flags); +break ; + } + +return data; +} + +void rtc_guest_write (unsigned int port,unsigned int data) +{ +struct domain *currd = current->domain; +unsigned long flags; + +ASSERT (port ==RTC_PORT (0 ) || port ==RTC_PORT (1 )); +if ( !ioports_access_permitted (currd, port, port) ) + { +ASSERT_UNREACHABLE (); +return ; + } + +switch ( port ) + { +case RTC_PORT (0 ): + currd->arch.cmos_idx = data; +break ; + +case RTC_PORT (1 ): +spin_lock_irqsave (&rtc_lock, flags); +outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); +outb (data,RTC_PORT (1 )); +spin_unlock_irqrestore (&rtc_lock, flags); +break ; + } +} +static unsigned long get_wallclock_time (void ) {#ifdef CONFIG_XEN_GUEST xen/include/asm-x86/mc146818rtc.h +3
-1@@ -110,4 +110,7 @@ outb_p((val),RTC_PORT(1)); \#define RTC_IRQ 8 +unsigned int rtc_guest_read (unsigned int port); +void rtc_guest_write (unsigned int port,unsigned int data); +#endif /* _ASM_MC146818RTC_H */ --2.26.2
Quoted 15 lines · Roger Pau Monne
Mediated access to the RTC was provided for PVHv1 dom0 using the PV code paths (guest_io_{write/read}), but those accesses where never implemented for PVHv2 dom0. This patch provides such mediated accesses to the RTC for PVH dom0, just like it's provided for a classic PV dom0.
Pull out some of the RTC logic from guest_io_{read/write} into specific helpers that can be used by both PV and HVM guests. The setup of the handlers for PVH is done in
rtc_init, which is already used to initialize the fully emulated RTC.Without this a Linux PVH dom0 will read garbage when trying to access the RTC, and one vCPU will be constantly looping in
rtc_timer_do_work.
Quoted 7 lines
Note that such issue doesn't happen on domUs because the ACPI
NO_CMOS_RTCflag is set in FADT, which prevents the OS from accessing the RTC. Also theX86_EMU_RTCflag is not set for PVH dom0, as the accesses are not emulated but rather forwarded to the physical hardware.No functional change expected for classic PV dom0.
But there is, in whether (virtual) port 0x71 can be read/written (even by a DomU). I'm afraid of being called guilty in splitting hair, though.
Quoted 7 lines
xen/arch/x86/hvm/rtc.c +3
-0@@ -808,10 +809,43 @@ void rtc_reset(struct domain *d) s->pt.source = PTSRC_isa; } +/* RTC mediator for HVM hardware domain. */ +static int hw_rtc_io (int dir,unsigned int port,unsigned int size, +uint32_t *val)
xen/arch/x86/hvm/rtc.c void rtc_reset(struct domain *d) · line 824
Quoted 10 lines
xen/arch/x86/hvm/rtc.c +10
-0+{ +if ( dir ==IOREQ_READ ) + *val = ~0 ; + +if ( size !=1 ) + { +gdprintk (XENLOG_WARNING ,"bad RTC access size (%u)\n" , size); +return X86EMUL_OKAY ; + } +if ( !ioports_access_permitted (current->domain, port, port) )
This wants to move into the helper, such that the PV side can have it moved too.
xen/arch/x86/hvm/rtc.c void rtc_reset(struct domain *d) · line 846
Quoted 9 lines
xen/arch/x86/hvm/rtc.c +5
-0void rtc_init (struct domain *d) {RTCState *s =domain_vrtc (d); +if (is_hardware_domain (d) ) + { +/* Hardware domain gets mediated access to the physical RTC. */ +register_portio_handler (d,RTC_PORT (0 ),2 , hw_rtc_io); +return ;
Any reason for this explicit return, rather than ...
xen/arch/x86/hvm/rtc.c void rtc_reset(struct domain *d) · line 850
Quoted 4 lines
xen/arch/x86/hvm/rtc.c +2
-0+ } +if ( !has_vrtc (d) )return ;
... making use of this one? In fact wouldn't it be more correct to have
if ( !has_vrtc(d) )
{
/* Hardware domain gets mediated access to the physical RTC. */
if ( is_hardware_domain(d) )
register_portio_handler(d, RTC_PORT(0), 2, hw_rtc_io);
return;
}such that eventual (perhaps optional) enabling of vRTC for hwdom would have it properly work without changing this function again?
xen/arch/x86/pv/emul-priv-op.c static uint32_t guest_io_read(unsigned int port, unsigned int bytes, · line 285
Quoted 9 lines
xen/arch/x86/pv/emul-priv-op.c +0
-3@@ -280,19 +280,10 @@ static uint32_t guest_io_read(unsigned int port, unsigned int bytes, { sub_data =pv_pit_handler (port,0 ,0 ); } - else if ( port == RTC_PORT(0) ) - { - sub_data = currd->arch.cmos_idx;
Note how there was no permission check here. Having one or more I/O ports that can be used to simply latch a value can, as I've learned, be quite valuable as a debugging vehicle, and there aren't many (if any) ports beyond this one that a PV DomU might use for such a purpose. Arguably the value is somewhat limited here, as the value wouldn't survive a crash, but I'd still prefer if we could retain prior functionality.
xen/arch/x86/pv/emul-priv-op.c static unsigned long get_cmos_time(void) · line 1121
Quoted 12 lines
xen/arch/x86/pv/emul-priv-op.c +8
-0@@ -1110,6 +1111,64 @@ static unsigned long get_cmos_time(void)return mktime (rtc.year, rtc.mon, rtc.day, rtc.hour, rtc.min, rtc.sec); } +/* Helpers for guest accesses to the physical RTC. */ +unsigned int rtc_guest_read (unsigned int port) +{ +const struct domain *currd = current->domain; +unsigned long flags; +unsigned int data = ~0 ; + +ASSERT (port ==RTC_PORT (0 ) || port ==RTC_PORT (1 ));
Instead of this, how about ...
Quoted 8 lines
xen/arch/x86/pv/emul-priv-op.c +8
-0+if ( !ioports_access_permitted (currd, port, port) ) + { +ASSERT_UNREACHABLE (); +return data; + } + +switch ( port ) + {
xen/arch/x86/pv/emul-priv-op.c static unsigned long get_cmos_time(void) · line 1139
Quoted 10 lines
xen/arch/x86/pv/emul-priv-op.c +10
-0+case RTC_PORT (0 ): + data = currd->arch.cmos_idx; +break ; + +case RTC_PORT (1 ): +spin_lock_irqsave (&rtc_lock, flags); +outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); + data =inb (RTC_PORT (1 )); +spin_unlock_irqrestore (&rtc_lock, flags); +break ;
default:
ASSERT_UNREACHABLE();
break;?
Jan
Quoted 22 lines · Jan Beulich
Quoted 21 lines · Roger Pau Monne
Mediated access to the RTC was provided for PVHv1 dom0 using the PV code paths (guest_io_{write/read}), but those accesses where never implemented for PVHv2 dom0. This patch provides such mediated accesses to the RTC for PVH dom0, just like it's provided for a classic PV dom0.
Pull out some of the RTC logic from guest_io_{read/write} into specific helpers that can be used by both PV and HVM guests. The setup of the handlers for PVH is done in
rtc_init, which is already used to initialize the fully emulated RTC.Without this a Linux PVH dom0 will read garbage when trying to access the RTC, and one vCPU will be constantly looping in
rtc_timer_do_work.Note that such issue doesn't happen on domUs because the ACPI
NO_CMOS_RTCflag is set in FADT, which prevents the OS from accessing the RTC. Also theX86_EMU_RTCflag is not set for PVH dom0, as the accesses are not emulated but rather forwarded to the physical hardware.
Quoted 4 lines
Quoted 1 line
No functional change expected for classic PV dom0.
But there is, in whether (virtual) port
0x71can be read/written (even by a DomU). I'm afraid of being called guilty in splitting hair, though.
Urg, OK, I realized that but considered it a harmless mistake.
Quoted 49 lines
Quoted 7 lines
xen/arch/x86/hvm/rtc.c +3
-0@@ -808,10 +809,43 @@ void rtc_reset(struct domain *d) s->pt.source = PTSRC_isa; } +/* RTC mediator for HVM hardware domain. */ +static int hw_rtc_io (int dir,unsigned int port,unsigned int size, +uint32_t *val)xen/arch/x86/hvm/rtc.c void rtc_reset(struct domain *d) · line 824
Quoted 10 lines
xen/arch/x86/hvm/rtc.c +10
-0+{ +if ( dir ==IOREQ_READ ) + *val = ~0 ; + +if ( size !=1 ) + { +gdprintk (XENLOG_WARNING ,"bad RTC access size (%u)\n" , size); +return X86EMUL_OKAY ; + } +if ( !ioports_access_permitted (current->domain, port, port) )This wants to move into the helper, such that the PV side can have it moved too.
xen/arch/x86/hvm/rtc.c void rtc_reset(struct domain *d) · line 846
Quoted 9 lines
xen/arch/x86/hvm/rtc.c +5
-0void rtc_init (struct domain *d) {RTCState *s =domain_vrtc (d); +if (is_hardware_domain (d) ) + { +/* Hardware domain gets mediated access to the physical RTC. */ +register_portio_handler (d,RTC_PORT (0 ),2 , hw_rtc_io); +return ;Any reason for this explicit return, rather than ...
xen/arch/x86/hvm/rtc.c void rtc_reset(struct domain *d) · line 850
Quoted 4 lines
xen/arch/x86/hvm/rtc.c +2
-0+ } +if ( !has_vrtc (d) )return ;... making use of this one? In fact wouldn't it be more correct to have
if ( !has_vrtc(d) ) { /* Hardware domain gets mediated access to the physical RTC. */ if ( is_hardware_domain(d) ) register_portio_handler(d, RTC_PORT(0), 2, hw_rtc_io); return; }
Quoted 2 lines
such that eventual (perhaps optional) enabling of vRTC for hwdom would have it properly work without changing this function again?
Right, that seems fine to me.
Quoted 10 lines
xen/arch/x86/pv/emul-priv-op.c static uint32_t guest_io_read(unsigned int port, unsigned int bytes, · line 285
Quoted 9 lines
xen/arch/x86/pv/emul-priv-op.c +0
-3@@ -280,19 +280,10 @@ static uint32_t guest_io_read(unsigned int port, unsigned int bytes, { sub_data =pv_pit_handler (port,0 ,0 ); } - else if ( port == RTC_PORT(0) ) - { - sub_data = currd->arch.cmos_idx;
Quoted 7 lines
Note how there was no permission check here. Having one or more I/O ports that can be used to simply latch a value can, as I've learned, be quite valuable as a debugging vehicle, and there aren't many (if any) ports beyond this one that a PV DomU might use for such a purpose. Arguably the value is somewhat limited here, as the value wouldn't survive a crash, but I'd still prefer if we could retain prior functionality.
OK, as said above I considered this a harmless mistake, but seeing as you find it valuable I will make sure to keep the behavior.
Quoted 38 lines
xen/arch/x86/pv/emul-priv-op.c static unsigned long get_cmos_time(void) · line 1121
Quoted 12 lines
xen/arch/x86/pv/emul-priv-op.c +8
-0@@ -1110,6 +1111,64 @@ static unsigned long get_cmos_time(void)return mktime (rtc.year, rtc.mon, rtc.day, rtc.hour, rtc.min, rtc.sec); } +/* Helpers for guest accesses to the physical RTC. */ +unsigned int rtc_guest_read (unsigned int port) +{ +const struct domain *currd = current->domain; +unsigned long flags; +unsigned int data = ~0 ; + +ASSERT (port ==RTC_PORT (0 ) || port ==RTC_PORT (1 ));Instead of this, how about ...
Quoted 8 lines
xen/arch/x86/pv/emul-priv-op.c +8
-0+if ( !ioports_access_permitted (currd, port, port) ) + { +ASSERT_UNREACHABLE (); +return data; + } + +switch ( port ) + {xen/arch/x86/pv/emul-priv-op.c static unsigned long get_cmos_time(void) · line 1139
Quoted 10 lines
xen/arch/x86/pv/emul-priv-op.c +10
-0+case RTC_PORT (0 ): + data = currd->arch.cmos_idx; +break ; + +case RTC_PORT (1 ): +spin_lock_irqsave (&rtc_lock, flags); +outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); + data =inb (RTC_PORT (1 )); +spin_unlock_irqrestore (&rtc_lock, flags); +break ;default: ASSERT_UNREACHABLE(); break;
Quoted 1 line
?
Sure.
Thanks, Roger.
Quoted 16 lines · Roger Pau Monne
Mediated access to the RTC was provided for PVHv1 dom0 using the PV code paths (guest_io_{write/read}), but those accesses where never implemented for PVHv2 dom0. This patch provides such mediated accesses to the RTC for PVH dom0, just like it's provided for a classic PV dom0.
Pull out some of the RTC logic from guest_io_{read/write} into specific helpers that can be used by both PV and HVM guests. The setup of the handlers for PVH is done in
rtc_init, which is already used to initialize the fully emulated RTC.Without this a Linux PVH dom0 will read garbage when trying to access the RTC, and one vCPU will be constantly looping in
rtc_timer_do_work.
Quoted 7 lines
Note that such issue doesn't happen on domUs because the ACPI
NO_CMOS_RTCflag is set in FADT, which prevents the OS from accessing the RTC. Also theX86_EMU_RTCflag is not set for PVH dom0, as the accesses are not emulated but rather forwarded to the physical hardware.No functional change expected for classic PV dom0.
For the dense guys like me: what is the user-visible feature that is now being offered with this? Would really appreciate a pointer or two.
Thanks,
Roman.
Quoted 218 lines
Signed-off-by Roger Pau Monné <[email protected]>---
for-4.14 reasoning: the fix is mostly isolated to PVH dom0, and as such the risk is very low of causing issues to other guests types, but without this fix one vCPU when using a Linux dom0 will be constantly looping overrtc_timer_do_workwith 100% CPU usage, at least when using Linux 4.19 or newer.
---
Changes since v1:
- Share the code with PV.
- Add access checks to the IO ports.--- xen/arch/x86/hvm/rtc.c | 34 ++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 28 +++------------ xen/arch/x86/time.c | 59 +++++++++++++++++++++++++++++++ xen/include/asm-x86/mc146818rtc.h | 3 ++ 4 files changed, 100 insertions(+), 24 deletions(-)xen/arch/x86/hvm/rtc.c +34
-0@@ -22,6 +22,7 @@* IN THE SOFTWARE. */ +#include <asm/iocap.h> #include <asm/mc146818rtc.h> #include <asm/hvm/vpt.h> #include <asm/hvm/io.h> @@ -808,10 +809,43 @@ void rtc_reset(struct domain *d) s->pt.source = PTSRC_isa; } +/* RTC mediator for HVM hardware domain. */ +static int hw_rtc_io (int dir,unsigned int port,unsigned int size, +uint32_t *val) +{ +if ( dir ==IOREQ_READ ) + *val = ~0 ; + +if ( size !=1 ) + { +gdprintk (XENLOG_WARNING ,"bad RTC access size (%u)\n" , size); +return X86EMUL_OKAY ; + } +if ( !ioports_access_permitted (current->domain, port, port) ) + { +gdprintk (XENLOG_WARNING ,"access to RTC port %x not allowed\n" , port); +return X86EMUL_OKAY ; + } + +if ( dir ==IOREQ_WRITE ) +rtc_guest_write (port, *val); +else + *val =rtc_guest_read (port); + +return X86EMUL_OKAY ; +} +void rtc_init (struct domain *d) {RTCState *s =domain_vrtc (d); +if (is_hardware_domain (d) ) + { +/* Hardware domain gets mediated access to the physical RTC. */ +register_portio_handler (d,RTC_PORT (0 ),2 , hw_rtc_io); +return ; + } +if ( !has_vrtc (d) )return ;xen/arch/x86/pv/emul-priv-op.c +4
-24@@ -280,19 +280,10 @@ static uint32_t guest_io_read(unsigned int port, unsigned int bytes, { sub_data =pv_pit_handler (port,0 ,0 ); } - else if ( port == RTC_PORT(0) ) - { - sub_data = currd->arch.cmos_idx; - } - else if ( (port == RTC_PORT(1)) && + else if ( (port == RTC_PORT(0) || port == RTC_PORT(1)) && ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { -unsigned long flags; - -spin_lock_irqsave (&rtc_lock, flags); -outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); - sub_data =inb (RTC_PORT (1 )); -spin_unlock_irqrestore (&rtc_lock, flags); + sub_data =rtc_guest_read (port); } else if ( (port == 0xcf8) && (bytes == 4) ) {@@ -413,21 +404,10 @@ static void guest_io_write(unsigned int port, unsigned int bytes, {pv_pit_handler (port, (uint8_t )data,1 ); } - else if ( port == RTC_PORT(0) ) - { - currd->arch.cmos_idx = data; - } - else if ( (port == RTC_PORT(1)) && + else if ( (port == RTC_PORT(0) || port == RTC_PORT(1)) && ioports_access_permitted(currd, RTC_PORT(0), RTC_PORT(1)) ) { -unsigned long flags; - -if ( pv_rtc_handler ) -pv_rtc_handler (currd->arch.cmos_idx &0x7f , data); -spin_lock_irqsave (&rtc_lock, flags); -outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); -outb (data,RTC_PORT (1 )); -spin_unlock_irqrestore (&rtc_lock, flags); +rtc_guest_write (port, data); } else if ( (port == 0xcf8) && (bytes == 4) ) {xen/arch/x86/time.c +59
-0@@ -27,6 +27,7 @@#include <xen/keyhandler.h> #include <xen/guest_access.h> #include <asm/io.h> +#include <asm/iocap.h> #include <asm/msr.h> #include <asm/mpspec.h> #include <asm/processor.h> @@ -1110,6 +1111,64 @@ static unsigned long get_cmos_time(void)return mktime (rtc.year, rtc.mon, rtc.day, rtc.hour, rtc.min, rtc.sec); } +/* Helpers for guest accesses to the physical RTC. */ +unsigned int rtc_guest_read (unsigned int port) +{ +const struct domain *currd = current->domain; +unsigned long flags; +unsigned int data = ~0 ; + +ASSERT (port ==RTC_PORT (0 ) || port ==RTC_PORT (1 )); +if ( !ioports_access_permitted (currd, port, port) ) + { +ASSERT_UNREACHABLE (); +return data; + } + +switch ( port ) + { +case RTC_PORT (0 ): + data = currd->arch.cmos_idx; +break ; + +case RTC_PORT (1 ): +spin_lock_irqsave (&rtc_lock, flags); +outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); + data =inb (RTC_PORT (1 )); +spin_unlock_irqrestore (&rtc_lock, flags); +break ; + } + +return data; +} + +void rtc_guest_write (unsigned int port,unsigned int data) +{ +struct domain *currd = current->domain; +unsigned long flags; + +ASSERT (port ==RTC_PORT (0 ) || port ==RTC_PORT (1 )); +if ( !ioports_access_permitted (currd, port, port) ) + { +ASSERT_UNREACHABLE (); +return ; + } + +switch ( port ) + { +case RTC_PORT (0 ): + currd->arch.cmos_idx = data; +break ; + +case RTC_PORT (1 ): +spin_lock_irqsave (&rtc_lock, flags); +outb (currd->arch.cmos_idx &0x7f ,RTC_PORT (0 )); +outb (data,RTC_PORT (1 )); +spin_unlock_irqrestore (&rtc_lock, flags); +break ; + } +} +static unsigned long get_wallclock_time (void ) {#ifdef CONFIG_XEN_GUEST xen/include/asm-x86/mc146818rtc.h +3
-1@@ -110,4 +110,7 @@ outb_p((val),RTC_PORT(1)); \#define RTC_IRQ 8 +unsigned int rtc_guest_read (unsigned int port); +void rtc_guest_write (unsigned int port,unsigned int data); +#endif /* _ASM_MC146818RTC_H */ --2.26.2
Quoted 23 lines · Roman Shaposhnik
Quoted 22 lines · Roger Pau Monne
Mediated access to the RTC was provided for PVHv1 dom0 using the PV code paths (guest_io_{write/read}), but those accesses where never implemented for PVHv2 dom0. This patch provides such mediated accesses to the RTC for PVH dom0, just like it's provided for a classic PV dom0.
Pull out some of the RTC logic from guest_io_{read/write} into specific helpers that can be used by both PV and HVM guests. The setup of the handlers for PVH is done in
rtc_init, which is already used to initialize the fully emulated RTC.Without this a Linux PVH dom0 will read garbage when trying to access the RTC, and one vCPU will be constantly looping in
rtc_timer_do_work.Note that such issue doesn't happen on domUs because the ACPI
NO_CMOS_RTCflag is set in FADT, which prevents the OS from accessing the RTC. Also theX86_EMU_RTCflag is not set for PVH dom0, as the accesses are not emulated but rather forwarded to the physical hardware.
Quoted 4 lines
Quoted 1 line
No functional change expected for classic PV dom0.
For the dense guys like me: what is the user-visible feature that is now being offered with this? Would really appreciate a pointer or two.
PV Dom0 has always been permitted direct access to the hardware RTC. This change makes PVH Dom0 follow suit.
Jan
Quoted 23 lines · Roman Shaposhnik
Quoted 22 lines · Roger Pau Monne
Mediated access to the RTC was provided for PVHv1 dom0 using the PV code paths (guest_io_{write/read}), but those accesses where never implemented for PVHv2 dom0. This patch provides such mediated accesses to the RTC for PVH dom0, just like it's provided for a classic PV dom0.
Pull out some of the RTC logic from guest_io_{read/write} into specific helpers that can be used by both PV and HVM guests. The setup of the handlers for PVH is done in
rtc_init, which is already used to initialize the fully emulated RTC.Without this a Linux PVH dom0 will read garbage when trying to access the RTC, and one vCPU will be constantly looping in
rtc_timer_do_work.Note that such issue doesn't happen on domUs because the ACPI
NO_CMOS_RTCflag is set in FADT, which prevents the OS from accessing the RTC. Also theX86_EMU_RTCflag is not set for PVH dom0, as the accesses are not emulated but rather forwarded to the physical hardware.
Quoted 4 lines
Quoted 1 line
No functional change expected for classic PV dom0.
For the dense guys like me: what is the user-visible feature that is now being offered with this? Would really appreciate a pointer or two.
Without this dom0 is not able to change the date. Note that XENPF_settime{32/64} doesn't write the changes to the RTC (at least on x86), so dom0 needs to write such changes to the RTC so they can survive a poweroff.
However dom0 cannot be given direct access to the registers, since the RTC uses an indirect access interface using two IO registers, so Xen needs to trap such accesses by dom0 in order to serialize them and prevent conflicts with Xen accesses to the RTC.
Roger.