From patchwork Wed Apr 27 19:27:19 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: 8962191 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 BE3739F1C1 for ; Wed, 27 Apr 2016 19:30:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9DA842026C for ; Wed, 27 Apr 2016 19:30:43 +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 80DD12026F for ; Wed, 27 Apr 2016 19:30:42 +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 1avV8g-000524-B0; Wed, 27 Apr 2016 19:28:46 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1avV8f-0004yN-5R for xen-devel@lists.xenproject.org; Wed, 27 Apr 2016 19:28:45 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id C1/C2-09532-CE211275; Wed, 27 Apr 2016 19:28:44 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42KZM10+UPe1kGK 4wfSX5hbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8a+fxeZC3brVxxvSGlgPKjexcjFISQwkUli +u497BDON0aJdwsnQjkbGSWa5t9ng3C6GSW2rmhi7GLkBHKKJPb3t7B2MXJwsAmYSLxZ5QgSF hFYzijx4kweiM0sUC6xesZ7NhBbWCBKYn3PdWYQm0VAVaJl00SwMbwCbhJ3d21gAxkjISAnse BCOojJCRR+sy4aYpGrxMMr31lAbAkBQ4nPG5cyT2DkX8DIsIpRvTi1qCy1SNdIL6koMz2jJDc xM0fX0MBMLze1uDgxPTUnMalYLzk/dxMjMHQYgGAH47K/TocYJTmYlER5N/xRCBfiS8pPqcxI LM6ILyrNSS0+xCjDwaEkwbtRUDFcSLAoNT21Ii0zBxjEMGkJDh4lEV5tYCAL8RYXJOYWZ6ZDp E4xKkqJ894D6RMASWSU5sG1wSLnEqOslDAvI9AhQjwFqUW5mSWo8q8YxTkYlYR5RUDG82Tmlc BNfwW0mAlo8eVDsiCLSxIRUlINjLzLTizXtrg4yzvzem1B5edzPbnM4Zw96xuXnLMxL0q+nBV Ua7/pim64p6j8uwZTtWoVIcf/V5//ygzybt9sG8JwMb5txnHn4sIpji1da46dkZlX9WL/N4OH L16oTK+bGKciVGS2v0b5T/PPGXvmBi5jjTl7Ofev1LPpHjHrHONXqt5+c2LSdSWW4oxEQy3mo uJEAPTxKJeXAgAA X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1461785321!7200806!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.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9613 invoked from network); 27 Apr 2016 19:28:43 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 27 Apr 2016 19:28:43 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u3RJS3eA004824 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 27 Apr 2016 19:28:03 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u3RJS22n008416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 27 Apr 2016 19:28:02 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u3RJS2B0012670; Wed, 27 Apr 2016 19:28:02 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 27 Apr 2016 12:28:02 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 419726A0115; Wed, 27 Apr 2016 15:27:59 -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, 27 Apr 2016 15:27:19 -0400 Message-Id: <1461785241-4481-23-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461785241-4481-1-git-send-email-konrad.wilk@oracle.com> References: <1461785241-4481-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: Keir Fraser , Jan Beulich , Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH v10 22/24] xsplice/xen_replace_world: Test-case for XSPLICE_ACTION_REPLACE 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 With this third payload one can do: -bash-4.1# xen-xsplice load xen_hello_world.xsplice Uploading xen_hello_world.xsplice (10148 bytes) Performing check: completed Performing apply:. completed [xen_hello_world depends on hypervisor build-id] -bash-4.1# xen-xsplice load xen_bye_world.xsplice Uploading xen_bye_world.xsplice (7076 bytes) Performing check: completed Performing apply:. completed [xen_bye_world depends on xen_hello_world build-id] -bash-4.1# xen-xsplice upload xen_replace_world xen_replace_world.xsplice Uploading xen_replace_world.xsplice (7148 bytes) -bash-4.1# xen-xsplice list ID | status ----------------------------------------+------------ xen_hello_world | APPLIED xen_bye_world | APPLIED xen_replace_world | CHECKED -bash-4.1# xen-xsplice replace xen_replace_world Performing replace:. completed -bash-4.1# xl info | grep extra xen_extra : Hello Again World! -bash-4.1# xen-xsplice list ID | status ----------------------------------------+------------ xen_hello_world | CHECKED xen_bye_world | CHECKED xen_replace_world | APPLIED and revert both of the previous payloads and apply the xen_replace_world. All the magic of this is in the Makefile - we extract the build-id from the hypervisor (xen-syms) and jam it in the xen_replace_world as .xsplice.depends. We also make .old_addr be zero, forcing the hypervisor to lookup the xen_extra_version. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper --- Cc: Keir Fraser Cc: Jan Beulich Cc: Andrew Cooper v4: New. Make the objcopy use -S to strip the name. v7: Added Andrew's Reviewed-by v9: Drop (unsignd long) casts on new_addr and old_addr as they are void pointers. Make the build section use $(XSPLICE_REPLACE) Make the test-case include Don't set .old_addr - let the hypervisor look it up. v10: Use filter to XSPLICE_REPLACE target Change xen_replace_world.o dependency to depend on config.h Drop Andrew's Reviewed-by --- .gitignore | 1 + xen/arch/x86/test/Makefile | 12 ++++++++++- xen/arch/x86/test/xen_replace_world.c | 33 ++++++++++++++++++++++++++++++ xen/arch/x86/test/xen_replace_world_func.c | 22 ++++++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 xen/arch/x86/test/xen_replace_world.c create mode 100644 xen/arch/x86/test/xen_replace_world_func.c diff --git a/.gitignore b/.gitignore index 88cec1d..1b73293 100644 --- a/.gitignore +++ b/.gitignore @@ -249,6 +249,7 @@ xen/arch/x86/efi/mkreloc xen/arch/x86/test/config.h xen/arch/x86/test/xen_hello_world.xsplice xen/arch/x86/test/xen_bye_world.xsplice +xen/arch/x86/test/xen_replace_world.xsplice xen/arch/*/efi/boot.c xen/arch/*/efi/compat.c xen/arch/*/efi/efi.h diff --git a/xen/arch/x86/test/Makefile b/xen/arch/x86/test/Makefile index 349c603..9fcbbfe 100644 --- a/xen/arch/x86/test/Makefile +++ b/xen/arch/x86/test/Makefile @@ -7,15 +7,18 @@ CODE_SZ=$(shell nm --defined -S $(1) | grep $(2) | awk '{ print "0x"$$2}') XSPLICE := xen_hello_world.xsplice XSPLICE_BYE := xen_bye_world.xsplice +XSPLICE_REPLACE := xen_replace_world.xsplice default: xsplice install: xsplice $(INSTALL_DATA) $(XSPLICE) $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE) $(INSTALL_DATA) $(XSPLICE_BYE) $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE_BYE) + $(INSTALL_DATA) $(XSPLICE_REPLACE) $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE_REPLACE) uninstall: rm -f $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE) rm -f $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE_BYE) + rm -f $(DESTDIR)$(DEBUG_DIR)/$(XSPLICE_REPLACE) .PHONY: clean clean:: @@ -73,6 +76,13 @@ $(XSPLICE_BYE): $(XSPLICE) config.h xen_bye_world_func.o xen_bye_world.o hello_w $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(XSPLICE_BYE) \ $(filter %.o,$^) +xen_replace_world.o: config.h + +.PHONY: $(XSPLICE_REPLACE) +$(XSPLICE_REPLACE): config.h xen_replace_world_func.o xen_replace_world.o note.o + $(LD) $(LDFLAGS) $(build_id_linker) -r -o $(XSPLICE_REPLACE) \ + $(filter %.o,$^) + .PHONY: xsplice -xsplice: $(XSPLICE) $(XSPLICE_BYE) +xsplice: $(XSPLICE) $(XSPLICE_BYE) $(XSPLICE_REPLACE) diff --git a/xen/arch/x86/test/xen_replace_world.c b/xen/arch/x86/test/xen_replace_world.c new file mode 100644 index 0000000..fab2841 --- /dev/null +++ b/xen/arch/x86/test/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 char xen_replace_world_name[] = "xen_extra_version"; +extern const char *xen_replace_world(void); + +struct xsplice_patch_func __section(".xsplice.funcs") xsplice_xen_replace_world = { + .version = XSPLICE_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 new file mode 100644 index 0000000..afb5cda --- /dev/null +++ b/xen/arch/x86/test/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: + */