From nobody Mon May 6 21:31:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1575737635; cv=none; d=zohomail.com; s=zohoarc; b=kckhkvwpIuZ+9/fvXE2/ccxbCprIQBdvDMf5jDggxU/Y02KjntogWKglthV7nJjzah8o38mK3tbl5TSuIve6YT5PIp5Owek2wkusz6622OJKblZuz9ReMGGwMD2gznXbsU3Ej0rurYAHAfv/VE97L6jbvgyEHTNbZ6jyDq2ti0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575737635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=13nrqVo1KjY6NDU19bAIrQfZScSYMcSwjyZcsJlUSBg=; b=dHj0D6/E2WbYsJvpJeq3j9JOhdhs3/qsmE1wXY0eliutOo/PlMN+3IQIUCnHuOCh7tTl2WPjLyzi0iVQS+s2r6n01w4sz6HDkJ0aE8qqIfFAg4ApbkCEVWU6x206pMsTFCb6LfRj8jsF/HdKLhV47b2UQXkGsb+U9Dnt9t+y0ec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 15757376352591013.4033717219927; Sat, 7 Dec 2019 08:53:55 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iddKK-0001TE-FE; Sat, 07 Dec 2019 16:53:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iddKJ-0001T9-2b for xen-devel@lists.xenproject.org; Sat, 07 Dec 2019 16:53:03 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0499da52-1912-11ea-a1e1-bc764e2007e4; Sat, 07 Dec 2019 16:52:57 +0000 (UTC) X-Inumbo-ID: 0499da52-1912-11ea-a1e1-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1575737577; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=/FdFJaveInpq0PepbCf79b7l7Jgjsx9OuI5LZga/E60=; b=JDw3coQ9/PX+NfcoprAR7uUj9O32WjTg+lJ+8UvCcdNNyU9qL2yYpz4Q e7bJ8Z7FebdARlgLBDf7+/EinJ8vJfUbdtO1bVoQQb21+v9dA/UOYNKoc VAWnkJL6vjh1HVWRAPuE3dUVHwLZRgG9WoFStIFdIHfFDCkx4GHTdRRj5 E=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 0RN1OxF1NQADeTXIHlMLjI3NtPuR4/hM/AgRkK47OLRRoUnSg2yE4tNrAw9ZrwBKHiCZcqyw47 Yn4uHBYGLjMdhGicDekgwwKJIL+85v76JTMKNDC9niEq/NpHEvxX/sFmvsXcGfr2lCSLuQ18Sx vWtSI3tZnUuKweryLUplzYWZMKuTRvwGBxQaF8mYdcWhhXI9B1z4QNLCJgArJ8X60VUo8X2bwc jYOQvVNhDf58hv6cbgCqUhJIzVtt8etb4vUI/1IDLfqUGLoZYHFakWbaJ5eeLRWgoZ2G0vs7ng 4L4= X-SBRS: 2.7 X-MesageID: 9704955 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,288,1571716800"; d="scan'208";a="9704955" From: Andrew Cooper To: Xen-devel Date: Sat, 7 Dec 2019 16:52:51 +0000 Message-ID: <20191207165252.1045-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191207165252.1045-1-andrew.cooper3@citrix.com> References: <20191207165252.1045-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 1/2] xen/flask: Fix Python 3 problems with gen-policy.py X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Andrew Cooper , Daniel De Graaf Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The script is Python 2 specific, and fails with string/binary issues with Python 3: Traceback (most recent call last): File "gen-policy.py", line 14, in for char in sys.stdin.read(): File "/usr/lib/python3.5/codecs.py", line 321, in decode (result, consumed) =3D self._buffer_decode(data, self.errors, final) UnicodeDecodeError: 'utf-8' codec can't decode byte 0x8c in position 0: i= nvalid start byte Fixing the script to be compatible isn't hard, but using python here is wasteful. Drop the script entirely, and write a short flask-policy.S inste= ad. Signed-off-by: Andrew Cooper --- CC: Daniel De Graaf CC: Juergen Gross For 4.13. This is a blocker to our intent to by Py3-clean in this release Discovered entirely accidently when testing the following patch. --- xen/xsm/flask/Makefile | 6 ++---- xen/xsm/flask/flask-policy.S | 20 ++++++++++++++++++++ xen/xsm/flask/gen-policy.py | 23 ----------------------- 3 files changed, 22 insertions(+), 27 deletions(-) create mode 100644 xen/xsm/flask/flask-policy.S delete mode 100644 xen/xsm/flask/gen-policy.py diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index f5ffab1226..7c3f381287 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -27,7 +27,8 @@ $(FLASK_H_FILES): $(FLASK_H_DEPEND) $(AV_H_FILES): $(AV_H_DEPEND) $(CONFIG_SHELL) policy/mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) =20 -obj-$(CONFIG_XSM_FLASK_POLICY) +=3D policy.o +obj-bin-$(CONFIG_XSM_FLASK_POLICY) +=3D flask-policy.o +flask-policy.o: policy.bin =20 FLASK_BUILD_DIR :=3D $(CURDIR) POLICY_SRC :=3D $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) @@ -36,9 +37,6 @@ policy.bin: FORCE $(MAKE) -f $(XEN_ROOT)/tools/flask/policy/Makefile.common -C $(XEN_ROOT)/= tools/flask/policy FLASK_BUILD_DIR=3D$(FLASK_BUILD_DIR) cmp -s $(POLICY_SRC) $@ || cp $(POLICY_SRC) $@ =20 -policy.c: policy.bin gen-policy.py - $(PYTHON) gen-policy.py < $< > $@ - .PHONY: clean clean:: rm -f $(ALL_H_FILES) *.o $(DEPS_RM) policy.* $(POLICY_SRC) diff --git a/xen/xsm/flask/flask-policy.S b/xen/xsm/flask/flask-policy.S new file mode 100644 index 0000000000..d78ce77fd6 --- /dev/null +++ b/xen/xsm/flask/flask-policy.S @@ -0,0 +1,20 @@ + .section .init.rodata, "a", @progbits + +/* const unsigned char xsm_flask_init_policy[] __initconst */ + .align 4 + .global xsm_flask_init_policy +xsm_flask_init_policy: + .incbin "policy.bin" +.Lend: + + .type xsm_flask_init_policy, @object + .size xsm_flask_init_policy, . - xsm_flask_init_policy + +/* const unsigned int __initconst xsm_flask_init_policy_size */ + .align 4 + .global xsm_flask_init_policy_size +xsm_flask_init_policy_size: + .long .Lend - xsm_flask_init_policy + + .type xsm_flask_init_policy_size, @object + .size xsm_flask_init_policy_size, . - xsm_flask_init_policy_size diff --git a/xen/xsm/flask/gen-policy.py b/xen/xsm/flask/gen-policy.py deleted file mode 100644 index c7501e4614..0000000000 --- a/xen/xsm/flask/gen-policy.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python -import sys - -policy_size =3D 0 - -sys.stdout.write(""" -/* This file is autogenerated by gen_policy.py */ -#include -#include - -const unsigned char xsm_flask_init_policy[] __initconst =3D { -""") - -for char in sys.stdin.read(): - sys.stdout.write(" 0x%02x," % ord(char)) - policy_size =3D policy_size + 1 - if policy_size % 13 =3D=3D 0: - sys.stdout.write("\n") - -sys.stdout.write(""" -}; -const unsigned int __initconst xsm_flask_init_policy_size =3D %d; -""" % policy_size) --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Mon May 6 21:31:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1575737633; cv=none; d=zohomail.com; s=zohoarc; b=G34AinCOenADl8pS0Qd02r7W43SQNpZU8wH5VMGh0NC+4LEIxzp/l73VH4ji2qN9iX55ZlWteRYPvP+BEnrgz3T6hSijH95mlE8BIeCjRjQSnYs93bzs7ve0YbsDzjwBPWQmYuTcDYTmB1rMoRySo774eLmYOKXiQKsjsP8RZ5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575737633; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1FO7IdiQ0Ob2s9cj9W/M5PNw7L4LCRN3K81jIfgVeIs=; b=M7PEjVhr3uYRFENTlo7u3IlI3WS39r53QxSDtaiWe582mal4dfUFDgbgrOkAagPdLAuHZtkpoMkuYEGsloJGjTMgeS/PcUhtB5b+eLhEWJAjVa8yOEKJkcuwFJFoBUYuqUWhMJQ/I9kjZnKE2jiA2kU+LW6mRbZB1UwazTEhJn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 157573763332478.43476174726084; Sat, 7 Dec 2019 08:53:53 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iddKP-0001TX-O4; Sat, 07 Dec 2019 16:53:09 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iddKO-0001TS-3N for xen-devel@lists.xenproject.org; Sat, 07 Dec 2019 16:53:08 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0590db72-1912-11ea-a1e1-bc764e2007e4; Sat, 07 Dec 2019 16:52:58 +0000 (UTC) X-Inumbo-ID: 0590db72-1912-11ea-a1e1-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1575737578; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=KfZ5k1GCGybok2YdxP8dG1qh3yim1hLYVV6a6LaKsD8=; b=G+Uct0tmQ2bIa3tFUa3kGaupyRek/8jSnMD0zr/me0S97wAZoWo95bf1 Iduh38O4uwPFfZny0LnlpHdf8+OlnXBq83DVOAo4y0YXzRxMXHnlByO9a qjn/0qJJsUptUGqPK65RKDvI0FeOEXRRj9Ze0AUcKZCMQNTs4QJnx68L3 Q=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: fCGu3BYvkWEv6yX46Jb4PxEiv9kjtW+UKKFmu5T7Pt8jqkfzQ4m8JwDy2XSi0RyqDG05nXtS2C OSZSKm2qVeTi6qXVOQgfQv5+J4r1JEM3dBRQQOYnpTmENyyTCjy4W/qFV8l5ziXqXmKAGmipR2 xp6EESP37KexqgXK+qpNwqqdRrH3HlSpXuuyleCHxkphaNwWsyBN1qtBbyMb6pxuh8bACvcBIc rHfZtoIqUgEqsU4FjObGSWeyuqx3BU1esivfGKNm7CaV9aOsyJDAQaLD88/aqfqWS7+kbAE+h2 Yi4= X-SBRS: 2.7 X-MesageID: 9704956 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,288,1571716800"; d="scan'208";a="9704956" From: Andrew Cooper To: Xen-devel Date: Sat, 7 Dec 2019 16:52:52 +0000 Message-ID: <20191207165252.1045-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191207165252.1045-1-andrew.cooper3@citrix.com> References: <20191207165252.1045-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 2/2] xen/build: Automatically locate a suitable python interpreter X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Steven Haigh , Jan Beulich , Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Needing to pass PYTHON=3Dpython3 into hypervisor builds is irritating and unnecessary. Locate a suitable interpreter automatically, defaulting to Py3 if it is available. Reported-by: Steven Haigh Signed-off-by: Andrew Cooper --- CC: George Dunlap CC: Ian Jackson CC: Jan Beulich CC: Konrad Rzeszutek Wilk CC: Stefano Stabellini CC: Wei Liu CC: Julien Grall CC: Steven Haigh CC: Juergen Gross For 4.13. This is a very-nice-to-have WRT our Py3-clean intention. --- xen/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/Makefile b/xen/Makefile index 99701e3165..b936d1812b 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -12,6 +12,8 @@ export XEN_BUILD_DATE ?=3D $(shell LC_ALL=3DC date) export XEN_BUILD_TIME ?=3D $(shell LC_ALL=3DC date +%T) export XEN_BUILD_HOST ?=3D $(shell hostname) export XEN_CONFIG_EXPERT ?=3D n +# Best effort attempt to find a python interpreter +export PYTHON ?=3D $(word 1,$(shell which python3 python python2)) =20 export BASEDIR :=3D $(CURDIR) export XEN_ROOT :=3D $(BASEDIR)/.. --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel