From patchwork Fri Sep 16 16:58:46 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: 9336225 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 D14EC6077F for ; Fri, 16 Sep 2016 17:01:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCDEF2A03E for ; Fri, 16 Sep 2016 17:01:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B13D52A043; Fri, 16 Sep 2016 17:01:57 +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 AE6282A03E for ; Fri, 16 Sep 2016 17:01:55 +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 1bkwTi-00061p-Rq; Fri, 16 Sep 2016 16:59:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bkwTh-00061j-SN for xen-devel@lists.xenproject.org; Fri, 16 Sep 2016 16:59:06 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 4C/DC-11508-8D42CD75; Fri, 16 Sep 2016 16:59:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRWlGSWpSXmKPExsUyZ7p8oO51lTv hBh/uqll83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnz+rczFiyIqPj86R5TA+Mpzy5GLg4hgQ4m iWOtE1ghnG+MEoe+LmeDcDYySmx/18zcxcgJ5HQzSlxeEghhF0ncvzWbFcRmEVCVWN71gKmLk YODTcBE4s0qR5BeEYE+RonbR/8ygtQwC/hJNO06AFYvLBArcXPPIjaQel4Bc4meVVC7mhgl3t 99yA5SwysgKHFy5hMWiF4tiRv/XoLNZxaQllj+jwMkzCngLvFlzRSwclEBZYnF/T1sILaEgLF E36w+lgmMQrOQTJqFZNIshEkLGJlXMWoUpxaVpRbpGprpJRVlpmeU5CZm5ugaGpjq5aYWFyem p+YkJhXrJefnbmIEhjMDEOxgPH/a8xCjJAeTkihvceHtcCG+pPyUyozE4oz4otKc1OJDjDIcH EoSvHOV74QLCRalpqdWpGXmACMLJi3BwaMkwjsFJM1bXJCYW5yZDpE6xagoJc47CyQhAJLIKM 2Da4NF8yVGWSlhXkagQ4R4ClKLcjNLUOVfMYpzMCoJ80aBTOHJzCuBm/4KaDET0OLVs26DLC5 JREhJNTAqfrtfLydpH+q/4pDujZ4PWcvX3r2wKu3v7tp/lqE+Nrpffyer3JJ2X8R154Jo0MbO 9NPXSyv23114dUlX1f3iJ+mqspIvIrTYtH87c6m35zAdWb+fd9b8m6YsuYE8R1+c8fKXnBpdF djySKhrJs/PStFSwYuCj0TE381+3MWqfHBD3PLF2s+VWIozEg21mIuKEwHQxRHQ4QIAAA== X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1474045141!23632963!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 9715 invoked from network); 16 Sep 2016 16:59:03 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Sep 2016 16:59:03 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8GGwoa4026943 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 16 Sep 2016 16:58:51 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u8GGwoe9017562 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 16 Sep 2016 16:58:50 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u8GGwlw7015379; Fri, 16 Sep 2016 16:58:48 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:58:47 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 5F8056A0DEF; Fri, 16 Sep 2016 12:58:46 -0400 (EDT) Date: Fri, 16 Sep 2016 12:58:46 -0400 From: Konrad Rzeszutek Wilk To: xen-devel@lists.xenproject.org, konrad@kernel.org, ross.lagerwall@citrix.com, julien.grall@arm.com, sstabellini@kernel.org Message-ID: <20160916165846.GA18146@char.us.oracle.com> References: <1474043908-12101-1-git-send-email-konrad.wilk@oracle.com> <1474043908-12101-9-git-send-email-konrad.wilk@oracle.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1474043908-12101-9-git-send-email-konrad.wilk@oracle.com> User-Agent: Mutt/1.6.2 (2016-07-01) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: Andrew Cooper , Jan Beulich Subject: Re: [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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Sep 16, 2016 at 12:38:20PM -0400, Konrad Rzeszutek Wilk wrote: > 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 ARGH!!! There has to be some .gitconfig parameter for this. In the meantime please ignore this patch and instead see this one: From 50f28785cff34a060ae528dc21493ee41ad55cdd Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 12 Aug 2016 15:27:58 -0400 Subject: [PATCH v5] livepatch: Move test-cases to their own sub-directory in test. 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/test/Makefile | 9 +++++++++ xen/{arch/x86/test => test/livepatch}/Makefile | 0 xen/{arch/x86/test => test/livepatch}/xen_bye_world.c | 0 xen/{arch/x86/test => test/livepatch}/xen_bye_world_func.c | 0 xen/{arch/x86/test => test/livepatch}/xen_hello_world.c | 0 xen/{arch/x86/test => test/livepatch}/xen_hello_world_func.c | 0 xen/{arch/x86/test => test/livepatch}/xen_replace_world.c | 0 xen/{arch/x86/test => test/livepatch}/xen_replace_world_func.c | 0 13 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 xen/test/Makefile rename xen/{arch/x86/test => test/livepatch}/Makefile (100%) rename xen/{arch/x86/test => test/livepatch}/xen_bye_world.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_bye_world_func.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_hello_world.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_hello_world_func.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_replace_world.c (100%) rename xen/{arch/x86/test => test/livepatch}/xen_replace_world_func.c (100%) 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/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/arch/x86/test/Makefile b/xen/test/livepatch/Makefile similarity index 100% rename from xen/arch/x86/test/Makefile rename to xen/test/livepatch/Makefile diff --git a/xen/arch/x86/test/xen_bye_world.c b/xen/test/livepatch/xen_bye_world.c similarity index 100% rename from xen/arch/x86/test/xen_bye_world.c rename to xen/test/livepatch/xen_bye_world.c diff --git a/xen/arch/x86/test/xen_bye_world_func.c b/xen/test/livepatch/xen_bye_world_func.c similarity index 100% rename from xen/arch/x86/test/xen_bye_world_func.c rename to xen/test/livepatch/xen_bye_world_func.c diff --git a/xen/arch/x86/test/xen_hello_world.c b/xen/test/livepatch/xen_hello_world.c similarity index 100% rename from xen/arch/x86/test/xen_hello_world.c rename to xen/test/livepatch/xen_hello_world.c diff --git a/xen/arch/x86/test/xen_hello_world_func.c b/xen/test/livepatch/xen_hello_world_func.c similarity index 100% rename from xen/arch/x86/test/xen_hello_world_func.c rename to xen/test/livepatch/xen_hello_world_func.c diff --git a/xen/arch/x86/test/xen_replace_world.c b/xen/test/livepatch/xen_replace_world.c similarity index 100% rename from xen/arch/x86/test/xen_replace_world.c rename to xen/test/livepatch/xen_replace_world.c diff --git a/xen/arch/x86/test/xen_replace_world_func.c b/xen/test/livepatch/xen_replace_world_func.c similarity index 100% rename from xen/arch/x86/test/xen_replace_world_func.c rename to xen/test/livepatch/xen_replace_world_func.c