From patchwork Wed Apr 13 21:09:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 8828671 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 82AC09F3A0 for ; Wed, 13 Apr 2016 21:12:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1DC3202A1 for ; Wed, 13 Apr 2016 21:12:38 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48FA220374 for ; Wed, 13 Apr 2016 21:12:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aqS3L-0006Ck-VF; Wed, 13 Apr 2016 21:10:23 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aqS3K-00069M-DQ for xen-devel@lists.xenproject.org; Wed, 13 Apr 2016 21:10:22 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 89/A1-07120-DB5BE075; Wed, 13 Apr 2016 21:10:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnkeJIrShJLcpLzFFi42KZM10+UHfvVr5 wg2e3WC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ox1syeyF3T7V+x/287awPjRsYuRi0NIoI1J YvufXnYI5wujxLSprxkhnA2MEr/Pr2aDcLoZJfb0z2LtYuQEcookJr3bDtTCwcEmYCLxZpUjS FhEYDmjxIszeSD1zAI3GSVOrlnDDpIQFkiV+HnxDguIzSKgKrHoWzcTiM0r4C6x8fATNpA5Eg JyEgsupIOEOYHC816/Z4JY5SZx6e0esLUSAoYSpx9uY5zAyL+AkWEVo3pxalFZapGusV5SUWZ 6RkluYmaOrqGBmV5uanFxYnpqTmJSsV5yfu4mRmAAMQDBDsaOf06HGCU5mJREeU1W8YUL8SXl p1RmJBZnxBeV5qQWH2KU4eBQkuB9sAUoJ1iUmp5akZaZAwxlmLQEB4+SCO9zkDRvcUFibnFmO kTqFKOilDjvQpCEAEgiozQPrg0WP5cYZaWEeRmBDhHiKUgtys0sQZV/xSjOwagkzPsaZApPZl 4J3PRXQIuZgBaXveMFWVySiJCSamBMl76ziVOpueY6++lvi9+Z7zn7Y0m2S/+GVv1Hb1epFHK f+5NaMztzVvSNJBWvpEsv9WsnLb1qt8Q6+8Gqqcs+HfdaMj/n0ov87uSEk9KqnE9UNf1uPpjC /jNXaXG/qZfaiidBJwvS9k82f6n2zTfixnftLoWK1KuZl3buvLju+GGLjT8mPrPsU2Ipzkg01 GIuKk4EAEu3p5+aAgAA X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1460581819!6882701!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53201 invoked from network); 13 Apr 2016 21:10:20 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-4.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 13 Apr 2016 21:10:20 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u3DLA9o8031353 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 13 Apr 2016 21:10:09 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u3DLA9cv025002 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 13 Apr 2016 21:10:09 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u3DLA8ck003790; Wed, 13 Apr 2016 21:10:08 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 13 Apr 2016 14:10:07 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id CF1D46A0113; Wed, 13 Apr 2016 17:10:05 -0400 (EDT) From: Konrad Rzeszutek Wilk To: konrad@kernel.org, xen-devel@lists.xenproject.org, sasha.levin@oracle.com, andrew.cooper3@citrix.com, ross.lagerwall@citrix.com, mpohlack@amazon.de Date: Wed, 13 Apr 2016 17:09:42 -0400 Message-Id: <1460581796-30071-12-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460581796-30071-1-git-send-email-konrad.wilk@oracle.com> References: <1460581796-30071-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: Julien Grall , Stefano Stabellini , Keir Fraser , Jan Beulich , Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH v8 11/25] x86/xen_hello_world.xsplice: Test payload for patching 'xen_extra_version'. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This change demonstrates how to generate an xSplice ELF payload. The idea here is that we want to patch in the hypervisor the 'xen_version_extra' function with an function that will return 'Hello World'. The 'xl info | grep extraversion' will reflect the new value after the patching. To generate this ELF payload file we need: - C code of the new code (xen_hello_world_func.c). - C code generating the .xsplice.funcs structure (xen_hello_world.c) - The address of the old code (xen_extra_version). We retrieve it by using 'nm --defined' on xen-syms. - The size of the new and old code for which we use nm --defined -S on our code and xen-syms respectively. There are two C files and one header files generated during build. One could make this one C file if the size of the newly patched function size was known in advance (or an random value was choosen). There is also a strict order of compiling: 1) xen_hello_world_func.c 2) config.h - extract the size of the new function, the old function and the old function address. 3) xen_hello_world.c - which contains the .xsplice.funcs structure. 4) Link the object files in an xen_hello_world.xsplice file. The use-case is simple: $xen-xsplice load /usr/lib/debug/xen_hello_world.xsplice $xen-xsplice list ID | status ----------------------------------------+------------ xen_hello_world APPLIED $xl info | grep extra xen_extra : Hello World $xen-xsplice revert xen_hello_world Performing revert: completed $xen-xsplice unload xen_hello_world Performing unload: completed $xl info | grep extra xen_extra : -unstable Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Julien Grall [ARM] --- Cc: Stefano Stabellini Cc: Julien Grall Cc: Keir Fraser Cc: Jan Beulich Cc: Andrew Cooper v2: Do it using hypervisor Makefiles v3: Remove the stale linker file. Add Copyright and local definition block s/name/xen_hello_world_name/ v6: Remove the 'install', and 'uninstall' destinations. Remove xen/config.h from files. v7: Made the build target be called 'tests'. Changed the .name to have 'xen_extra_version' to be consistent with the spec. Add Julien's Ack and Andrew's Reviewed-by. --- --- .gitignore | 2 ++ docs/misc/xsplice.markdown | 37 +++++++++++++++++++++++++++ xen/Makefile | 8 ++++-- xen/arch/arm/Makefile | 2 ++ xen/arch/x86/Makefile | 4 +++ xen/arch/x86/test/Makefile | 44 ++++++++++++++++++++++++++++++++ xen/arch/x86/test/xen_hello_world.c | 30 ++++++++++++++++++++++ xen/arch/x86/test/xen_hello_world_func.c | 22 ++++++++++++++++ 8 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 xen/arch/x86/test/Makefile create mode 100644 xen/arch/x86/test/xen_hello_world.c create mode 100644 xen/arch/x86/test/xen_hello_world_func.c diff --git a/.gitignore b/.gitignore index 39eb779..4a81f43 100644 --- a/.gitignore +++ b/.gitignore @@ -246,6 +246,8 @@ xen/arch/x86/efi.lds xen/arch/x86/efi/check.efi xen/arch/x86/efi/disabled xen/arch/x86/efi/mkreloc +xen/arch/x86/test/config.h +xen/arch/x86/test/xen_hello_world.xsplice xen/arch/*/efi/boot.c xen/arch/*/efi/compat.c xen/arch/*/efi/efi.h diff --git a/docs/misc/xsplice.markdown b/docs/misc/xsplice.markdown index 7a19b60..4b9403e 100644 --- a/docs/misc/xsplice.markdown +++ b/docs/misc/xsplice.markdown @@ -336,6 +336,43 @@ When reverting a patch, the hypervisor iterates over each `xsplice_patch_func` and the core code copies the data from the undo buffer (private internal copy) to `old_addr`. +### Example of .xsplice.funcs + +A simple example of what a payload file can be: + +
+/* MUST be in sync with hypervisor. */  
+struct xsplice_patch_func {  
+    const char *name;  
+    uint64_t new_addr;  
+    uint64_t old_addr;  
+    uint32_t new_size;  
+    uint32_t old_size;  
+    uint8_t version;
+    uint8_t pad[31];  
+};  
+
+/* Our replacement function for xen_extra_version. */  
+const char *xen_hello_world(void)  
+{  
+    return "Hello World";  
+}  
+
+static unsigned char patch_this_fnc[] = "xen_extra_version";  
+
+struct xsplice_patch_func xsplice_hello_world = {  
+    .version = XSPLICE_PAYLOAD_VERSION,
+    .name = patch_this_fnc,  
+    .new_addr = (unsigned long)(xen_hello_world),  
+    .old_addr = 0xffff82d08013963c, /* Extracted from xen-syms. */  
+    .new_size = 13, /* To be be computed by scripts. */  
+    .old_size = 13, /* -----------""---------------  */  
+} __attribute__((__section__(".xsplice.funcs")));  
+
+
+ +Code must be compiled with -fPIC. + ## Hypercalls We will employ the sub operations of the system management hypercall (sysctl). diff --git a/xen/Makefile b/xen/Makefile index c908544..eb0482e 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -39,8 +39,8 @@ dist: install build install:: include/config/auto.conf -.PHONY: build install uninstall clean distclean cscope TAGS tags MAP gtags -build install uninstall debug clean distclean cscope TAGS tags MAP gtags:: +.PHONY: build install uninstall clean distclean cscope TAGS tags MAP gtags tests +build install uninstall debug clean distclean cscope TAGS tags MAP gtags tests:: ifneq ($(XEN_TARGET_ARCH),x86_32) $(MAKE) -f Rules.mk _$@ else @@ -76,6 +76,10 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) fi; \ fi +.PHONY: _tests +_tests: + $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) tests + .PHONY: _uninstall _uninstall: D=$(DESTDIR) _uninstall: T=$(notdir $(TARGET)) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index eae5cb3..0afa414 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -57,6 +57,8 @@ ifeq ($(CONFIG_ARM_64),y) ln -sf $(notdir $@) ../../$(notdir $@).efi endif +tests: + $(TARGET).axf: $(TARGET)-syms # XXX: VE model loads by VMA so instead of # making a proper ELF we link with LMA == VMA and adjust crudely diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 8a6a7d5..6c2d5fa 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -76,6 +76,9 @@ $(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32 ./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000 \ `$(NM) -nr $(TARGET)-syms | head -n 1 | sed -e 's/^\([^ ]*\).*/0x\1/'` +.PHONY: tests +tests: + $(MAKE) -f $(BASEDIR)/Rules.mk -C test xsplice ALL_OBJS := $(BASEDIR)/arch/x86/boot/built_in.o $(BASEDIR)/arch/x86/efi/built_in.o $(ALL_OBJS) @@ -179,3 +182,4 @@ clean:: rm -f $(BASEDIR)/.xen-syms.[0-9]* boot/.*.d rm -f $(BASEDIR)/.xen.efi.[0-9]* efi/*.o efi/.*.d efi/*.efi efi/disabled efi/mkreloc rm -f boot/reloc.S boot/reloc.lnk boot/reloc.bin + $(MAKE) -f $(BASEDIR)/Rules.mk -C test clean diff --git a/xen/arch/x86/test/Makefile b/xen/arch/x86/test/Makefile new file mode 100644 index 0000000..b9cf13c --- /dev/null +++ b/xen/arch/x86/test/Makefile @@ -0,0 +1,44 @@ +include $(XEN_ROOT)/Config.mk + +CODE_ADDR=$(shell nm --defined $(1) | grep $(2) | awk '{print "0x"$$1}') +CODE_SZ=$(shell nm --defined -S $(1) | grep $(2) | awk '{ print "0x"$$2}') + +.PHONY: default + +XSPLICE := xen_hello_world.xsplice + +default: xsplice + +install: xsplice + $(INSTALL_DATA) $(XSPLICE) $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE) +uninstall: + rm -f $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE) + +.PHONY: clean +clean:: + rm -f *.o .*.o.d $(XSPLICE) config.h + +# +# To compute these values we need the binary files: xen-syms +# and xen_hello_world_func.o to be already compiled. +# +# We can be assured that xen-syms is already built as we are +# the last entry in the build target. +# +.PHONY: config.h +config.h: OLD_CODE=$(call CODE_ADDR,$(BASEDIR)/xen-syms,xen_extra_version) +config.h: OLD_CODE_SZ=$(call CODE_SZ,$(BASEDIR)/xen-syms,xen_extra_version) +config.h: NEW_CODE_SZ=$(call CODE_SZ,$<,xen_hello_world) +config.h: xen_hello_world_func.o + (set -e; \ + echo "#define NEW_CODE_SZ $(NEW_CODE_SZ)"; \ + echo "#define OLD_CODE_SZ $(OLD_CODE_SZ)"; \ + echo "#define OLD_CODE $(OLD_CODE)") > $@ + +.PHONY: xsplice +xsplice: config.h + # Need to have these done in sequential order + $(MAKE) -f $(BASEDIR)/Rules.mk xen_hello_world_func.o + $(MAKE) -f $(BASEDIR)/Rules.mk xen_hello_world.o + $(LD) $(LDFLAGS) -r -o $(XSPLICE) xen_hello_world_func.o \ + xen_hello_world.o diff --git a/xen/arch/x86/test/xen_hello_world.c b/xen/arch/x86/test/xen_hello_world.c new file mode 100644 index 0000000..21831e9 --- /dev/null +++ b/xen/arch/x86/test/xen_hello_world.c @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * + */ + +#include "config.h" +#include +#include + +static char hello_world_patch_this_fnc[] = "xen_extra_version"; +extern const char *xen_hello_world(void); + +struct xsplice_patch_func __section(".xsplice.funcs") xsplice_xen_hello_world = { + .version = XSPLICE_PAYLOAD_VERSION, + .name = hello_world_patch_this_fnc, + .new_addr = (unsigned long)(xen_hello_world), + .old_addr = OLD_CODE, + .new_size = NEW_CODE_SZ, + .old_size = OLD_CODE_SZ, +}; + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/test/xen_hello_world_func.c b/xen/arch/x86/test/xen_hello_world_func.c new file mode 100644 index 0000000..1ad002a --- /dev/null +++ b/xen/arch/x86/test/xen_hello_world_func.c @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * + */ + +#include + +/* Our replacement function for xen_extra_version. */ +const char *xen_hello_world(void) +{ + return "Hello World"; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */