From patchwork Tue Jun 8 16:19:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 12307501 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18C59C47082 for ; Tue, 8 Jun 2021 16:21:19 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBEC561249 for ; Tue, 8 Jun 2021 16:21:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBEC561249 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.138578.256468 (Exim 4.92) (envelope-from ) id 1lqeTL-0001sw-SW; Tue, 08 Jun 2021 16:20:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 138578.256468; Tue, 08 Jun 2021 16:20:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqeTL-0001sp-PV; Tue, 08 Jun 2021 16:20:59 +0000 Received: by outflank-mailman (input) for mailman id 138578; Tue, 08 Jun 2021 16:20:58 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lqeTK-0001sj-78 for xen-devel@lists.xenproject.org; Tue, 08 Jun 2021 16:20:58 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9f32f43c-1787-4252-b3d6-31beea1c021c; Tue, 08 Jun 2021 16:20:56 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9f32f43c-1787-4252-b3d6-31beea1c021c DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1623169256; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=D27eqjDhlfxlV8ZkEkb2PBFocv0/RKZBPYjWwSqnb1A=; b=ZBdk2Ze0OIySzZ8Xg5h5ncG1m0WoI3b8JF8i+yYfpue5ui6N+/aWVFTR nJ/CfJN+I5WTnIaP4Ivra+vrVyjXnVk1Ad5djisINcSlcojj1HhaJ18aD +N4+n8yc1LhpuQQBjBk+w1QhH0edtaCl9lyePMYvpCOp/HPfvQkIkutco 4=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: g3FRmaIpO0D+TVKbxTrl0zqm/Y0UhMpAVeVB5MVKkvNUNMfT1bItSwsiPfIXCafrlknXmrct02 vucAmrrtKHCNmQAylpIHMSYSN0g8D0jtSvbfLo/OXsb14y67kMcpwYemKwz8l7KhZkmnJjTwYd uz9sz7QbygzZUCo4sLCCJAog4Mm/9APaw9D/QapmHV4739z+ciwumYph6wJMtz+qeI1stkoiDv nKqrQ/oJOk59i5XmYkEaFO0VChBEg4wKuYjOqwdpRJsQdGqS0fdsoZ4y8kggBrp8O/toFUMP7y pXI= X-SBRS: 5.1 X-MesageID: 45401988 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:BAyZOqCTTR7UTv3lHemg55DYdb4zR+YMi2TC1yhKJyC9Ffbo8P xG/c5rsSMc5wxwZJhNo7y90cq7MBbhHPxOkOos1N6ZNWGM0gaVxelZnO3fKlbbehEWmNQz6U 4ZSdkdNOHN X-IronPort-AV: E=Sophos;i="5.83,258,1616472000"; d="scan'208";a="45401988" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , Sander Eikelenboom Subject: [PATCH] x86/cpuid: Half revert "x86/cpuid: Drop special_features[]" Date: Tue, 8 Jun 2021 17:19:01 +0100 Message-ID: <20210608161901.1894-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 xen-cpuid does print out the list of special features, and this is helpful to keep. Fixes: ba6950fb070 ("x86/cpuid: Drop special_features[]") Reported-by: Jan Beulich Reported-by: Sander Eikelenboom Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monné CC: Wei Liu CC: Sander Eikelenboom Note - this deliberately doesn't insert ifdefary, because it is pointless. It adds to constructing/parsing time, and nothing in Xen can gain access to this without an explicit introduction of INIT_SPECIAL_FEATURES again, which will be obvious during code review. --- xen/tools/gen-cpuid.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index c6b5056a8d..b953648b65 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -362,6 +362,8 @@ def write_results(state): #define INIT_KNOWN_FEATURES { \\\n%s\n} +#define INIT_SPECIAL_FEATURES { \\\n%s\n} + #define INIT_PV_DEF_FEATURES { \\\n%s\n} #define INIT_PV_MAX_FEATURES { \\\n%s\n} @@ -382,6 +384,7 @@ def write_results(state): """ % (state.nr_entries, next(featureset_to_uint32s(state.common_1d, 1)), format_uint32s(state, state.names.keys(), 4), + format_uint32s(state, state.raw['!'], 4), format_uint32s(state, state.pv_def, 4), format_uint32s(state, state.pv_max, 4), format_uint32s(state, state.hvm_shadow_def, 4),