[PATCH-for-4.14 v2 0/2] xen: build fixes for CONFIG_HYPFS

[PATCH-for-4.14 v2 0/2] xen: build fixes for CONFIG_HYPFS

[Juergen Gross]

Fixing an issue Andrew met, and disabling CONFIG_HYPFS in pv-shim.

Juergen Gross (2):
  xen: fix build with CONFIG_HYPFS_CONFIG enabled
  xen/config: disable hypervisor filesystem for pv-shim

 xen/arch/x86/configs/pvshim_defconfig | 1 +
 xen/common/Makefile                   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.26.2

[PATCH-for-4.14 v2 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled

[Juergen Gross]

Commit 58263ed7713e ("xen: add /buildinfo/config entry to hypervisor
filesystem") added a dependency to .config, but the hypervisor's build
config could be have another name via setting KCONFIG_CONFIG.

Fix that by using $(KCONFIG_CONFIG) instead. Additionally reference
the config file via $(XEN_ROOT) instead of a relative path.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
V2:
- accept an absolute path in KCONFIG_CONFIG (Jan Beulich)
---
 xen/common/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 91581e1815..fc2c8eb4a3 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -75,7 +75,8 @@ obj-$(CONFIG_UBSAN) += ubsan/
 obj-$(CONFIG_NEEDS_LIBELF) += libelf/
 obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
 
-config.gz: ../.config
+CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(XEN_ROOT)/xen/$(KCONFIG_CONFIG),$(KCONFIG_CONFIG))
+config.gz: $(CONF_FILE)
 	gzip -c $< >$@
 
 config_data.o: config.gz
-- 
2.26.2

[PATCH-for-4.14 v2 2/2] xen/config: disable hypervisor filesystem for pv-shim

[Juergen Gross]

The pv-shim doesn't need the hypervisor filesystem, so disable it.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
 xen/arch/x86/configs/pvshim_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/pvshim_defconfig
index 9710aa6238..830660e022 100644
--- a/xen/arch/x86/configs/pvshim_defconfig
+++ b/xen/arch/x86/configs/pvshim_defconfig
@@ -6,6 +6,7 @@ CONFIG_PV_SHIM=y
 CONFIG_PV_SHIM_EXCLUSIVE=y
 CONFIG_NR_CPUS=32
 # Disable features not used by the PV shim
+# CONFIG_HYPFS is not set
 # CONFIG_SHADOW_PAGING is not set
 # CONFIG_BIGMEM is not set
 # CONFIG_HVM_FEP is not set
-- 
2.26.2

Re: [PATCH-for-4.14 v2 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled

[Jan Beulich]

On 02.06.2020 14:58, Juergen Gross wrote:
> Commit 58263ed7713e ("xen: add /buildinfo/config entry to hypervisor
> filesystem") added a dependency to .config, but the hypervisor's build
> config could be have another name via setting KCONFIG_CONFIG.
> 
> Fix that by using $(KCONFIG_CONFIG) instead. Additionally reference
> the config file via $(XEN_ROOT) instead of a relative path.
> 
> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Signed-off-by: Juergen Gross <jgross@suse.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>
albeit ...

> --- a/xen/common/Makefile
> +++ b/xen/common/Makefile
> @@ -75,7 +75,8 @@ obj-$(CONFIG_UBSAN) += ubsan/
>  obj-$(CONFIG_NEEDS_LIBELF) += libelf/
>  obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
>  
> -config.gz: ../.config
> +CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(XEN_ROOT)/xen/$(KCONFIG_CONFIG),$(KCONFIG_CONFIG))

... I'll be tempted to shorten this to

CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(XEN_ROOT)/xen/)$(KCONFIG_CONFIG)

Jan

Re: [PATCH-for-4.14 v2 1/2] xen: fix build with CONFIG_HYPFS_CONFIG enabled

[Jürgen Groß]

On 02.06.20 15:02, Jan Beulich wrote:
> On 02.06.2020 14:58, Juergen Gross wrote:
>> Commit 58263ed7713e ("xen: add /buildinfo/config entry to hypervisor
>> filesystem") added a dependency to .config, but the hypervisor's build
>> config could be have another name via setting KCONFIG_CONFIG.
>>
>> Fix that by using $(KCONFIG_CONFIG) instead. Additionally reference
>> the config file via $(XEN_ROOT) instead of a relative path.
>>
>> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> Signed-off-by: Juergen Gross <jgross@suse.com>
> 
> Reviewed-by: Jan Beulich <jbeulich@suse.com>
> albeit ...
> 
>> --- a/xen/common/Makefile
>> +++ b/xen/common/Makefile
>> @@ -75,7 +75,8 @@ obj-$(CONFIG_UBSAN) += ubsan/
>>   obj-$(CONFIG_NEEDS_LIBELF) += libelf/
>>   obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
>>   
>> -config.gz: ../.config
>> +CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(XEN_ROOT)/xen/$(KCONFIG_CONFIG),$(KCONFIG_CONFIG))
> 
> ... I'll be tempted to shorten this to
> 
> CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(XEN_ROOT)/xen/)$(KCONFIG_CONFIG)

Yes, this is better.


Juergen

RE: [PATCH-for-4.14 v2 0/2] xen: build fixes for CONFIG_HYPFS

[Paul Durrant]

> -----Original Message-----
> From: Juergen Gross <jgross@suse.com>
> Sent: 02 June 2020 13:59
> To: xen-devel@lists.xenproject.org
> Cc: paul@xen.org; Juergen Gross <jgross@suse.com>; Andrew Cooper <andrew.cooper3@citrix.com>; George
> Dunlap <george.dunlap@citrix.com>; Ian Jackson <ian.jackson@eu.citrix.com>; Jan Beulich
> <jbeulich@suse.com>; Julien Grall <julien@xen.org>; Stefano Stabellini <sstabellini@kernel.org>; Wei
> Liu <wl@xen.org>; Roger Pau Monné <roger.pau@citrix.com>
> Subject: [PATCH-for-4.14 v2 0/2] xen: build fixes for CONFIG_HYPFS
> 
> Fixing an issue Andrew met, and disabling CONFIG_HYPFS in pv-shim.
> 
> Juergen Gross (2):
>   xen: fix build with CONFIG_HYPFS_CONFIG enabled
>   xen/config: disable hypervisor filesystem for pv-shim
> 
>  xen/arch/x86/configs/pvshim_defconfig | 1 +
>  xen/common/Makefile                   | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 

Release-acked-by: Paul Durrant <paul@xen.org>