Skip to contentSkip to conversation

oxenstored: fix ABI breakage in reset watches

PATCH In review Edwin Török 3 participants 4 messages Jul 15, 2020 – Jul 21, 2020

lore
Share & tools
lore
#0 lore raw

cover oxenstored: fix ABI breakage in reset watches

dbc84d2983969bb47d294131ed9e6bbbdc2aec49 (Xen >= 4.9.0) deleted XS_RESTRICT from oxenstored, which caused all the following opcodes to be shifted by 1, breaking the ABI compared to the C version and guests.

The affected opcode is 'reset watches', e.g. Linux uses this during kexec if a suitable control/platform-feature-xs_reset_watches field is present in xenstore.

Edwin Török (1):
oxenstored: fix ABI breakage introduced in Xen 4.9.0

 tools/ocaml/libs/xb/op.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 oxenstored: fix ABI breakage introduced in Xen 4.9.0

dbc84d2983969bb47d294131ed9e6bbbdc2aec49 (Xen >= 4.9.0) deleted XS_RESTRICT from oxenstored, which caused all the following opcodes to be shifted by 1:
reset_watches became off-by-one compared to the C version of xenstored.

Looking at the C code the opcode for reset watches needs:
XS_RESET_WATCHES = XS_SET_TARGET + 2

So add the placeholder Invalid in the OCaml<->C mapping list. (Note that the code here doesn't simply convert the OCaml constructor to
an integer, so we don't need to introduce a dummy constructor).

Igor says that with a suitably patched xenopsd to enable watch reset, we now see reset watches during kdump of a guest in xenstored-access.log.

---
 tools/ocaml/libs/xb/op.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/ocaml/libs/xb/op.ml +1 -1
index d4f1f08185..9bcab0f38c 100644
@@ -28,7 +28,7 @@ let operation_c_mapping =
            Transaction_end; Introduce; Release;
            Getdomainpath; Write; Mkdir; Rm;
            Setperms; Watchevent; Error; Isintroduced;
-           Resume; Set_target; Reset_watches |]
+           Resume; Set_target; Invalid; Reset_watches |]
 let size = Array.length operation_c_mapping
 
 let array_search el a =
Signature · 1 line
2.25.1
Tested-by Igor Druzhinin on v1 1/1
#2 lore raw

Re: [PATCH v1 1/1] oxenstored: fix ABI breakage introduced in Xen 4.9.0

________________________________________
From: Edwin Török <[email protected]>
Sent: 15 July 2020 16:10
To: [email protected]
Cc: Edwin Torok; Christian Lindig; David Scott; Ian Jackson; Wei Liu; Igor Druzhinin
Subject: [PATCH v1 1/1] oxenstored: fix ABI breakage introduced in Xen 4.9.0

dbc84d2983969bb47d294131ed9e6bbbdc2aec49 (Xen >= 4.9.0) deleted XS_RESTRICT from oxenstored, which caused all the following opcodes to be shifted by 1:
reset_watches became off-by-one compared to the C version of xenstored.

Looking at the C code the opcode for reset watches needs:
XS_RESET_WATCHES = XS_SET_TARGET + 2

So add the placeholder Invalid in the OCaml<->C mapping list. (Note that the code here doesn't simply convert the OCaml constructor to
an integer, so we don't need to introduce a dummy constructor).

Igor says that with a suitably patched xenopsd to enable watch reset, we now see reset watches during kdump of a guest in xenstored-access.log.

---
 tools/ocaml/libs/xb/op.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/ocaml/libs/xb/op.ml +1 -1
index d4f1f08185..9bcab0f38c 100644
@@ -28,7 +28,7 @@ let operation_c_mapping =
            Transaction_end; Introduce; Release;
            Getdomainpath; Write; Mkdir; Rm;
            Setperms; Watchevent; Error; Isintroduced;
-           Resume; Set_target; Reset_watches |]
+           Resume; Set_target; Invalid; Reset_watches |]
 let size = Array.length operation_c_mapping
 
 let array_search el a =

--
2.25.1

Signature · 1 line
Acked-by: Christian Lindig <[email protected]>
#3 lore raw

Re: [PATCH v1 1/1] oxenstored: fix ABI breakage introduced in Xen 4.9.0

Quoted 8 lines · Christian Lindig

________________________________________
From: Edwin Török <[email protected]>
Sent: 15 July 2020 16:10
To: [email protected]
Cc: Edwin Torok; Christian Lindig; David Scott; Ian Jackson; Wei Liu; Igor Druzhinin
Subject: [PATCH v1 1/1] oxenstored: fix ABI breakage introduced in Xen 4.9.0

Quoted 4 lines

dbc84d2983969bb47d294131ed9e6bbbdc2aec49 (Xen >= 4.9.0) deleted XS_RESTRICT from oxenstored, which caused all the following opcodes to be shifted by 1:
reset_watches became off-by-one compared to the C version of xenstored.

I guess this needs

Backport: 4.9+

(Ian FYI)

Quoted 34 lines

Looking at the C code the opcode for reset watches needs:
XS_RESET_WATCHES = XS_SET_TARGET + 2

So add the placeholder Invalid in the OCaml<->C mapping list. (Note that the code here doesn't simply convert the OCaml constructor to
an integer, so we don't need to introduce a dummy constructor).

Igor says that with a suitably patched xenopsd to enable watch reset, we now see reset watches during kdump of a guest in xenstored-access.log.

---
 tools/ocaml/libs/xb/op.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/ocaml/libs/xb/op.ml +1 -2
index d4f1f08185..9bcab0f38c 100644
@@ -28,7 +28,7 @@ let operation_c_mapping =
            Transaction_end; Introduce; Release;
            Getdomainpath; Write; Mkdir; Rm;
            Setperms; Watchevent; Error; Isintroduced;
-           Resume; Set_target; Reset_watches |]
+           Resume; Set_target; Invalid; Reset_watches |]
 let size = Array.length operation_c_mapping
 
 let array_search el a =
--

2.25.1

Signature · 1 line
Acked-by: Christian Lindig <[email protected]>