Skip to contentSkip to conversation

kexec: implement STATUS hypercall to check if image is loaded

PATCH Superseded Eric DeVolder 5 participants 9 messages Jan 17, 2017 – Jan 18, 2017

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 kexec: implement STATUS hypercall to check if image is loaded

The tools that use kexec are asynchronous in nature and do not keep state changes. As such provide an hypercall to find out whether an image has been loaded for either type.

Note: No need to modify XSM as it has one size fits all check and does not check for subcommands.

Note: No need to check KEXEC_FLAG_IN_PROGRESS (and error out of kexec_status()) as this flag is set only once by the first/only cpu on the crash path.

Note: This is just the Xen side of the hypercall, kexec-tools patch to come separately.

---
CC: Andrew Cooper <[email protected]>
CC: Elena Ufimtseva <[email protected]>
CC: Daniel Kiper <[email protected]>

v0: Internal version.
v1: Dropped Reviewed-by, posting on xen-devel.
v2: Incorporated xen-devel feedback, re-posted on xen-devel.
v3: Incorporated xen-devel feedback

---
 tools/libxc/include/xenctrl.h | 10 ++++++++++
 tools/libxc/xc_kexec.c        | 24 ++++++++++++++++++++++++
 xen/common/kexec.c            | 19 +++++++++++++++++++
 xen/include/public/kexec.h    | 13 +++++++++++++
 4 files changed, 66 insertions(+)
tools/libxc/include/xenctrl.h +10 -0
index 4ab0f57..63c616f 100644
@@ -2574,6 +2574,16 @@ int xc_kexec_load(xc_interface *xch, uint8_t type, uint16_t arch,
  */
 int xc_kexec_unload(xc_interface *xch, int type);
 
+/*
+ * Find out whether the image has been succesfully loaded.
+ *
+ * The type can be either KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH.
+ * If zero is returned, that means no image is loaded for the type.
+ * If one is returned, that means an image is loaded for the type.
+ * Otherwise, negative return value indicates error.
+ */
+int xc_kexec_status(xc_interface *xch, int type);
+
 typedef xenpf_resource_entry_t xc_resource_entry_t;
 
 /*
tools/libxc/xc_kexec.c +24 -0
index 59e2f07..a4e8966 100644
@@ -126,3 +126,27 @@ out:
 
     return ret;
 }
+
+int xc_kexec_status(xc_interface *xch, int type)
+{
+    DECLARE_HYPERCALL_BUFFER(xen_kexec_status_t, status);
+    int ret = -1;
+
+    status = xc_hypercall_buffer_alloc(xch, status, sizeof(*status));
+    if ( status == NULL )
+    {
+        PERROR("Could not alloc buffer for kexec status hypercall");
+        goto out;
+    }
+
+    status->type = type;
+
+    ret = xencall2(xch->xcall, __HYPERVISOR_kexec_op,
+                   KEXEC_CMD_kexec_status,
+                   HYPERCALL_BUFFER_AS_ARG(status));
+
+out:
+    xc_hypercall_buffer_free(xch, status);
+
+    return ret;
+}
xen/common/kexec.c +19 -0
index c83d48f..aa808cb 100644
@@ -1169,6 +1169,22 @@ static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg)
     return kexec_do_unload(&unload);
 }
 
+static int kexec_status(XEN_GUEST_HANDLE_PARAM(void) uarg)
+{
+    xen_kexec_status_t status;
+    int base, bit;
+
+    if ( unlikely(copy_from_guest(&status, uarg, 1)) )
+        return -EFAULT;
+
+    /* No need to check KEXEC_FLAG_IN_PROGRESS. */
+
+    if ( kexec_load_get_bits(status.type, &base, &bit) )
+        return -EINVAL;
+
+    return test_bit(bit, &kexec_flags);
+}
+
 static int do_kexec_op_internal(unsigned long op,
                                 XEN_GUEST_HANDLE_PARAM(void) uarg,
                                 bool_t compat)
@@ -1208,6 +1224,9 @@ static int do_kexec_op_internal(unsigned long op,
     case KEXEC_CMD_kexec_unload:
         ret = kexec_unload(uarg);
         break;
+    case KEXEC_CMD_kexec_status:
+        ret = kexec_status(uarg);
+        break;
     }
 
     return ret;
xen/include/public/kexec.h +13 -0
index a6a0a88..c200e8c 100644
@@ -227,6 +227,19 @@ typedef struct xen_kexec_unload {
 } xen_kexec_unload_t;
 DEFINE_XEN_GUEST_HANDLE(xen_kexec_unload_t);
 
+/*
+ * Figure out whether we have an image loaded. A return value of
+ * zero indicates no image loaded. A return value of one
+ * indicates an image is loaded. A negative return value
+ * indicates an error.
+ *
+ * Type must be one of KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH.
+ */
+#define KEXEC_CMD_kexec_status 6
+typedef struct xen_kexec_status {
+    uint8_t type;
+} xen_kexec_status_t;
+DEFINE_XEN_GUEST_HANDLE(xen_kexec_status_t);
 #else /* __XEN_INTERFACE_VERSION__ < 0x00040400 */
 
 #define KEXEC_CMD_kexec_load KEXEC_CMD_kexec_load_v1
Signature · 7 lines
2.7.4


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Reviewed-by on v3 1/1
#1 lore raw
Quoted 11 lines · Eric DeVolder

The tools that use kexec are asynchronous in nature and do not keep state changes. As such provide an hypercall to find out whether an image has been loaded for either type.

Note: No need to modify XSM as it has one size fits all check and does not check for subcommands.

Note: No need to check KEXEC_FLAG_IN_PROGRESS (and error out of kexec_status()) as this flag is set only once by the first/only cpu on the crash path.

Quoted 5 lines

Note: This is just the Xen side of the hypercall, kexec-tools patch to come separately.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Reviewed-by on v3 1/1
#2 lore raw
In reply to Eric DeVolder
Quoted 11 lines · Eric DeVolder

The tools that use kexec are asynchronous in nature and do not keep state changes. As such provide an hypercall to find out whether an image has been loaded for either type.

Note: No need to modify XSM as it has one size fits all check and does not check for subcommands.

Note: No need to check KEXEC_FLAG_IN_PROGRESS (and error out of kexec_status()) as this flag is set only once by the first/only cpu on the crash path.

Quoted 5 lines

Note: This is just the Xen side of the hypercall, kexec-tools patch to come separately.

Daniel

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

Acked-by on v3 1/1
#3 lore raw
In reply to Eric DeVolder
Quoted 11 lines · Eric DeVolder

The tools that use kexec are asynchronous in nature and do not keep state changes. As such provide an hypercall to find out whether an image has been loaded for either type.

Note: No need to modify XSM as it has one size fits all check and does not check for subcommands.

Note: No need to check KEXEC_FLAG_IN_PROGRESS (and error out of kexec_status()) as this flag is set only once by the first/only cpu on the crash path.

Quoted 5 lines

Note: This is just the Xen side of the hypercall, kexec-tools patch to come separately.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

#4 lore raw
In reply to Eric DeVolder
Quoted 11 lines
Quoted 1 line
Quoted 1 line · On 17.01.17 at 18:29, <[email protected]> wrote:
xen/common/kexec.c +4 -0
@@ -1169,6 +1169,22 @@ static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg)
     return kexec_do_unload(&unload);
 }
 
+static int kexec_status(XEN_GUEST_HANDLE_PARAM(void) uarg)
+{
+    xen_kexec_status_t status;
+    int base, bit;

xen/common/kexec.c static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg) · line 1185

Quoted 10 lines
xen/common/kexec.c +10 -0
+
+    if ( unlikely(copy_from_guest(&status, uarg, 1)) )
+        return -EFAULT;
+
+    /* No need to check KEXEC_FLAG_IN_PROGRESS. */
+
+    if ( kexec_load_get_bits(status.type, &base, &bit) )
+        return -EINVAL;
+
+    return test_bit(bit, &kexec_flags);

In the public header you promise to return zero or one here (unless an error occurs), which requires the use of !!. Please see x86's implementation of the function for how/when there can actually be other non-zero values returned here (in particular all ones, which would resolve to -EPERM).

Quoted 10 lines
xen/include/public/kexec.h +4 -0
@@ -227,6 +227,19 @@ typedef struct xen_kexec_unload {
 } xen_kexec_unload_t;
 DEFINE_XEN_GUEST_HANDLE(xen_kexec_unload_t);
 
+/*
+ * Figure out whether we have an image loaded. A return value of
+ * zero indicates no image loaded. A return value of one
+ * indicates an image is loaded. A negative return value

xen/include/public/kexec.h typedef struct xen_kexec_unload { · line 243

Quoted 10 lines
xen/include/public/kexec.h +9 -0
+ * indicates an error.
+ *
+ * Type must be one of KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH.
+ */
+#define KEXEC_CMD_kexec_status 6
+typedef struct xen_kexec_status {
+    uint8_t type;
+} xen_kexec_status_t;
+DEFINE_XEN_GUEST_HANDLE(xen_kexec_status_t);
 #else /* __XEN_INTERFACE_VERSION__ < 0x00040400 */

There was a blank line above here before your addition, and you shouldn't eliminate it (making quickly scanning over the file harder).

I guess both items are simple enough to fix while committing.

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

#5 lore raw
Quoted 52 lines · Jan Beulich
Quoted 11 lines
Quoted 1 line
Quoted 1 line · On 17.01.17 at 18:29, <[email protected]> wrote:
xen/common/kexec.c +4 -0
@@ -1169,6 +1169,22 @@ static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg)
     return kexec_do_unload(&unload);
 }
 
+static int kexec_status(XEN_GUEST_HANDLE_PARAM(void) uarg)
+{
+    xen_kexec_status_t status;
+    int base, bit;

xen/common/kexec.c static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg) · line 1185

Quoted 10 lines
xen/common/kexec.c +10 -0
+
+    if ( unlikely(copy_from_guest(&status, uarg, 1)) )
+        return -EFAULT;
+
+    /* No need to check KEXEC_FLAG_IN_PROGRESS. */
+
+    if ( kexec_load_get_bits(status.type, &base, &bit) )
+        return -EINVAL;
+
+    return test_bit(bit, &kexec_flags);

In the public header you promise to return zero or one here (unless an error occurs), which requires the use of !!. Please see x86's implementation of the function for how/when there can actually be other non-zero values returned here (in particular all ones, which would resolve to -EPERM).

Quoted 10 lines
xen/include/public/kexec.h +4 -0
@@ -227,6 +227,19 @@ typedef struct xen_kexec_unload {
 } xen_kexec_unload_t;
 DEFINE_XEN_GUEST_HANDLE(xen_kexec_unload_t);
 
+/*
+ * Figure out whether we have an image loaded. A return value of
+ * zero indicates no image loaded. A return value of one
+ * indicates an image is loaded. A negative return value

xen/include/public/kexec.h typedef struct xen_kexec_unload { · line 243

Quoted 10 lines
xen/include/public/kexec.h +9 -0
+ * indicates an error.
+ *
+ * Type must be one of KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH.
+ */
+#define KEXEC_CMD_kexec_status 6
+typedef struct xen_kexec_status {
+    uint8_t type;
+} xen_kexec_status_t;
+DEFINE_XEN_GUEST_HANDLE(xen_kexec_status_t);
 #else /* __XEN_INTERFACE_VERSION__ < 0x00040400 */

There was a blank line above here before your addition, and you shouldn't eliminate it (making quickly scanning over the file harder).

Quoted 2 lines

I guess both items are simple enough to fix while committing.

Oops, I already committed this patch with Andrew's review. A follow-up patch is appreciated. Thanks.

Wei.

Quoted 2 lines

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

#6 lore raw
Quoted 54 lines
Quoted 1 line
Quoted 1 line · On 18.01.17 at 11:37, <[email protected]> wrote:
Quoted 52 lines · Jan Beulich
Quoted 11 lines
Quoted 1 line
Quoted 1 line · On 17.01.17 at 18:29, <[email protected]> wrote:
xen/common/kexec.c +4 -0
@@ -1169,6 +1169,22 @@ static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg)
     return kexec_do_unload(&unload);
 }
 
+static int kexec_status(XEN_GUEST_HANDLE_PARAM(void) uarg)
+{
+    xen_kexec_status_t status;
+    int base, bit;

xen/common/kexec.c static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg) · line 1185

Quoted 10 lines
xen/common/kexec.c +10 -0
+
+    if ( unlikely(copy_from_guest(&status, uarg, 1)) )
+        return -EFAULT;
+
+    /* No need to check KEXEC_FLAG_IN_PROGRESS. */
+
+    if ( kexec_load_get_bits(status.type, &base, &bit) )
+        return -EINVAL;
+
+    return test_bit(bit, &kexec_flags);

In the public header you promise to return zero or one here (unless an error occurs), which requires the use of !!. Please see x86's implementation of the function for how/when there can actually be other non-zero values returned here (in particular all ones, which would resolve to -EPERM).

Quoted 10 lines
xen/include/public/kexec.h +4 -0
@@ -227,6 +227,19 @@ typedef struct xen_kexec_unload {
 } xen_kexec_unload_t;
 DEFINE_XEN_GUEST_HANDLE(xen_kexec_unload_t);
 
+/*
+ * Figure out whether we have an image loaded. A return value of
+ * zero indicates no image loaded. A return value of one
+ * indicates an image is loaded. A negative return value

xen/include/public/kexec.h typedef struct xen_kexec_unload { · line 243

Quoted 10 lines
xen/include/public/kexec.h +9 -0
+ * indicates an error.
+ *
+ * Type must be one of KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH.
+ */
+#define KEXEC_CMD_kexec_status 6
+typedef struct xen_kexec_status {
+    uint8_t type;
+} xen_kexec_status_t;
+DEFINE_XEN_GUEST_HANDLE(xen_kexec_status_t);
 #else /* __XEN_INTERFACE_VERSION__ < 0x00040400 */

There was a blank line above here before your addition, and you shouldn't eliminate it (making quickly scanning over the file harder).

Quoted 4 lines
Quoted 1 line

I guess both items are simple enough to fix while committing.

Oops, I already committed this patch with Andrew's review. A follow-up patch is appreciated. Thanks.

Well, I suppose that was directed at Eric ...

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

#7 lore raw
Quoted 54 lines · Jan Beulich
Quoted 54 lines
Quoted 1 line
Quoted 1 line · On 18.01.17 at 11:37, <[email protected]> wrote:
Quoted 52 lines · Jan Beulich
Quoted 11 lines
Quoted 1 line
Quoted 1 line · On 17.01.17 at 18:29, <[email protected]> wrote:
xen/common/kexec.c +4 -0
@@ -1169,6 +1169,22 @@ static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg)
     return kexec_do_unload(&unload);
 }
 
+static int kexec_status(XEN_GUEST_HANDLE_PARAM(void) uarg)
+{
+    xen_kexec_status_t status;
+    int base, bit;

xen/common/kexec.c static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg) · line 1185

Quoted 10 lines
xen/common/kexec.c +10 -0
+
+    if ( unlikely(copy_from_guest(&status, uarg, 1)) )
+        return -EFAULT;
+
+    /* No need to check KEXEC_FLAG_IN_PROGRESS. */
+
+    if ( kexec_load_get_bits(status.type, &base, &bit) )
+        return -EINVAL;
+
+    return test_bit(bit, &kexec_flags);

In the public header you promise to return zero or one here (unless an error occurs), which requires the use of !!. Please see x86's implementation of the function for how/when there can actually be other non-zero values returned here (in particular all ones, which would resolve to -EPERM).

Quoted 10 lines
xen/include/public/kexec.h +4 -0
@@ -227,6 +227,19 @@ typedef struct xen_kexec_unload {
 } xen_kexec_unload_t;
 DEFINE_XEN_GUEST_HANDLE(xen_kexec_unload_t);
 
+/*
+ * Figure out whether we have an image loaded. A return value of
+ * zero indicates no image loaded. A return value of one
+ * indicates an image is loaded. A negative return value

xen/include/public/kexec.h typedef struct xen_kexec_unload { · line 243

Quoted 10 lines
xen/include/public/kexec.h +9 -0
+ * indicates an error.
+ *
+ * Type must be one of KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH.
+ */
+#define KEXEC_CMD_kexec_status 6
+typedef struct xen_kexec_status {
+    uint8_t type;
+} xen_kexec_status_t;
+DEFINE_XEN_GUEST_HANDLE(xen_kexec_status_t);
 #else /* __XEN_INTERFACE_VERSION__ < 0x00040400 */

There was a blank line above here before your addition, and you shouldn't eliminate it (making quickly scanning over the file harder).

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

I guess both items are simple enough to fix while committing.

Oops, I already committed this patch with Andrew's review. A follow-up patch is appreciated. Thanks.

Well, I suppose that was directed at Eric ...

Yes. That was for Eric.

Wei.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel

#8 lore raw
Quoted 60 lines · Wei Liu
Quoted 59 lines · Jan Beulich
Quoted 58 lines
Quoted 1 line
Quoted 1 line · On 18.01.17 at 11:37, <[email protected]> wrote:
Quoted 52 lines · Jan Beulich
Quoted 11 lines
Quoted 1 line
Quoted 1 line · On 17.01.17 at 18:29, <[email protected]> wrote:
xen/common/kexec.c +4 -0
@@ -1169,6 +1169,22 @@ static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg)
     return kexec_do_unload(&unload);
 }
 
+static int kexec_status(XEN_GUEST_HANDLE_PARAM(void) uarg)
+{
+    xen_kexec_status_t status;
+    int base, bit;

xen/common/kexec.c static int kexec_unload(XEN_GUEST_HANDLE_PARAM(void) uarg) · line 1185

Quoted 10 lines
xen/common/kexec.c +10 -0
+
+    if ( unlikely(copy_from_guest(&status, uarg, 1)) )
+        return -EFAULT;
+
+    /* No need to check KEXEC_FLAG_IN_PROGRESS. */
+
+    if ( kexec_load_get_bits(status.type, &base, &bit) )
+        return -EINVAL;
+
+    return test_bit(bit, &kexec_flags);

In the public header you promise to return zero or one here (unless an error occurs), which requires the use of !!. Please see x86's implementation of the function for how/when there can actually be other non-zero values returned here (in particular all ones, which would resolve to -EPERM).

Quoted 10 lines
xen/include/public/kexec.h +4 -0
@@ -227,6 +227,19 @@ typedef struct xen_kexec_unload {
 } xen_kexec_unload_t;
 DEFINE_XEN_GUEST_HANDLE(xen_kexec_unload_t);
 
+/*
+ * Figure out whether we have an image loaded. A return value of
+ * zero indicates no image loaded. A return value of one
+ * indicates an image is loaded. A negative return value

xen/include/public/kexec.h typedef struct xen_kexec_unload { · line 243

Quoted 10 lines
xen/include/public/kexec.h +9 -0
+ * indicates an error.
+ *
+ * Type must be one of KEXEC_TYPE_DEFAULT or KEXEC_TYPE_CRASH.
+ */
+#define KEXEC_CMD_kexec_status 6
+typedef struct xen_kexec_status {
+    uint8_t type;
+} xen_kexec_status_t;
+DEFINE_XEN_GUEST_HANDLE(xen_kexec_status_t);
 #else /* __XEN_INTERFACE_VERSION__ < 0x00040400 */

There was a blank line above here before your addition, and you shouldn't eliminate it (making quickly scanning over the file harder).

Quoted 1 line

I guess both items are simple enough to fix while committing.

Oops, I already committed this patch with Andrew's review. A follow-up patch is appreciated. Thanks.

Quoted 7 lines
Quoted 2 lines

Well, I suppose that was directed at Eric ...

Yes. That was for Eric.

Wei.

Hi. I have made the two changes and recreated the entire patch. It has been posted as v4.
If a delta patch against v3 was what was desired, then please let me know and I'll provide.

Note my handling of the test_bit() scenario is to explicitly check for return value of 1, so any value other than 1 returns 0.

Regards,
Eric

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel