From patchwork Mon Oct 30 13:19:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13440557 Return-Path: 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 912EAC4332F for ; Mon, 30 Oct 2023 13:19:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.625098.974009 (Exim 4.92) (envelope-from ) id 1qxSAp-0002H1-2N; Mon, 30 Oct 2023 13:19:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 625098.974009; Mon, 30 Oct 2023 13:19:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qxSAo-0002Gu-Vx; Mon, 30 Oct 2023 13:19:18 +0000 Received: by outflank-mailman (input) for mailman id 625098; Mon, 30 Oct 2023 13:19:18 +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 ) id 1qxSAo-0002Go-CX for xen-devel@lists.xenproject.org; Mon, 30 Oct 2023 13:19:18 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20609.outbound.protection.outlook.com [2a01:111:f400:7d00::609]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ed88ae7e-7726-11ee-98d6-6d05b1d4d9a1; Mon, 30 Oct 2023 14:19:17 +0100 (CET) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by AS8PR04MB8312.eurprd04.prod.outlook.com (2603:10a6:20b:3f1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.19; Mon, 30 Oct 2023 13:19:14 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::d924:b650:a2ad:7b25]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::d924:b650:a2ad:7b25%3]) with mapi id 15.20.6954.016; Mon, 30 Oct 2023 13:19:14 +0000 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: ed88ae7e-7726-11ee-98d6-6d05b1d4d9a1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bjQNCXKmNj4mro9ba8eH5pvt2Jr/AxynQ4QoNH+xLReAN1b4O72580yYoYsYsjxTIF2/SgRe/MvjGGSoyhEEFRli2/G8uJWAjFw2tj9OTMtJiT4hFF4nVTRb9ntv4aa0NMB3VNE6Z/5TEeLpL2tND7j23DOaxK1SOFupXjsIBaUdLKDduarmtZvGvSkfoJYcD0nJUKMyWSzwcsk8RowHM4uqhijD+ZfB23ZLsC3PD60fCjX0u9uGmOOvZ2qwj/kv/WKoi8F2qwlKWIBLjmPPSV2slTcL8ja7lVKm6vHD0FAIs/gWB0fHIbB4OaFZynFXKzMyOLSBtWD0F2+wc8MKzQ== 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=5RS7ML3zUGduWIOpMzIYiW9tDyouZkunpiHrgT+gfaE=; b=QYy66vO8D5sMfQxaKemYNfWnndLG7TN557Lq8fB8ueFY0Q8hefcBK63+s8apMx5IUlDzkVuNP+EFo9wOy38rIqWMFlEUIMiuQMThgiyflRT5YANYU+WAb3cISQh5gpGugbfxktNDoEHnxFFJezFr/UnqLDxX6SuUMwmofvf/b9KecDogsQI1ojRn4R1aDDnChhkKKFHIWWw70HGif9WSlpB8K5N9qWAjOrxTi8/o5ebXdQ6VzAJv5LEJ8bNDJ8CvwVWhTqIXhmxVPIi6wOQxa4RUfNyHCO4xCDNK5eNq8qa7m0EHLqhmBPLiv2aTs5ENttW0CuwK/vLtzxjijcDw3w== 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=5RS7ML3zUGduWIOpMzIYiW9tDyouZkunpiHrgT+gfaE=; b=z2ssQhIz3b3HCNG1YdampZGwmQ05AbCFQhi6p50GGLUl0cYuE+Y62hJNLuJjBv5e0++cAIWmMA9qxk/uMJvukXwTuHg2nz1npwLH3NM76xMeXHJ8JOaWGXqb3UwH1P/4xaf2mNq0aL9JCMjcfbacbim8a1GzxFA5FeZznt0bO5zoDSrQzIHbsR12OKEcH1zjR7QXUuz0olRDtZH3spJfFoqPNWQeGKaqzzeexqNAs64jsFJMrnM2Ab1EK8nfxbySOV1XuCB4eF6LthhDv9gMsaiQYh/ldjoCxetV4+K/o5tZMATfIkPhfnOaBaz+Dl4LGK0+DWCe3Raq0uwfqka1vg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <4fda4793-6fdc-70e6-575d-062f72c8c0dc@suse.com> Date: Mon, 30 Oct 2023 14:19:15 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , Bertrand Marquis , Volodymyr Babchuk , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Shawn Anastasio , Oleksii Kurochko From: Jan Beulich Subject: [PATCH] xenoprof: move asm/ include X-ClientProxiedBy: FR0P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::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_|AS8PR04MB8312:EE_ X-MS-Office365-Filtering-Correlation-Id: 65c10bf9-4e13-43d0-9603-08dbd94ad024 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gy133bWC/77N70i+llbpcboTicUHyiUo/GMdfVEopWzHPBPKwFRue8UXt7LnavGIRQGuMtDyUmOk8BbWP6xrklxA+o5RbI5uz5VExDbm/M32uebesCMvKsr0uMoPHMK9MtLR168qlBKpvIVeLkNvrCHp+LnAtG0HK7O5LcM7gMniYI9jo4dh9D1tsSamH/OQkX2pUSWCAqWr6zQRfetoqRwwgKHkJt3UAEqx0Hoi+AakCGSWXokqILpYe6+yjw4sZTd+Ul1fY4+ATjvozGy7K6D2pkgm/etkJOu5uNMDE2VO2xXoXDJ4d6mJeXM3VaIHxqorP/gHEwb8EeaEbIpcp6+F0F/E8vvUzwYbDJ+I8s+IVPlcV8NfFWe7Xi5mws27XEfS4hFYBhmJt0ujBpgRgsyIga6GNzKMbipo+2d+ykymfKnXG0cNOVn2Jpa8nnpw7dzN8SUzC9usThyg5XeJSRrgPSsQqGDfLcmHSvwep9k6XvfGWTMBJURXjWMWb/2vnnEC3bIhgUto2Df0oAm1Wph+cd90JQwPCwocnNA6gApEwIUIp3mZerO0eRUr4bpvlQbPTxEmSyCT6OmPomPffODibts8c8PPcsDchL8rgJWOo85kSANHi5nu4XCrvsj3LX2/8JVfnlX0LcOLWrWr6A== 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:(13230031)(136003)(346002)(366004)(39860400002)(396003)(376002)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(31696002)(6486002)(8936002)(8676002)(31686004)(54906003)(66476007)(66556008)(478600001)(7416002)(66946007)(86362001)(4326008)(41300700001)(5660300002)(316002)(6916009)(2906002)(6506007)(38100700002)(36756003)(2616005)(6512007)(26005)(83380400001)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jOaPA1lCWvFFc28gBndVn1LWCWbY?= =?utf-8?q?nCvT4VRfWbf1hSoyh/b3pfZzspp6AeP1uRZk7vvQ6WvvM1wa61LoS6PHBAz6JC9sV?= =?utf-8?q?Eh+KWha0gQc17sMAX5DNAljsm5b93y2wabxE62C6fKEl1Ikezrh+6fgGus+m0gShI?= =?utf-8?q?xbN1Wg+FL56Da1qgAo6fahp3zJlJOzYBzfWH/W1TMlsBd6OllfWzH/DR2w6VtB/WP?= =?utf-8?q?UuUoaBpAxQIpnEKBMJL6Njl+FlXOKtpm1szDb/EOCjhw/G+G/IEWQ0Z12pItbTwxx?= =?utf-8?q?5UG9MoztfD3teKWLV6BieWSWEjJnDtsXPtFrASxe8+jPrUZJe+KMTz0avi+8TzSTQ?= =?utf-8?q?BEtRqIBKFmNhX541p3aZpIg727Ec66HNXxLeVDOMuaeucBpFsbDiaRvRIJFv4r1ia?= =?utf-8?q?c96Lfu7WOpnXWScPHbUXAMehVNojaU9UdiO9AZ1uHjJFc6ccPVCU/UOqh4hcBW267?= =?utf-8?q?WKjSzCb0cMHEBxUNj+7kFrK2gtu0fYksOuxUcHHtUoSGyRqDarfDdhSmZoX3gnsg6?= =?utf-8?q?LZNsIfVWLv8+MMq8/Xeipx/nc2OjX08AbZrpeOTYHy0bvlTXoxiaUw63Op3PbaqgO?= =?utf-8?q?DVT4zry4FSoUmZVbDtttMhu+Z5Rh7GZ/Fvh3IbK/Z/h3IAAFwOSHDyjvBFtkiAqnf?= =?utf-8?q?+vP6wExl5OMs5BG+oq6w9NQA/t7p3zCM6nw4120wS6WvFoKDVmZhF8pRQuNv6o39B?= =?utf-8?q?ZZMZUZsR2xwYDEaq+vPit791g4sLC0KI8LV8Eq/FGZudm6hVtreaewwzv8ioCaKav?= =?utf-8?q?A/l3Ni+U7/k1B/AFBQ1cHPLz930mSVZ2Zp0W/2jrxVgY5rGIqN7EDeYZ3YveAM908?= =?utf-8?q?nMPdhg/vcHF/4EBbD3eK+iqfTHDBCswk9bxYuM6sfUMPw+P9r/01uNrb1qvSJYmpS?= =?utf-8?q?R7C8ksUp1wQh7mf/idQHJ3TMeHm0Vs/ZmH8kCbVyVKH5vZU1Ojp7UfNC5hfl95P/l?= =?utf-8?q?ApkoorxveJ9SrLpas13Fg9CiIBn1u95P5JI+7Ms0F+aYYyavOGai2tJQsANjm0R8k?= =?utf-8?q?VAS1jmq/6nlCxS208EYcVe8gKg7p/UXkOfkCq/NfW4UmK51leYG4OEfmyTFBqsdiv?= =?utf-8?q?fuVk814CH+RiZau8bf8L/E8FqrXBUOWr/HXyUQuqB76rC82Not92NcJ2829XZGj2l?= =?utf-8?q?oVl0MsPNwrseueLui0dSvgjovHFlLKTUd3Ausimqd4xg1sK+ky1tNtRW8oZCy9SQo?= =?utf-8?q?ZOlzNxe1ji/w3gZj86VKfAcvCJd+/PxlUDgsBk58fN46lL1c4kYReUv2cbbkgBpOt?= =?utf-8?q?jeeZJIWZFW6moo3zdr/kfqLVrcq3qE4iW0pmAnMYilgXn+8ynVLBXUENzdZMNtIbA?= =?utf-8?q?cyiPrYOpT5vuPbyjChauC0bhnZ76CbiLf8XAwb/OYK68D40CL5U9mYwprVRj20IFR?= =?utf-8?q?qVsyAE32enh327FT/U1dVtnuGdfK9k/W4iZQyht6sa1K/sB5b/sqTVv6cYYU3XOfp?= =?utf-8?q?gQgfRTEShfJzplhStb6s4vee5pEb7Ea41/i8ImqkzNU9LUGxvS9InlNdibYQoTz6J?= =?utf-8?q?ZkfzzanXIgHS?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65c10bf9-4e13-43d0-9603-08dbd94ad024 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2023 13:19:14.7123 (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: 8rga3Q4mQquvG/Z2IGgAp9isEeYdHmH5EGwasYNMeV6xZ2vXxnwE5EWiFlIsryJuZuWhMvbHazEG677RCXTnmQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8312 There's no need for xen/xenoprof.h to include the arch header when the respective config option is off. The only compensation needed is for svm.c to explicitly include the arch header instead of the common one (matching what vmx.c and traps.c do). With that Arm's header can be deleted, and neither RISC-V nor PPC will need to introduce one. While there also adjust and move the (prior) inclusion of inttypes.h. Signed-off-by: Jan Beulich Reviewed-by: Oleksii Kurochko Reviewed-by: Bertrand Marquis --- a/xen/arch/arm/include/asm/xenoprof.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __ASM_XENOPROF_H__ -#define __ASM_XENOPROF_H__ - -#endif /* __ASM_XENOPROF_H__ */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -38,6 +37,7 @@ #include #include #include +#include #include --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -10,15 +10,15 @@ #ifndef __XEN_XENOPROF_H__ #define __XEN_XENOPROF_H__ -#include -#include - #define PMU_OWNER_NONE 0 #define PMU_OWNER_XENOPROF 1 #define PMU_OWNER_HVM 2 #ifdef CONFIG_XENOPROF +#include +#include + struct domain; struct vcpu; struct cpu_user_regs;