Skip to contentSkip to conversation

qga: fence guest-set-time if hwclock not available

PATCH Superseded Cornelia Huck 4 participants 6 messages Nov 28, 2019 – Dec 4, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 qga: fence guest-set-time if hwclock not available

The Posix implementation of guest-set-time invokes hwclock to set/retrieve the time to/from the hardware clock. If hwclock is not available, the user is currently informed that "hwclock failed to set hardware clock to system time", which is quite misleading. This may happen e.g. on s390x, which has a different timekeeping concept anyway.

Let's check for the availability of the hwclock command and return QERR_UNSUPPORTED for guest-set-time if it is not available.

---

v1 (RFC) -> v2:
- use hwclock_path[]
- use access() instead of stat()

---
 qga/commands-posix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
qga/commands-posix.c +12 -1
index 1c1a165daed8..ffb6420fa9cd 100644
@@ -156,6 +156,17 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
     pid_t pid;
     Error *local_err = NULL;
     struct timeval tv;
+    const char hwclock_path[] = "/sbin/hwclock";
+    static int hwclock_available = -1;
+
+    if (hwclock_available < 0) {
+        hwclock_available = (access(hwclock_path, X_OK) == 0);
+    }
+
+    if (!hwclock_available) {
+        error_setg(errp, QERR_UNSUPPORTED);
+        return;
+    }
 
     /* If user has passed a time, validate and set it. */
     if (has_time) {
@@ -195,7 +206,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
 
         /* Use '/sbin/hwclock -w' to set RTC from the system time,
          * or '/sbin/hwclock -s' to set the system time from RTC. */
-        execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s",
+        execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",
                NULL, environ);
         _exit(EXIT_FAILURE);
     } else if (pid < 0) {
Signature · 1 line
2.21.0
Reviewed-by Reviewed-by on v2 1/1
#1 lore raw

Hi Cornelia,

Quoted 26 lines · Cornelia Huck

The Posix implementation of guest-set-time invokes hwclock to set/retrieve the time to/from the hardware clock. If hwclock is not available, the user is currently informed that "hwclock failed to set hardware clock to system time", which is quite misleading. This may happen e.g. on s390x, which has a different timekeeping concept anyway.

Let's check for the availability of the hwclock command and return QERR_UNSUPPORTED for guest-set-time if it is not available.

---

v1 (RFC) -> v2:
- use hwclock_path[]
- use access() instead of stat()

---
 qga/commands-posix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
qga/commands-posix.c +0 -0
index 1c1a165daed8..ffb6420fa9cd 100644

qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 159

Quoted 4 lines
qga/commands-posix.c +1 -0
@@ -156,6 +156,17 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
     pid_t pid;
     Error *local_err = NULL;
     struct timeval tv;
+    const char hwclock_path[] = "/sbin/hwclock";

Did you drop the "static" storage-class specifier on purpose?

Quoted 14 lines
qga/commands-posix.c +10 -0
+    static int hwclock_available = -1;
+
+    if (hwclock_available < 0) {
+        hwclock_available = (access(hwclock_path, X_OK) == 0);
+    }
+
+    if (!hwclock_available) {
+        error_setg(errp, QERR_UNSUPPORTED);
+        return;
+    }
 
     /* If user has passed a time, validate and set it. */
     if (has_time) {

qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 209

Quoted 5 lines
qga/commands-posix.c +1 -1
@@ -195,7 +206,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
 
         /* Use '/sbin/hwclock -w' to set RTC from the system time,
          * or '/sbin/hwclock -s' to set the system time from RTC. */
-        execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s",
+        execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",

I think it's somewhat obscure now that arg="hwclock" is supposed to match the last pathname component in hwclock_path="/sbin/hwclock".

There are multiple ways to compute "arg" like that, of course. But I think they all look uglier than the above. So I'm fine if we just keep this.

If you purposely dropped the "static", then:

If you just missed the "static" and now intend to add it back, then for v3:

Thanks
Laszlo

Quoted 4 lines
qga/commands-posix.c +0 -0
                NULL, environ);
         _exit(EXIT_FAILURE);
     } else if (pid < 0) {
#2 lore raw
Quoted 24 lines · On Thu, 28 Nov 2019 19:38:00 +0100 Laszlo Ersek <[email protected]> wrote:

Hi Cornelia,

Quoted 21 lines · Cornelia Huck

The Posix implementation of guest-set-time invokes hwclock to set/retrieve the time to/from the hardware clock. If hwclock is not available, the user is currently informed that "hwclock failed to set hardware clock to system time", which is quite misleading. This may happen e.g. on s390x, which has a different timekeeping concept anyway.

Let's check for the availability of the hwclock command and return QERR_UNSUPPORTED for guest-set-time if it is not available.

---

v1 (RFC) -> v2:
- use hwclock_path[]
- use access() instead of stat()

---
 qga/commands-posix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
Quoted 11 lines

qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 159

Quoted 9 lines
qga/commands-posix.c +1 -0
index 1c1a165daed8..ffb6420fa9cd 100644
@@ -156,6 +156,17 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
     pid_t pid;
     Error *local_err = NULL;
     struct timeval tv;
+    const char hwclock_path[] = "/sbin/hwclock";  

Did you drop the "static" storage-class specifier on purpose?

No, I just need to do patches when I'm less tired :/

Quoted 24 lines
Quoted 15 lines
qga/commands-posix.c +10 -0
+    static int hwclock_available = -1;
+
+    if (hwclock_available < 0) {
+        hwclock_available = (access(hwclock_path, X_OK) == 0);
+    }
+
+    if (!hwclock_available) {
+        error_setg(errp, QERR_UNSUPPORTED);
+        return;
+    }
 
     /* If user has passed a time, validate and set it. */
     if (has_time) {

qga/commands-posix.c void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) · line 209

Quoted 5 lines
qga/commands-posix.c +1 -1
@@ -195,7 +206,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
 
         /* Use '/sbin/hwclock -w' to set RTC from the system time,
          * or '/sbin/hwclock -s' to set the system time from RTC. */
-        execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s",
+        execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",  

I think it's somewhat obscure now that arg="hwclock" is supposed to match the last pathname component in hwclock_path="/sbin/hwclock".

Quoted 2 lines

There are multiple ways to compute "arg" like that, of course. But I think they all look uglier than the above. So I'm fine if we just keep this.

Yes, I was not able to come up with something elegant, either.

[Side note: does really everyone put hwclock under /sbin (i.e., nobody doing something creative?)]

Quoted 4 lines

If you purposely dropped the "static", then:

Quoted 8 lines

If you just missed the "static" and now intend to add it back, then for v3:

Thanks
Laszlo

Thanks for looking! There'll be a v3.

Quoted 8 lines
Quoted 7 lines
qga/commands-posix.c +0 -0
                NULL, environ);
         _exit(EXIT_FAILURE);
     } else if (pid < 0) {
Reviewed-by on v2 1/1
#3 lore raw
In reply to Cornelia Huck
Quoted 13 lines · Cornelia Huck

The Posix implementation of guest-set-time invokes hwclock to set/retrieve the time to/from the hardware clock. If hwclock is not available, the user is currently informed that "hwclock failed to set hardware clock to system time", which is quite misleading. This may happen e.g. on s390x, which has a different timekeeping concept anyway.

Let's check for the availability of the hwclock command and return QERR_UNSUPPORTED for guest-set-time if it is not available.

---

Quoted 7 lines

v1 (RFC) -> v2:
- use hwclock_path[]
- use access() instead of stat()

---
 qga/commands-posix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#4 lore raw
In reply to Cornelia Huck
Quoted 11 lines · On Thu, 28 Nov 2019 19:11:00 +0100 Cornelia Huck <[email protected]> wrote:

The Posix implementation of guest-set-time invokes hwclock to set/retrieve the time to/from the hardware clock. If hwclock is not available, the user is currently informed that "hwclock failed to set hardware clock to system time", which is quite misleading. This may happen e.g. on s390x, which has a different timekeeping concept anyway.

Let's check for the availability of the hwclock command and return QERR_UNSUPPORTED for guest-set-time if it is not available.

Michael, any comments before I send a v3?

Quoted 41 lines

---

v1 (RFC) -> v2:
- use hwclock_path[]
- use access() instead of stat()

---
 qga/commands-posix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
qga/commands-posix.c +12 -1
index 1c1a165daed8..ffb6420fa9cd 100644
@@ -156,6 +156,17 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
     pid_t pid;
     Error *local_err = NULL;
     struct timeval tv;
+    const char hwclock_path[] = "/sbin/hwclock";
+    static int hwclock_available = -1;
+
+    if (hwclock_available < 0) {
+        hwclock_available = (access(hwclock_path, X_OK) == 0);
+    }
+
+    if (!hwclock_available) {
+        error_setg(errp, QERR_UNSUPPORTED);
+        return;
+    }
 
     /* If user has passed a time, validate and set it. */
     if (has_time) {
@@ -195,7 +206,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
 
         /* Use '/sbin/hwclock -w' to set RTC from the system time,
          * or '/sbin/hwclock -s' to set the system time from RTC. */
-        execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s",
+        execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",
                NULL, environ);
         _exit(EXIT_FAILURE);
     } else if (pid < 0) {
Reviewed-by on v2 1/1
#5 lore raw
In reply to Cornelia Huck

Quoting Cornelia Huck (2019-11-28 12:11:00)

Quoted 11 lines

The Posix implementation of guest-set-time invokes hwclock to set/retrieve the time to/from the hardware clock. If hwclock is not available, the user is currently informed that "hwclock failed to set hardware clock to system time", which is quite misleading. This may happen e.g. on s390x, which has a different timekeeping concept anyway.

Let's check for the availability of the hwclock command and return QERR_UNSUPPORTED for guest-set-time if it is not available.

Quoted 44 lines

---

v1 (RFC) -> v2:
- use hwclock_path[]
- use access() instead of stat()

---
 qga/commands-posix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
qga/commands-posix.c +12 -1
index 1c1a165daed8..ffb6420fa9cd 100644
@@ -156,6 +156,17 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
     pid_t pid;
     Error *local_err = NULL;
     struct timeval tv;
+    const char hwclock_path[] = "/sbin/hwclock";
+    static int hwclock_available = -1;
+
+    if (hwclock_available < 0) {
+        hwclock_available = (access(hwclock_path, X_OK) == 0);
+    }
+
+    if (!hwclock_available) {
+        error_setg(errp, QERR_UNSUPPORTED);
+        return;
+    }
 
     /* If user has passed a time, validate and set it. */
     if (has_time) {
@@ -195,7 +206,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
 
         /* Use '/sbin/hwclock -w' to set RTC from the system time,
          * or '/sbin/hwclock -s' to set the system time from RTC. */
-        execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s",
+        execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",
                NULL, environ);
         _exit(EXIT_FAILURE);
     } else if (pid < 0) {
Signature · 1 line
2.21.0