kexec-tools: Perform run-time linking of libxenctrl.so
Subsystems (2)
PATCH v3 1/1 kexec-tools: Perform run-time linking of libxenctrl.so
When kexec is utilized in a Xen environment, it has an explicit run-time dependency on libxenctrl.so. This dependency occurs during the configure stage and when building kexec-tools.
When kexec is utilized in a non-Xen environment (either bare metal or KVM), the configure and build of kexec-tools omits any reference to libxenctrl.so.
Thus today it is not currently possible to configure and build a *single* kexec that will work in *both* Xen and non-Xen environments, unless the libxenctrl.so is *always* present.
For example, a kexec configured for Xen in a Xen environment:
# ldd build/sbin/kexec
linux-vdso.so.1 => (0x00007ffdeba5c000)
libxenctrl.so.4.4 => /usr/lib64/libxenctrl.so.4.4 (0x00000038d8000000)
libz.so.1 => /lib64/libz.so.1 (0x00000038d6c00000)
libc.so.6 => /lib64/libc.so.6 (0x00000038d6000000)
libdl.so.2 => /lib64/libdl.so.2 (0x00000038d6400000)
libpthread.so.0 => /lib64/libpthread.so.0 (0x00000038d6800000)
/lib64/ld-linux-x86-64.so.2 (0x000055e9f8c6c000)
# build/sbin/kexec -v
kexec-tools 2.0.16However, the *same* kexec executable fails in a non-Xen environment:
# copy xen kexec to .
# ldd ./kexec
linux-vdso.so.1 => (0x00007fffa9da7000)
libxenctrl.so.4.4 => not found
liblzma.so.0 => /usr/lib64/liblzma.so.0 (0x0000003014e00000)
libz.so.1 => /lib64/libz.so.1 (0x000000300ea00000)
libc.so.6 => /lib64/libc.so.6 (0x000000300de00000)
libpthread.so.0 => /lib64/libpthread.so.0 (0x000000300e200000)
/lib64/ld-linux-x86-64.so.2 (0x0000558cc786c000)
# ./kexec -v
./kexec: error while loading shared libraries:
libxenctrl.so.4.4: cannot open shared object file: No such file or directoryAt Oracle we "workaround" this by having two kexec-tools packages, one for Xen and another for non-Xen environments. At Oracle, the desire is to offer a single kexec-tools package that works in either environment. To achieve this, kexec-tools would either have to ship with libxenctrl.so (which we have deemed as unacceptable), or we can make kexec perform run-time linking against libxenctrl.so.
This patch is one possible way to alleviate the explicit run-time dependency on libxenctrl.so. This implementation utilizes a set of macros to wrap calls into libxenctrl.so so that the library can instead be dlopen() and obtain the function via dlsym() and then make the call. The advantage of this implementation is that it requires few changes to the existing kexec-tools code. The dis- advantage is that it uses macros to remap libxenctrl functions and do work under the hood.
Another possible implementation worth considering is the approach taken by libvmi. Reference the following file:
https://github.com/libvmi/libvmi/blob/master/libvmi/driver/xen/libxc_wrapper.h
The libxc_wrapper_t structure definition that starts at line ~33 has members that are function pointers into libxenctrl.so. This structure is populated once and then later referenced/dereferenced by the callers of libxenctrl.so members. The advantage of this implementation is it is more explicit in managing the use of libxenctrl.so and its versions, but the disadvantage is it would require touching more of the kexec-tools code.
The following is a list libxenctrl members utilized by kexec:
Functions:xc_interface_openxc_kexec_get_rangexc_interface_closexc_kexec_get_rangexc_interface_openxc_get_max_cpusxc_kexec_get_rangexc_versionxc_kexec_execxc_kexec_statusxc_kexec_unloadxc_hypercall_buffer_array_createxc__hypercall_buffer_array_allocxc_hypercall_buffer_array_destroyxc_kexec_loadxc_get_machine_memory_map
Data:xc__hypercall_buffer_HYPERCALL_BUFFER_NULL
These were identified by configuring and building kexec-tools with Xen support, but omitting the -lxenctrl from the LDFLAGS in the Makefile for an x86_64 build.
The above libxenctrl members were referenced via these source files.
kexec/crashdump-xen.ckexec/kexec-xen.ckexec/arch/i386/kexec-x86-common.ckexec/arch/i386/crashdump-x86.c
This patch provides a wrapper around the calls to the above functions in libxenctrl.so. Every libxenctrl call must pass a xc_interface which it obtains from xc_interface_open(). So the existing code is already structured in a manner that facilitates graceful dlopen()'ing of the libxenctrl.so and the subsequent dlsym() of the required member.
The patch creates a wrapper function around xc_interface_open() and xc_interface_close() to perform the dlopen() and dlclose().
For the remaining xc_ functions, this patch defines a macro of the same name which performs the dlsym() and then invokes the function. See the __xc_call() macro for details.
There was one data item in libxenctrl.so that presented a unique problem, HYPERCALL_BUFFER_NULL. It was only utilized once, as
set_xen_guest_handle(xen_segs[s].buf.h, HYPERCALL_BUFFER_NULL);
I tried a variety of techniques but could not find a general macro-type solution without modifying xenctrl.h. So the solution was to declare a local HYPERCALL_BUFFER_NULL, and this appears to work. I admit I am not familiar with libxenctrl to state if this is a satisfactory workaround, so feedback here welcome. I can state that this allows kexec to load/unload/kexec on Xen and non-Xen environments that I've tested without issue.
With this patch applied, kexec-tools can be built with Xen support and yet there is no explicit run-time dependency on libxenctrl.so. Thus it can also be deployed in non-Xen environments where libxenctrl.so is not installed.
# ldd build/sbin/kexec
linux-vdso.so.1 => (0x00007fff7dbcd000)
liblzma.so.0 => /usr/lib64/liblzma.so.0 (0x00000038d9000000)
libz.so.1 => /lib64/libz.so.1 (0x00000038d6c00000)
libdl.so.2 => /lib64/libdl.so.2 (0x00000038d6400000)
libc.so.6 => /lib64/libc.so.6 (0x00000038d6000000)
libpthread.so.0 => /lib64/libpthread.so.0 (0x00000038d6800000)
/lib64/ld-linux-x86-64.so.2 (0x0000562dc0c14000)
# build/sbin/kexec -v
kexec-tools 2.0.16This feature/ability is enabled with the following:
./configure --with-xen=dl
The previous --with-xen=no and --with-xen=yes still work as before. Not specifying a --with-xen still defaults to --with-xen=yes.
As I've introduced a new build and run-time mode, I've done an extensive matrix of both build-time and run-time checks of kexec with this patch applied. The set of build-time scenarios are:
1: configure --with-xen=no and Xen support NOT present 2: configure --with-xen=no and Xen support IS present 3: configure --with-xen=yes and Xen support NOT present 4: configure --with-xen=yes and Xen support IS present 5: configure --with-xen=dl and Xen support NOT present 6: configure --with-xen=dl and Xen support IS present
Xen support present requires that configure can find both xenctrl.h and libxenctrl.so.
Then for each of the six scenarios above, the corresponding kexec binary was tested on a Xen system (Oracle's OVS dom0) and a non-Xen system (Oracle Linux).
There are two build-time checks: did kexec build, and did it contain libxenctrl.so? The presence of libxenctrl.so in kexec was checked via ldd. The results were:
Scenario | Build | libxenctrl.so | Result 1 | pass | no | pass - see Note 1 2 | pass | no | pass - see Note 1 3 | pass | no | pass - see Note 2 4 | pass | yes | pass - see Note 3 5 | pass | no | pass - see Note 2 6 | pass | no | pass - see Note 4
Note 1: This passes since due to --with-xen=no, there will be no Xen support in kexec and therefore no libxenctrl.so a in the kexec.
Note 2: This passes since while --with-xen=yes, the configure displays a message indicating that Xen support is disabled, and allows kexec to build (this is the same behavior as prior to this patch). And since Xen support is disabled, there is no libxenctrl.so in the kexec.
Note 3: This passes since with --with-xen=yes and configure locating the xenctrl.h and libxenctrl.so, support for Xen was built into kexec. Ldd shows an explicit dependency on the library.
Note 4: This passes since with --with-xen=dl and configure locating the xenctrl.h and libxencrl.so, support for Xen was built into kexec. However, this uses the new technique introduced by this patch and, as a result, ldd shows that the libxenctrl.so is not a explicit run-time dependency for kexec (rather libdl.so is now an explicit dependency). This is precisely the goal of this patch!
The net effect is that there are now three "flavors" of a kexec binary (prior to this patch there were two): a) kexec with no support for Xen [scenarios 1, 2, 3, 5], b) kexec with support for Xen and libxenctrl.so as an explicit dependency [scenario 4], and c) kexec with support for Xen and libxenctrl.so is NOT an explicit dependency [scenario 6].
The run-time checks are to take each of the six scenarios above and run the corresponding kexec binary on both a Xen system and a non-Xen system. The test for each kexec scenario was:
% service kdump stop
% vi /etc/init.d/kdump
change KEXEC= to /sbin/kexec-[123456]
% service kdump start
# If not FAILED, then below
% service kdump status
Kdump is operational
% rm -fr /var/crash/*
% echo c > /proc/sysrq-trigger
# after reboot verify vmcore generated % ls -al /var/crash/<tab>
The results were:
Scenario | Xen environment | non-Xen environment 1 | fail - see Note 5 | pass 2 | fail - see Note 5 | pass 3 | fail - see Note 6 | pass 4 | pass | pass 5 | fail - see Note 6 | pass 6 | pass | pass
Note 5: Due to --with-xen=no, kexec lacks support for Xen and will fail in the Xen environment. This behavior is the same as prior to this patch.
Note 6: Due to the missing xenctrl.h and libxenctrl.so, kexec was built without support for Xen, and thus will fail in the Xen environment. This behavior is the same as prior to this patch.
Note that for scenarios 1, 2, 3 and 5 kexec lacks support for Xen, thus these versions are expected to "fail" in a Xen environment. On the flip side, since a non-Xen environment does not need libxenctrl.so, all six scenarios are expected to "pass" in a non-Xen environment. The results match these expectations!
And, of course, importantly with this patch applied, it did not have an adverse impact on kexec build or run-time.
---
v1: 29nov2017
- Daniel Kiper suggested Debian's libxen package of libraries, but I did not find similar package on most other systems.
v2: 14dec2017
- Reposted to kexec and xen-devel mailing lists
v3: 12jan2018
- Incorporated feedback from Daniel Kiper.
Configure changes for --with-xen=dl, style problems corrected. Extensive testing of the new mode.
--- configure.ac | 27 ++++++++++---- kexec/Makefile | 1 + kexec/arch/i386/crashdump-x86.c | 4 +-- kexec/arch/i386/kexec-x86-common.c | 4 +-- kexec/crashdump-xen.c | 4 +-- kexec/kexec-xen.c | 41 ++++++++++++++++++++- kexec/kexec-xen.h | 73 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 138 insertions(+), 16 deletions(-) create mode 100644 kexec/kexec-xen.h
configure.ac +21 -6
@@ -167,12 +167,27 @@ if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, [AC_CHECK_LIB(xenctrl, xc_kexec_load, , AC_MSG_NOTICE([Xen support disabled]))]) - if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then - AC_CHECK_LIB(xenctrl, xc_kexec_status, - AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, - [The kexec_status call is available]), - AC_MSG_NOTICE([The kexec_status call is not available])) - fi +fi + +dnl Link libxenctrl.so at run-time rather than build-time +if test "$with_xen" = dl ; then + AC_CHECK_HEADER(dlfcn.h, + [AC_CHECK_LIB(dl, dlopen, , + AC_MSG_ERROR([Dynamic library linking not available]))], + AC_MSG_ERROR([Dynamic library linking not available])) + AC_DEFINE(CONFIG_LIBXENCTRL_DL, 1, [Define to 1 to link libxenctrl.so at run-time rather than build-time]) + AC_CHECK_HEADER(xenctrl.h, + [AC_CHECK_LIB(xenctrl, xc_kexec_load, + AC_DEFINE(HAVE_LIBXENCTRL, 1, ), # required define, and prevent -lxenctrl + AC_MSG_NOTICE([Xen support disabled]))]) +fi + +dnl Check for the Xen kexec_status hypercall - reachable from --with-xen=yes|dl +if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then + AC_CHECK_LIB(xenctrl, xc_kexec_status, + AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, + [The kexec_status call is available]), + AC_MSG_NOTICE([The kexec_status call is not available])) fi dnl ---Sanity checks
kexec/Makefile +1 -0
@@ -36,6 +36,7 @@ dist += kexec/Makefile \ kexec/kexec-elf-boot.h \ kexec/kexec-elf.h kexec/kexec-sha256.h \ kexec/kexec-zlib.h kexec/kexec-lzma.h \ + kexec/kexec-xen.h \ kexec/kexec-syscall.h kexec/kexec.h kexec/kexec.8 dist += kexec/proc_iomem.c
kexec/arch/i386/crashdump-x86.c +1 -3
@@ -44,9 +44,7 @@#include "kexec-x86.h" #include "crashdump-x86.h" -#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h" #include "x86-linux-setup.h"
kexec/arch/i386/kexec-x86-common.c +1 -3
@@ -40,9 +40,7 @@#include "../../crashdump.h" #include "kexec-x86.h" -#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h" /* Used below but not present in (older?) xenctrl.h */ #ifndef E820_PMEM
kexec/crashdump-xen.c +1 -3
@@ -18,9 +18,7 @@#include "config.h" -#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif +#include "kexec-xen.h" struct crash_note_info {unsigned long base;
kexec/kexec-xen.c +40 -1
50 lines not on this page · raw message
kexec/kexec-xen.h new file +73 -0
73 lines not on this page · raw message
Signature · 7 lines
2.7.4 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Quoted 7 lines · Eric DeVolder
When kexec is utilized in a Xen environment, it has an explicit run-time dependency on libxenctrl.so. This dependency occurs during the configure stage and when building kexec-tools.
When kexec is utilized in a non-Xen environment (either bare metal or KVM), the configure and build of kexec-tools omits any reference to libxenctrl.so.
[...]
Wow! What a long story! Patch looks quite good. Just a few nitpicks. If you fix them then you can add Reviewed-by: Daniel Kiper <[email protected]> to the next version.
Quoted 36 lines
Signed-off-by Eric DeVolder <[email protected]>---
v1: 29nov2017
- Daniel Kiper suggested Debian's libxen package of libraries, but I did not find similar package on most other systems.v2:
14dec2017
- Reposted to kexec and xen-devel mailing listsv3: 12jan2018
- Incorporated feedback from Daniel Kiper.
Configure changes for --with-xen=dl, style problems corrected. Extensive testing of the new mode.--- configure.ac | 27 ++++++++++---- kexec/Makefile | 1 + kexec/arch/i386/crashdump-x86.c | 4 +-- kexec/arch/i386/kexec-x86-common.c | 4 +-- kexec/crashdump-xen.c | 4 +-- kexec/kexec-xen.c | 41 ++++++++++++++++++++- kexec/kexec-xen.h | 73 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 138 insertions(+), 16 deletions(-) create mode 100644 kexec/kexec-xen.hconfigure.ac +0
-4@@ -167,12 +167,27 @@ if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, [AC_CHECK_LIB(xenctrl, xc_kexec_load, , AC_MSG_NOTICE([Xen support disabled]))]) - if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then - AC_CHECK_LIB(xenctrl, xc_kexec_status, - AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, - [The kexec_status call is available]),
configure.ac if test "$with_xen" = yes ; then · line 177
Quoted 10 lines
configure.ac +8
-2- AC_MSG_NOTICE([The kexec_status call is not available])) - fi +fi + +dnl Link libxenctrl.so at run-time rather than build-time +if test "$with_xen" = dl ; then + AC_CHECK_HEADER(dlfcn.h, + [AC_CHECK_LIB(dl, dlopen, , + AC_MSG_ERROR([Dynamic library linking not available]))], + AC_MSG_ERROR([Dynamic library linking not available]))
I think that this error message should be like this:
Dynamic library linking header not available
Quoted 21 lines
configure.ac +13
-0+ AC_DEFINE(CONFIG_LIBXENCTRL_DL, 1, [Define to 1 to link libxenctrl.so at run-time rather than build-time]) + AC_CHECK_HEADER(xenctrl.h, + [AC_CHECK_LIB(xenctrl, xc_kexec_load, + AC_DEFINE(HAVE_LIBXENCTRL, 1, ), # required define, and prevent -lxenctrl + AC_MSG_NOTICE([Xen support disabled]))]) +fi + +dnl Check for the Xen kexec_status hypercall - reachable from --with-xen=yes|dl +if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then + AC_CHECK_LIB(xenctrl, xc_kexec_status, + AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, + [The kexec_status call is available]), + AC_MSG_NOTICE([The kexec_status call is not available])) fi dnl ---Sanity checkskexec/Makefile +0
-0
kexec/Makefile dist += kexec/Makefile \ · line 39
Quoted 4 lines
kexec/Makefile +1
-0@@ -36,6 +36,7 @@ dist += kexec/Makefile \ kexec/kexec-elf-boot.h \ kexec/kexec-elf.h kexec/kexec-sha256.h \ kexec/kexec-zlib.h kexec/kexec-lzma.h \ + kexec/kexec-xen.h \
Could you fix backslash alignment? Maybe in separate patch. It can be part of this series.
kexec/arch/i386/crashdump-x86.c line 46
Quoted 11 lines
kexec/Makefile +0
-0kexec/kexec-syscall.h kexec/kexec.h kexec/kexec.8 dist += kexec/proc_iomem.ckexec/arch/i386/crashdump-x86.c +0
-0@@ -44,9 +44,7 @@#include "kexec-x86.h" #include "crashdump-x86.h"
Please remove this blank line...
kexec/arch/i386/crashdump-x86.c line 48
Quoted 5 lines
kexec/arch/i386/crashdump-x86.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h"
...and this... Same things below... This was done to separate conditional include from unconditional ones. So, blank lines after your patch are no longer needed.
kexec/arch/i386/kexec-x86-common.c line 42
Quoted 10 lines
kexec/arch/i386/crashdump-x86.c +0
-0#include "x86-linux-setup.h" kexec/arch/i386/kexec-x86-common.c +0
-0@@ -40,9 +40,7 @@#include "../../crashdump.h" #include "kexec-x86.h"
Ditto...
kexec/arch/i386/kexec-x86-common.c line 44
Quoted 5 lines
kexec/arch/i386/kexec-x86-common.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h"
But leave this one...
kexec/crashdump-xen.c line 20
Quoted 10 lines
kexec/arch/i386/kexec-x86-common.c +0
-0/* Used below but not present in (older?) xenctrl.h */ #ifndef E820_PMEM kexec/crashdump-xen.c +0
-0@@ -18,9 +18,7 @@#include "config.h"
Ditto...
kexec/crashdump-xen.c line 22
Quoted 5 lines
kexec/crashdump-xen.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif +#include "kexec-xen.h"
But leave this one... And same rules below...
Quoted 22 lines
kexec/crashdump-xen.c +0
-0struct crash_note_info {unsigned long base;kexec/kexec-xen.c +8
-1@@ -10,10 +10,49 @@#include "config.h" #ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> +#include "kexec-xen.h" #include "crashdump.h" +#ifdef CONFIG_LIBXENCTRL_DL +void *xc_dlhandle; +xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(HYPERCALL_BUFFER_NULL); +xc_interface *__xc_interface_open(xentoollog_logger *logger, + xentoollog_logger *dombuild_logger, + unsigned open_flags) +{
kexec/kexec-xen.c line 33
Quoted 10 lines
kexec/kexec-xen.c +10
-0+xc_interface *xch =NULL ; + +if (!xc_dlhandle) + xc_dlhandle =dlopen ("libxenctrl.so" ,RTLD_NOW |RTLD_NODELETE ); + +if (xc_dlhandle) { +typedef xc_interface *(*func_t )(xentoollog_logger *logger, +xentoollog_logger *dombuild_logger, +unsigned open_flags); +func_t func = (func_t )dlsym (xc_dlhandle,"xc_interface_open" );
I know your opinion about that definitions but I am not happy with them here. However, if maintainer is OK with them I will not insist on changing that. Just please add one extra line between definitions above and function call below.
kexec/kexec-xen.c line 46
Quoted 13 lines
kexec/kexec-xen.c +13
-0+ xch =func (logger, dombuild_logger, open_flags); + } + +return xch; +} + +int __xc_interface_close (xc_interface *xch) +{ +int rc =-1 ; + +if (xc_dlhandle) { +typedef int (*func_t )(xc_interface *xch); +func_t func = (func_t )dlsym (xc_dlhandle,"xc_interface_close" );
Same as above... Please add empty line here...
kexec/kexec-xen.c line 48
Quoted 2 lines
kexec/kexec-xen.c +2
-0+ rc =func (xch); +
...and I think that you can drop this one here...
Quoted 16 lines
kexec/kexec-xen.c +7
-0+ xc_dlhandle = NULL; + } + +return rc; +} +#endif /* CONFIG_LIBXENCTRL_DL */ +int xen_kexec_load (struct kexec_info *info) {uint32_t nr_segments = info->nr_segments;kexec/kexec-xen.h new file +0
-0
kexec/kexec-xen.h line 4
Quoted 4 lines
kexec/kexec-xen.h new file +4
-0@@ -0,0 +1,73 @@ +#ifndef KEXEC_XEN_H +#define KEXEC_XEN_H + +#ifdef HAVE_LIBXENCTRL
I would add empty line here...
kexec/kexec-xen.h line 7
Quoted 3 lines
kexec/kexec-xen.h new file +3
-0+#include <xenctrl.h> + +#ifdef CONFIG_LIBXENCTRL_DL
...and here...
Quoted 9 lines
kexec/kexec-xen.h new file +9
-0+#include <dlfcn.h> + +/* The handle from dlopen(), needed by dlsym(), dlclose() */ +extern void *xc_dlhandle; + +/* Wrappers around xc_interface_open/close() to insert dlopen/dlclose() */ +xc_interface *__xc_interface_open (xentoollog_logger *logger, +xentoollog_logger *dombuild_logger, +unsigned open_flags);
kexec/kexec-xen.h line 26
Quoted 10 lines
kexec/kexec-xen.h new file +10
-0+int __xc_interface_close (xc_interface *xch); + +/* GCC expression statements for evaluating dlsym() */ +#define __xc_call(dtype, name, args...) \ +( \ + { dtype value; \ + typedef dtype (*func_t)(xc_interface *, ...); \ + func_t func = dlsym(xc_dlhandle, #name); \ + value = func(args); \ + value; } \
Please use one tab instead of spaces here.
kexec/kexec-xen.h line 31
Quoted 5 lines
kexec/kexec-xen.h new file +5
-0+) +#define __xc_data (dtype, name) \ +( \ + { dtype *value = (dtype *)dlsym(xc_dlhandle, #name); \ + value; } \
It looks that this code can fit into one line. Could you change that? And one tab instead of spaces...
kexec/kexec-xen.h line 36
Quoted 5 lines
kexec/kexec-xen.h new file +5
-0+) + +/* The wrappers around utilized xenctrl.h functions */ +#define xc_interface_open (a, b, c) \ + __xc_interface_open(a, b, c)
I would put 2 tabs instead of spaces here and below...
Quoted 23 lines
kexec/kexec-xen.h new file +23
-0+#define xc_interface_close (a) \ + __xc_interface_close(a) +#define xc_version(args...) \ + __xc_call(int, xc_version, args) +#define xc_get_max_cpus(args...) \ + __xc_call(int, xc_get_max_cpus, args) +#define xc_get_machine_memory_map(args...) \ + __xc_call(int, xc_get_machine_memory_map, args) +#define xc_kexec_get_range(args...) \ + __xc_call(int, xc_kexec_get_range, args) +#define xc_kexec_load(args...) \ + __xc_call(int, xc_kexec_load, args) +#define xc_kexec_unload(args...) \ + __xc_call(int, xc_kexec_unload, args) +#define xc_kexec_status(args...) \ + __xc_call(int, xc_kexec_status, args) +#define xc_kexec_exec(args...) \ + __xc_call(int, xc_kexec_exec, args) +#define xc_hypercall_buffer_array_create(args...) \ + __xc_call(xc_hypercall_buffer_array_t *, xc_hypercall_buffer_array_create, args) +#define xc__hypercall_buffer_alloc_pages(args...) \ + __xc_call(void *, xc__hypercall_buffer_alloc_pages, args) +#define xc__hypercall_buffer_free_pages(args...) \
kexec/kexec-xen.h line 69
Quoted 10 lines
kexec/kexec-xen.h new file +10
-0+ __xc_call(void , xc__hypercall_buffer_free_pages, args) +#define xc__hypercall_buffer_array_alloc(args...) \ + __xc_call(void *, xc__hypercall_buffer_array_alloc, args) +#define xc__hypercall_buffer_array_get(args...) \ + __xc_call(void *, xc__hypercall_buffer_array_get, args) +#define xc_hypercall_buffer_array_destroy(args...) \ + __xc_call(void *, xc_hypercall_buffer_array_destroy, args) + +#endif /* CONFIG_LIBXENCTRL_DL */ +
You can drop this empty line...
kexec/kexec-xen.h line 71
Quoted 2 lines
kexec/kexec-xen.h new file +2
-0+#endif /* HAVE_LIBXENCTRL */ +
...and leave this one...
kexec/kexec-xen.h line 73
Quoted 2 lines
kexec/kexec-xen.h new file +2
-0+#endif /* KEXEC_XEN_H */ +
...and drop this one...
Thanks,
Daniel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 7 lines · Eric DeVolder
When kexec is utilized in a Xen environment, it has an explicit run-time dependency on libxenctrl.so. This dependency occurs during the configure stage and when building kexec-tools.
When kexec is utilized in a non-Xen environment (either bare metal or KVM), the configure and build of kexec-tools omits any reference to libxenctrl.so.
[...]
Wow! What a long story! Patch looks quite good. Just a few nitpicks. If you fix them then you can add Reviewed-by: Daniel Kiper <[email protected]> to the next version.
Quoted 36 lines
Signed-off-by Eric DeVolder <[email protected]>---
v1: 29nov2017
- Daniel Kiper suggested Debian's libxen package of libraries, but I did not find similar package on most other systems.v2:
14dec2017
- Reposted to kexec and xen-devel mailing listsv3: 12jan2018
- Incorporated feedback from Daniel Kiper.
Configure changes for --with-xen=dl, style problems corrected. Extensive testing of the new mode.--- configure.ac | 27 ++++++++++---- kexec/Makefile | 1 + kexec/arch/i386/crashdump-x86.c | 4 +-- kexec/arch/i386/kexec-x86-common.c | 4 +-- kexec/crashdump-xen.c | 4 +-- kexec/kexec-xen.c | 41 ++++++++++++++++++++- kexec/kexec-xen.h | 73 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 138 insertions(+), 16 deletions(-) create mode 100644 kexec/kexec-xen.hconfigure.ac +0
-4@@ -167,12 +167,27 @@ if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, [AC_CHECK_LIB(xenctrl, xc_kexec_load, , AC_MSG_NOTICE([Xen support disabled]))]) - if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then - AC_CHECK_LIB(xenctrl, xc_kexec_status, - AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, - [The kexec_status call is available]),
configure.ac if test "$with_xen" = yes ; then · line 177
Quoted 10 lines
configure.ac +8
-2- AC_MSG_NOTICE([The kexec_status call is not available])) - fi +fi + +dnl Link libxenctrl.so at run-time rather than build-time +if test "$with_xen" = dl ; then + AC_CHECK_HEADER(dlfcn.h, + [AC_CHECK_LIB(dl, dlopen, , + AC_MSG_ERROR([Dynamic library linking not available]))], + AC_MSG_ERROR([Dynamic library linking not available]))
I think that this error message should be like this:
Dynamic library linking header not available
Quoted 21 lines
configure.ac +13
-0+ AC_DEFINE(CONFIG_LIBXENCTRL_DL, 1, [Define to 1 to link libxenctrl.so at run-time rather than build-time]) + AC_CHECK_HEADER(xenctrl.h, + [AC_CHECK_LIB(xenctrl, xc_kexec_load, + AC_DEFINE(HAVE_LIBXENCTRL, 1, ), # required define, and prevent -lxenctrl + AC_MSG_NOTICE([Xen support disabled]))]) +fi + +dnl Check for the Xen kexec_status hypercall - reachable from --with-xen=yes|dl +if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then + AC_CHECK_LIB(xenctrl, xc_kexec_status, + AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, + [The kexec_status call is available]), + AC_MSG_NOTICE([The kexec_status call is not available])) fi dnl ---Sanity checkskexec/Makefile +0
-0
kexec/Makefile dist += kexec/Makefile \ · line 39
Quoted 4 lines
kexec/Makefile +1
-0@@ -36,6 +36,7 @@ dist += kexec/Makefile \ kexec/kexec-elf-boot.h \ kexec/kexec-elf.h kexec/kexec-sha256.h \ kexec/kexec-zlib.h kexec/kexec-lzma.h \ + kexec/kexec-xen.h \
Could you fix backslash alignment? Maybe in separate patch. It can be part of this series.
kexec/arch/i386/crashdump-x86.c line 46
Quoted 11 lines
kexec/Makefile +0
-0kexec/kexec-syscall.h kexec/kexec.h kexec/kexec.8 dist += kexec/proc_iomem.ckexec/arch/i386/crashdump-x86.c +0
-0@@ -44,9 +44,7 @@#include "kexec-x86.h" #include "crashdump-x86.h"
Please remove this blank line...
kexec/arch/i386/crashdump-x86.c line 48
Quoted 5 lines
kexec/arch/i386/crashdump-x86.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h"
...and this... Same things below... This was done to separate conditional include from unconditional ones. So, blank lines after your patch are no longer needed.
kexec/arch/i386/kexec-x86-common.c line 42
Quoted 10 lines
kexec/arch/i386/crashdump-x86.c +0
-0#include "x86-linux-setup.h" kexec/arch/i386/kexec-x86-common.c +0
-0@@ -40,9 +40,7 @@#include "../../crashdump.h" #include "kexec-x86.h"
Ditto...
kexec/arch/i386/kexec-x86-common.c line 44
Quoted 5 lines
kexec/arch/i386/kexec-x86-common.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h"
But leave this one...
kexec/crashdump-xen.c line 20
Quoted 10 lines
kexec/arch/i386/kexec-x86-common.c +0
-0/* Used below but not present in (older?) xenctrl.h */ #ifndef E820_PMEM kexec/crashdump-xen.c +0
-0@@ -18,9 +18,7 @@#include "config.h"
Ditto...
kexec/crashdump-xen.c line 22
Quoted 5 lines
kexec/crashdump-xen.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif +#include "kexec-xen.h"
But leave this one... And same rules below...
Quoted 22 lines
kexec/crashdump-xen.c +0
-0struct crash_note_info {unsigned long base;kexec/kexec-xen.c +8
-1@@ -10,10 +10,49 @@#include "config.h" #ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> +#include "kexec-xen.h" #include "crashdump.h" +#ifdef CONFIG_LIBXENCTRL_DL +void *xc_dlhandle; +xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(HYPERCALL_BUFFER_NULL); +xc_interface *__xc_interface_open(xentoollog_logger *logger, + xentoollog_logger *dombuild_logger, + unsigned open_flags) +{
kexec/kexec-xen.c line 33
Quoted 10 lines
kexec/kexec-xen.c +10
-0+xc_interface *xch =NULL ; + +if (!xc_dlhandle) + xc_dlhandle =dlopen ("libxenctrl.so" ,RTLD_NOW |RTLD_NODELETE ); + +if (xc_dlhandle) { +typedef xc_interface *(*func_t )(xentoollog_logger *logger, +xentoollog_logger *dombuild_logger, +unsigned open_flags); +func_t func = (func_t )dlsym (xc_dlhandle,"xc_interface_open" );
I know your opinion about that definitions but I am not happy with them here. However, if maintainer is OK with them I will not insist on changing that. Just please add one extra line between definitions above and function call below.
kexec/kexec-xen.c line 46
Quoted 13 lines
kexec/kexec-xen.c +13
-0+ xch =func (logger, dombuild_logger, open_flags); + } + +return xch; +} + +int __xc_interface_close (xc_interface *xch) +{ +int rc =-1 ; + +if (xc_dlhandle) { +typedef int (*func_t )(xc_interface *xch); +func_t func = (func_t )dlsym (xc_dlhandle,"xc_interface_close" );
Same as above... Please add empty line here...
kexec/kexec-xen.c line 48
Quoted 2 lines
kexec/kexec-xen.c +2
-0+ rc =func (xch); +
...and I think that you can drop this one here...
Quoted 16 lines
kexec/kexec-xen.c +7
-0+ xc_dlhandle = NULL; + } + +return rc; +} +#endif /* CONFIG_LIBXENCTRL_DL */ +int xen_kexec_load (struct kexec_info *info) {uint32_t nr_segments = info->nr_segments;kexec/kexec-xen.h new file +0
-0
kexec/kexec-xen.h line 4
Quoted 4 lines
kexec/kexec-xen.h new file +4
-0@@ -0,0 +1,73 @@ +#ifndef KEXEC_XEN_H +#define KEXEC_XEN_H + +#ifdef HAVE_LIBXENCTRL
I would add empty line here...
kexec/kexec-xen.h line 7
Quoted 3 lines
kexec/kexec-xen.h new file +3
-0+#include <xenctrl.h> + +#ifdef CONFIG_LIBXENCTRL_DL
...and here...
Quoted 9 lines
kexec/kexec-xen.h new file +9
-0+#include <dlfcn.h> + +/* The handle from dlopen(), needed by dlsym(), dlclose() */ +extern void *xc_dlhandle; + +/* Wrappers around xc_interface_open/close() to insert dlopen/dlclose() */ +xc_interface *__xc_interface_open (xentoollog_logger *logger, +xentoollog_logger *dombuild_logger, +unsigned open_flags);
kexec/kexec-xen.h line 26
Quoted 10 lines
kexec/kexec-xen.h new file +10
-0+int __xc_interface_close (xc_interface *xch); + +/* GCC expression statements for evaluating dlsym() */ +#define __xc_call(dtype, name, args...) \ +( \ + { dtype value; \ + typedef dtype (*func_t)(xc_interface *, ...); \ + func_t func = dlsym(xc_dlhandle, #name); \ + value = func(args); \ + value; } \
Please use one tab instead of spaces here.
kexec/kexec-xen.h line 31
Quoted 5 lines
kexec/kexec-xen.h new file +5
-0+) +#define __xc_data (dtype, name) \ +( \ + { dtype *value = (dtype *)dlsym(xc_dlhandle, #name); \ + value; } \
It looks that this code can fit into one line. Could you change that? And one tab instead of spaces...
kexec/kexec-xen.h line 36
Quoted 5 lines
kexec/kexec-xen.h new file +5
-0+) + +/* The wrappers around utilized xenctrl.h functions */ +#define xc_interface_open (a, b, c) \ + __xc_interface_open(a, b, c)
I would put 2 tabs instead of spaces here and below...
Quoted 23 lines
kexec/kexec-xen.h new file +23
-0+#define xc_interface_close (a) \ + __xc_interface_close(a) +#define xc_version(args...) \ + __xc_call(int, xc_version, args) +#define xc_get_max_cpus(args...) \ + __xc_call(int, xc_get_max_cpus, args) +#define xc_get_machine_memory_map(args...) \ + __xc_call(int, xc_get_machine_memory_map, args) +#define xc_kexec_get_range(args...) \ + __xc_call(int, xc_kexec_get_range, args) +#define xc_kexec_load(args...) \ + __xc_call(int, xc_kexec_load, args) +#define xc_kexec_unload(args...) \ + __xc_call(int, xc_kexec_unload, args) +#define xc_kexec_status(args...) \ + __xc_call(int, xc_kexec_status, args) +#define xc_kexec_exec(args...) \ + __xc_call(int, xc_kexec_exec, args) +#define xc_hypercall_buffer_array_create(args...) \ + __xc_call(xc_hypercall_buffer_array_t *, xc_hypercall_buffer_array_create, args) +#define xc__hypercall_buffer_alloc_pages(args...) \ + __xc_call(void *, xc__hypercall_buffer_alloc_pages, args) +#define xc__hypercall_buffer_free_pages(args...) \
kexec/kexec-xen.h line 69
Quoted 10 lines
kexec/kexec-xen.h new file +10
-0+ __xc_call(void , xc__hypercall_buffer_free_pages, args) +#define xc__hypercall_buffer_array_alloc(args...) \ + __xc_call(void *, xc__hypercall_buffer_array_alloc, args) +#define xc__hypercall_buffer_array_get(args...) \ + __xc_call(void *, xc__hypercall_buffer_array_get, args) +#define xc_hypercall_buffer_array_destroy(args...) \ + __xc_call(void *, xc_hypercall_buffer_array_destroy, args) + +#endif /* CONFIG_LIBXENCTRL_DL */ +
You can drop this empty line...
kexec/kexec-xen.h line 71
Quoted 2 lines
kexec/kexec-xen.h new file +2
-0+#endif /* HAVE_LIBXENCTRL */ +
...and leave this one...
kexec/kexec-xen.h line 73
Quoted 2 lines
kexec/kexec-xen.h new file +2
-0+#endif /* KEXEC_XEN_H */ +
...and drop this one...
Thanks,
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Responses are inlined below.
Eric
Quoted 5 lines · Daniel Kiper
Quoted 4 lines · Eric DeVolder
When kexec is utilized in a Xen environment, it has an explicit run-time dependency on libxenctrl.so. This dependency occurs during the configure stage and when building kexec-tools.
Quoted 8 lines
Quoted 3 lines
When kexec is utilized in a non-Xen environment (either bare metal or KVM), the configure and build of kexec-tools omits any reference to libxenctrl.so.
[...]
Wow! What a long story! Patch looks quite good. Just a few nitpicks.
If you fix them then you can add Reviewed-by: Daniel Kiper <[email protected] > to the next version.
Thanks, I've incorporated all these and added your RB and posted V4.
Quoted 42 lines
Quoted 42 lines
Signed-off-by Eric DeVolder <[email protected]>---
v1: 29nov2017
- Daniel Kiper suggested Debian's libxen package of libraries, but I did not find similar package on most other systems.v2:
14dec2017
- Reposted to kexec and xen-devel mailing listsv3: 12jan2018
- Incorporated feedback from Daniel Kiper.
Configure changes for --with-xen=dl, style problems corrected. Extensive testing of the new mode.--- configure.ac | 27 ++++++++++---- kexec/Makefile | 1 + kexec/arch/i386/crashdump-x86.c | 4 +-- kexec/arch/i386/kexec-x86-common.c | 4 +-- kexec/crashdump-xen.c | 4 +-- kexec/kexec-xen.c | 41 ++++++++++++++++++++- kexec/kexec-xen.h | 73 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 138 insertions(+), 16 deletions(-)create mode 100644
kexec/kexec-xen.hconfigure.ac +3
-6@@ -167,12 +167,27 @@ if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, [AC_CHECK_LIB(xenctrl, xc_kexec_load, , AC_MSG_NOTICE([Xen support disabled]))]) - if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then - AC_CHECK_LIB(xenctrl, xc_kexec_status, - AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, - [The kexec_status call is available]), - AC_MSG_NOTICE([The kexec_status call is not available])) - fi +fi + +dnl Link libxenctrl.so at run-time rather than build-time
Quoted 8 lines
configure.ac if test "$with_xen" = yes ; then · line 177
Quoted 5 lines
configure.ac +5
-0+if test "$with_xen" = dl ; then + AC_CHECK_HEADER(dlfcn.h, + [AC_CHECK_LIB(dl, dlopen, , + AC_MSG_ERROR([Dynamic library linking not available]))], + AC_MSG_ERROR([Dynamic library linking not available]))I think that this error message should be like this:
Dynamic library linking header not available
done
Quoted 16 lines
Quoted 16 lines
configure.ac +13
-0+ AC_DEFINE(CONFIG_LIBXENCTRL_DL, 1, [Define to 1 to link libxenctrl.so at run-time rather than build-time]) + AC_CHECK_HEADER(xenctrl.h, + [AC_CHECK_LIB(xenctrl, xc_kexec_load, + AC_DEFINE(HAVE_LIBXENCTRL, 1, ), # required define, and prevent -lxenctrl + AC_MSG_NOTICE([Xen support disabled]))]) +fi + +dnl Check for the Xen kexec_status hypercall - reachable from --with-xen=yes|dl +if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then + AC_CHECK_LIB(xenctrl, xc_kexec_status, + AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, + [The kexec_status call is available]), + AC_MSG_NOTICE([The kexec_status call is not available])) fi
Quoted 13 lines
kexec/Makefile dist += kexec/Makefile \ · line 39
Quoted 10 lines
configure.ac +0
-0dnl ---Sanity checkskexec/Makefile +1
-0@@ -36,6 +36,7 @@ dist += kexec/Makefile \ kexec/kexec-elf-boot.h \ kexec/kexec-elf.h kexec/kexec-sha256.h \ kexec/kexec-zlib.h kexec/kexec-lzma.h \ + kexec/kexec-xen.h \Could you fix backslash alignment? Maybe in separate patch. It can be part of this series.
Turns out I had tabstop=4 and it should have been tabstop=8. I've corrected my tabstop and the backslash alignment and everything aligns now; no additional patch needed.
Quoted 14 lines
kexec/arch/i386/crashdump-x86.c line 46
Quoted 12 lines
kexec/Makefile +0
-0kexec/kexec-syscall.h kexec/kexec.h kexec/kexec.8 dist += kexec/proc_iomem.ckexec/arch/i386/crashdump-x86.c +0
-0@@ -44,9 +44,7 @@#include "kexec-x86.h" #include "crashdump-x86.h" Please remove this blank line...
done
Quoted 10 lines
kexec/arch/i386/crashdump-x86.c line 48
Quoted 6 lines
kexec/arch/i386/crashdump-x86.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h" ...and this... Same things below... This was done to separate conditional include from unconditional ones. So, blank lines after your patch are no longer needed.
done
Quoted 13 lines
kexec/arch/i386/kexec-x86-common.c line 42
Quoted 11 lines
kexec/arch/i386/crashdump-x86.c +0
-0#include "x86-linux-setup.h" kexec/arch/i386/kexec-x86-common.c +0
-0@@ -40,9 +40,7 @@#include "../../crashdump.h" #include "kexec-x86.h" Ditto...
done
Quoted 8 lines
kexec/arch/i386/kexec-x86-common.c line 44
Quoted 6 lines
kexec/arch/i386/kexec-x86-common.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h" But leave this one...
ok
Quoted 9 lines
Quoted 9 lines
kexec/arch/i386/kexec-x86-common.c +0
-0/* Used below but not present in (older?) xenctrl.h */ #ifndef E820_PMEM kexec/crashdump-xen.c +0
-0@@ -18,9 +18,7 @@
Quoted 5 lines
kexec/crashdump-xen.c line 20
Quoted 2 lines
kexec/crashdump-xen.c +0
-0#include "config.h" Ditto...
done
Quoted 7 lines
kexec/crashdump-xen.c line 22
Quoted 5 lines
kexec/crashdump-xen.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif +#include "kexec-xen.h" But leave this one... And same rules below...
ok
Quoted 30 lines
Quoted 30 lines
kexec/crashdump-xen.c +0
-0struct crash_note_info {unsigned long base;kexec/kexec-xen.c +14
-1@@ -10,10 +10,49 @@#include "config.h" #ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> +#include "kexec-xen.h" #include "crashdump.h" +#ifdef CONFIG_LIBXENCTRL_DL +void *xc_dlhandle; +xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(HYPERCALL_BUFFER_NULL); +xc_interface *__xc_interface_open(xentoollog_logger *logger, + xentoollog_logger *dombuild_logger, + unsigned open_flags) +{ + xc_interface *xch = NULL; + + if (!xc_dlhandle) + xc_dlhandle = dlopen("libxenctrl.so", RTLD_NOW | RTLD_NODELETE); + + if (xc_dlhandle) {
Quoted 8 lines
kexec/kexec-xen.c line 33
Quoted 4 lines
kexec/kexec-xen.c +4
-0+typedef xc_interface *(*func_t )(xentoollog_logger *logger, +xentoollog_logger *dombuild_logger, +unsigned open_flags); +func_t func = (func_t )dlsym (xc_dlhandle,"xc_interface_open" );I know your opinion about that definitions but I am not happy with them here. However, if maintainer is OK with them I will not insist on changing that. Just please add one extra line between definitions above and function call below.
I've added the extra line; and otherwise left the code as is.
Quoted 16 lines
Quoted 4 lines
kexec/kexec-xen.c +3
-0+ xch =func (logger, dombuild_logger, open_flags); + } +kexec/kexec-xen.c line 46
Quoted 10 lines
kexec/kexec-xen.c +10
-0+return xch; +} + +int __xc_interface_close (xc_interface *xch) +{ +int rc =-1 ; + +if (xc_dlhandle) { +typedef int (*func_t )(xc_interface *xch); +func_t func = (func_t )dlsym (xc_dlhandle,"xc_interface_close" );Same as above... Please add empty line here...
done
Quoted 5 lines
kexec/kexec-xen.c line 48
Quoted 3 lines
kexec/kexec-xen.c +2
-0+ rc =func (xch); +...and I think that you can drop this one here...
done
Quoted 15 lines
Quoted 15 lines
kexec/kexec-xen.c +7
-0+ xc_dlhandle = NULL; + } + +return rc; +} +#endif /* CONFIG_LIBXENCTRL_DL */ +int xen_kexec_load (struct kexec_info *info) {uint32_t nr_segments = info->nr_segments;kexec/kexec-xen.h new file +0
-1--- /dev/null
Quoted 8 lines
kexec/kexec-xen.h line 4
Quoted 6 lines
+++
b/kexec/kexec-xen.hkexec/kexec-xen.h new file +4
-0@@ -0,0 +1,73 @@ +#ifndef KEXEC_XEN_H +#define KEXEC_XEN_H + +#ifdef HAVE_LIBXENCTRL I would add empty line here...
done
Quoted 6 lines
kexec/kexec-xen.h line 7
Quoted 4 lines
kexec/kexec-xen.h new file +3
-0+#include <xenctrl.h> + +#ifdef CONFIG_LIBXENCTRL_DL ...and here...
done
Quoted 14 lines
Quoted 14 lines
kexec/kexec-xen.h new file +13
-0+#include <dlfcn.h> + +/* The handle from dlopen(), needed by dlsym(), dlclose() */ +extern void *xc_dlhandle; + +/* Wrappers around xc_interface_open/close() to insert dlopen/dlclose() */ +xc_interface *__xc_interface_open (xentoollog_logger *logger, +xentoollog_logger *dombuild_logger, +unsigned open_flags); +int __xc_interface_close (xc_interface *xch); + +/* GCC expression statements for evaluating dlsym() */ +#define __xc_call(dtype, name, args...) \
Quoted 8 lines
kexec/kexec-xen.h line 26
Quoted 6 lines
kexec/kexec-xen.h new file +6
-0+( \ + { dtype value; \ + typedef dtype (*func_t)(xc_interface *, ...); \ + func_t func = dlsym(xc_dlhandle, #name); \ + value = func(args); \ + value; } \Please use one tab instead of spaces here.
done (all spaces converted to tabs)
Quoted 9 lines
kexec/kexec-xen.h line 31
Quoted 6 lines
kexec/kexec-xen.h new file +5
-0+) +#define __xc_data (dtype, name) \ +( \ + { dtype *value = (dtype *)dlsym(xc_dlhandle, #name); \ + value; } \It looks that this code can fit into one line. Could you change that? And one tab instead of spaces...
done
Quoted 8 lines
kexec/kexec-xen.h line 36
Quoted 6 lines
kexec/kexec-xen.h new file +5
-0+) + +/* The wrappers around utilized xenctrl.h functions */ +#define xc_interface_open (a, b, c) \ + __xc_interface_open(a, b, c)I would put 2 tabs instead of spaces here and below...
done
Quoted 28 lines
Quoted 28 lines
kexec/kexec-xen.h new file +27
-0+#define xc_interface_close (a) \ + __xc_interface_close(a) +#define xc_version(args...) \ + __xc_call(int, xc_version, args) +#define xc_get_max_cpus(args...) \ + __xc_call(int, xc_get_max_cpus, args) +#define xc_get_machine_memory_map(args...) \ + __xc_call(int, xc_get_machine_memory_map, args) +#define xc_kexec_get_range(args...) \ + __xc_call(int, xc_kexec_get_range, args) +#define xc_kexec_load(args...) \ + __xc_call(int, xc_kexec_load, args) +#define xc_kexec_unload(args...) \ + __xc_call(int, xc_kexec_unload, args) +#define xc_kexec_status(args...) \ + __xc_call(int, xc_kexec_status, args) +#define xc_kexec_exec(args...) \ + __xc_call(int, xc_kexec_exec, args) +#define xc_hypercall_buffer_array_create(args...) \ + __xc_call(xc_hypercall_buffer_array_t *, xc_hypercall_buffer_array_create, args) +#define xc__hypercall_buffer_alloc_pages(args...) \ + __xc_call(void *, xc__hypercall_buffer_alloc_pages, args) +#define xc__hypercall_buffer_free_pages(args...) \ + __xc_call(void , xc__hypercall_buffer_free_pages, args) +#define xc__hypercall_buffer_array_alloc(args...) \ + __xc_call(void *, xc__hypercall_buffer_array_alloc, args) +#define xc__hypercall_buffer_array_get(args...) \
Quoted 8 lines
kexec/kexec-xen.h line 69
Quoted 6 lines
kexec/kexec-xen.h new file +6
-0+ __xc_call(void *, xc__hypercall_buffer_array_get, args) +#define xc_hypercall_buffer_array_destroy(args...) \ + __xc_call(void *, xc_hypercall_buffer_array_destroy, args) + +#endif /* CONFIG_LIBXENCTRL_DL */ +You can drop this empty line...
done
Quoted 5 lines
kexec/kexec-xen.h line 71
Quoted 3 lines
kexec/kexec-xen.h new file +2
-0+#endif /* HAVE_LIBXENCTRL */ +...and leave this one...
ok
Quoted 5 lines
kexec/kexec-xen.h line 73
Quoted 3 lines
kexec/kexec-xen.h new file +2
-0+#endif /* KEXEC_XEN_H */ +...and drop this one...
done
Quoted 5 lines
Thanks,
Daniel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Responses are inlined below.
Eric
Quoted 5 lines · Daniel Kiper
Quoted 4 lines · Eric DeVolder
When kexec is utilized in a Xen environment, it has an explicit run-time dependency on libxenctrl.so. This dependency occurs during the configure stage and when building kexec-tools.
Quoted 8 lines
Quoted 3 lines
When kexec is utilized in a non-Xen environment (either bare metal or KVM), the configure and build of kexec-tools omits any reference to libxenctrl.so.
[...]
Wow! What a long story! Patch looks quite good. Just a few nitpicks.
If you fix them then you can add Reviewed-by: Daniel Kiper <[email protected] > to the next version.
Thanks, I've incorporated all these and added your RB and posted V4.
Quoted 42 lines
Quoted 42 lines
Signed-off-by Eric DeVolder <[email protected]>---
v1: 29nov2017
- Daniel Kiper suggested Debian's libxen package of libraries, but I did not find similar package on most other systems.v2:
14dec2017
- Reposted to kexec and xen-devel mailing listsv3: 12jan2018
- Incorporated feedback from Daniel Kiper.
Configure changes for --with-xen=dl, style problems corrected. Extensive testing of the new mode.--- configure.ac | 27 ++++++++++---- kexec/Makefile | 1 + kexec/arch/i386/crashdump-x86.c | 4 +-- kexec/arch/i386/kexec-x86-common.c | 4 +-- kexec/crashdump-xen.c | 4 +-- kexec/kexec-xen.c | 41 ++++++++++++++++++++- kexec/kexec-xen.h | 73 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 138 insertions(+), 16 deletions(-)create mode 100644
kexec/kexec-xen.hconfigure.ac +3
-6@@ -167,12 +167,27 @@ if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, [AC_CHECK_LIB(xenctrl, xc_kexec_load, , AC_MSG_NOTICE([Xen support disabled]))]) - if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then - AC_CHECK_LIB(xenctrl, xc_kexec_status, - AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, - [The kexec_status call is available]), - AC_MSG_NOTICE([The kexec_status call is not available])) - fi +fi + +dnl Link libxenctrl.so at run-time rather than build-time
Quoted 8 lines
configure.ac if test "$with_xen" = yes ; then · line 177
Quoted 5 lines
configure.ac +5
-0+if test "$with_xen" = dl ; then + AC_CHECK_HEADER(dlfcn.h, + [AC_CHECK_LIB(dl, dlopen, , + AC_MSG_ERROR([Dynamic library linking not available]))], + AC_MSG_ERROR([Dynamic library linking not available]))I think that this error message should be like this:
Dynamic library linking header not available
done
Quoted 16 lines
Quoted 16 lines
configure.ac +13
-0+ AC_DEFINE(CONFIG_LIBXENCTRL_DL, 1, [Define to 1 to link libxenctrl.so at run-time rather than build-time]) + AC_CHECK_HEADER(xenctrl.h, + [AC_CHECK_LIB(xenctrl, xc_kexec_load, + AC_DEFINE(HAVE_LIBXENCTRL, 1, ), # required define, and prevent -lxenctrl + AC_MSG_NOTICE([Xen support disabled]))]) +fi + +dnl Check for the Xen kexec_status hypercall - reachable from --with-xen=yes|dl +if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then + AC_CHECK_LIB(xenctrl, xc_kexec_status, + AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1, + [The kexec_status call is available]), + AC_MSG_NOTICE([The kexec_status call is not available])) fi
Quoted 13 lines
kexec/Makefile dist += kexec/Makefile \ · line 39
Quoted 10 lines
configure.ac +0
-0dnl ---Sanity checkskexec/Makefile +1
-0@@ -36,6 +36,7 @@ dist += kexec/Makefile \ kexec/kexec-elf-boot.h \ kexec/kexec-elf.h kexec/kexec-sha256.h \ kexec/kexec-zlib.h kexec/kexec-lzma.h \ + kexec/kexec-xen.h \Could you fix backslash alignment? Maybe in separate patch. It can be part of this series.
Turns out I had tabstop=4 and it should have been tabstop=8. I've corrected my tabstop and the backslash alignment and everything aligns now; no additional patch needed.
Quoted 14 lines
kexec/arch/i386/crashdump-x86.c line 46
Quoted 12 lines
kexec/Makefile +0
-0kexec/kexec-syscall.h kexec/kexec.h kexec/kexec.8 dist += kexec/proc_iomem.ckexec/arch/i386/crashdump-x86.c +0
-0@@ -44,9 +44,7 @@#include "kexec-x86.h" #include "crashdump-x86.h" Please remove this blank line...
done
Quoted 10 lines
kexec/arch/i386/crashdump-x86.c line 48
Quoted 6 lines
kexec/arch/i386/crashdump-x86.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h" ...and this... Same things below... This was done to separate conditional include from unconditional ones. So, blank lines after your patch are no longer needed.
done
Quoted 13 lines
kexec/arch/i386/kexec-x86-common.c line 42
Quoted 11 lines
kexec/arch/i386/crashdump-x86.c +0
-0#include "x86-linux-setup.h" kexec/arch/i386/kexec-x86-common.c +0
-0@@ -40,9 +40,7 @@#include "../../crashdump.h" #include "kexec-x86.h" Ditto...
done
Quoted 8 lines
kexec/arch/i386/kexec-x86-common.c line 44
Quoted 6 lines
kexec/arch/i386/kexec-x86-common.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif /* HAVE_LIBXENCTRL */ +#include "../../kexec-xen.h" But leave this one...
ok
Quoted 9 lines
Quoted 9 lines
kexec/arch/i386/kexec-x86-common.c +0
-0/* Used below but not present in (older?) xenctrl.h */ #ifndef E820_PMEM kexec/crashdump-xen.c +0
-0@@ -18,9 +18,7 @@
Quoted 5 lines
kexec/crashdump-xen.c line 20
Quoted 2 lines
kexec/crashdump-xen.c +0
-0#include "config.h" Ditto...
done
Quoted 7 lines
kexec/crashdump-xen.c line 22
Quoted 5 lines
kexec/crashdump-xen.c +1
-3-#ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> -#endif +#include "kexec-xen.h" But leave this one... And same rules below...
ok
Quoted 30 lines
Quoted 30 lines
kexec/crashdump-xen.c +0
-0struct crash_note_info {unsigned long base;kexec/kexec-xen.c +14
-1@@ -10,10 +10,49 @@#include "config.h" #ifdef HAVE_LIBXENCTRL -#include <xenctrl.h> +#include "kexec-xen.h" #include "crashdump.h" +#ifdef CONFIG_LIBXENCTRL_DL +void *xc_dlhandle; +xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(HYPERCALL_BUFFER_NULL); +xc_interface *__xc_interface_open(xentoollog_logger *logger, + xentoollog_logger *dombuild_logger, + unsigned open_flags) +{ + xc_interface *xch = NULL; + + if (!xc_dlhandle) + xc_dlhandle = dlopen("libxenctrl.so", RTLD_NOW | RTLD_NODELETE); + + if (xc_dlhandle) {
Quoted 8 lines
kexec/kexec-xen.c line 33
Quoted 4 lines
kexec/kexec-xen.c +4
-0+typedef xc_interface *(*func_t )(xentoollog_logger *logger, +xentoollog_logger *dombuild_logger, +unsigned open_flags); +func_t func = (func_t )dlsym (xc_dlhandle,"xc_interface_open" );I know your opinion about that definitions but I am not happy with them here. However, if maintainer is OK with them I will not insist on changing that. Just please add one extra line between definitions above and function call below.
I've added the extra line; and otherwise left the code as is.
Quoted 16 lines
Quoted 4 lines
kexec/kexec-xen.c +3
-0+ xch =func (logger, dombuild_logger, open_flags); + } +kexec/kexec-xen.c line 46
Quoted 10 lines
kexec/kexec-xen.c +10
-0+return xch; +} + +int __xc_interface_close (xc_interface *xch) +{ +int rc =-1 ; + +if (xc_dlhandle) { +typedef int (*func_t )(xc_interface *xch); +func_t func = (func_t )dlsym (xc_dlhandle,"xc_interface_close" );Same as above... Please add empty line here...
done
Quoted 5 lines
kexec/kexec-xen.c line 48
Quoted 3 lines
kexec/kexec-xen.c +2
-0+ rc =func (xch); +...and I think that you can drop this one here...
done
Quoted 15 lines
Quoted 15 lines
kexec/kexec-xen.c +7
-0+ xc_dlhandle = NULL; + } + +return rc; +} +#endif /* CONFIG_LIBXENCTRL_DL */ +int xen_kexec_load (struct kexec_info *info) {uint32_t nr_segments = info->nr_segments;kexec/kexec-xen.h new file +0
-1--- /dev/null
Quoted 8 lines
kexec/kexec-xen.h line 4
Quoted 6 lines
+++
b/kexec/kexec-xen.hkexec/kexec-xen.h new file +4
-0@@ -0,0 +1,73 @@ +#ifndef KEXEC_XEN_H +#define KEXEC_XEN_H + +#ifdef HAVE_LIBXENCTRL I would add empty line here...
done
Quoted 6 lines
kexec/kexec-xen.h line 7
Quoted 4 lines
kexec/kexec-xen.h new file +3
-0+#include <xenctrl.h> + +#ifdef CONFIG_LIBXENCTRL_DL ...and here...
done
Quoted 14 lines
Quoted 14 lines
kexec/kexec-xen.h new file +13
-0+#include <dlfcn.h> + +/* The handle from dlopen(), needed by dlsym(), dlclose() */ +extern void *xc_dlhandle; + +/* Wrappers around xc_interface_open/close() to insert dlopen/dlclose() */ +xc_interface *__xc_interface_open (xentoollog_logger *logger, +xentoollog_logger *dombuild_logger, +unsigned open_flags); +int __xc_interface_close (xc_interface *xch); + +/* GCC expression statements for evaluating dlsym() */ +#define __xc_call(dtype, name, args...) \
Quoted 8 lines
kexec/kexec-xen.h line 26
Quoted 6 lines
kexec/kexec-xen.h new file +6
-0+( \ + { dtype value; \ + typedef dtype (*func_t)(xc_interface *, ...); \ + func_t func = dlsym(xc_dlhandle, #name); \ + value = func(args); \ + value; } \Please use one tab instead of spaces here.
done (all spaces converted to tabs)
Quoted 9 lines
kexec/kexec-xen.h line 31
Quoted 6 lines
kexec/kexec-xen.h new file +5
-0+) +#define __xc_data (dtype, name) \ +( \ + { dtype *value = (dtype *)dlsym(xc_dlhandle, #name); \ + value; } \It looks that this code can fit into one line. Could you change that? And one tab instead of spaces...
done
Quoted 8 lines
kexec/kexec-xen.h line 36
Quoted 6 lines
kexec/kexec-xen.h new file +5
-0+) + +/* The wrappers around utilized xenctrl.h functions */ +#define xc_interface_open (a, b, c) \ + __xc_interface_open(a, b, c)I would put 2 tabs instead of spaces here and below...
done
Quoted 28 lines
Quoted 28 lines
kexec/kexec-xen.h new file +27
-0+#define xc_interface_close (a) \ + __xc_interface_close(a) +#define xc_version(args...) \ + __xc_call(int, xc_version, args) +#define xc_get_max_cpus(args...) \ + __xc_call(int, xc_get_max_cpus, args) +#define xc_get_machine_memory_map(args...) \ + __xc_call(int, xc_get_machine_memory_map, args) +#define xc_kexec_get_range(args...) \ + __xc_call(int, xc_kexec_get_range, args) +#define xc_kexec_load(args...) \ + __xc_call(int, xc_kexec_load, args) +#define xc_kexec_unload(args...) \ + __xc_call(int, xc_kexec_unload, args) +#define xc_kexec_status(args...) \ + __xc_call(int, xc_kexec_status, args) +#define xc_kexec_exec(args...) \ + __xc_call(int, xc_kexec_exec, args) +#define xc_hypercall_buffer_array_create(args...) \ + __xc_call(xc_hypercall_buffer_array_t *, xc_hypercall_buffer_array_create, args) +#define xc__hypercall_buffer_alloc_pages(args...) \ + __xc_call(void *, xc__hypercall_buffer_alloc_pages, args) +#define xc__hypercall_buffer_free_pages(args...) \ + __xc_call(void , xc__hypercall_buffer_free_pages, args) +#define xc__hypercall_buffer_array_alloc(args...) \ + __xc_call(void *, xc__hypercall_buffer_array_alloc, args) +#define xc__hypercall_buffer_array_get(args...) \
Quoted 8 lines
kexec/kexec-xen.h line 69
Quoted 6 lines
kexec/kexec-xen.h new file +6
-0+ __xc_call(void *, xc__hypercall_buffer_array_get, args) +#define xc_hypercall_buffer_array_destroy(args...) \ + __xc_call(void *, xc_hypercall_buffer_array_destroy, args) + +#endif /* CONFIG_LIBXENCTRL_DL */ +You can drop this empty line...
done
Quoted 5 lines
kexec/kexec-xen.h line 71
Quoted 3 lines
kexec/kexec-xen.h new file +2
-0+#endif /* HAVE_LIBXENCTRL */ +...and leave this one...
ok
Quoted 5 lines
kexec/kexec-xen.h line 73
Quoted 3 lines
kexec/kexec-xen.h new file +2
-0+#endif /* KEXEC_XEN_H */ +...and drop this one...
done
Quoted 5 lines
Thanks,
Daniel
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec