From patchwork Wed Jul 26 10:33:07 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Beulich <JBeulich@suse.com>
X-Patchwork-Id: 13327823
Return-Path: <xen-devel-bounces@lists.xenproject.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
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 smtp.lore.kernel.org (Postfix) with ESMTPS id 083C9C0015E
	for <xen-devel@archiver.kernel.org>; Wed, 26 Jul 2023 10:33:28 +0000 (UTC)
Received: from list by lists.xenproject.org with
 outflank-mailman.570282.891990 (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObpS-0007hz-LW; Wed, 26 Jul 2023 10:33:14 +0000
X-Outflank-Mailman: Message body and most headers restored to incoming version
Received: by outflank-mailman (output) from mailman id 570282.891990;
 Wed, 26 Jul 2023 10:33:14 +0000
Received: from localhost ([127.0.0.1] helo=lists.xenproject.org)
	by lists.xenproject.org with esmtp (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObpS-0007hs-II; Wed, 26 Jul 2023 10:33:14 +0000
Received: by outflank-mailman (input) for mailman id 570282;
 Wed, 26 Jul 2023 10:33:13 +0000
Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50]
 helo=se1-gles-flk1.inumbo.com)
 by lists.xenproject.org with esmtp (Exim 4.92)
 (envelope-from
 <SRS0=aSls=DM=suse.com=JBeulich@srs-se1.protection.inumbo.net>)
 id 1qObpR-0007hm-92
 for xen-devel@lists.xenproject.org; Wed, 26 Jul 2023 10:33:13 +0000
Received: from EUR03-DBA-obe.outbound.protection.outlook.com
 (mail-dbaeur03on2061f.outbound.protection.outlook.com
 [2a01:111:f400:fe1a::61f])
 by se1-gles-flk1.inumbo.com (Halon) with ESMTPS
 id d1606bcb-2b9f-11ee-8613-37d641c3527e;
 Wed, 26 Jul 2023 12:33:11 +0200 (CEST)
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23)
 by AS8PR04MB9175.eurprd04.prod.outlook.com (2603:10a6:20b:44a::10)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Wed, 26 Jul
 2023 10:33:09 +0000
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6609.032; Wed, 26 Jul 2023
 10:33:09 +0000
X-BeenThere: xen-devel@lists.xenproject.org
List-Id: Xen developer discussion <xen-devel.lists.xenproject.org>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
X-Inumbo-ID: d1606bcb-2b9f-11ee-8613-37d641c3527e
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=kEKu4H5/KA/7ug4A//MCHkUTExtYmWcW/xp8/4bv4ryRMoP93r/tTQKpTowX/7UUjIsKFADjfRdnWVnaq2W3+c30od/O0RgZeL8O0kheB6g1AYz7gxbLU6w/q4GU5XKKRZc+0aA4t5G8pLIITEdKEge5HXrKUWw+ourARIPSDso1854UhPksdXc/YOX7puoRGrKx5M01BfjcCSzpd4jF2IIb/BQSNHLswzwnFMrBnFljPk9k5Qo+goRQ5JVomfs8+FqYK8QEnHfouFenf/i0ThCBuSt/SW/g8AznOdtbrXK81YuJtGebOedW8tgve601oGg0XXdhrxr3dE+a9NVwOg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=BUQNrBvwkCW3i8IvMZ9HOVhTuG/uMRjUcx7MUJQ2KDs=;
 b=BqiMFfDHMyCh6kt6o/J9vFXJIUoOERDjuXhf5T1MLG3pWGLRbEZLfTovXT0Pzn7MySSZPP8lCDTm9dj2/4htp5A3y0XOkyEr2tv9J7r/SNd/5P7Nhp4MxH4IQrEa+lQsIHy+Wj8KwkTs+u4+fj1ZzPIN2j74gpHjHctJJOe3uRcLi13Lms5zNnPsiJPE4BE4gaNwnYX8bFfPmECT1svyAK0z62jamfAFg5fPy0bUO+mdhMuChIyl7z+wD8KMOD0VVszkoGzIpb8g4B0FVREKxY93KT4DKacYiLeVOlH84Lbev69trJInBcfllr8Pzvh8xGRVoiWB/k7hWUM77Cxbsw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com;
 dkim=pass header.d=suse.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=BUQNrBvwkCW3i8IvMZ9HOVhTuG/uMRjUcx7MUJQ2KDs=;
 b=F3D/c9wASpnoUlsGnSkTbc28lFwnr/C060k4jXaM1+dUCfh9+GTASptadQrHCGsBhQEwazmmcGwrCgGy5CgbbVOEWlCTps1EEE2avS5E5jQK+0Aa3JBivjMtHslhd+DlSvf4gfMXceeV2FDdp0kcWQDrbhMb2cZU1egursNJ+w4ioffJIBqNByv4om3dU0je2LXzPfDFkEpwMKaEcGL2DJaE0CtkUuSM4FmK7vQZprgjxOnReg3G3vzoXAbPa1uo5MrPfGrPc53LMFlgzto5gKS7lQbYLBLfrNfNtVnKs4534H6/0+NBR8cJF27Zpvih4NNemhKu6JNTch3r0fUXSg==
Authentication-Results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=suse.com;
Message-ID: <60da37cf-abec-be58-d433-e98eec0c59bd@suse.com>
Date: Wed, 26 Jul 2023 12:33:07 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: [PATCH v3 1/5] build: make cc-option properly deal with unrecognized
 sub-options
Content-Language: en-US
From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
 George Dunlap <george.dunlap@citrix.com>, Julien Grall <julien@xen.org>,
 Stefano Stabellini <sstabellini@kernel.org>, Wei Liu <wl@xen.org>,
	=?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>,
 Anthony Perard <anthony.perard@citrix.com>
References: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
In-Reply-To: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
X-ClientProxiedBy: FR0P281CA0248.DEUP281.PROD.OUTLOOK.COM
 (2603:10a6:d10:af::7) To DU2PR04MB8790.eurprd04.prod.outlook.com
 (2603:10a6:10:2e1::23)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB9175:EE_
X-MS-Office365-Filtering-Correlation-Id: 0f0894e5-913e-4ea7-586a-08db8dc3b487
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
	dO0ZO6NNcmo7vhh8sQOispNr04T0/FSewxKg/zkrAlnNXFCD1u6N4jPF4AivX+bqW2U4BwkvyUmkX/jSdDm0O2zY9iQS0YnlHMww32VeZsuTQ4Pze2SbKWxXSQ30YWDGYlhjdqRkqG6795DdegWcpRl7zMqWBPHKV7cMI6ECp0dR+PyenpdE4qeod63VDooZ2NqVu0rtrJo+cQ2cCiXrV0qcyHPAP+Ifzx3TIzKJD3xX0mt7W9owWI77uBeTOQ9XPXpwxLAlwc3Kvh+L+cp8Khev4CbB8A9EdE2U8LJJvmSrI5FF8ArKs+KNUTZp0zPgbPSbNINuFsOh1f/Ieb6ZvJIwn5Ws0yqbmg+LsHHbw3PLLCYtla9U+eKq/rUVxx7IkWVhqrw2bw0LZuhzT9pmgP+78iNUd9CYuP1GhBQ681ylC/Ye4a9IikEsjUP/zVP4tdoas6KQxOKeKXeYgyBZdX4asysEWFVUoNfRVDl4MgTB/LWIB2Pp19k9juDv5tu1N4L3R8+A3Xx6iN0Tcj39NEw5iouULOPFYlvuZdBhnGcBl6I25uRkHm6e+4/UUtK34E4xkjIlj9cGM+RmR5r2pig6vB/QaSxz2xJHKmqbk1yKTm9+dZS6HP2Jubu7UytEvOrGSjAJRUN+wXc5qWqfVQ==
X-Forefront-Antispam-Report: 
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(346002)(376002)(366004)(396003)(136003)(451199021)(54906003)(6512007)(6486002)(478600001)(66476007)(2616005)(26005)(186003)(6506007)(2906002)(66556008)(6916009)(66946007)(316002)(4326008)(5660300002)(8936002)(8676002)(41300700001)(38100700002)(86362001)(31696002)(83380400001)(36756003)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?zFWFqZ0Pr6XEQm9n/jaVIiBqXx6/?=
	=?utf-8?q?rA+tEylS7yRE4EL8BE67vNYxF6/L+rVaYyFJsG8G5fcvgK9oFP65mv+KmJaB0h2sD?=
	=?utf-8?q?rueAa3YT6+M6JJP8s0KRpt029kes/62SBtc+bOvHLGNG48VAUiT8LVljcJaBVz+pA?=
	=?utf-8?q?N8eRoD3+76sShBcFm1n4UUCxsA2hd+UndElSzzSaq1rU9sdg2St4+EL54YxQD+yVp?=
	=?utf-8?q?tHp4tC855C3ksStnJqIOLs++QU6ytKM7JvkCcsfuDEU+9rC1v3m5evCp0Yf3FJV+z?=
	=?utf-8?q?VLXCddv81QJ1x8SJVXSM2/2YhHrv4gPpZKurAuL0hC5Xp2E2dP5BO6jFJCPNsVHDg?=
	=?utf-8?q?UbwB+B3iA67uKEFULblPp7tmDTCbUFk4hAXT7JW9+XDBg86+HpOv5/gxzkpIhmFGR?=
	=?utf-8?q?URx2VbSJr+rtCW6fScD84UcKswOmd9poagPXXzdLuNmfSSJsFUBFduyL444DDKUH4?=
	=?utf-8?q?nrXyyzfBDw9acYP3X7Z1FDaFG8X0S3bmngD6sZmjR98gg4oIPkhalUQzgIKfbg9Xu?=
	=?utf-8?q?XytHbh47dfxN8Fh5vUPJ88tR/rRtBUQKqbXziUxNXO2WzssDoo1HRN4fjzna4l+wH?=
	=?utf-8?q?Zh38vs32O+o+aWKOVwJNAp+s1tYd2/hepr3JJX8ZybjMF7RLgbwHbVeGfzV4+/nm9?=
	=?utf-8?q?q9ZyrOp/zMsGn4qHSV1W4WIANNKvqutLg/UJ9SeGrbEwXZHmKmWGl0qLwwn0in07d?=
	=?utf-8?q?0aubZHNckud8cHDHFaIEf0uPyF5tkxvC/oPCf5fU6Kj+6fmxfK7xZ6pM9CPSd3Am4?=
	=?utf-8?q?Bd0SEs1xEBE7PvDdWLnlM630PqIS9A451uLPy8wRmoeMDtDQC1muQWSY+SmJrjSlD?=
	=?utf-8?q?+CJ27y7riec8pw/Aj+F1W4O0bdglRYId4cAQk1iLhFkwPbXH7iK7c/NgnkCgfQo21?=
	=?utf-8?q?GX+5VqezQSWvkzmycL0SxcyR4mEubod+k1qLdD2GUJ0MiNjFyHLNqxHWfFfZJ26Ea?=
	=?utf-8?q?GtjnhxwC8xzvMUF+YkQ/RJzBQaFyxYXlA2l/DGRQTKmOQ/ZwB0Om2UnMIh9xz6a/p?=
	=?utf-8?q?V0FBn8FEIgLruyy2ViSuvC9gLWH6IGklPY520DgLd97OXkfvwgZo+23BJ4oQBjJyO?=
	=?utf-8?q?GMborBCBm/fRYakACDA6T6EWeiE2+DwWwaEQkL8dsI6JOtwD+/n/W+77Slb6njfl8?=
	=?utf-8?q?BypCsC7X5L29AjFdRpQIjDNkKw4aehP2W9dQzDgPaZuYSsDlxT1ZsbG+zY6Exo+Wq?=
	=?utf-8?q?L6rQzYSgrZEKB/KuDb6av7o80iu6ab7hVTA9lfbBJv6JR7JEiWUCP4co3C9fKSo95?=
	=?utf-8?q?i86DmgLK/zgnzYuRikkLhZWaPhkuSV97wd2FAYEocNCeABQzCtnsm5hC/L+P2dhZL?=
	=?utf-8?q?8JoUPnbiuI4daj49MOceNLk/P3wDdohGD6vrj45zGcVniAKZ3oZ23JX23MzjcwhQ5?=
	=?utf-8?q?XjJyi8lVnhSYWVevgycTHTMVDtNDfez/f7RFSQIjrz7KlJATXw/2ndHCiLK35TWxa?=
	=?utf-8?q?mICeuBAA9QX8ZFCb/NcULEl+f6ob8tkcYMHYZ/7RSTB9/V7bONI747GkpKplqgKSb?=
	=?utf-8?q?Z/oEEne9OdGs?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 0f0894e5-913e-4ea7-586a-08db8dc3b487
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 10:33:09.3501
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 CLHqeQ3epvvmn3b8VZyKNOaBn/Pp5f/+DzKI6LXyt3+u+E2CTPbbU/O7dmO5EM7Ex+mLj/YABvE1EhLi/HXiww==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9175

In options like -march=, it may be only the sub-option which is
unrecognized by the compiler. In such an event the error message often
splits option and argument, typically saying something like "bad value
'<argument>' for '<option>'. Extend the grep invocation accordingly,
also accounting for Clang to not mention e.g. -march at all when an
incorrect argument was given for it.

To keep things halfway readable, re-wrap and re-indent the entire
construct.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
---
In principle -e "$$pat" could now be omitted from the grep invocation,
since if that matches, both $$opt and $$arg will, too. But I thought I'd
leave it for completeness.
---
v3: Fix build with make 4.3 and newer, where the treatment of \# has
    changed.
v2: Further relax grep patterns for clang, which doesn't mention -march
    when complaining about an invalid argument to it.

--- a/Config.mk
+++ b/Config.mk
@@ -8,6 +8,7 @@ endif
 comma   := ,
 open    := (
 close   := )
+sharp   := \#
 squote  := '
 #' Balancing squote, to help syntax highlighting
 empty   :=
@@ -90,9 +91,14 @@ PYTHON_PREFIX_ARG ?= --prefix="$(prefix)
 # of which would indicate an "unrecognized command-line option" warning/error.
 #
 # Usage: cflags-y += $(call cc-option,$(CC),-march=winchip-c6,-march=i586)
-cc-option = $(shell if test -z "`echo 'void*p=1;' | \
-              $(1) $(2) -c -o /dev/null -x c - 2>&1 | grep -- $(2:-Wa$(comma)%=%) -`"; \
-              then echo "$(2)"; else echo "$(3)"; fi ;)
+cc-option = $(shell pat='$(2:-Wa$(comma)%=%)'; \
+                    opt="$${pat%%=*}" arg="$${pat$(sharp)*=}"; \
+                    if test -z "`echo 'void*p=1;' | \
+                                 $(1) $(2) -c -o /dev/null -x c - 2>&1 | \
+                                 grep -e "$$pat" -e "$$opt" -e "$$arg" -`"; \
+                    then echo "$(2)"; \
+                    else echo "$(3)"; \
+                    fi;)
 
 # cc-option-add: Add an option to compilation flags, but only if supported.
 # Usage: $(call cc-option-add CFLAGS,CC,-march=winchip-c6)

From patchwork Wed Jul 26 10:33:54 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Beulich <JBeulich@suse.com>
X-Patchwork-Id: 13327824
Return-Path: <xen-devel-bounces@lists.xenproject.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4F927C0015E
	for <xen-devel@archiver.kernel.org>; Wed, 26 Jul 2023 10:34:10 +0000 (UTC)
Received: from list by lists.xenproject.org with
 outflank-mailman.570285.891999 (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObqC-0008JM-3E; Wed, 26 Jul 2023 10:34:00 +0000
X-Outflank-Mailman: Message body and most headers restored to incoming version
Received: by outflank-mailman (output) from mailman id 570285.891999;
 Wed, 26 Jul 2023 10:34:00 +0000
Received: from localhost ([127.0.0.1] helo=lists.xenproject.org)
	by lists.xenproject.org with esmtp (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObqC-0008JF-05; Wed, 26 Jul 2023 10:34:00 +0000
Received: by outflank-mailman (input) for mailman id 570285;
 Wed, 26 Jul 2023 10:33:59 +0000
Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254]
 helo=se1-gles-sth1.inumbo.com)
 by lists.xenproject.org with esmtp (Exim 4.92)
 (envelope-from
 <SRS0=aSls=DM=suse.com=JBeulich@srs-se1.protection.inumbo.net>)
 id 1qObqB-00089h-3h
 for xen-devel@lists.xenproject.org; Wed, 26 Jul 2023 10:33:59 +0000
Received: from EUR02-AM0-obe.outbound.protection.outlook.com
 (mail-am0eur02on20607.outbound.protection.outlook.com
 [2a01:111:f400:fe13::607])
 by se1-gles-sth1.inumbo.com (Halon) with ESMTPS
 id edb30fa0-2b9f-11ee-b242-6b7b168915f2;
 Wed, 26 Jul 2023 12:33:58 +0200 (CEST)
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23)
 by AS8PR04MB9175.eurprd04.prod.outlook.com (2603:10a6:20b:44a::10)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Wed, 26 Jul
 2023 10:33:56 +0000
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6609.032; Wed, 26 Jul 2023
 10:33:56 +0000
X-BeenThere: xen-devel@lists.xenproject.org
List-Id: Xen developer discussion <xen-devel.lists.xenproject.org>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
X-Inumbo-ID: edb30fa0-2b9f-11ee-b242-6b7b168915f2
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=eIlGtv243838urcZISZZpaCepcZ0enGGrTcprCxv0A3SV2m/hkRUMutPlRVLhoMVrXmJhZH3g8KmqbQ2/e5ckV6bbYIlnmO3UrfvGg7FLOclX41XH3vpeTH3qI1lAG+bCbXpPX9QM7CaygRee5gJORyp97k7A14M0gHSD1YWrSaUahWvsHYeNPAc+E4Y6c2MkiepQI15fHshvcSoF+TXmkGW+miHKh7FtamBso6hvTlMsl/wWm9IqCo+rmHUGxvh9pH9DoOEMPduoibeuNVgTPpQ/Gj/Uz0rn/bx/7D+KX8hpbKAfIY2l60zGweibIWH4AxL2mlc63Pcg0rzq3+EzA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=TBwtNBln1PoPHd4P5QDMVI0TR5/7gNq72VnGJQQ+6LE=;
 b=hTX9lA5Ds1kpSxMCuHEdGG0otfSroxP2chakMD7qwUbLt+/B41PwIL1z8Qlx7mDRvHDprQDeO/F9YRw6luIiuHN3CLOOwVO9o37bcF9dnN+w65Li09mPztO3qdvmRHANqVZHiWPqCbDdqqYekl03xSxU/WS5k3sT8c0GIcAGzQizEYjrjz9iu7lv7lbhBYAJnl2Fu0jqO+FpftECrrNZRGDn+9uMhgwRq8sf2nvDGCmSiuK5kvYeAmoozvNNxZL0TismpQDhO+DXju3uKGz/6Xg7zYUKv8cHPsgBzSrMdbCKuOzNp5xEwQLNuFLNrbeIr9w1PZu6Wn0smXsJC4nJUw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com;
 dkim=pass header.d=suse.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=TBwtNBln1PoPHd4P5QDMVI0TR5/7gNq72VnGJQQ+6LE=;
 b=AcrVotX6iyA6bHD+au+pVhACXLpD+EsjGv8T0G2jDLrex9YUcfNeEvY20Zeqk9Wf71reIpyM18PvXGUpPVZ0o2b0u70F2n0fKiFRa67sDxUwC8I4il42IvyS/VMqCYCxYRW0718W9rHc7NXwyCqcHdhsDGGS7HOAcWF3ioL/xy8z6bS2BhTCrMCPDt3yeGT5zbCCsP2jJCup6LTFSQWMnLnwjOAuIO7KZGyH70SmjhOxpFIKKTKr6BeH/HbiUtZZjrOKkdtf27qtvyxUze0z4NsFMg/LUvhV4HTsmzvMTxBclhmymztSNYjFC7lw5SuTpQYdRtw8Rz0CXYQ3rdLWrw==
Authentication-Results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=suse.com;
Message-ID: <14b578f9-b612-4bb8-e558-983be6f72386@suse.com>
Date: Wed, 26 Jul 2023 12:33:54 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: [PATCH v3 2/5] build: permit Kconfig control over how to deal with
 unsatisfiable choices
Content-Language: en-US
From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
 George Dunlap <george.dunlap@citrix.com>, Julien Grall <julien@xen.org>,
 Stefano Stabellini <sstabellini@kernel.org>, Wei Liu <wl@xen.org>,
	=?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>,
 Anthony Perard <anthony.perard@citrix.com>
References: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
In-Reply-To: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
X-ClientProxiedBy: FR0P281CA0244.DEUP281.PROD.OUTLOOK.COM
 (2603:10a6:d10:af::13) To DU2PR04MB8790.eurprd04.prod.outlook.com
 (2603:10a6:10:2e1::23)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB9175:EE_
X-MS-Office365-Filtering-Correlation-Id: 9badda2b-1be2-4954-5f6f-08db8dc3d07b
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
	xUliL8az7+whMLLTPui9pgrZBhy9ZFHCteFU2RpdUoAQ/tWnnZwdkzwXc6VVApGpFJPH/kk5eH56dPOTBc3w3Yg/OA6GVa7wIz8YnvowLbVLU/JzkybbCo1dSh8v6eoTT5YjkTghJrOcP/LiVAZ/k07e5uRRe7KP8HvAMDbOHdU7dYBG0JdN8K1+EsAGLNPcPFVGCr0O+Ab/DCbLRAFaeogXcO/dbpEvXAZcbqsIvM0edHpqbB7tyxlyOQk2H5RKnFwaeV9h032XqY76ptOgYw0fn2pfbjHVLn1ZeFAfnAch33FqblGhkRkmaYkkvU18CRJ1U2RVunNkTDjGEeEHarZe2JBo1nK0+me3r1iL3i4YD9uI6nppSRAOKr/b9HnjfoC6XcfjS6OsZTBZQUEkUd93fOIuB0E610tLzf5rQKeP0xLN7e5bmHw/WLvgWkE5p4/x1jBclS9W5x+u7+iTGIEavmTyovPq360o4zYXmdOkduqkn7pIzW4vvbVgtCAjncn/5nTSKQcMiy+dxINWKa6FkIqsO6GnbWRFrwM38s7h1oCn1OLuF7qvjXX9JTeiStz4uvV0Q4MIiEIGxkBdX1bcTx+m0Dk81JaUiywaQwGQFgwTGQKfnZbxKxG3tSNqLzjXajUZ+3RJS/yXCkQuYg==
X-Forefront-Antispam-Report: 
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(346002)(376002)(366004)(396003)(136003)(451199021)(54906003)(6512007)(6486002)(478600001)(66476007)(2616005)(26005)(186003)(6506007)(2906002)(66556008)(6916009)(66946007)(316002)(4326008)(5660300002)(8936002)(8676002)(41300700001)(38100700002)(86362001)(31696002)(83380400001)(36756003)(31686004)(66899021)(43740500002)(45980500001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?7tOS+FDL7abiYOXXv5TUDIQ8nEtX?=
	=?utf-8?q?a28krh4STfdu6kVR3a2bBPOITFnpg8+dK+FOakYNtsYtzjrMExLcJTIdRgDuUSK4s?=
	=?utf-8?q?qXAl0wEkE1YEpAZT2OplTm1gYSXRwKRCc5tbEkhE2XcwHWgUXN+7ZSoB7UI4B8iLB?=
	=?utf-8?q?/IgRS9QdocqGWfaO9rec1mEIJbaNbeSOQFmgSGjy2mN1oE+uhhHP/mseu1fUq0MW7?=
	=?utf-8?q?CePgPqSZUuUSxbcpjVzL/k/Dmdc3M3dn3tV7TxzVaqBxZhsg057GB7DLZhVBuJQG9?=
	=?utf-8?q?JEJankx04gbDHsitWmThv4yE3cQqhyzqjKYNqecS8Ommlfld8Rsko0rdQLjw5ioEL?=
	=?utf-8?q?0LgQ31MZFuMa0g2RKegBFfzV5c8D+fp8LqZU88v4bFAwkoDA8Usera+Wu2o+ANvQo?=
	=?utf-8?q?etHokgu0JnAOhmJ2u2OkKGLL3PgPbEivIQUMwWb7jtnwLrGnbpCWYvKkKaB1Fpt3W?=
	=?utf-8?q?LVGO5FU083JEM/nxAhCvv8iT0gGNfZwjYf8ChS7Vh/3lvWHJtEqkMAX44uGQdDHE/?=
	=?utf-8?q?TxdaQ0KiR8Yt0z9moR/VSjOStkbKKGtUO7hGloxufsxnitfpa0tGNgzg9z4goGppW?=
	=?utf-8?q?Nx7OtHQbehlQ5JuTnLP/ldwOSu80cbhYkfe3/mfeDWmOMyGyYYlcZtgU0vllmXqaF?=
	=?utf-8?q?VVkhCMymEPYM63nvojPCllLj4bbdv86qKCRrf5dQsdJM0Q2avwELvaZryB0AjoTjk?=
	=?utf-8?q?q2+KmknanXRuShseLOP0crIS1GxvRGR4qHOtQdFQXFDYPe9OgB2IZmwW5ejnCbU1E?=
	=?utf-8?q?Cik6g/HPjplz6UvqHhDMSBMGhU42F97gS8/rieEakPKvpcFkvoa9LRXEax1AC6+EN?=
	=?utf-8?q?lX8B1FJYeVQCovEJ46DsegguIpJCc5QFfm/v+dQ7YUTEZi7nYThenUjJbIs87wG06?=
	=?utf-8?q?eW7qcvUDtd3O/HxIx43oOtARoBS5qVMkur3X8t+Yq5pLE0FekUnmFTX57hwshja2E?=
	=?utf-8?q?KVxAyPrNe4O0v3LWKVYlKYxmJ7sly/E5YxEVLhjHAztNyXV+M2N29oc1q7Ha+aWOv?=
	=?utf-8?q?FiwmwjDYPDlUSrgQIEU+mWCmF+IXI0mO05d7VN7brylcTm05AsUdYc1leAESiZCHX?=
	=?utf-8?q?yPBMEHtvcKpFRQ6slgfk3LiC5pbExuFhtDnlN1TccIbcXwapZMCCkm47ql2dj2eYv?=
	=?utf-8?q?gCUFHLOrdEEBZbhrqYE7IHtyd1ByGnL6QATSf0aoCu92R3rv8tgghx5ZAzi4aEfZC?=
	=?utf-8?q?PUbdEsXcRvLPicV+hc4iiu8Es9agEWnRwv7f19NsrEcd+caEvbjCf4uKmw20cWfCy?=
	=?utf-8?q?P6vfkF655/w/Yse+Odn43yFMVbub6DglZ8BPsk6ZEo7UggJvJvij3uDHUHJIFWYSd?=
	=?utf-8?q?HjtBBMdSr5jFNUDK+xIDzM1bNTINNQaXfAqc0kTFq+HVmPUm4SAqrniMRPyfJiZ/v?=
	=?utf-8?q?Nfsgenx4IV9/SO8/8SprwjeZoq3LqzcCxqaKOqhDr1l8zk5WAnqYaseZKq3e2wL+L?=
	=?utf-8?q?KKc43qArPlnzI26F0MXeTnlsn6GAL4onCFIlGB04MS0E62tqiIGDKzdnCJ/ke9f0J?=
	=?utf-8?q?8aMZFy7sAWJg?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 9badda2b-1be2-4954-5f6f-08db8dc3d07b
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 10:33:56.0156
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 p+4ysTVEqNcniNVNTmV+pRBm7v+Bw3NF0wzep7Rc2SgcF5tsaaPupkS0tsMDf6fazqtMzJxMoVM2Kg5CQ13sag==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9175

Some options we allow the build admin to select may require new enough
tool chain components to fulfill (partly or entirely). Provide yet
another control to pick what action to take at the end of the build
process - be silent about this, warn, or fail the build.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
This may not be fine grained enough: Optimization settings (like added
by "x86: allow Kconfig control over psABI level") may want dealing with
differently than security relevant ones (like XEN_SHSTK or XEN_IBT).

Whether to do this uniformly at the end of the build is up for
discussion: In the "warn" case we will want the resulting output late,
so it is more likely to be noticed. In the "fail build" case though we
may want the failure to occur early.
---
v3: New.

--- a/xen/Kconfig
+++ b/xen/Kconfig
@@ -64,6 +64,25 @@ config UNSUPPORTED
 	  preview features as defined by SUPPORT.md. (Note that if an option
 	  doesn't depend on UNSUPPORTED it doesn't imply that is supported.)
 
+choice
+	prompt "How to deal with settings which cannot be satisified"
+	default UNSATISFIED_WARNING
+	help
+	  Some selectable options may depend on e.g. tool chain functionality.
+	  Select here how to deal with such when actually building a such
+	  configured hypervisor.
+
+config UNSATISFIED_SILENT
+	bool "silent"
+
+config UNSATISFIED_WARNING
+	bool "emit warnings"
+
+config UNSATISFIED_ERROR
+	bool "fail the build"
+
+endchoice
+
 config LTO
 	bool "Link Time Optimisation"
 	depends on BROKEN
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -588,6 +588,10 @@ $(TARGET): outputmakefile FORCE
 	$(Q)$(MAKE) $(build)=arch/$(SRCARCH) include
 	$(Q)$(MAKE) $(build)=. arch/$(SRCARCH)/include/asm/asm-offsets.h
 	$(Q)$(MAKE) $(build)=. MKRELOC=$(MKRELOC) 'ALL_OBJS=$(ALL_OBJS-y)' 'ALL_LIBS=$(ALL_LIBS-y)' $@
+ifneq ($(CONFIG_UNSATISFIED_SILENT),y)
+	$(Q)$(if $(strip $(XEN_CONFIG_UNSATISFIED)),$(MAKE),:) \
+	    $(build)=. 'XEN_CONFIG_UNSATISFIED=$(XEN_CONFIG_UNSATISFIED)' check_unsatisfied
+endif
 
 SUBDIRS = xsm arch common crypto drivers lib test
 define all_sources
--- a/xen/build.mk
+++ b/xen/build.mk
@@ -88,3 +88,11 @@ targets += prelink.o
 
 $(TARGET): prelink.o FORCE
 	$(Q)$(MAKE) $(build)=arch/$(SRCARCH) $@
+
+PHONY += check_unsatisfied
+check_unsatisfied:
+	$(Q): $(if $(filter y,$(CONFIG_UNSATISFIED_WARNING)), \
+	           $(warning The following selections could not be satisfied:), \
+	           $(shell echo 'The following selections could not be satisfied:' >&2)) \
+	      $(foreach c,$(sort $(XEN_CONFIG_UNSATISFIED)),$(shell echo ' - CONFIG_$c' >&2)) \
+	      $(if $(filter y,$(CONFIG_UNSATISFIED_ERROR)),$(error Failing build))

From patchwork Wed Jul 26 10:34:15 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Beulich <JBeulich@suse.com>
X-Patchwork-Id: 13327825
Return-Path: <xen-devel-bounces@lists.xenproject.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7D30BC0015E
	for <xen-devel@archiver.kernel.org>; Wed, 26 Jul 2023 10:34:36 +0000 (UTC)
Received: from list by lists.xenproject.org with
 outflank-mailman.570287.892010 (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObqZ-0000Lo-B1; Wed, 26 Jul 2023 10:34:23 +0000
X-Outflank-Mailman: Message body and most headers restored to incoming version
Received: by outflank-mailman (output) from mailman id 570287.892010;
 Wed, 26 Jul 2023 10:34:23 +0000
Received: from localhost ([127.0.0.1] helo=lists.xenproject.org)
	by lists.xenproject.org with esmtp (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObqZ-0000Lh-85; Wed, 26 Jul 2023 10:34:23 +0000
Received: by outflank-mailman (input) for mailman id 570287;
 Wed, 26 Jul 2023 10:34:21 +0000
Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50]
 helo=se1-gles-flk1.inumbo.com)
 by lists.xenproject.org with esmtp (Exim 4.92)
 (envelope-from
 <SRS0=aSls=DM=suse.com=JBeulich@srs-se1.protection.inumbo.net>)
 id 1qObqX-0000JJ-O9
 for xen-devel@lists.xenproject.org; Wed, 26 Jul 2023 10:34:21 +0000
Received: from EUR03-DBA-obe.outbound.protection.outlook.com
 (mail-dbaeur03on2060c.outbound.protection.outlook.com
 [2a01:111:f400:fe1a::60c])
 by se1-gles-flk1.inumbo.com (Halon) with ESMTPS
 id fa43eba7-2b9f-11ee-8613-37d641c3527e;
 Wed, 26 Jul 2023 12:34:19 +0200 (CEST)
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23)
 by AS8PR04MB9175.eurprd04.prod.outlook.com (2603:10a6:20b:44a::10)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Wed, 26 Jul
 2023 10:34:18 +0000
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6609.032; Wed, 26 Jul 2023
 10:34:18 +0000
X-BeenThere: xen-devel@lists.xenproject.org
List-Id: Xen developer discussion <xen-devel.lists.xenproject.org>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
X-Inumbo-ID: fa43eba7-2b9f-11ee-8613-37d641c3527e
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=Amg9aCqrhZjQQYcofkVt0WyW9aFCqhUsc/1LoL4KJ9WpuvvvLLmNH7zyKn3gZBxYuhF6Eau3X6EkRbxwnUI1lkCL2nWSPsgr2//Gnq4tOcOJLdxF8aiujtvtngdvc0KMQ7zDfkwwa6AbyZH1x5zHy1tr6X6P5sm5EI4CjW29YLROgAbOiiuZXXaFHTfoim/RoRmp8GHbYtLVSpHQNLmXahzeLWjh4x8EvBWrfN+fpaY4my0KEMkHlF2uCE8P8Y6qVOO5F/Ek6IYFy99c7O8DurRPsFOY1GogIMxtcFPMInlCQQwafWq3wnxwq2aB57ffiBVdV8jNCGwL70e1tFEjOQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=TPlKNfVxQjdacpVGXLYkRGRaFkfGEJC8kPssuPwlEoU=;
 b=CHZLd8BxrxOILk+9VcZIhf4Bv1no3OUexskYRKHRhGHG4FYx4ByndqJoLUWE/lrp/evaQIVQLZR4/gI0xncI8jO5wtLOaAxDfIpCbvoXn7tvjyuewSWu6eTAGmXzAVEU+KBKNB56B4DLTTYpVtYSuu5hQQpGREffbpxbOyIeduODFicj6hC1//4Iig8r/Yfobl2Ll5iQom0GIswTtOHuI5TH3asr6AohLOAbJkC1g5pq7hDwA4OIIoM4zr1JeK47pqI9srakrz/xR/nKxTjpanhpZG7pcv/qYwOg6HMAtEEyiTptkDqf42oNajAA5c9xDUg4L2nkPEPC2hrYDg1ciQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com;
 dkim=pass header.d=suse.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=TPlKNfVxQjdacpVGXLYkRGRaFkfGEJC8kPssuPwlEoU=;
 b=ipwkk5+OLkiHvxKV23r/UDXB31ecXzYGJK6xgDUSnDMsDuBy03+Xvcr+2HBTe9VxchV+RXp6KdYahEgqVZ9r2DsPQdfOEoBZxBceUKXOFVae7ujBRLdsTcrngzIgSeZLnOlG8/vtSfTSXAhKJL+fqqgo0Cf7vPy8t9WAM0GGlmqOgjzncSd+bfiy2/QeATLpEORdhrUfndVFyK36pMNC4k5YRzo4HYvpcajeI94gFP/jEiM1G6zRUG46siG4tcTNnlfT3KtkTbsAtMIKbBYgE0a0wFIZ2emSSIx+J24N4a8ToEaj5fVMbd4YHH/9N93Z8PjvQPPrrPFalNj88D86mw==
Authentication-Results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=suse.com;
Message-ID: <3c819879-d113-facd-b025-b062e68bb6a1@suse.com>
Date: Wed, 26 Jul 2023 12:34:15 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: [PATCH v3 3/5] x86: allow Kconfig control over psABI level
Content-Language: en-US
From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wl@xen.org>,
	=?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>
References: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
In-Reply-To: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
X-ClientProxiedBy: FR0P281CA0097.DEUP281.PROD.OUTLOOK.COM
 (2603:10a6:d10:a9::10) To DU2PR04MB8790.eurprd04.prod.outlook.com
 (2603:10a6:10:2e1::23)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB9175:EE_
X-MS-Office365-Filtering-Correlation-Id: d97ce499-2a6a-4e29-17c9-08db8dc3dd7b
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
	CL2WyjQ9i5UA4x8FButp0SkHhuwwDJNq1PUiC7wLmjHttd56NiSvNidxdkj3sEKw1nGBzD+8Uo2tBzz+yjZGR4Qbp9SRh5wo4gAtSmzq/7zjnhTXJBxAB+oEzi7N/f9OZnhn0Ah9ZhdNhpc/3FGN2i7P17gChO9rgoc8qevlZtAHPoodop1ufLNt2Y1MiJzXw1DkfIAISHGoThrFdBlIZ/qhyIJzm78Jpt2wQb9iC46UcMbXDlnxaf5dzIl3u0IVdJoa02z1Mnto6wqm11ePB8iE1qj9LQPsRTNPKuTCXOfQosq0WAVpsuUyBgvJNgYhzseH1kigVmKYrhhE8GUG5+IbTJCrVSdCnjZGmrGgqcpOMupasw90PvEQBOilYikpm3bOaV2VfRH7XXlfDVBm68UD8o+BLjeq+8Ne7YOFziZWTalKk+LJ///JtjVFGj2zfuObYzqn2GuuUoDxsEnGl3GL3UXLJmRtXANSFXVZ9y7o8E3iUOn5Ydq5hLkwhAwALcDSdIuETGErLcfFxPWSlTGmsr1Y+rWl1qkJLv0HLG/ojF9FhmQmtqQPkmO1fN/QMc1HvZQNQmyqwiOwGJZ8J1R5fYxbWPwsLUt5G+4Bsp1/DBU3MlZmhZNtZD2a9dTap4q4O9h0rFkyz5p5bxPhig==
X-Forefront-Antispam-Report: 
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(346002)(376002)(366004)(396003)(136003)(451199021)(54906003)(6512007)(6486002)(6666004)(478600001)(66476007)(2616005)(26005)(186003)(6506007)(2906002)(66556008)(6916009)(66946007)(316002)(4326008)(5660300002)(8936002)(8676002)(41300700001)(38100700002)(86362001)(31696002)(83380400001)(36756003)(31686004)(66899021)(43740500002)(45980500001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?R0J8MK3YknjOW0lViC6WQRl1Rpqb?=
	=?utf-8?q?2EN7narMry4qwISLI9aZMhbdTNOFoQ9CNVh9J1sGdP79kSfmvWi8EoLH1an/hZBPD?=
	=?utf-8?q?Ouy205BIug7mt3Dyxv0is7baKJ0dSPnmdPvkACtgelhFFg61RfIe7KpCi+BckbJ5I?=
	=?utf-8?q?lb14D2M4FrFDvjz3O9GFkKMnXCrAqu9qQ3cLhmL9gXxW/mhgmicfwMooz6mzrkWHr?=
	=?utf-8?q?XssZ8YpO9QbL4LG72qGQ3RMcGAEOiW0BHKg7S3LH9Lk5ATPWpdVMXP4cOTydfup1d?=
	=?utf-8?q?5EEszF6rfjO4b2Sua99td3uK7l8zMXs9B8rmPq7QAW83QP84OVzFp+CDYTas5Rbed?=
	=?utf-8?q?2I6vb0oDHesySGvX64czlL6vSkSAQxlmnqUJ9Z4YNSEEAt0Jj13XVVBCBKADbWC4U?=
	=?utf-8?q?zeKl6CFlaNr1zGzDb3qOho/FZMt7jYXExIeOTXwtcArKET2Q5JQGKXjwvS22r3scE?=
	=?utf-8?q?IsNvNwPZjzWAXeGMCO8aYGyx4kvdMp8w+GoMaKNbl+ifLmOwFDNtoBVo6r14sCnuy?=
	=?utf-8?q?5mfTmzSIch0qMt/NMzQmLVR/BXrVtUXvmtIQVlpt2uAUOU0ZbJXrSSSyzQIfobDog?=
	=?utf-8?q?6Q/wqJxmiPMQUYCXDysonQP3VR5e8S5q9xK3NjEpHg5RurcN7arqZGrm+VzEnIgEL?=
	=?utf-8?q?hn7g7tMfNS9fux/rMEiagHpic/56uwV986khMBLaqyyionbTMc4jGPrZOZEvpns69?=
	=?utf-8?q?qhOL9Rs2GKCAxkK/B6Td39f0pXUgUcJy13ZpqplwTlhyvLDV6gKJCkHvJ0TCHlK1T?=
	=?utf-8?q?jIT3nsa2uSglSw57yNizjszFBijbJ50HG2B0Qwt2M/OCC55zrANjEJthl5croHCki?=
	=?utf-8?q?bbX+LHvdPKgwQd8p697NhhWV/Tcl86gGoGiBWTvONmEYroI982Y5oJwiUTw3AJQoG?=
	=?utf-8?q?EYVKI8X7wueG0NXSujM0k1fPfwNKvZ3NcjLiADneCEZS6Lu8U85f6LupWO0y2KL4I?=
	=?utf-8?q?8rEj8qQtpEKY/16+ZZCLqtnpvU6SKsG8WZFA6vOyKfu/RNW435IGcSEmbwCvfekGs?=
	=?utf-8?q?h1JrHvh2zMiotZ6ZC5/GzFJs+KuXbEuHkT/xE9bSlK2JkIetT80x0Lo4DFif8uziY?=
	=?utf-8?q?0+LsyDMhKnAEc33nS8yHc53/ghGsVF6/VLiDVVLJHaz9xZVF48FG0mpz50l0qMrBC?=
	=?utf-8?q?AvPvenpgq5HxUG9GTugw2I9JzoPVeblLfJnjBYpkwUQqhbLzLLuAlroAygZVkFkBx?=
	=?utf-8?q?+QUGzQ1V3Dweg/g/hnAv4zd19UhtseQ/EDKrj5hoKz6nqwHHOz2EA0PFSvYk1Xr6O?=
	=?utf-8?q?sC7p0foBKc2zS+5aTvL3WJkerE2aKOid3Zk+MvYhoM6hJbULGSSFOBVy1PhYVN2jg?=
	=?utf-8?q?9ha7j7mYZu7Q/HgefNlIiWLbqtAJy1RrCTi1/rmAf3+Ycievc+NWRLO1l9RKKOc0E?=
	=?utf-8?q?k5lT7aGmY8cCXZy+k040vkHCvekI4M+EhpS3e0FnR3ZhulPgYmjVUf4ibyTA1Igg8?=
	=?utf-8?q?CXJF1E+vcY0Tsu/5jvwnofrGNOFDyL5AwQRYflgzlOovkY0MdfvenU4dNM/6PNrvP?=
	=?utf-8?q?csyuSC7RtFxM?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 d97ce499-2a6a-4e29-17c9-08db8dc3dd7b
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 10:34:18.3412
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 ZHPiCP0ljD7tcCAq5uDNGbK1XYXpTj1lvlyVMlIjVYpxku22BduGB8mKdc65pmNv0+TsAHciJwmHUROzQSHrrg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9175

Newer hardware offers more efficient and/or flexible and/or capable
instructions, some of which we can make good use of in the hypervisor
as well. Allow a basic way (no alternatives patching) of enabling their
use. Of course this means that hypervisors thus built won't work
anymore on older, less capable hardware.

Since older compilers (apparently gcc10 / clang11 and older) won't
recognize -march=x86-64-v2 etc, also addd fallback logic passing
-mpopcnt and alike explicitly.

Note that in efi_arch_cpu() the filling of 7c0 and 7d0 are forward-
looking; we only require 7b0, but we need to use cpuid_count() anyway.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Jason Andryuk <jandryuk@gmail.com>
---
TBD: While the added assembly code goes strictly from the CONFIG_*
     settings, EFI code uses the compiler provided manifest constants
     where available (just like the subsequent "x86: short-circuit
     certain cpu_has_* when x86-64-v{2,3} are in effect"). While I
     generally prefer it that way, this comes with a downside: If we
     ever started to use one of the ISA extensions in assembly code
     (and then keyed to the CONFIG_* settings), things could break. I
     don't view us doing this as very likely though, as then we'd need
     to have two (or more) variants of such assembly code, which we
     would likely want to avoid. (What I'd like to avoid is using the
     compiler manifest constants in assembly code: In principle we ought
     to filter out any -march= when constructing AFLAGS, and perhaps
     at least all -m... and -f... options. Compilers might rightfully
     complain about their use as inapplicable, much like we've seen for
     -Wl,... when no linking is done.)

TBD: While we don't document most "cpuid=no-*" options (and hence imply
     their use to be unsupported), using e.g. "cpuid=no-popcnt" with a
     V2=y hypervisor clearly can't have the intended effect, and hence
     might perhaps better be flagged in some way.

TBD: v2 also includes LAHF/SAHF. Since we don't use floating point and
     hence FPU insns, we ought to be okay not explicitly checking for
     it. But there is a certain amount of risk of the compiler finding
     some "smart" use for one or both of the insns. However, if we were
     to check the feature, we'd need to account for the quirk that
     init_amd() also works around.

Whereas the baseline -> v2 step isn't much of a difference (we'll gain
more there by a subsequent patch), v2 -> v3, while presumably (or shall
I say hopefully) faster, yields an overall growth of .text size by (in
my build) about 2k. The primary reason for this appear to be conversions
of SHL-by-immediate to SHLX.

The VGA output attempt in early (MB/MB2) boot code does not appear to
work (anymore?). The serial output may work, but only if - without any
setup in Xen - both sides agree on the serial settings (baud rate etc).
Hence the feature checks added on the legacy paths are of limited use.
---
v3: Add fallback logic and use logic from new prereq change.
v2: Also cover XSAVE. Add early boot feature checking.

--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -118,6 +118,36 @@ config HVM
 
 	  If unsure, say Y.
 
+choice
+	prompt "base psABI level"
+	default X86_64_BASELINE
+	help
+	  The psABI defines 4 levels of ISA extension sets as a coarse granular
+	  way of identifying advanced functionality that would be uniformly
+	  available in respectively newer hardware.  While v4 is not really of
+	  interest for Xen, the others can be selected here, making the
+	  resulting Xen no longer work on older hardware.  This option won't
+	  have any effect if the toolchain doesn't support the distinction.
+
+	  If unsure, stick to the default.
+
+config X86_64_BASELINE
+	bool "baseline"
+
+config X86_64_V2
+	bool "v2"
+	help
+	  This enables POPCNT and CX16, besides other extensions which are of
+	  no interest here.
+
+config X86_64_V3
+	bool "v3"
+	help
+	  This enables BMI, BMI2, LZCNT, MOVBE, and XSAVE, besides other
+	  extensions which are of no interest here.
+
+endchoice
+
 config XEN_SHSTK
 	bool "Supervisor Shadow Stacks"
 	depends on HAS_AS_CET_SS
--- a/xen/arch/x86/arch.mk
+++ b/xen/arch/x86/arch.mk
@@ -36,6 +36,29 @@ CFLAGS += -mno-red-zone -fpic
 # the SSE setup for variadic function calls.
 CFLAGS += -mno-mmx -mno-sse $(call cc-option,$(CC),-mskip-rax-setup)
 
+# Enable the selected baseline ABI, if supported by the compiler.
+x86-64-$(CONFIG_X86_64_BASELINE) :=
+x86-64-$(CONFIG_X86_64_V2) := x86-64-v2
+x86-64-$(CONFIG_X86_64_V3) := x86-64-v3
+
+ifneq ($(x86-64-y),)
+CFLAGS-psabi := $(call cc-option,$(CC),-march=$(x86-64-y))
+
+ifeq ($(CFLAGS-psabi),)
+# Fall back to using the subset of -m... options that are of interest.
+x86-64-v2 := -mpopcnt -mcx16
+x86-64-v3 := $(x86-64-v2) -mbmi -mbmi2 -mlzcnt -mmovbe -mxsave
+$(call cc-options-add,CFLAGS-psabi,CC,$($(x86-64-y)))
+
+ifneq ($(strip $(CFLAGS-psabi)),$($(x86-64-y)))
+$(warning Options not recognized by $(CC): $(filter-out $(CFLAGS-psabi),$($(x86-64-y))))
+XEN_CONFIG_UNSATISFIED += X86_64_Vn
+endif
+endif # CFLAGS-psabi
+
+CFLAGS += $(CFLAGS-psabi)
+endif # x86-64-y
+
 ifeq ($(CONFIG_INDIRECT_THUNK),y)
 # Compile with gcc thunk-extern, indirect-branch-register if available.
 CFLAGS-$(CONFIG_CC_IS_GCC) += -mindirect-branch=thunk-extern
--- a/xen/arch/x86/boot/head.S
+++ b/xen/arch/x86/boot/head.S
@@ -124,6 +124,12 @@ multiboot2_header:
 .Lbad_efi_msg: .asciz "ERR: EFI IA-32 platforms are not supported!"
 .Lbag_alg_msg: .asciz "ERR: Xen must be loaded at a 2Mb boundary!"
 .Lno_nx_msg:   .asciz "ERR: Not an NX-capable CPU!"
+#if defined(CONFIG_X86_64_V2) || defined(CONFIG_X86_64_V3)
+.Lno_x86_64_v2_msg: .asciz "ERR: Not an x86-64-v2 capable CPU!"
+#endif
+#ifdef CONFIG_X86_64_V3
+.Lno_x86_64_v3_msg: .asciz "ERR: Not an x86-64-v3 capable CPU!"
+#endif
 
         .section .init.data, "aw", @progbits
         .align 4
@@ -156,9 +162,20 @@ early_error: /* Here to improve the disa
         jmp     .Lget_vtb
 #ifdef CONFIG_REQUIRE_NX
 .Lno_nx:
+        pop     %ecx
         mov     $sym_offs(.Lno_nx_msg), %ecx
         jmp     .Lget_vtb
 #endif
+#if defined(CONFIG_X86_64_V2) || defined(CONFIG_X86_64_V3)
+.Lno_x86_64_v2:
+        mov     $sym_offs(.Lno_x86_64_v2_msg), %ecx
+        jmp     .Lget_vtb
+#endif
+#ifdef CONFIG_X86_64_V3
+.Lno_x86_64_v3:
+        mov     $sym_offs(.Lno_x86_64_v3_msg), %ecx
+        jmp     .Lget_vtb
+#endif
 .Lmb2_no_st:
         /*
          * Here we are on EFI platform. vga_text_buffer was zapped earlier
@@ -657,6 +674,7 @@ trampoline_setup:
         mov     $1, %eax
         cpuid
         mov     %ecx, CPUINFO_FEATURE_OFFSET(X86_FEATURE_HYPERVISOR) + sym_esi(boot_cpu_data)
+        mov     %ecx, %edi
 
         mov     $0x80000000,%eax
         cpuid
@@ -674,6 +692,9 @@ trampoline_setup:
         bt      $cpufeat_bit(X86_FEATURE_LM),%edx
         jnc     .Lbad_cpu
 
+        /* Preserve %ecx for later use. */
+        push    %ecx
+
         /*
          * Check for NX
          *   - If Xen was compiled requiring it simply assert it's
@@ -724,6 +745,36 @@ trampoline_setup:
 .Lno_nx:
 #endif
 
+        /* Restore CPUID[80000001].ecx output. */
+        pop     %ecx
+
+#if defined(CONFIG_X86_64_V2) || defined(CONFIG_X86_64_V3)
+        mov     $cpufeat_mask(X86_FEATURE_POPCNT) | cpufeat_mask(X86_FEATURE_CX16), %eax
+        and     %edi, %eax
+        cmp     $cpufeat_mask(X86_FEATURE_POPCNT) | cpufeat_mask(X86_FEATURE_CX16), %eax
+        jne     .Lno_x86_64_v2
+#endif
+
+#ifdef CONFIG_X86_64_V3
+        mov     $cpufeat_mask(X86_FEATURE_MOVBE) | cpufeat_mask(X86_FEATURE_XSAVE), %eax
+        and     %edi, %eax
+        cmp     $cpufeat_mask(X86_FEATURE_MOVBE) | cpufeat_mask(X86_FEATURE_XSAVE), %eax
+        jne     .Lno_x86_64_v3
+        bt      $cpufeat_bit(X86_FEATURE_ABM), %ecx
+        jnc     .Lno_x86_64_v3
+        xor     %eax, %eax
+        cpuid
+        cmp     $7, %eax
+        jb      .Lno_x86_64_v3
+        mov     $7, %eax
+        xor     %ecx, %ecx
+        cpuid
+        mov     $cpufeat_mask(X86_FEATURE_BMI1) | cpufeat_mask(X86_FEATURE_BMI2), %eax
+        and     %ebx, %eax
+        cmp     $cpufeat_mask(X86_FEATURE_BMI1) | cpufeat_mask(X86_FEATURE_BMI2), %eax
+        jne     .Lno_x86_64_v3
+#endif
+
         /* Stash TSC to calculate a good approximation of time-since-boot */
         rdtsc
         mov     %eax,     sym_esi(boot_tsc_stamp)
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -740,29 +740,53 @@ static void __init efi_arch_handle_modul
 
 static void __init efi_arch_cpu(void)
 {
-    uint32_t eax = cpuid_eax(0x80000000);
+    uint32_t eax = cpuid_eax(0), dummy;
     uint32_t *caps = boot_cpu_data.x86_capability;
 
     boot_tsc_stamp = rdtsc();
 
-    caps[FEATURESET_1c] = cpuid_ecx(1);
+    if ( eax )
+        caps[FEATURESET_1c] = cpuid_ecx(1);
 
-    if ( (eax >> 16) == 0x8000 && eax > 0x80000000 )
-    {
-        caps[FEATURESET_e1d] = cpuid_edx(0x80000001);
-
-        /*
-         * This check purposefully doesn't use cpu_has_nx because
-         * cpu_has_nx bypasses the boot_cpu_data read if Xen was compiled
-         * with CONFIG_REQUIRE_NX
-         */
-        if ( IS_ENABLED(CONFIG_REQUIRE_NX) &&
-             !boot_cpu_has(X86_FEATURE_NX) )
-            blexit(L"This build of Xen requires NX support");
-
-        if ( cpu_has_nx )
-            trampoline_efer |= EFER_NXE;
-    }
+    if ( eax >= 7 )
+        cpuid_count(7, 0, &dummy,
+                    &caps[FEATURESET_7b0],
+                    &caps[FEATURESET_7c0],
+                    &caps[FEATURESET_7d0]);
+
+    eax = cpuid_eax(0x80000000U);
+    if ( (eax >> 16) == 0x8000 && eax > 0x80000000U )
+        cpuid(0x80000001U, &dummy, &dummy,
+              &caps[FEATURESET_e1c], &caps[FEATURESET_e1d]);
+
+    /*
+     * Checks here purposefully don't use cpu_has_* because they bypass
+     * boot_cpu_data reads if Xen was compiled with respective CONFIG_*.
+     */
+#define CHK(ppsym, feat) do {                                        \
+        if ( IS_ENABLED(ppsym) &&                                    \
+             !boot_cpu_has(X86_FEATURE_ ## feat) )                   \
+            blexit(L"This build of Xen requires " #feat " support"); \
+    } while ( false )
+
+    CHK(CONFIG_REQUIRE_NX, NX);
+
+    /* x86-64-v2 */
+    CHK(__POPCNT__, POPCNT);
+    CHK(CONFIG_X86_64_V2, CX16);
+    CHK(CONFIG_X86_64_V3, CX16);
+
+    /* x86-64-v3 */
+    CHK(__ABM__, ABM); /* LZCNT */
+    CHK(__BMI__, BMI1);
+    CHK(__BMI2__, BMI2);
+    CHK(__MOVBE__, MOVBE);
+    CHK(__XSAVE__, XSAVE);
+
+#undef CHK
+
+    if ( cpu_has_nx )
+        trampoline_efer |= EFER_NXE;
 }
 
 static void __init efi_arch_blexit(void)

From patchwork Wed Jul 26 10:34:37 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Beulich <JBeulich@suse.com>
X-Patchwork-Id: 13327826
Return-Path: <xen-devel-bounces@lists.xenproject.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
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 smtp.lore.kernel.org (Postfix) with ESMTPS id BC3BEC41513
	for <xen-devel@archiver.kernel.org>; Wed, 26 Jul 2023 10:34:50 +0000 (UTC)
Received: from list by lists.xenproject.org with
 outflank-mailman.570290.892020 (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObqs-0000sa-NW; Wed, 26 Jul 2023 10:34:42 +0000
X-Outflank-Mailman: Message body and most headers restored to incoming version
Received: by outflank-mailman (output) from mailman id 570290.892020;
 Wed, 26 Jul 2023 10:34:42 +0000
Received: from localhost ([127.0.0.1] helo=lists.xenproject.org)
	by lists.xenproject.org with esmtp (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObqs-0000sT-Kh; Wed, 26 Jul 2023 10:34:42 +0000
Received: by outflank-mailman (input) for mailman id 570290;
 Wed, 26 Jul 2023 10:34:41 +0000
Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254]
 helo=se1-gles-sth1.inumbo.com)
 by lists.xenproject.org with esmtp (Exim 4.92)
 (envelope-from
 <SRS0=aSls=DM=suse.com=JBeulich@srs-se1.protection.inumbo.net>)
 id 1qObqr-0000pF-94
 for xen-devel@lists.xenproject.org; Wed, 26 Jul 2023 10:34:41 +0000
Received: from EUR02-AM0-obe.outbound.protection.outlook.com
 (mail-am0eur02on20606.outbound.protection.outlook.com
 [2a01:111:f400:fe13::606])
 by se1-gles-sth1.inumbo.com (Halon) with ESMTPS
 id 0698903f-2ba0-11ee-b242-6b7b168915f2;
 Wed, 26 Jul 2023 12:34:40 +0200 (CEST)
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23)
 by AS8PR04MB9175.eurprd04.prod.outlook.com (2603:10a6:20b:44a::10)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Wed, 26 Jul
 2023 10:34:39 +0000
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6609.032; Wed, 26 Jul 2023
 10:34:39 +0000
X-BeenThere: xen-devel@lists.xenproject.org
List-Id: Xen developer discussion <xen-devel.lists.xenproject.org>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
X-Inumbo-ID: 0698903f-2ba0-11ee-b242-6b7b168915f2
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=Kki6fVBK4bJS/poodZ3FhNqFU38J2KWcqpy5QhAKDaeYBkVtqlKLOkexGP2M4azXVey2Y9bTYYmO7/G2GdXQyWmsu5VA8vyAgrSNhwlI8AwTZrnGcwqd0uHnfoD36dZ52jEDAwH9fCa5cDFaDINEpUjeNVsqGnzmKFA/HTHluDr9Dh/bDRtvvvGuFx5OPkEdclOdy7m1Kc6uX1x0kU+W2uqF0QbAsBaLRqKZPoEFmR+Qb2XraEfvvZvdKCgp4D+E9dgLd/SiXCNDFr30SESDFUNtZrOUThvq5acRKOIbdFXxxrwUsCW4eeB9hYH5yVZkW4bevBTnqaNO32QDBsveIA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=4bXX4UWXnWt29w89tvGp0cf+LqZaRKTS56ciKBNCO2k=;
 b=b3P2K6SwCJdzJ1CDg60+v4aRD7vZ7uC3BReNRQD222Q8qeJFAhiFGS2oth9oZJFshJvSkFLsk4ijgzhl46LZpUa4KmR3A/wLzweFDFM0bGKI+fkjMmjT6HEAiOpVn519xYJwdTxUiO+uGqCwLIHthhG0Bsm73ZpxJGX+RC9Sop/xj/CU6xWoPlPTnVVAizYjNlm5EoyU/R+G94iaJ7uIFAs113R+B2hnzGIUF3txw5RUnuIqisPxjTF+SM95+6rPXlp3yGL40WA/Z/nZGTW4aNfURKRVnXPEj84GXI8EjuPyW+TuyT8QRFizi57zAXs/181fcomMjXsfJ79QZbIMqQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com;
 dkim=pass header.d=suse.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=4bXX4UWXnWt29w89tvGp0cf+LqZaRKTS56ciKBNCO2k=;
 b=sEar2vZFCtLy4pccu4KzcUj9IsA3ZHTNPo2KD3JPuCwIP3iNB0+5c+SH9BBxPEKGDqO5znCwz7PnZ0fanYbrF7y5gkhCuPMtqWJpFy495sbseMu9mQzG0EEb5j/XJDS69iSHEPt27+cMRGJONn017mTTCopX9H4pny3g9x53+z7jW2GzNq1NUY1llM/fgg97Ueb9HDzWJcTTwD9wJvlUbguELzZpuNvJDp2Y/kK7udRn6JaqafG7+PDMtPKQiPH3kobh/Gdbl7TXvQG/UTkgzFYOFvnoJZmgGG+TBvE4fMxKnAY4S+5awYIIHBhuMPQ1dymbVvudvk+sSxTp4Tq0Bw==
Authentication-Results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=suse.com;
Message-ID: <4fdfecbc-0ed3-dc1c-379c-3a556fea8b89@suse.com>
Date: Wed, 26 Jul 2023 12:34:37 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: [PATCH v3 4/5] x86: use POPCNT for hweight<N>() when available
Content-Language: en-US
From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wl@xen.org>,
	=?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>
References: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
In-Reply-To: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
X-ClientProxiedBy: FR2P281CA0139.DEUP281.PROD.OUTLOOK.COM
 (2603:10a6:d10:9e::10) To DU2PR04MB8790.eurprd04.prod.outlook.com
 (2603:10a6:10:2e1::23)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB9175:EE_
X-MS-Office365-Filtering-Correlation-Id: ef695472-c47a-4302-3aca-08db8dc3ea20
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
	pXLW/0KF4oJYbWL5xCtn/ARmSF8xBgOhebIURnVwOoKCRONcIQDuH3DLlQqFO5XFWdc0OKtlQAYqEoljrK5WcvcG4cBskCnzerq8eYXmr4VHQwLiuWuEaYe9YPCYJkxczQyoUBJmtV/INqgbw+fSbgQCgzv6baFfMiYGVowSWXjSdbMojCzoLqKsA0/ZS7dclQj6bha3dpJDXoLJXTktZrv57nW1gV4obHQmi2hQrFEO5wQocmE8XQAfQdEwTCRkqK6MaptMLf9FnfCsmWwLu3wy/sbkH1nbbkGJs4JDcC+GG256vx75xN7js6oj4N9MECHZTlfdrBOQUhZETHe1vs8vsQcQuBMcv9D8ShB+JtKAs9sMFm0HvZ4f9qFHQWl39XOZCedc2FSr1ktUzbL1vKIYLk/lzCnFbMWv60EDql9ZZde8kT/1ihooBfFnIQWfDDRLf3zhyDEW592wWbvxVRNjYLc08mOS4J1K8M720TPShgb9yT0DI6sefZ9qc0UsLi8gWab+yQbHMhN3d95SWuZS5X/zxXWVDQxOiuGBFdzfr12D7f6U/a5xwz5X9jr5yoehDHntZNOTJoAoXdXug0kDgIwn1Cs1cKSaX7RpUR/NDN/er+SwSXf4DF/Wc4vrklokYLAeOMK75sG0N/CmzWsxp+ahHWzJX/K22zrJBhu+t2cpkfO2ln5wKoCBgwCB
X-Forefront-Antispam-Report: 
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(346002)(376002)(366004)(396003)(136003)(451199021)(54906003)(6512007)(6486002)(478600001)(66476007)(2616005)(26005)(186003)(6506007)(2906002)(4744005)(66556008)(6916009)(66946007)(316002)(4326008)(5660300002)(8936002)(8676002)(41300700001)(38100700002)(86362001)(31696002)(36756003)(31686004)(16393002)(43740500002)(45980500001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?l1Fr77a+MlfQOf+88UhIwY91qbg5?=
	=?utf-8?q?Ypk3FxX8t7dsxdEbtpErd8Xd5n7FmLYYDZ3kMOanch70CtwkUvtKrRGA/5N+lLeVx?=
	=?utf-8?q?qaRoGEiiI0P3TzsfZtC83zakz2AaMD6Dyo8TMdCB93e6+6lXVYhm1S80DPCmF9Xqo?=
	=?utf-8?q?D0nNdefIKegaCi7enagLFjdSfhBSZAAD/ouIj9vi4eUI2TrZB/Hgv0gdYqSZHJK+P?=
	=?utf-8?q?DJN9HX+JEjerVpLPcOVB+kn9wJ63YIr780AIwZ8JKZzO6273sKzjukg43NxVoYUPk?=
	=?utf-8?q?ggIXb7albfmwvkg8HqTjoFgyoysc40xk4lWSeHva9ow1KKVw/IwkljNJdwX5eOJ9h?=
	=?utf-8?q?Wo8IL0Sq6h4cOfX2j7oRt5ExbhmMTjc8/2B9JVjMct7p714dlOwTdBdefOF2PCn8E?=
	=?utf-8?q?s6uj97XQy70vlL/ZZnSIP6lwqfgwzrqMyGPzZZW3VsRuBVhnZt4aeDjU5H0M4iayp?=
	=?utf-8?q?58vmgitFuAZpQLWaRz6dvB8B2LhIg5s17j6Oa85CoL70so1AkBO7msQItdGvfTvQN?=
	=?utf-8?q?LafafgmIZQHDeOyRPz2Zu8VvluLTY7XvcX3dvrnknpq5z8+00BnMpWa+IeSl4RyVb?=
	=?utf-8?q?fFzTnqLRNRyIH/E6+s6iOwnhE5u/kg2HUEkq93HQao1L4i2ijap404M7WTJTXvIM4?=
	=?utf-8?q?zr/oWChSbFnR6XxBNRqaH9p5idJnzh1whXPw3oHbjJh0Gj/E820V3XOSY7B0fgY0n?=
	=?utf-8?q?lUKTG9HwEi7Toq5AkxbA+pRftSdFJMWChG2YTLJdKIeZo+Wms6nckWBgjvOgg6g3m?=
	=?utf-8?q?I+t/yu0/JlQbb4XuM1CNjet6Tao17d0f2HPw/xnRCE3wWL7VQoWLOyIfBp9a5nNiL?=
	=?utf-8?q?GuR6Sz+WKQLp4//lzec1CQ8i32vc49WUhbvw3AXuY+nJ4ymkmlpoEHEfZCQD88U6w?=
	=?utf-8?q?hzys1QtEY84GSyem+/NgRLTvMdIAdS6pTt8MITT6KOhHtZw+6Hf6PMYiyJRjfOlqG?=
	=?utf-8?q?59NE1mRJcJszOhobxcIHnpLTYaJzVhy5tcnNp97N06JZsb5TzHIFqbE9gWTmLoXxv?=
	=?utf-8?q?OBis5GbgZ+Gwbrzg5ZhruHeetYqnwrSWP5rRPYrHwGiIvv68zlRI1M2aOh+hSzBg/?=
	=?utf-8?q?G9bentn/ww3kVMMjtunilO/J17URK2Sw9L+/aQURDCI0M9jEqnPJ8vYkThcngQDD3?=
	=?utf-8?q?nUzmQ1BKmcD908GlIRkY2lEpLEMsHNIRfxm0Dh+1FYMLEkJf3PPR9g2WGEBN9pTuQ?=
	=?utf-8?q?AmxqOSjcZjS5q1hpbiwkWX15Y+o76eOA19FKwg55C91xqcKG4Smz5btzvNqwLfSSg?=
	=?utf-8?q?mINbpe61dLbcYf1KszqnNxLdKWEnnoQLPX5chjMTsSe4kb4pE5h3zL1zD72fltBcj?=
	=?utf-8?q?8T+VSK6hJuoBqTTjXLONgLlA4c8gbWH/6yGaT4jtJCP4RUnMdxT9IIMBMKLWjSn3g?=
	=?utf-8?q?FaogiSdgXO97OL0qvULWg/M1Moe8FdigIeDlgoIz/hHCmQlQtaQ9bhQqDTiia/oFH?=
	=?utf-8?q?WN6X6Oqd2nznQ7t/KcM+aHp9lQrYoqa2H56t2u62TeBbu0kgZ7IOFOYfIYNJDYo26?=
	=?utf-8?q?K3A/j3vaxYvF?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 ef695472-c47a-4302-3aca-08db8dc3ea20
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 10:34:39.0999
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 lk65ibqpXKDPWL9c04qQzQapaxG+okr/vOFnnayq0JF7IknSqo+DmEZEiuxZa0dWgG1oP7y2hi6vaokGj8IyIQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9175

This is faster than using the software implementation, and the insn is
available on all half-way recent hardware. Use the respective compiler
builtins when available.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Jason Andryuk <jandryuk@gmail.com>

--- a/xen/arch/x86/include/asm/bitops.h
+++ b/xen/arch/x86/include/asm/bitops.h
@@ -475,9 +475,16 @@ static inline int fls(unsigned int x)
  *
  * The Hamming Weight of a number is the total number of bits set in it.
  */
+#ifdef __POPCNT__
+#define hweight64(x) __builtin_popcountll(x)
+#define hweight32(x) __builtin_popcount(x)
+#define hweight16(x) __builtin_popcount((uint16_t)(x))
+#define hweight8(x)  __builtin_popcount((uint8_t)(x))
+#else
 #define hweight64(x) generic_hweight64(x)
 #define hweight32(x) generic_hweight32(x)
 #define hweight16(x) generic_hweight16(x)
 #define hweight8(x) generic_hweight8(x)
+#endif
 
 #endif /* _X86_BITOPS_H */

From patchwork Wed Jul 26 10:35:02 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Beulich <JBeulich@suse.com>
X-Patchwork-Id: 13327827
Return-Path: <xen-devel-bounces@lists.xenproject.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
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 smtp.lore.kernel.org (Postfix) with ESMTPS id E3502C001DC
	for <xen-devel@archiver.kernel.org>; Wed, 26 Jul 2023 10:35:27 +0000 (UTC)
Received: from list by lists.xenproject.org with
 outflank-mailman.570292.892030 (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObrO-0001Xz-1D; Wed, 26 Jul 2023 10:35:14 +0000
X-Outflank-Mailman: Message body and most headers restored to incoming version
Received: by outflank-mailman (output) from mailman id 570292.892030;
 Wed, 26 Jul 2023 10:35:14 +0000
Received: from localhost ([127.0.0.1] helo=lists.xenproject.org)
	by lists.xenproject.org with esmtp (Exim 4.92)
	(envelope-from <xen-devel-bounces@lists.xenproject.org>)
	id 1qObrN-0001Xp-UC; Wed, 26 Jul 2023 10:35:13 +0000
Received: by outflank-mailman (input) for mailman id 570292;
 Wed, 26 Jul 2023 10:35:12 +0000
Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50]
 helo=se1-gles-flk1.inumbo.com)
 by lists.xenproject.org with esmtp (Exim 4.92)
 (envelope-from
 <SRS0=aSls=DM=suse.com=JBeulich@srs-se1.protection.inumbo.net>)
 id 1qObrM-0000JJ-0h
 for xen-devel@lists.xenproject.org; Wed, 26 Jul 2023 10:35:12 +0000
Received: from EUR03-DBA-obe.outbound.protection.outlook.com
 (mail-dbaeur03on20602.outbound.protection.outlook.com
 [2a01:111:f400:fe1a::602])
 by se1-gles-flk1.inumbo.com (Halon) with ESMTPS
 id 18786356-2ba0-11ee-8613-37d641c3527e;
 Wed, 26 Jul 2023 12:35:10 +0200 (CEST)
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23)
 by AS8PR04MB9175.eurprd04.prod.outlook.com (2603:10a6:20b:44a::10)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Wed, 26 Jul
 2023 10:35:08 +0000
Received: from DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com
 ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6609.032; Wed, 26 Jul 2023
 10:35:08 +0000
X-BeenThere: xen-devel@lists.xenproject.org
List-Id: Xen developer discussion <xen-devel.lists.xenproject.org>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Precedence: list
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
X-Inumbo-ID: 18786356-2ba0-11ee-8613-37d641c3527e
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=Uq9CgiWYX/RWkQ2UTKQ7FAI9AZQHGTcVKFqWjeXdZRUHIvce38Bs+sErV1gn0AmYFigdHjFdvZUOrZNP2bWRy8MI5OEo1Js1DfvZWeVJkQdxAThKLiRGmunH0DES/Crr2VuXOlDRf3ICibSVcl8MAL8In4R8a8EKn942IkxRPkQJmIMJBGYJFsKxeTzqoUHHquSdfqiEL6RspqfIfxXsHkFYUAagy2sy30rs4WxWG0ZFJcYdNPQDZe20h/6asPnpAbpMHoN3oINwnLRhv+dgNZXFHHP6lJ2MHYUy+t/l/l9vt0RyuWCtTplZN0TUGPyipsnLJRSRJvPnSsmGz2tvMw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=L7fll069aCOGhw/Ujfnzc7eYrLnddgaGWv3jfKQz64w=;
 b=hXIUzDngWICNoHZZyVas9DwoxToew+ySpHApwhblOjigvYovQqT1LdvSHTjVw1KiiM2eYjAj1RKTu+vh04MsCNwM0QjE+ygYjqrDjWmKRE/K2nQJfQYRuPAj/A7T6LbNdgz981tLIbzBXiOyAcpXafULKhGkQqDi2Lifr/0XYEiotEHsu25b5R9phHeSkYCATZoJafATl5jAZx/0Rl1PIe1nj9dqOTXK6J36G4CPN3Ej7ZPwrTjakm+0y0U48B45SdF7MPpYYUAXYL8sqd/OXD6AvgOG+p5dthmAWq/adnEPm3J2lAin4PCD46PtcPJrnhJ9F3awF88Ha2nU9x7V0A==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com;
 dkim=pass header.d=suse.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=L7fll069aCOGhw/Ujfnzc7eYrLnddgaGWv3jfKQz64w=;
 b=a9BEUIZHRI4N248NyvYpGbKaxTnc/hWC3dABl/e63jDTeIcbAjeW9JWKQE41Tbz2KAettUOG28vSJVOZeXWYIG7BmU9Y+nU3slMj+Id7toIctVt+I4oX5jCyjAS3BK/3jaDAbiatWlrCsTG6H9pN8LhmD/FJ9MX6fwbNCIh72emXTvyzgB7/9rKVoGKtZ1q1D9atTbJyksIaVKw6z0sdJW9MP7B4m5iEvGKzvClAWwfg3evvGhGHyy7gTi3r2XmxWycWifLQaTjd9iCgQ/AKbrsPIQcUc6epoTEqYjokfSC0U+zlEl7wXzalFoMU4e0XkGfBOOj6I6RurT1Xe6u7uw==
Authentication-Results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=suse.com;
Message-ID: <367db8f8-3287-d694-e591-efcffaf9ee99@suse.com>
Date: Wed, 26 Jul 2023 12:35:02 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: [PATCH v3 5/5] x86: short-circuit certain cpu_has_* when
 x86-64-v{2,3} are in effect
Content-Language: en-US
From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Wei Liu <wl@xen.org>,
	=?utf-8?q?Roger_Pau_Monn=C3=A9?= <roger.pau@citrix.com>
References: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
In-Reply-To: <10ce72fb-4fb7-67de-41ec-7291dbac0038@suse.com>
X-ClientProxiedBy: FR2P281CA0086.DEUP281.PROD.OUTLOOK.COM
 (2603:10a6:d10:9b::14) To DU2PR04MB8790.eurprd04.prod.outlook.com
 (2603:10a6:10:2e1::23)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|AS8PR04MB9175:EE_
X-MS-Office365-Filtering-Correlation-Id: 7566a849-3fc9-4cae-5308-08db8dc3fb61
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 
	ifCeFUCnR6lwHLjtHZipaMwiJracc2ZrDpwhR6tR8Wg9cwCsgzPH4BOIuw7zyRT8bcVOOpdyutDgZhb/4eT6+avo0s1jLftAHSI87+gLFbH/qacaEM3LX2uasbTZ0748Y5LHAh3ldFL6q+Dg1JdHCJ6PZVCmQ/leJARFfKlkAm6xgLF+STadqcY6NIyQXMLwr7YQqGyK9veDzUc4s6vC4Cxh15M5+j1AAPR4xstdAVH45wNHSpWiJhUjRrdv+wvD0BrjGh/3KJrYXCQCD40oYANF+O9joxYvj5+K2yxhJTrmajER6eYpMbke8G9m8YrDfLOD0yKA2lbpmKD4AczAZPuxT3QvEkbGr+vbo3+fy6A7kRJuKC7R1xvMiDhSVtFocEWq0P5fc5LkxR727A0wQjXorKrQzJyh2WeBY2gs0vUnOazu1ZpqZT2Mxy478uv/PtankHmQyiz9SMq2T9y1XjatxiVPu4q7yygvBeoUAuQO6bwkYVSnaDtsG0jad5nWN1jAouL8ncmPwVJOSorYmXHB9ZU19nZ0ESFNe1ngUBalKn36A7YcnDgNzwyPYpnxaxc2BCeIGkLSK1iVo1nepejU0Zfgni4wTKRFViNUociq5wDY3xjlrBXNgcf//nsXVGHJen9yatuv9+iVNVkziw==
X-Forefront-Antispam-Report: 
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(346002)(376002)(366004)(396003)(136003)(451199021)(54906003)(6512007)(6486002)(6666004)(478600001)(66476007)(2616005)(26005)(186003)(6506007)(2906002)(66556008)(6916009)(66946007)(316002)(4326008)(5660300002)(8936002)(8676002)(41300700001)(38100700002)(86362001)(31696002)(36756003)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?os6v7b9J7BrsLVT28AaQRtGmWeHl?=
	=?utf-8?q?7uxOUxVCSlgXGDYttkaKcMdKOrANsL8tIxmbrLrOKiZmfAtYxqY7N2Z7WrSlLXc81?=
	=?utf-8?q?dHhCzHRm5g4/1h6oKsgC06TWuKZ3oGgWchUe446d6f3LVacBUpn051A6VoGf9G1yg?=
	=?utf-8?q?BcQmLi8nWyewT/Yz2itWOdftwWgfAu1rX638hIg/+T5HLvDkTE+QyOhxz/4iIql2w?=
	=?utf-8?q?JaB4W6usZOU4bIbgbwZRfRPy0oGqUbdYJrjoKZV9MgesnclQmMYvmO8wS4awr6aRk?=
	=?utf-8?q?w+F1x8xFth9lk5LyjMVmr19k/YfQPowlr1vSQH/vJEgcfZz0byO5ZmM1WL1Nrf5w7?=
	=?utf-8?q?BBFlXUw6TkOcSUEiM20mYitG8A8TDP03fWVzn+1+Pvc+AOiLOel4A6pGRC1jYdNvr?=
	=?utf-8?q?gH+VfKj9kofOrL0Q6zps9ZJyiGtXV4gkopD3R6SNPwIbt5qAUKBAVPo4oYSwiaCqG?=
	=?utf-8?q?gQpP7f526xHnZYtUUkUh6svEfIinfGwS/bFsRO9ciU8/BBcpSHpMl67u2N0EiRp02?=
	=?utf-8?q?7/mm4TWuRRERTsOERnt3utMTV3u3bJOfvOgdIHm0QYpwBcy2ohmZUfKv9IR4yRUCq?=
	=?utf-8?q?HU/48re3WAHZfVHv0MAalB8861RNqmrkcnffmaksVMFqP/xf9NG5eFCEgHUll7ExV?=
	=?utf-8?q?NmqiGNxlqO+CUyFP8yzWpg76T5zNGx56tP6F7O5E2uyttsC3896fYK/cAA/E+HWZC?=
	=?utf-8?q?sS1Ia6uFKHfIfEdn8IS7GWw4CAdnYy5M3zV2LoW49lcyVqFYBthU2z8Paqi6E8KUU?=
	=?utf-8?q?kIwLAHrAfk2wVBOUfBBO4Qv3KxNuwAylVQBaLPpMUXcLFeKogQJk8BAS7aiG7fyJi?=
	=?utf-8?q?+EfUVMzAOFmkfnqbe3AGD1rTPQI0DIkvFHeKpELQ2tX13EwTzgwbLmk3/e0CamWAG?=
	=?utf-8?q?DdoilttOXptBOSQ1Dlh3cnhUolHPDESCmu71WdpGQ6BaLqjrhrGgIVqCsNZAXUR3Z?=
	=?utf-8?q?u3AiPhauA8OHJve5r7n5V0dZY46AfBah2AcTeU9c007aMEK26qMDjq6zcT3uPFKS1?=
	=?utf-8?q?td1tiffRrXDToLRt8UAMpZ6yQPRndq3csU8BrGeluMqrTemKuxGDO911E8Y2V5pLV?=
	=?utf-8?q?qqhPaQIArpycZTWRk6mMgHjcmSs7cDYe1+FBZiPqX49zAz1W08BVAI/o43DAC4Yj9?=
	=?utf-8?q?oB2tvrVa9ZvbiUJO2VpXLjlRsD61+R0x6tfjFZOqlmxRT9NdkJgDxk48vcLD0TeT4?=
	=?utf-8?q?rNzNIDGWTNLOKH8Us1DoyJ4CN2ccmt9hp55rLuen6WUkMPBoocZLr/YBTy8/+BIfO?=
	=?utf-8?q?jU0xDZrRPAj3WI0hC2BbYRgpyAuAM8pvwvIcG2T60C0g/zOI/vwczDh2Qo9txWpwR?=
	=?utf-8?q?myOpQdIvJnumuNJOc+WCXW6RsZQkVa32ynfthIG01zJ/5gDCDdfX9J5koGyAmcxq9?=
	=?utf-8?q?TQj2kYb7UaeUEt2o8Ypi8lzTWya5xK45HRKLLthtraxId/65yBcr9YjAWHpWb60Nj?=
	=?utf-8?q?vlcDUgNRYKZAFyEc9CMBT5E7/K8XnSNW4rXmAm2VQgMN21a1orKYX+TDxK3YPCCTl?=
	=?utf-8?q?KYV/nAwjjPWR?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 7566a849-3fc9-4cae-5308-08db8dc3fb61
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 10:35:07.9880
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 
 FS2i1ATqXtHVRibKZdJw23TtvmgxYh4uNG+nEizuc7zhEwY4dLjrzq+n0j814i1zMUfYa7d8V1L1NvRUD0aJSw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9175

Certain fallback code can be made subject to DCE this way. Note that
CX16 has no compiler provided manifest constant, so CONFIG_* are used
there instead. Note also that we don't have cpu_has_movbe nor
cpu_has_lzcnt (aka cpu_has_abm).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Jason Andryuk <jandryuk@gmail.com>
---
Of course we could use IS_ENABLED(CONFIG_X86_64_V<n>) everywhere, but as
CX16 shows this isn't necessarily better than the #if/#else approach
based on compiler-provided manifest symbols. While not really intended
to be used that way, it looks as if we could also use
IS_ENABLED(__POPCNT__) and alike if we thought this would end up neater
(because of avoiding the #ifdef).

We could go further and also short-circuit SSE*, AVX and alike, which we
don't use outside of the emulator. This then would of course call for
also having a way to select x86-64-v4.
---
v2: Also cover XSAVE.

--- a/xen/arch/x86/include/asm/cpufeature.h
+++ b/xen/arch/x86/include/asm/cpufeature.h
@@ -76,15 +76,25 @@ static inline bool boot_cpu_has(unsigned
 #define cpu_has_eist            boot_cpu_has(X86_FEATURE_EIST)
 #define cpu_has_ssse3           boot_cpu_has(X86_FEATURE_SSSE3)
 #define cpu_has_fma             boot_cpu_has(X86_FEATURE_FMA)
-#define cpu_has_cx16            boot_cpu_has(X86_FEATURE_CX16)
+#define cpu_has_cx16            (IS_ENABLED(CONFIG_X86_64_V2) || \
+                                 IS_ENABLED(CONFIG_X86_64_V3) || \
+                                 boot_cpu_has(X86_FEATURE_CX16))
 #define cpu_has_pdcm            boot_cpu_has(X86_FEATURE_PDCM)
 #define cpu_has_pcid            boot_cpu_has(X86_FEATURE_PCID)
 #define cpu_has_sse4_1          boot_cpu_has(X86_FEATURE_SSE4_1)
 #define cpu_has_sse4_2          boot_cpu_has(X86_FEATURE_SSE4_2)
 #define cpu_has_x2apic          boot_cpu_has(X86_FEATURE_X2APIC)
+#ifdef __POPCNT__
+#define cpu_has_popcnt          true
+#else
 #define cpu_has_popcnt          boot_cpu_has(X86_FEATURE_POPCNT)
+#endif
 #define cpu_has_aesni           boot_cpu_has(X86_FEATURE_AESNI)
+#ifdef __XSAVE__
+#define cpu_has_xsave           true
+#else
 #define cpu_has_xsave           boot_cpu_has(X86_FEATURE_XSAVE)
+#endif
 #define cpu_has_avx             boot_cpu_has(X86_FEATURE_AVX)
 #define cpu_has_f16c            boot_cpu_has(X86_FEATURE_F16C)
 #define cpu_has_rdrand          boot_cpu_has(X86_FEATURE_RDRAND)
@@ -114,11 +124,19 @@ static inline bool boot_cpu_has(unsigned
 #define cpu_has_xsaves          boot_cpu_has(X86_FEATURE_XSAVES)
 
 /* CPUID level 0x00000007:0.ebx */
+#ifdef __BMI__
+#define cpu_has_bmi1            true
+#else
 #define cpu_has_bmi1            boot_cpu_has(X86_FEATURE_BMI1)
+#endif
 #define cpu_has_hle             boot_cpu_has(X86_FEATURE_HLE)
 #define cpu_has_avx2            boot_cpu_has(X86_FEATURE_AVX2)
 #define cpu_has_smep            boot_cpu_has(X86_FEATURE_SMEP)
+#ifdef __BMI2__
+#define cpu_has_bmi2            true
+#else
 #define cpu_has_bmi2            boot_cpu_has(X86_FEATURE_BMI2)
+#endif
 #define cpu_has_invpcid         boot_cpu_has(X86_FEATURE_INVPCID)
 #define cpu_has_rtm             boot_cpu_has(X86_FEATURE_RTM)
 #define cpu_has_pqe             boot_cpu_has(X86_FEATURE_PQE)