From patchwork Fri Sep 16 16:38:20 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: 9336183 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 88B5260839 for ; Fri, 16 Sep 2016 16:41:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76D002A039 for ; Fri, 16 Sep 2016 16:41:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69F8D2A03E; Fri, 16 Sep 2016 16:41:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 4EB4A2A039 for ; Fri, 16 Sep 2016 16:41:23 +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 1bkwAA-0002kh-FB; Fri, 16 Sep 2016 16:38:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bkwA8-0002id-U7 for xen-devel@lists.xenproject.org; Fri, 16 Sep 2016 16:38:53 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id 8B/E3-05361-C102CD75; Fri, 16 Sep 2016 16:38:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeJIrShJLcpLzFFi42KZM10+UFda4U6 4wco2YYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePU40+sBXOPMlb86vzE2MC4ciVjFyMXh5DA ZCaJ/VdOsHQxcgI5vxkllt+PgrA3MkpsecUKUdTNKNG2cz1UUZHE3Dl7gRIcHGwCJhJvVjmC1 IgI9DFK3D76lxGkhhnE2XeaGcQWFoiQePnhGCuIzSKgKvF/3zWwOK+Am8SXe4/BZkoIyEls27 KHEWQmp4C7RM+5TIhVbhJL1q9lgigxlmh/e5FtAiP/AkaGVYwaxalFZalFusbGeklFmekZJbm JmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgSHEAAQ7GHeuDzzEKMnBpCTKW1x4O1yILyk/pTIj sTgjvqg0J7X4EKMMB4eSBO9XuTvhQoJFqempFWmZOcBghklLcPAoifAuBknzFhck5hZnpkOkT jEqSonz1oAkBEASGaV5cG2wCLrEKCslzMsIdIgQT0FqUW5mCar8K0ZxDkYlYd41IFN4MvNK4K a/AlrMBLR49azbIItLEhFSUg2M+53+7i1PT5352rBlt3ykjsQuS7v8e0tX+QY6Hr5gn9R5VuW OGjOjySohlaspi69KtpWv0zpl9ULoUXxG4+2DuYz9a08u2b7nf5Xd3ZX/b+yb84VbsTaW5+28 8u7QgIOHrZ+eVb9cHdi5vExe8qOa25zVLotnB+8vbt7ovjT1Q/+hDUm2m7v9lViKMxINtZiLi hMBoVe+OJsCAAA= X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1474043929!33061455!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.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4664 invoked from network); 16 Sep 2016 16:38:50 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Sep 2016 16:38:50 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8GGcadq030465 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 Sep 2016 16:38:36 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id u8GGcZof006799 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 Sep 2016 16:38:35 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u8GGcZHS006137; Fri, 16 Sep 2016 16:38:35 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 16 Sep 2016 09:38:34 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 0D10C6A0E00; Fri, 16 Sep 2016 12:38:33 -0400 (EDT) From: Konrad Rzeszutek Wilk To: xen-devel@lists.xenproject.org, konrad@kernel.org, ross.lagerwall@citrix.com, julien.grall@arm.com, sstabellini@kernel.org Date: Fri, 16 Sep 2016 12:38:20 -0400 Message-Id: <1474043908-12101-9-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1474043908-12101-1-git-send-email-konrad.wilk@oracle.com> References: <1474043908-12101-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Cc: Andrew Cooper , Jan Beulich , Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH v4 08/16] livepatch: Move test-cases to their own sub-directory in test. 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-Virus-Scanned: ClamAV using ClamSMTP So they can be shared with ARM64 (but not yet, so they are only built on x86). No functional change. We also need to tweak the MAINTAINERS and .gitignore file. Also we need to update SUBDIRS to include the new 'test' directory so 'cscope' can show the example livepatches. Acked-by: Jan Beulich [for directory] Signed-off-by: Konrad Rzeszutek Wilk --- Cc: Stefano Stabellini Cc: Julien Grall Cc: Jan Beulich Cc: Andrew Cooper v1: First submission v2: Move to test/livepatch per Jan's recommendation v3: Sort MAINTAINERS for livepatch. Add Jan's Acked-by. Added on the SUBDIRS the 'test' directory Change title of patch (common-> own sub-directory) --- .gitignore | 8 +-- MAINTAINERS | 1 + xen/Makefile | 5 +- xen/arch/arm/Makefile | 3 - xen/arch/x86/Makefile | 5 -- xen/arch/x86/test/Makefile | 85 ----------------------------- xen/arch/x86/test/xen_bye_world.c | 34 ------------ xen/arch/x86/test/xen_bye_world_func.c | 22 -------- xen/arch/x86/test/xen_hello_world.c | 67 ----------------------- xen/arch/x86/test/xen_hello_world_func.c | 39 ------------- xen/arch/x86/test/xen_replace_world.c | 33 ----------- xen/arch/x86/test/xen_replace_world_func.c | 22 -------- xen/test/Makefile | 9 +++ xen/test/livepatch/Makefile | 85 +++++++++++++++++++++++++++++ xen/test/livepatch/xen_bye_world.c | 34 ++++++++++++ xen/test/livepatch/xen_bye_world_func.c | 22 ++++++++ xen/test/livepatch/xen_hello_world.c | 67 +++++++++++++++++++++++ xen/test/livepatch/xen_hello_world_func.c | 39 +++++++++++++ xen/test/livepatch/xen_replace_world.c | 33 +++++++++++ xen/test/livepatch/xen_replace_world_func.c | 22 ++++++++ 20 files changed, 319 insertions(+), 316 deletions(-) delete mode 100644 xen/arch/x86/test/Makefile delete mode 100644 xen/arch/x86/test/xen_bye_world.c delete mode 100644 xen/arch/x86/test/xen_bye_world_func.c delete mode 100644 xen/arch/x86/test/xen_hello_world.c delete mode 100644 xen/arch/x86/test/xen_hello_world_func.c delete mode 100644 xen/arch/x86/test/xen_replace_world.c delete mode 100644 xen/arch/x86/test/xen_replace_world_func.c create mode 100644 xen/test/Makefile create mode 100644 xen/test/livepatch/Makefile create mode 100644 xen/test/livepatch/xen_bye_world.c create mode 100644 xen/test/livepatch/xen_bye_world_func.c create mode 100644 xen/test/livepatch/xen_hello_world.c create mode 100644 xen/test/livepatch/xen_hello_world_func.c create mode 100644 xen/test/livepatch/xen_replace_world.c create mode 100644 xen/test/livepatch/xen_replace_world_func.c diff --git a/.gitignore b/.gitignore index cc64fc9..eeabe0b 100644 --- a/.gitignore +++ b/.gitignore @@ -254,10 +254,6 @@ 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.livepatch -xen/arch/x86/test/xen_bye_world.livepatch -xen/arch/x86/test/xen_replace_world.livepatch xen/arch/*/efi/boot.c xen/arch/*/efi/compat.c xen/arch/*/efi/efi.h @@ -274,6 +270,10 @@ xen/include/public/public xen/include/xen/*.new xen/include/xen/acm_policy.h xen/include/xen/compile.h +xen/test/livepatch/config.h +xen/test/livepatch/xen_bye_world.livepatch +xen/test/livepatch/xen_hello_world.livepatch +xen/test/livepatch/xen_replace_world.livepatch xen/tools/kconfig/.tmp_gtkcheck xen/tools/kconfig/.tmp_qtcheck xen/tools/symbols diff --git a/MAINTAINERS b/MAINTAINERS index ae0b6bc..edc8603 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -272,6 +272,7 @@ F: xen/arch/*/livepatch* F: xen/arch/*/*/livepatch* F: xen/common/livepatch* F: xen/include/xen/livepatch* +F: xen/test/livepatch/* MACHINE CHECK (MCA) & RAS M: Christoph Egger diff --git a/xen/Makefile b/xen/Makefile index 012509b..e989a20 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -80,7 +80,7 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) .PHONY: _tests _tests: - $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) tests + $(MAKE) -f $(BASEDIR)/Rules.mk -C test tests .PHONY: _uninstall _uninstall: D=$(DESTDIR) @@ -114,6 +114,7 @@ _clean: delete-unfresh-files $(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean $(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean + $(MAKE) -f $(BASEDIR)/Rules.mk -C test clean $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH) SRCARCH=$(SRCARCH) clean find . \( -name "*.o" -o -name ".*.d" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core @@ -189,7 +190,7 @@ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s echo ""; \ echo "#endif") <$< >$@ -SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers +SUBDIRS = xsm arch/$(TARGET_ARCH) common drivers test define all_sources ( find include/asm-$(TARGET_ARCH) -name '*.h' -print; \ find include -name 'asm-*' -prune -o -name '*.h' -print; \ diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 5cee84d..1d9051c 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -74,9 +74,6 @@ ifeq ($(CONFIG_ARM_64),y) ln -sf $(notdir $@) ../../$(notdir $@).efi endif -.PHONY: tests -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 d3875c5..931917d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -93,10 +93,6 @@ $(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32 ./boot/mkelf32 $(notes_phdrs) $(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 livepatch - ALL_OBJS := $(BASEDIR)/arch/x86/boot/built_in.o $(BASEDIR)/arch/x86/efi/built_in.o $(ALL_OBJS) ifeq ($(lto),y) @@ -226,4 +222,3 @@ clean:: 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 rm -f note.o - $(MAKE) -f $(BASEDIR)/Rules.mk -C test clean diff --git a/xen/arch/x86/test/Makefile b/xen/arch/x86/test/Makefile deleted file mode 100644 index 48ff843..0000000 --- a/xen/arch/x86/test/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -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 - -LIVEPATCH := xen_hello_world.livepatch -LIVEPATCH_BYE := xen_bye_world.livepatch -LIVEPATCH_REPLACE := xen_replace_world.livepatch - -default: livepatch - -install: livepatch - $(INSTALL_DATA) $(LIVEPATCH) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH) - $(INSTALL_DATA) $(LIVEPATCH_BYE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE) - $(INSTALL_DATA) $(LIVEPATCH_REPLACE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE) -uninstall: - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH) - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE) - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE) - -.PHONY: clean -clean:: - rm -f *.o .*.o.d *.livepatch config.h - -# -# To compute these values we need the binary files: xen-syms -# and xen_hello_world_func.o to be already compiled. -# -.PHONY: config.h -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)") > $@ - -xen_hello_world.o: config.h - -.PHONY: $(LIVEPATCH) -$(LIVEPATCH): xen_hello_world_func.o xen_hello_world.o note.o - $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH) $^ - -# -# This target is only accessible if CONFIG_LIVEPATCH is defined, which -# depends on $(build_id_linker) being available. Hence we do not -# need any checks. -# -# N.B. The reason we don't use arch/x86/note.o is that it may -# not be built (it is for EFI builds), and that we do not have -# the note.o.bin to muck with (as it gets deleted) -# -.PHONY: note.o -note.o: - $(OBJCOPY) -O binary --only-section=.note.gnu.build-id $(BASEDIR)/xen-syms $@.bin - $(OBJCOPY) -I binary -O elf64-x86-64 -B i386:x86-64 \ - --rename-section=.data=.livepatch.depends,alloc,load,readonly,data,contents -S $@.bin $@ - rm -f $@.bin - -# -# Extract the build-id of the xen_hello_world.livepatch -# (which xen_bye_world will depend on). -# -.PHONY: hello_world_note.o -hello_world_note.o: $(LIVEPATCH) - $(OBJCOPY) -O binary --only-section=.note.gnu.build-id $(LIVEPATCH) $@.bin - $(OBJCOPY) -I binary -O elf64-x86-64 -B i386:x86-64 \ - --rename-section=.data=.livepatch.depends,alloc,load,readonly,data,contents -S $@.bin $@ - rm -f $@.bin - -xen_bye_world.o: config.h - -.PHONY: $(LIVEPATCH_BYE) -$(LIVEPATCH_BYE): xen_bye_world_func.o xen_bye_world.o hello_world_note.o - $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_BYE) $^ - -xen_replace_world.o: config.h - -.PHONY: $(LIVEPATCH_REPLACE) -$(LIVEPATCH_REPLACE): xen_replace_world_func.o xen_replace_world.o note.o - $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_REPLACE) $^ - -.PHONY: livepatch -livepatch: $(LIVEPATCH) $(LIVEPATCH_BYE) $(LIVEPATCH_REPLACE) diff --git a/xen/arch/x86/test/xen_bye_world.c b/xen/arch/x86/test/xen_bye_world.c deleted file mode 100644 index 2700f0e..0000000 --- a/xen/arch/x86/test/xen_bye_world.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - * - */ - -#include "config.h" -#include -#include -#include -#include - -#include - -static const char bye_world_patch_this_fnc[] = "xen_extra_version"; -extern const char *xen_bye_world(void); - -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_bye_world = { - .version = LIVEPATCH_PAYLOAD_VERSION, - .name = bye_world_patch_this_fnc, - .new_addr = xen_bye_world, - .old_addr = xen_extra_version, - .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_bye_world_func.c b/xen/arch/x86/test/xen_bye_world_func.c deleted file mode 100644 index 32ef341..0000000 --- a/xen/arch/x86/test/xen_bye_world_func.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - * - */ - -#include - -/* Our replacement function for xen_hello_world. */ -const char *xen_bye_world(void) -{ - return "Bye World!"; -} - -/* - * 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.c b/xen/arch/x86/test/xen_hello_world.c deleted file mode 100644 index 02f3f85..0000000 --- a/xen/arch/x86/test/xen_hello_world.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - * - */ - -#include "config.h" -#include -#include -#include -#include -#include - -#include - -static const char hello_world_patch_this_fnc[] = "xen_extra_version"; -extern const char *xen_hello_world(void); -static unsigned int cnt; - -static void apply_hook(void) -{ - printk(KERN_DEBUG "Hook executing.\n"); -} - -static void revert_hook(void) -{ - printk(KERN_DEBUG "Hook unloaded.\n"); -} - -static void hi_func(void) -{ - printk(KERN_DEBUG "%s: Hi! (called %u times)\n", __func__, ++cnt); -}; - -static void check_fnc(void) -{ - printk(KERN_DEBUG "%s: Hi func called %u times\n", __func__, cnt); - BUG_ON(cnt == 0 || cnt > 2); -} - -LIVEPATCH_LOAD_HOOK(apply_hook); -LIVEPATCH_UNLOAD_HOOK(revert_hook); - -/* Imbalance here. Two load and three unload. */ - -LIVEPATCH_LOAD_HOOK(hi_func); -LIVEPATCH_UNLOAD_HOOK(hi_func); - -LIVEPATCH_UNLOAD_HOOK(check_fnc); - -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { - .version = LIVEPATCH_PAYLOAD_VERSION, - .name = hello_world_patch_this_fnc, - .new_addr = xen_hello_world, - .old_addr = xen_extra_version, - .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 deleted file mode 100644 index 03d6b84..0000000 --- a/xen/arch/x86/test/xen_hello_world_func.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - * - */ - -#include - -#include -#include -#include - -static unsigned long *non_canonical_addr = (unsigned long *)0xdead000000000000ULL; - -/* Our replacement function for xen_extra_version. */ -const char *xen_hello_world(void) -{ - unsigned long tmp; - int rc; - - alternative(ASM_NOP8, ASM_NOP1, X86_FEATURE_LM); - /* - * Any BUG, or WARN_ON will contain symbol and payload name. Furthermore - * exceptions will be caught and processed properly. - */ - rc = __get_user(tmp, non_canonical_addr); - BUG_ON(rc != -EFAULT); - - return "Hello World"; -} - -/* - * 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_replace_world.c b/xen/arch/x86/test/xen_replace_world.c deleted file mode 100644 index 78a8f52..0000000 --- a/xen/arch/x86/test/xen_replace_world.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - * - */ - -#include "config.h" -#include -#include -#include - -#include - -static const char xen_replace_world_name[] = "xen_extra_version"; -extern const char *xen_replace_world(void); - -struct livepatch_func __section(".livepatch.funcs") livepatch_xen_replace_world = { - .version = LIVEPATCH_PAYLOAD_VERSION, - .name = xen_replace_world_name, - .old_addr = 0, /* Forces the hypervisor to lookup .name */ - .new_addr = xen_replace_world, - .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_replace_world_func.c b/xen/arch/x86/test/xen_replace_world_func.c deleted file mode 100644 index afb5cda..0000000 --- a/xen/arch/x86/test/xen_replace_world_func.c +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. - * - */ - -#include - -/* Our replacement function for xen_hello_world. */ -const char *xen_replace_world(void) -{ - return "Hello Again World!"; -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/test/Makefile b/xen/test/Makefile new file mode 100644 index 0000000..8c53040 --- /dev/null +++ b/xen/test/Makefile @@ -0,0 +1,9 @@ +.PHONY: tests +tests: +ifeq ($(XEN_TARGET_ARCH),x86_64) + $(MAKE) -f $(BASEDIR)/Rules.mk -C livepatch livepatch +endif + +.PHONY: clean +clean:: + $(MAKE) -f $(BASEDIR)/Rules.mk -C livepatch clean diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile new file mode 100644 index 0000000..48ff843 --- /dev/null +++ b/xen/test/livepatch/Makefile @@ -0,0 +1,85 @@ +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 + +LIVEPATCH := xen_hello_world.livepatch +LIVEPATCH_BYE := xen_bye_world.livepatch +LIVEPATCH_REPLACE := xen_replace_world.livepatch + +default: livepatch + +install: livepatch + $(INSTALL_DATA) $(LIVEPATCH) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH) + $(INSTALL_DATA) $(LIVEPATCH_BYE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE) + $(INSTALL_DATA) $(LIVEPATCH_REPLACE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE) +uninstall: + rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH) + rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE) + rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE) + +.PHONY: clean +clean:: + rm -f *.o .*.o.d *.livepatch config.h + +# +# To compute these values we need the binary files: xen-syms +# and xen_hello_world_func.o to be already compiled. +# +.PHONY: config.h +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)") > $@ + +xen_hello_world.o: config.h + +.PHONY: $(LIVEPATCH) +$(LIVEPATCH): xen_hello_world_func.o xen_hello_world.o note.o + $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH) $^ + +# +# This target is only accessible if CONFIG_LIVEPATCH is defined, which +# depends on $(build_id_linker) being available. Hence we do not +# need any checks. +# +# N.B. The reason we don't use arch/x86/note.o is that it may +# not be built (it is for EFI builds), and that we do not have +# the note.o.bin to muck with (as it gets deleted) +# +.PHONY: note.o +note.o: + $(OBJCOPY) -O binary --only-section=.note.gnu.build-id $(BASEDIR)/xen-syms $@.bin + $(OBJCOPY) -I binary -O elf64-x86-64 -B i386:x86-64 \ + --rename-section=.data=.livepatch.depends,alloc,load,readonly,data,contents -S $@.bin $@ + rm -f $@.bin + +# +# Extract the build-id of the xen_hello_world.livepatch +# (which xen_bye_world will depend on). +# +.PHONY: hello_world_note.o +hello_world_note.o: $(LIVEPATCH) + $(OBJCOPY) -O binary --only-section=.note.gnu.build-id $(LIVEPATCH) $@.bin + $(OBJCOPY) -I binary -O elf64-x86-64 -B i386:x86-64 \ + --rename-section=.data=.livepatch.depends,alloc,load,readonly,data,contents -S $@.bin $@ + rm -f $@.bin + +xen_bye_world.o: config.h + +.PHONY: $(LIVEPATCH_BYE) +$(LIVEPATCH_BYE): xen_bye_world_func.o xen_bye_world.o hello_world_note.o + $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_BYE) $^ + +xen_replace_world.o: config.h + +.PHONY: $(LIVEPATCH_REPLACE) +$(LIVEPATCH_REPLACE): xen_replace_world_func.o xen_replace_world.o note.o + $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(LIVEPATCH_REPLACE) $^ + +.PHONY: livepatch +livepatch: $(LIVEPATCH) $(LIVEPATCH_BYE) $(LIVEPATCH_REPLACE) diff --git a/xen/test/livepatch/xen_bye_world.c b/xen/test/livepatch/xen_bye_world.c new file mode 100644 index 0000000..2700f0e --- /dev/null +++ b/xen/test/livepatch/xen_bye_world.c @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * + */ + +#include "config.h" +#include +#include +#include +#include + +#include + +static const char bye_world_patch_this_fnc[] = "xen_extra_version"; +extern const char *xen_bye_world(void); + +struct livepatch_func __section(".livepatch.funcs") livepatch_xen_bye_world = { + .version = LIVEPATCH_PAYLOAD_VERSION, + .name = bye_world_patch_this_fnc, + .new_addr = xen_bye_world, + .old_addr = xen_extra_version, + .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/test/livepatch/xen_bye_world_func.c b/xen/test/livepatch/xen_bye_world_func.c new file mode 100644 index 0000000..32ef341 --- /dev/null +++ b/xen/test/livepatch/xen_bye_world_func.c @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * + */ + +#include + +/* Our replacement function for xen_hello_world. */ +const char *xen_bye_world(void) +{ + return "Bye World!"; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/test/livepatch/xen_hello_world.c b/xen/test/livepatch/xen_hello_world.c new file mode 100644 index 0000000..02f3f85 --- /dev/null +++ b/xen/test/livepatch/xen_hello_world.c @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * + */ + +#include "config.h" +#include +#include +#include +#include +#include + +#include + +static const char hello_world_patch_this_fnc[] = "xen_extra_version"; +extern const char *xen_hello_world(void); +static unsigned int cnt; + +static void apply_hook(void) +{ + printk(KERN_DEBUG "Hook executing.\n"); +} + +static void revert_hook(void) +{ + printk(KERN_DEBUG "Hook unloaded.\n"); +} + +static void hi_func(void) +{ + printk(KERN_DEBUG "%s: Hi! (called %u times)\n", __func__, ++cnt); +}; + +static void check_fnc(void) +{ + printk(KERN_DEBUG "%s: Hi func called %u times\n", __func__, cnt); + BUG_ON(cnt == 0 || cnt > 2); +} + +LIVEPATCH_LOAD_HOOK(apply_hook); +LIVEPATCH_UNLOAD_HOOK(revert_hook); + +/* Imbalance here. Two load and three unload. */ + +LIVEPATCH_LOAD_HOOK(hi_func); +LIVEPATCH_UNLOAD_HOOK(hi_func); + +LIVEPATCH_UNLOAD_HOOK(check_fnc); + +struct livepatch_func __section(".livepatch.funcs") livepatch_xen_hello_world = { + .version = LIVEPATCH_PAYLOAD_VERSION, + .name = hello_world_patch_this_fnc, + .new_addr = xen_hello_world, + .old_addr = xen_extra_version, + .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/test/livepatch/xen_hello_world_func.c b/xen/test/livepatch/xen_hello_world_func.c new file mode 100644 index 0000000..03d6b84 --- /dev/null +++ b/xen/test/livepatch/xen_hello_world_func.c @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * + */ + +#include + +#include +#include +#include + +static unsigned long *non_canonical_addr = (unsigned long *)0xdead000000000000ULL; + +/* Our replacement function for xen_extra_version. */ +const char *xen_hello_world(void) +{ + unsigned long tmp; + int rc; + + alternative(ASM_NOP8, ASM_NOP1, X86_FEATURE_LM); + /* + * Any BUG, or WARN_ON will contain symbol and payload name. Furthermore + * exceptions will be caught and processed properly. + */ + rc = __get_user(tmp, non_canonical_addr); + BUG_ON(rc != -EFAULT); + + return "Hello World"; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/test/livepatch/xen_replace_world.c b/xen/test/livepatch/xen_replace_world.c new file mode 100644 index 0000000..78a8f52 --- /dev/null +++ b/xen/test/livepatch/xen_replace_world.c @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * + */ + +#include "config.h" +#include +#include +#include + +#include + +static const char xen_replace_world_name[] = "xen_extra_version"; +extern const char *xen_replace_world(void); + +struct livepatch_func __section(".livepatch.funcs") livepatch_xen_replace_world = { + .version = LIVEPATCH_PAYLOAD_VERSION, + .name = xen_replace_world_name, + .old_addr = 0, /* Forces the hypervisor to lookup .name */ + .new_addr = xen_replace_world, + .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/test/livepatch/xen_replace_world_func.c b/xen/test/livepatch/xen_replace_world_func.c new file mode 100644 index 0000000..afb5cda --- /dev/null +++ b/xen/test/livepatch/xen_replace_world_func.c @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. + * + */ + +#include + +/* Our replacement function for xen_hello_world. */ +const char *xen_replace_world(void) +{ + return "Hello Again World!"; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */