From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423888; cv=pass; d=zohomail.com; s=zohoarc; b=H5WgoOpZ8icdg6vn9RO+92m1gAzFeyrE9fHkvY+Iz3s51bdMqz9d4509VAei85b1XXQJW5TnrPd4Mfi3E2gjJg1PY4WVBN99fVGb+GeqOuvh/1G2eN2I6PhUaRHTLSjWugUb/uCbVuHZ7KwFIMrOp1/CnYoQbF+tJkSEsIgRmf8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423888; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sXU7lCQ0nW2QkCoxel+HoxiYxmOkuqM2DkeV3pZanMc=; b=Qcwu0qyAJGk1XRogJit/njeuxfMqRI70y07K6WGHbqw009cG2s3NXyvejQB7EjXonKFDPHKMVr7m1GHz/1xJ2wzQQNUjgfv/gjEUYJhEJyIAgxbyJr0CAIH5D6Lq6oSf/t6kylsffdgL8Tt02SBLi0uASVvxAsPBoTSNWYSR56w= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748423888896471.2434624013806; Wed, 28 May 2025 02:18:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999059.1379776 (Exim 4.92) (envelope-from ) id 1uKCv2-0001R0-SU; Wed, 28 May 2025 09:17:52 +0000 Received: by outflank-mailman (output) from mailman id 999059.1379776; Wed, 28 May 2025 09:17:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCv2-0001Qt-PY; Wed, 28 May 2025 09:17:52 +0000 Received: by outflank-mailman (input) for mailman id 999059; Wed, 28 May 2025 09:17:52 +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 1uKCv2-0000yL-7I for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:17:52 +0000 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2060c.outbound.protection.outlook.com [2a01:111:f403:200a::60c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9f8c4909-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:17:51 +0200 (CEST) Received: from SN4PR0501CA0097.namprd05.prod.outlook.com (2603:10b6:803:42::14) by IA1PR12MB8309.namprd12.prod.outlook.com (2603:10b6:208:3fe::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.25; Wed, 28 May 2025 09:17:43 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10b6:803:42:cafe::90) by SN4PR0501CA0097.outlook.office365.com (2603:10b6:803:42::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.12 via Frontend Transport; Wed, 28 May 2025 09:17:43 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:17:43 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:17:41 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 9f8c4909-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UMXTis3pwxQNSWBoFylsWj7q/JAk1fn2IIny1B4tX6fffRa/RXMDIFrhQecJ+igRUYRcTJsNuUJBtmuFMOS7+a1UnZn9KFPWQo1BzspM+hMhLtyMATkf1YAkgGA79Tql9qB/WSQNkpQjjb0TEXicPXtzuRovHsTCzI6kIMIU8n6ZpVwdwfe3Ak9fy5v9vj92obzrOgjujpCmW5n0n3guhyCWhmZDoOQpgXZtjjdH48K9tsBJUcmVq2lq+mtonZrHN3+GuxQEJXoXNUCD7UzKBLQGZ/nqs3aPscnHFRlZtAlwayf77GhvycYmXYPsQzVe/L+fet0ds6HJ1FtB23Yadg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=sXU7lCQ0nW2QkCoxel+HoxiYxmOkuqM2DkeV3pZanMc=; b=nX6fRCMpaEE5lZCKx+ClKHSnHK1MTtXJZthP+ojZnJUykPUAHbOao8wj3j3QI3UJGBtxugWrXsQmMVABQOZK82LHqf1cU4fgM1JaWADMMN/oAPp5NriQlnqiXfVfohpQmdb4ZlIVj9OpVqWbXeIe+QhEfPgy/yWpjf7Lx5cEkCm9j1JATzdKliWAqeiCmo7JpnE/HsNvtwsvkS/39/sGZBUZ1GF0DUDVPfSKR1uEgWgQtQCeY06C+849upgJmXdE3sR3w54led7q+wFmjM8Uq4LPZqzKYyWskEMadnMo6uIW9zLEMylxKimXwxf2ksncBdtKaXgxPE5+bcVEFzJ3Lg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sXU7lCQ0nW2QkCoxel+HoxiYxmOkuqM2DkeV3pZanMc=; b=3FPnwI/4Ib0Wvk/v1ZFsP1qvdP/2ozc8TmZ9ibUE8sFHUZNaGiSGQR/Qd22A583q55yokRcLdcWZ9ovz5twdKjDs+712Bo7OyY12M0QXZDN0F6noEQupFPpldh96nqz+nTHnIxvZv4aIjLDYBbrg89u0Ac7rDQgLDyPAtKVayxo= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Jan Beulich , Stefano Stabellini Subject: [PATCH v4 01/20] xen/pmstat: consolidate code into pmstat.c Date: Wed, 28 May 2025 17:16:49 +0800 Message-ID: <20250528091708.390767-2-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|IA1PR12MB8309:EE_ X-MS-Office365-Filtering-Correlation-Id: cd8ff61a-ae5e-4278-ac27-08dd9dc880b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rXlmgzl/JuTuBbb34mj2DJ9uthG2VwG1t+4DjQFr11JcMAMwbdGcgd9pvWIQ?= =?us-ascii?Q?VjO+CsV4kfP1u0IMHJuDQnrXVirBrRwW9YDYKCTiu2c7sbIvbiR/O2wEJZ5Z?= =?us-ascii?Q?mBfeZFcipuNRZ2bKDyM31SawX/ouxax8qTiz7P/LtXcl6eQOsyM8jfqxgG7F?= =?us-ascii?Q?YLKQDmd/5StVWaDIanWqpEUxU9wF/SoroAF+VBofGmCixAxchfdhG5EbnJtp?= =?us-ascii?Q?4CmClFLK8mn983gILY+mgjDGX0OooRYrFsutzrn8SmxYWiq+/w5nAsfFSDBl?= =?us-ascii?Q?xqqjQU+fxLhahZ3Kfz11zveCS2WzsZHBoTXK/Ofccf1EZtEE4jVy/geDLwz8?= =?us-ascii?Q?pdKVa1DVW9zrcprBa/nq9ZzZ7G/d+vhSHA5cF+BzGHwqtwGT0iasNhgz2JMh?= =?us-ascii?Q?LpEq0pmKjO/+bTa7RqF+3+yQKs7oF1ep8Y3u76MwUzpHDwWb9VsevP7JGvh6?= =?us-ascii?Q?2T2hFnelLHi1CgleSPlqB8JvCWJ9MzSu9vSVeNbv9gQ4AOA5SsU3RsbDThNJ?= =?us-ascii?Q?YoNUbTGfnaG67/bNoD5NukFt4oHB+itRxrt2MPEAHQtIxw78nRbKYYnWChi2?= =?us-ascii?Q?+BbNeeg8cwDHpDGEayFPCibXtlDJ7ccezGsOcNkjEm7t8N6d5OAzD1wWfxmr?= =?us-ascii?Q?ddk9shRaHIMMze3c62LpG1TtnBAr0QEW23kq+ImPJ+2C7dQ5A3OEgkuAHxdb?= =?us-ascii?Q?dpKNBXU9Tm8X4p2SIX0uUDauq5iMgOrOkWkoKR5mXbBDRHO5OQN7G06I4IWm?= =?us-ascii?Q?fiSxnewpbqNaCeTckQGWkTc3MHO2NdUkuFQ4hlZ9/1uCyPKDQYAzOznyYNIA?= =?us-ascii?Q?pUzabqRtSzFVEC1b+idyNfB1lVb9wSYJlGY8T+fwgpC3VTxUa4a/+xOhXlB+?= =?us-ascii?Q?L7O9j6MdUMnLATlUcX/jzP1drr4BMCzmZ/xVwpwqHNvcX/82zZpKbuzSjqzM?= =?us-ascii?Q?MGEo2aoWv1xMAqVcuAYZ9uPLS0/IyE1/OnbYmFenSZGmzib4LsZZwYclNjr0?= =?us-ascii?Q?MIi6y5V9FW+1gJDegmbBhUorWWojonbn2X/UI5DRzy9lrmLxvgHjwfEPnJu5?= =?us-ascii?Q?DDHpc4btj32a33bm+csHQZn0U6mzBGtyyOL8U9a1XPUbx1LZmEqBRBt5DfXo?= =?us-ascii?Q?lPUhmfutUDrg0Se/CIlKe9rWuZdgxNEuYEhk1q27/jucgajrbdzk2WJeqGco?= =?us-ascii?Q?4KagbO+iNEmPpKjy7zcW7MaH3q1T3Jm29FsdX889fKhvUjTWPcsDFfu48dmq?= =?us-ascii?Q?5BWH9hmSOA7p2cNHMNi8AOLDPdAwKnKaVeenbDEa4kouhGEYOOy0mSxYd3E0?= =?us-ascii?Q?98gjwevFAxpiRE1Sk3AkUu3O74we41IN2R4sAu6EUgE2pIldPPkN4Uykv7zZ?= =?us-ascii?Q?68Wb6p3kRDvyDalTsbAA0SXnsOT2htiFrkwVmFOAT9WiXZHznsIxOV0NcIi8?= =?us-ascii?Q?Joc6mGR6vlTWyld5Mo+AbHerNVwmAjIMwh4h0FhuKKzHKp5LhUAIcToRWI1g?= =?us-ascii?Q?Cs67oplEWRbUE2P3ppZjMQGcejLWLwq302Iq?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:17:43.4104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cd8ff61a-ae5e-4278-ac27-08dd9dc880b3 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8309 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423891242116600 Content-Type: text/plain; charset="utf-8" We move the following functions into drivers/acpi/pmstat.c, as they are all designed for performance statistic: - cpufreq_residency_update() - cpufreq_statistic_reset() - cpufreq_statistic_update() - cpufreq_statistic_init() - cpufreq_statistic_exit() Consequently, variable "cpufreq_statistic_data" and "cpufreq_statistic_lock" shall become static. We also move out acpi_set_pdc_bits(), as it is the handler for sub-hypercall XEN_PM_PDC, and shall stay with the other handlers together in drivers/cpufreq/cpufreq.c. Various style corrections shall be applied at the same time while moving th= ese functions, including: - brace for if() and for() shall live at a seperate line - add extra space before and after bracket of if() and for() - use array notation - convert uint32_t into unsigned int - convert u32 into uint32_t Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- v2 -> v3: - brace for if() and for() shall live at a seperate line - use array notation - convert uint32_t into unsigned int --- v3 -> v4: - move ahead and could go in right away --- xen/drivers/acpi/pmstat.c | 202 ++++++++++++++++++---- xen/drivers/cpufreq/cpufreq.c | 31 ++++ xen/drivers/cpufreq/utility.c | 163 ----------------- xen/include/acpi/cpufreq/cpufreq.h | 2 - xen/include/acpi/cpufreq/processor_perf.h | 4 - 5 files changed, 201 insertions(+), 201 deletions(-) diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index c51b9ca358..abfdc45cc2 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -41,7 +41,176 @@ #include #include =20 -DEFINE_PER_CPU_READ_MOSTLY(struct pm_px *, cpufreq_statistic_data); +static DEFINE_PER_CPU_READ_MOSTLY(struct pm_px *, cpufreq_statistic_data); + +static DEFINE_PER_CPU(spinlock_t, cpufreq_statistic_lock); + +/********************************************************************* + * Px STATISTIC INFO * + *********************************************************************/ + +static void cpufreq_residency_update(unsigned int cpu, uint8_t state) +{ + uint64_t now, total_idle_ns; + int64_t delta; + struct pm_px *pxpt =3D per_cpu(cpufreq_statistic_data, cpu); + + total_idle_ns =3D get_cpu_idle_time(cpu); + now =3D NOW(); + + delta =3D (now - pxpt->prev_state_wall) - + (total_idle_ns - pxpt->prev_idle_wall); + + if ( likely(delta >=3D 0) ) + pxpt->u.pt[state].residency +=3D delta; + + pxpt->prev_state_wall =3D now; + pxpt->prev_idle_wall =3D total_idle_ns; +} + +void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) +{ + struct pm_px *pxpt; + const struct processor_pminfo *pmpt =3D processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock =3D + &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt =3D per_cpu(cpufreq_statistic_data, cpu); + if ( !pxpt || !pmpt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + pxpt->u.last =3D from; + pxpt->u.cur =3D to; + pxpt->u.pt[to].count++; + + cpufreq_residency_update(cpu, from); + + pxpt->u.trans_pt[from * pmpt->perf.state_count + to]++; + + spin_unlock(cpufreq_statistic_lock); +} + +int cpufreq_statistic_init(unsigned int cpu) +{ + unsigned int i, count; + struct pm_px *pxpt; + const struct processor_pminfo *pmpt =3D processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock =3D &per_cpu(cpufreq_statistic_lock= , cpu); + + spin_lock_init(cpufreq_statistic_lock); + + if ( !pmpt ) + return -EINVAL; + + spin_lock(cpufreq_statistic_lock); + + pxpt =3D per_cpu(cpufreq_statistic_data, cpu); + if ( pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return 0; + } + + count =3D pmpt->perf.state_count; + + pxpt =3D xzalloc(struct pm_px); + if ( !pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + per_cpu(cpufreq_statistic_data, cpu) =3D pxpt; + + pxpt->u.trans_pt =3D xzalloc_array(uint64_t, count * count); + if ( !pxpt->u.trans_pt ) + { + xfree(pxpt); + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + + pxpt->u.pt =3D xzalloc_array(struct pm_px_val, count); + if ( !pxpt->u.pt ) + { + xfree(pxpt->u.trans_pt); + xfree(pxpt); + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + + pxpt->u.total =3D pmpt->perf.state_count; + pxpt->u.usable =3D pmpt->perf.state_count - pmpt->perf.platform_limit; + + for ( i =3D 0; i < pmpt->perf.state_count; i++ ) + pxpt->u.pt[i].freq =3D pmpt->perf.states[i].core_frequency; + + pxpt->prev_state_wall =3D NOW(); + pxpt->prev_idle_wall =3D get_cpu_idle_time(cpu); + + spin_unlock(cpufreq_statistic_lock); + + return 0; +} + +void cpufreq_statistic_exit(unsigned int cpu) +{ + struct pm_px *pxpt; + spinlock_t *cpufreq_statistic_lock =3D &per_cpu(cpufreq_statistic_lock= , cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt =3D per_cpu(cpufreq_statistic_data, cpu); + if ( !pxpt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + xfree(pxpt->u.trans_pt); + xfree(pxpt->u.pt); + xfree(pxpt); + per_cpu(cpufreq_statistic_data, cpu) =3D NULL; + + spin_unlock(cpufreq_statistic_lock); +} + +static void cpufreq_statistic_reset(unsigned int cpu) +{ + unsigned int i, j, count; + struct pm_px *pxpt; + const struct processor_pminfo *pmpt =3D processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock =3D &per_cpu(cpufreq_statistic_lock= , cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt =3D per_cpu(cpufreq_statistic_data, cpu); + if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) + { + spin_unlock(cpufreq_statistic_lock); + return; + } + + count =3D pmpt->perf.state_count; + + for ( i =3D 0; i < count; i++ ) + { + pxpt->u.pt[i].residency =3D 0; + pxpt->u.pt[i].count =3D 0; + + for ( j =3D 0; j < count; j++ ) + pxpt->u.trans_pt[i * count + j] =3D 0; + } + + pxpt->prev_state_wall =3D NOW(); + pxpt->prev_idle_wall =3D get_cpu_idle_time(cpu); + + spin_unlock(cpufreq_statistic_lock); +} =20 /* * Get PM statistic info @@ -518,34 +687,3 @@ int do_pm_op(struct xen_sysctl_pm_op *op) =20 return ret; } - -int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32) pdc) -{ - u32 bits[3]; - int ret; - - if ( copy_from_guest(bits, pdc, 2) ) - ret =3D -EFAULT; - else if ( bits[0] !=3D ACPI_PDC_REVISION_ID || !bits[1] ) - ret =3D -EINVAL; - else if ( copy_from_guest_offset(bits + 2, pdc, 2, 1) ) - ret =3D -EFAULT; - else - { - u32 mask =3D 0; - - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_CX ) - mask |=3D ACPI_PDC_C_MASK | ACPI_PDC_SMP_C1PT; - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_PX ) - mask |=3D ACPI_PDC_P_MASK | ACPI_PDC_SMP_C1PT; - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_TX ) - mask |=3D ACPI_PDC_T_MASK | ACPI_PDC_SMP_C1PT; - bits[2] &=3D (ACPI_PDC_C_MASK | ACPI_PDC_P_MASK | ACPI_PDC_T_MASK | - ACPI_PDC_SMP_C1PT) & ~mask; - ret =3D arch_acpi_set_pdc_bits(acpi_id, bits, mask); - } - if ( !ret && __copy_to_guest_offset(pdc, 2, bits + 2, 1) ) - ret =3D -EFAULT; - - return ret; -} diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 19e2992335..c2d777e0ec 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -588,6 +588,37 @@ out: return ret; } =20 +int acpi_set_pdc_bits(unsigned int acpi_id, XEN_GUEST_HANDLE(uint32) pdc) +{ + uint32_t bits[3]; + int ret; + + if ( copy_from_guest(bits, pdc, 2) ) + ret =3D -EFAULT; + else if ( bits[0] !=3D ACPI_PDC_REVISION_ID || !bits[1] ) + ret =3D -EINVAL; + else if ( copy_from_guest_offset(bits + 2, pdc, 2, 1) ) + ret =3D -EFAULT; + else + { + uint32_t mask =3D 0; + + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_CX ) + mask |=3D ACPI_PDC_C_MASK | ACPI_PDC_SMP_C1PT; + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_PX ) + mask |=3D ACPI_PDC_P_MASK | ACPI_PDC_SMP_C1PT; + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_TX ) + mask |=3D ACPI_PDC_T_MASK | ACPI_PDC_SMP_C1PT; + bits[2] &=3D (ACPI_PDC_C_MASK | ACPI_PDC_P_MASK | ACPI_PDC_T_MASK | + ACPI_PDC_SMP_C1PT) & ~mask; + ret =3D arch_acpi_set_pdc_bits(acpi_id, bits, mask); + } + if ( !ret && __copy_to_guest_offset(pdc, 2, bits + 2, 1) ) + ret =3D -EFAULT; + + return ret; +} + static void cpufreq_cmdline_common_para(struct cpufreq_policy *new_policy) { if (usr_max_freq) diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index 309c0682cf..723045b240 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -35,169 +35,6 @@ struct cpufreq_driver __read_mostly cpufreq_driver; struct processor_pminfo *__read_mostly processor_pminfo[NR_CPUS]; DEFINE_PER_CPU_READ_MOSTLY(struct cpufreq_policy *, cpufreq_cpu_policy); =20 -DEFINE_PER_CPU(spinlock_t, cpufreq_statistic_lock); - -/********************************************************************* - * Px STATISTIC INFO * - *********************************************************************/ - -void cpufreq_residency_update(unsigned int cpu, uint8_t state) -{ - uint64_t now, total_idle_ns; - int64_t delta; - struct pm_px *pxpt =3D per_cpu(cpufreq_statistic_data, cpu); - - total_idle_ns =3D get_cpu_idle_time(cpu); - now =3D NOW(); - - delta =3D (now - pxpt->prev_state_wall) -=20 - (total_idle_ns - pxpt->prev_idle_wall); - - if ( likely(delta >=3D 0) ) - pxpt->u.pt[state].residency +=3D delta; - - pxpt->prev_state_wall =3D now; - pxpt->prev_idle_wall =3D total_idle_ns; -} - -void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) -{ - struct pm_px *pxpt; - struct processor_pminfo *pmpt =3D processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock =3D=20 - &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt =3D per_cpu(cpufreq_statistic_data, cpu); - if ( !pxpt || !pmpt ) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - pxpt->u.last =3D from; - pxpt->u.cur =3D to; - pxpt->u.pt[to].count++; - - cpufreq_residency_update(cpu, from); - - (*(pxpt->u.trans_pt + from * pmpt->perf.state_count + to))++; - - spin_unlock(cpufreq_statistic_lock); -} - -int cpufreq_statistic_init(unsigned int cpu) -{ - uint32_t i, count; - struct pm_px *pxpt; - const struct processor_pminfo *pmpt =3D processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock =3D &per_cpu(cpufreq_statistic_lock= , cpu); - - spin_lock_init(cpufreq_statistic_lock); - - if ( !pmpt ) - return -EINVAL; - - spin_lock(cpufreq_statistic_lock); - - pxpt =3D per_cpu(cpufreq_statistic_data, cpu); - if ( pxpt ) { - spin_unlock(cpufreq_statistic_lock); - return 0; - } - - count =3D pmpt->perf.state_count; - - pxpt =3D xzalloc(struct pm_px); - if ( !pxpt ) { - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.trans_pt =3D xzalloc_array(uint64_t, count * count); - if (!pxpt->u.trans_pt) { - xfree(pxpt); - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.pt =3D xzalloc_array(struct pm_px_val, count); - if (!pxpt->u.pt) { - xfree(pxpt->u.trans_pt); - xfree(pxpt); - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.total =3D count; - pxpt->u.usable =3D count - pmpt->perf.platform_limit; - - for ( i =3D 0; i < count; i++ ) - pxpt->u.pt[i].freq =3D pmpt->perf.states[i].core_frequency; - - pxpt->prev_state_wall =3D NOW(); - pxpt->prev_idle_wall =3D get_cpu_idle_time(cpu); - - per_cpu(cpufreq_statistic_data, cpu) =3D pxpt; - - spin_unlock(cpufreq_statistic_lock); - - return 0; -} - -void cpufreq_statistic_exit(unsigned int cpu) -{ - struct pm_px *pxpt; - spinlock_t *cpufreq_statistic_lock =3D &per_cpu(cpufreq_statistic_lock= , cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt =3D per_cpu(cpufreq_statistic_data, cpu); - if (!pxpt) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - xfree(pxpt->u.trans_pt); - xfree(pxpt->u.pt); - xfree(pxpt); - per_cpu(cpufreq_statistic_data, cpu) =3D NULL; - - spin_unlock(cpufreq_statistic_lock); -} - -void cpufreq_statistic_reset(unsigned int cpu) -{ - uint32_t i, j, count; - struct pm_px *pxpt; - const struct processor_pminfo *pmpt =3D processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock =3D &per_cpu(cpufreq_statistic_lock= , cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt =3D per_cpu(cpufreq_statistic_data, cpu); - if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - count =3D pmpt->perf.state_count; - - for (i=3D0; i < count; i++) { - pxpt->u.pt[i].residency =3D 0; - pxpt->u.pt[i].count =3D 0; - - for (j=3D0; j < count; j++) - *(pxpt->u.trans_pt + i*count + j) =3D 0; - } - - pxpt->prev_state_wall =3D NOW(); - pxpt->prev_idle_wall =3D get_cpu_idle_time(cpu); - - spin_unlock(cpufreq_statistic_lock); -} - - /********************************************************************* * FREQUENCY TABLE HELPERS * *********************************************************************/ diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/= cpufreq.h index a3c84143af..241117a9af 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -20,8 +20,6 @@ =20 #include "processor_perf.h" =20 -DECLARE_PER_CPU(spinlock_t, cpufreq_statistic_lock); - extern bool cpufreq_verbose; =20 enum cpufreq_xen_opt { diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/c= pufreq/processor_perf.h index 301104e16f..6de43f8602 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -9,11 +9,9 @@ =20 unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); -void cpufreq_residency_update(unsigned int cpu, uint8_t state); void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to); int cpufreq_statistic_init(unsigned int cpu); void cpufreq_statistic_exit(unsigned int cpu); -void cpufreq_statistic_reset(unsigned int cpu); =20 int cpufreq_limit_change(unsigned int cpu); =20 @@ -56,7 +54,5 @@ struct pm_px { uint64_t prev_idle_wall; }; =20 -DECLARE_PER_CPU(struct pm_px *, cpufreq_statistic_data); - int cpufreq_cpu_init(unsigned int cpu); #endif /* __XEN_PROCESSOR_PM_H__ */ --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423887; cv=pass; d=zohomail.com; s=zohoarc; b=kaWIa9Hks6ZYgs2Cp9viH+PTBjs6Gce1EEEsl9J0tENnro5FpMXa+Uam4fsyztnY3lHHOS8SY/Vc1qe769a1/sgnuj9rMn5QaIQdddknyO7eO4QjrIY1++dq2Ycuwo8ZXuicy46cUE1rWytx9u8YGTyIDUd800PJDK17Egi6G5w= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423887; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/GfDRm9JhuMPhiHwATAYzNDZZibb4ZAY1VdgVn0JUz8=; b=CTZ7zj/lpf0VMnpXkcn6Ju7chXQwjKYce99qtI00dyzTb54kyC1D9IRHoJlE8IHWk3UmU5dLFjIK2rF4yyLplwIRoJbWmurkx9TKbZILSMdyCGJE3ohXSffvEhA2XK93WRM6g14v/dveKFISkxXxgEzF1D07BZwsdkYSLsbEuic= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17484238876001000.1510966472688; Wed, 28 May 2025 02:18:07 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999058.1379765 (Exim 4.92) (envelope-from ) id 1uKCv1-0001CJ-Gc; Wed, 28 May 2025 09:17:51 +0000 Received: by outflank-mailman (output) from mailman id 999058.1379765; Wed, 28 May 2025 09:17:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCv1-0001CC-Dp; Wed, 28 May 2025 09:17:51 +0000 Received: by outflank-mailman (input) for mailman id 999058; Wed, 28 May 2025 09:17:50 +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 1uKCv0-0000yL-9S for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:17:50 +0000 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2060d.outbound.protection.outlook.com [2a01:111:f403:2418::60d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9f7c8793-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:17:49 +0200 (CEST) Received: from SN4PR0501CA0113.namprd05.prod.outlook.com (2603:10b6:803:42::30) by CY1PR12MB9700.namprd12.prod.outlook.com (2603:10b6:930:108::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.26; Wed, 28 May 2025 09:17:46 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10b6:803:42:cafe::92) by SN4PR0501CA0113.outlook.office365.com (2603:10b6:803:42::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.19 via Frontend Transport; Wed, 28 May 2025 09:17:46 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:17:46 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:17:43 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 9f7c8793-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Xa4WyhsDYigSBWc43dWjwF+tfVdvQhmxB7TP16qn6/NXh/edWcpBYP9Two97KfEEVzf9Vdd0S4HuSqrxbFzvOB3W+D4mRHzudWwaDX5CZCGE2Gv6uz0rldlPhln0VRPEJZ+Wmzb3+4KpGIZo8loDYehqOXsKZkx2KFzFctA8UIj0feI92t5KGTWsAM6X8H8BIYLLGtkZCfnH2V9jO10iKXQ/KmHcwwsX7uXIHWE7ckyuaSVg9SAmDNCb3ys5d+EnsA7I2hQFtrxhKYehkn1CWTZ/8fLiw4ElWYG5/tk5/idr4RBIbmDiouWF+9OYwkr+if9MCJda7oG2w1UieXzDZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=/GfDRm9JhuMPhiHwATAYzNDZZibb4ZAY1VdgVn0JUz8=; b=kMyJEdVYQZyYlTmiEx1g1uqD5MGXhSDga7jVV9SfchVEXB+iZF8zRijNR5eAUjeQeKVUX76+JNLdKXxVP4/+ncVXLqRAt0O0Hkme86Ck4AcRcsFpvc57mrWNX+Eo4jmZy11Sp3KqTRb6aUh2ViN7SfhKCNM+p/YWPxgg0jGXJ86v5c/sbZqUOzD+38AW0ungPSK20OoHVHG6X80Vsyjkpkaaiuq1cQbkr061XCGX1uG8ibL0OANOQuuAZ3XdDvfXWUAQuMpUkFhwkcI6MK2lGsNID2BV24YYYH8Otd7CICYkbgyIpAnvp7ph6DXkykhlBL20qmGP26RFwD70wE/oZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/GfDRm9JhuMPhiHwATAYzNDZZibb4ZAY1VdgVn0JUz8=; b=NXGgtCc9eS48V3rPYpVVKp3uhizozXIWQLNuE1VtUzGXQBpJeKdC8GHrVj9JCo18Tpq6bmBx5Kimg1yKZT8etHpHe1KbNSMDlUr4gVbcmfG+A6VmlW1wMAIMsJlyMkUWBmhiXiR6cs2KzpGJGgfmVSw6AI/9Fm9TOhgOu9YsoQ0= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , "Julien Grall" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v4 02/20] xen: make avail_domheap_pages() inlined into get_outstanding_claims() Date: Wed, 28 May 2025 17:16:50 +0800 Message-ID: <20250528091708.390767-3-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|CY1PR12MB9700:EE_ X-MS-Office365-Filtering-Correlation-Id: f5d71637-5c8f-4e40-1214-08dd9dc8824a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Vonb12ej2Fs1zx9gJIj0+5j1J8VgLT/WcogGN8yvGteMatyScBJPT7ppeJD6?= =?us-ascii?Q?DL7HH8yYCGB5BFvZSTOee6IbGNjllSd2JLFy5LRKqvfUHQdJ1KK0kv3U3ogW?= =?us-ascii?Q?lMCwZek4U2u+X1Zg53bbQXoNmwu95UaPNivV6k78HdnbPLr/n7IftoJxyLqK?= =?us-ascii?Q?KfNeDq4+dNCBpmWiUaVK+BjBoPY9kG4TFm7DR8YmESbeaP1PB4TetF4jeyTE?= =?us-ascii?Q?4d2epXEwb/rTDfPsfnkRDawgm8AQLSe/r8tFyYTNbErfrBgg3gv9WKiHdelJ?= =?us-ascii?Q?VWK0+0HaJue2R5tk1mChBMPR0SOyd6tBM1QEQqjF5hJt8/jjexbtyhgSRFJP?= =?us-ascii?Q?2735X0h1qctK2OB+YTG74psC0yeZfC+qkkGGiPC0wfI/zKycBGjnUK/hra2R?= =?us-ascii?Q?1oX3xbIUrh+QqvboopPQ/iB0G7RfyxEQyco8vBXgdrxJxwnswC8iSRFqHnB0?= =?us-ascii?Q?TuyhLhjb40WqIM9oJsiQf+cJH6G0KmS/is0OpFw/i983z+BmwVn7HouzqJRS?= =?us-ascii?Q?1/6L/6D60fJuAtOd5wD4HEUe46gULTh5A26HUQLoUZAkLC0KbJ/rP12BDiQ4?= =?us-ascii?Q?ZuP0p0na+fg7pkYMPFgkZsHLSeihC4UTvRoDgn718eZ1vlsz9Y3fUFUpCQoy?= =?us-ascii?Q?pFA96ZKYSMRQVyJtCNGFAbNpQSoCDLz5nosiZvJ2yMaP909nD+YIIjuaa4mE?= =?us-ascii?Q?cf+vCMPFeKn+S7+GoDaG686Y0qfe/bQaebyF7kjo4V4HjUkWSiONZ9Sra2YP?= =?us-ascii?Q?sLlP9FZS1wbVk97CXrV4BlvmONIlvUH2+RoVLq7I/tVRvC+aMKT1exRt9t9k?= =?us-ascii?Q?MKtoRimpky/SEv+BgvRZ2jWq8yo/16G/oWOw+rCLIKqWW5pi0869bgh/PEs9?= =?us-ascii?Q?pLfsa+TooSwR4MNgZl/ZaiUEo57wQT7YCOaFnUbbFSSQbAt3Kfgd5ak/18hV?= =?us-ascii?Q?CnwX1x281xzKNTcUWQ3PqQ/O5RIcVN4Sxb0JYHq5ZHilU0AW9RnXM6sJjIxm?= =?us-ascii?Q?AkIO3Jk4CqvcdEsnxB/9qGT4RgpWs43gByKn/zWYIxpbaoFypvDpKfYeycHy?= =?us-ascii?Q?NiJmnanaFxLJc0i6tFVMtIW3euesFtuoEkePoGYYKrmRvPDQBlE/ajo/5Irv?= =?us-ascii?Q?cvTuWr7CDh9V6AV9aesJ7B8JJTJDO36FFsatRVTI3LhMzZavr/szG48ia1P7?= =?us-ascii?Q?01HRIt47zPXgCP+Db8Bsx2l3OZOwe1asxrLyjFZz4iyr1cp8/hnh2u+cK5fd?= =?us-ascii?Q?pOtJNb3iyLlhj+XYjDCMf0fbpVHLBjihkpExRp/f/ooUNtn1T/ep7yazKvUi?= =?us-ascii?Q?SU96wvpssKEAb/Oqce3UAf0apO9yc2YWK2l2J3K+/q9EyOayHND7SB2+h9sm?= =?us-ascii?Q?GFjgGrsCHg3DkyK9cWjIIMTdc3BzsCqHq1+wJbZeK1ZaT+uy0whlGOyl9INB?= =?us-ascii?Q?CX+ngVQUg8o0jyvKp2EhHa7lY9WcwF7ceXqynPkdZkAkkqoLSs4kWzgOqk7r?= =?us-ascii?Q?szkIaTeTBBcuuKpnF9PyPr4b9eaF+DofX+rP?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:17:46.0745 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5d71637-5c8f-4e40-1214-08dd9dc8824a X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB9700 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423889144116600 Content-Type: text/plain; charset="utf-8" Function avail_domheap_pages() is only invoked by get_outstanding_claims(), so it could be inlined into get_outstanding_claims(). Move up avail_heap_pages() to avoid declaration before get_outstanding_claims(). Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v1 -> v2: - let avail_domheap_pages() being inlined into its sole caller - move up avail_heap_pages() --- v2 -> v3: - change the title --- v4 -> v5: - move ahead and could go in right away --- xen/common/page_alloc.c | 51 ++++++++++++++++++----------------------- xen/include/xen/mm.h | 1 - 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index e57a287133..b204f22f50 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -488,6 +488,27 @@ static long total_avail_pages; static DEFINE_SPINLOCK(heap_lock); static long outstanding_claims; /* total outstanding claims by all domains= */ =20 +static unsigned long avail_heap_pages( + unsigned int zone_lo, unsigned int zone_hi, unsigned int node) +{ + unsigned int i, zone; + unsigned long free_pages =3D 0; + + if ( zone_hi >=3D NR_ZONES ) + zone_hi =3D NR_ZONES - 1; + + for_each_online_node(i) + { + if ( !avail[i] ) + continue; + for ( zone =3D zone_lo; zone <=3D zone_hi; zone++ ) + if ( (node =3D=3D -1) || (node =3D=3D i) ) + free_pages +=3D avail[i][zone]; + } + + return free_pages; +} + unsigned long domain_adjust_tot_pages(struct domain *d, long pages) { ASSERT(rspin_is_locked(&d->page_alloc_lock)); @@ -584,7 +605,7 @@ void get_outstanding_claims(uint64_t *free_pages, uint6= 4_t *outstanding_pages) { spin_lock(&heap_lock); *outstanding_pages =3D outstanding_claims; - *free_pages =3D avail_domheap_pages(); + *free_pages =3D avail_heap_pages(MEMZONE_XEN + 1, NR_ZONES - 1, -1); spin_unlock(&heap_lock); } =20 @@ -1962,27 +1983,6 @@ static void init_heap_pages( } } =20 -static unsigned long avail_heap_pages( - unsigned int zone_lo, unsigned int zone_hi, unsigned int node) -{ - unsigned int i, zone; - unsigned long free_pages =3D 0; - - if ( zone_hi >=3D NR_ZONES ) - zone_hi =3D NR_ZONES - 1; - - for_each_online_node(i) - { - if ( !avail[i] ) - continue; - for ( zone =3D zone_lo; zone <=3D zone_hi; zone++ ) - if ( (node =3D=3D -1) || (node =3D=3D i) ) - free_pages +=3D avail[i][zone]; - } - - return free_pages; -} - /************************* * COLORED SIDE-ALLOCATOR * @@ -2796,13 +2796,6 @@ unsigned long avail_domheap_pages_region( return avail_heap_pages(zone_lo, zone_hi, node); } =20 -unsigned long avail_domheap_pages(void) -{ - return avail_heap_pages(MEMZONE_XEN + 1, - NR_ZONES - 1, - -1); -} - unsigned long avail_node_heap_pages(unsigned int nodeid) { return avail_heap_pages(MEMZONE_XEN, NR_ZONES -1, nodeid); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index e89942b87d..93c037d618 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -141,7 +141,6 @@ struct page_info *alloc_domheap_pages( void free_domheap_pages(struct page_info *pg, unsigned int order); unsigned long avail_domheap_pages_region( unsigned int node, unsigned int min_width, unsigned int max_width); -unsigned long avail_domheap_pages(void); unsigned long avail_node_heap_pages(unsigned int nodeid); #define alloc_domheap_page(d,f) (alloc_domheap_pages(d,0,f)) #define free_domheap_page(p) (free_domheap_pages(p,0)) --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423896; cv=pass; d=zohomail.com; s=zohoarc; b=PXnmnHzZ7L1Dq5jeSqUzOC0hjAiT9h2l2J1wNKy9P+k2dBRUbPyVgyRol1m2WmyCqpYURbL6h1ItVzJx1k7rSfO5bAT7JParokbIoP5UnoCy8/jGhl4AHzAW/vcqjxsnpQE9iENeMXwI0V0Uy0p0CuuF4RvhIVHDq4lUqqEgeWQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423896; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nEQJjo/wnWVr8f3Aer+P6n+okT/uMW1cOMLdB+X33/0=; b=G3KASbYwp+xZtuVT9LMciySFe5wryAC+ijn+QG3f6jsDaWxmBQDBx7lr4ZQfIlVdA35flBnayaLeYCte+FSXwNXsQ7fC2oByuKPMjy8l40w7jL+H/e/ypqiMd5/0Oxuk4C2VCHbPX6nduBBizBbJHkEpVwA+Nu2dUTDrd4EJYmo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748423896733810.0257676871225; Wed, 28 May 2025 02:18:16 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999061.1379786 (Exim 4.92) (envelope-from ) id 1uKCv9-0001lk-3H; Wed, 28 May 2025 09:17:59 +0000 Received: by outflank-mailman (output) from mailman id 999061.1379786; Wed, 28 May 2025 09:17: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 1uKCv9-0001lY-0e; Wed, 28 May 2025 09:17:59 +0000 Received: by outflank-mailman (input) for mailman id 999061; Wed, 28 May 2025 09:17:57 +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 ) id 1uKCv7-0001jE-HX for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:17:57 +0000 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061c.outbound.protection.outlook.com [2a01:111:f403:2412::61c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a2b298c8-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:17:55 +0200 (CEST) Received: from SN4PR0501CA0121.namprd05.prod.outlook.com (2603:10b6:803:42::38) by SJ2PR12MB8692.namprd12.prod.outlook.com (2603:10b6:a03:543::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Wed, 28 May 2025 09:17:49 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10b6:803:42:cafe::56) by SN4PR0501CA0121.outlook.office365.com (2603:10b6:803:42::38) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.13 via Frontend Transport; Wed, 28 May 2025 09:17:49 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:17:48 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:17:45 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: a2b298c8-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vtELuvqUjmE9If4ZLTj9dHDlGd8BKwsf8YatmKSpKFs/jauaoeTs5j4FYzcG+2yaXz+MZWwFYqO2O2bek4KEkMq0gHtBDFUtejcyYI/7JN8IcAU/g6jpreIRWWnLdVJBX1zRB2FrC85M6t3UnvvScv1331y9vEidtL8GG+/kLm9Snh4hBs8gNlN3l8FE2usr4a2pDK4LhcXTrq+Mh9woNkCx3+k89uAaeVbT7VdKAgY2eWuQSs8Ka3lEzvyVQe/+UsTV7cAdEW4+h/t6nVyxwmJKD3ZK9qjPEESY1xTp/a3IntsuVPwF50/JN/793D+sdMGNBSrvVzHAmNP4kigkNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=nEQJjo/wnWVr8f3Aer+P6n+okT/uMW1cOMLdB+X33/0=; b=e+IayQh7+7SRG97fa7AEBpXj6O4aMkQ/BqQ+N0q/kkMW5Zl+ixi3iRwwZWCoNdZt+pycVQ4zZahj/0/7i4Nkck++gT1LMpHAEr1vB5AxAyJw431LBbNkoc+vEFVqDcen5uS0nh33Or50lS0UjE13xYHpu2IxnsCSAwamC4S251p7aSIVf1mV8H6OuLaALBWF/D9Trfp/qaDgwAISjbbZQhVaHjm2skyMGfp7T6xdCUPGhDE6sQTd++/DuY6OoyQevIt3FSTsR+W2vV6FSeVdqlizXko+tc+vltcTGWdz+9indY0IWfanECdlDSnkIdoHLoims5WLmvwfMbcEbrQJtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nEQJjo/wnWVr8f3Aer+P6n+okT/uMW1cOMLdB+X33/0=; b=aH/fSU08nHzBl9BGD3LLYbd2pN99DyJvhHz0VOvtbIXKka8fqfde9h7juLg9dbG22TjTn6P9/cSgq4UZ/wZ1jPCtsI46x9HXk0VjVXXWuhR6OAraE1qoE4KY9S4grX2JDfRkwbDRzjBXiAQQIcgRP6K/2e9qPp4j1Y8g0ydYbTY= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Anthony PERARD , Michal Orzel , "Julien Grall" , Stefano Stabellini Subject: [PATCH v4 03/20] xen/x86: remove "depends on !PV_SHIM_EXCLUSIVE" Date: Wed, 28 May 2025 17:16:51 +0800 Message-ID: <20250528091708.390767-4-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|SJ2PR12MB8692:EE_ X-MS-Office365-Filtering-Correlation-Id: ed927bc3-95d0-4425-c329-08dd9dc88401 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?66uNqdhPZh/3PfWpHzmKH1eZNta+L392t+5cXqaM0zP+jx8Ex+6/GutSCw12?= =?us-ascii?Q?oNUV/24Tp9xNq8MNaNgSamMaVSbC2KzHV+xsb7jVBSn95eMGsIUnUc0nc2di?= =?us-ascii?Q?f39XOR/Fbx4cU/gR+AxiUB2gi2uEztxxvW/ooaNxF4D82wrezM/qEZDdkwH9?= =?us-ascii?Q?3bMRvU4JCOZ7g0Ieh0D49Lw/81ukQduUqp/xekjXzHmkvpjOeh6934AStalN?= =?us-ascii?Q?b+8NoEQhsBBR10tin7tUmIhSAbyixz9EHGeZoAMyVSn0ZgH35an8UYnxy4FQ?= =?us-ascii?Q?U42I3/U3/ZfWJgymbYytfXBq0a5ZcwTPbf2ZQDFZGa9/kdouRNYBZV1rCzzM?= =?us-ascii?Q?5amv4f+U4wBJvql/rNOqDX/lzBAvBthLRaqcsYmOhSqy7dXgqKkdct+JGAhF?= =?us-ascii?Q?Fe7dDynSxzO9rgF3hGWskaON7mj2tp9bfHH5740D1bDh7ewhOJhHyDm+rLfq?= =?us-ascii?Q?Gogj9HmNp9Q/SacOOomzqiZOxXDSId9JeKrjfnYSELsCvqeyZkBjJwvCtlQv?= =?us-ascii?Q?il9PQCQavaTjLBK62QZnpUzfl9KB+35WIeDk46xvwMel2ZHMXAcK+vNFXFqG?= =?us-ascii?Q?fhR391TNX6WwJRNUH06wRSxYnQbmZVkehAteCZbKTwTWegsHe0vBNyk3Jnv6?= =?us-ascii?Q?WJ1qHaUxCrF+9HXJ0rGOTj+KTJKwf5vh5cfv6+4ONkdk+eae0GKslNMCsKnV?= =?us-ascii?Q?tN1b7lrqjUfm+f0TGVdHTQAVq3juPXDPzHCyQVb52ArxSHuBCLtjKtTZcQqb?= =?us-ascii?Q?H8BUuofxOynNU7Jig59lEykIR64GoUU7moT/aRU/MZfn3gzyJWy0m+K1faMe?= =?us-ascii?Q?oEqFZVokLyMg4nPG53Zl5hKdX4r9AsjV1qNeqbpxtKEy2/nlpEb0CfSnSf4L?= =?us-ascii?Q?Eo/OFCIkg+etH5fbvlYwXXA2m1Bfs6Px2Df3bUK4ge6aoY/JRgcW+1vvLZO9?= =?us-ascii?Q?imMDSGFLtpsCuks5RLIjTmIRho+RYHQ9HPKZndH8fV54mK12nTw3mob2AcZu?= =?us-ascii?Q?HCZ2FTH1BmgnV7rBz/jtGEJfEzDhHY40GOyMhB/eR1PMdDFRpuXCcKW1CvD1?= =?us-ascii?Q?jGODzMEdkFiHgOlL+iU6lRsyTUVKrh42PWyYGr5g4v+67TsW8n4ZUzzSLrng?= =?us-ascii?Q?g39ch+wa4g11bQuPxmIrW6DdZwH5JSgcXkN3NAKYtpWh+PC4uizFfQ++c57c?= =?us-ascii?Q?8c/IO+CUt8WktZsgk9P/vTJYljEEx9wiThct70CEWgZmpTq6ac3dh++XW9c3?= =?us-ascii?Q?5c7ZslvgimJGiOXz3tjQwr/FsbGMr+EcUv5omFL7YJDVnETq+ny5l4h6Sjrx?= =?us-ascii?Q?AjTFeG1OkhiqOdpbtzBgqUilQlVIzIl5UPXGESc71+ynyGj/fmoGrfAqbLpu?= =?us-ascii?Q?ggGUv4EVbpiqS+N+TxBEjNWNyszT0Dstyqh+Iy6X1A0HvDHCjqdouuUqdGyK?= =?us-ascii?Q?GQWUowOoihMAD2AOSC2IbTbQttIAAYX/wyAi02oMKltHLoTroAH4WDwRcdZq?= =?us-ascii?Q?SNNvfWRPM+NLRk4rP8Hg4ffYfRZBrd8+mJsi?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:17:48.9564 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed927bc3-95d0-4425-c329-08dd9dc88401 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8692 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423897385116600 Content-Type: text/plain; charset="utf-8" Remove all "depends on !PV_SHIM_EXCLUSIVE" (also the functionally equivalent "if !...") in Kconfig file, since negative dependancy will badly affect allyesconfig. To make sure unchanging produced config file based on "pvshim_defconfig", we shall explicitly state according Kconfig is not s= et Add "default y" for SHADOW_PAGING and TBOOT, otherwise we will have unset values when running make defconfig based on "x86_64_defconfig". Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v2 -> v3: - remove comment for PV_SHIM_EXCLUSIVE --- v3 -> v4: - explicitly state "CONFIG_xxx is not set" in "pvshim_defconfig" - Add "default y" for SHADOW_PAGING and TBOOT - refactor commit message --- xen/arch/x86/Kconfig | 6 ++---- xen/arch/x86/configs/pvshim_defconfig | 5 +++++ xen/arch/x86/hvm/Kconfig | 1 - xen/drivers/video/Kconfig | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 7afe879710..8c8e661d53 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -143,7 +143,7 @@ config XEN_IBT =20 config SHADOW_PAGING bool "Shadow Paging" - default !PV_SHIM_EXCLUSIVE + default y depends on PV || HVM help =20 @@ -175,7 +175,7 @@ config BIGMEM config TBOOT bool "Xen tboot support (UNSUPPORTED)" depends on INTEL && UNSUPPORTED - default !PV_SHIM_EXCLUSIVE + default y select CRYPTO help Allows support for Trusted Boot using the Intel(R) Trusted Execution @@ -288,7 +288,6 @@ config PV_SHIM_EXCLUSIVE =20 If unsure, say N. =20 -if !PV_SHIM_EXCLUSIVE =20 config HYPERV_GUEST bool "Hyper-V Guest" @@ -298,7 +297,6 @@ config HYPERV_GUEST =20 If unsure, say N. =20 -endif =20 config REQUIRE_NX bool "Require NX (No eXecute) support" diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/p= vshim_defconfig index 2ad27f898e..6f652e145e 100644 --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -26,3 +26,8 @@ CONFIG_EXPERT=3Dy # CONFIG_INTEL_IOMMU is not set # CONFIG_DEBUG is not set # CONFIG_GDBSX is not set +# CONFIG_SHADOW_PAGING is not set +# CONFIG_TBOOT is not set +# HYPERV_HYPERV_GUEST is not set +# CONFIG_HVM is not set +# CONFIG_VGA is not set diff --git a/xen/arch/x86/hvm/Kconfig b/xen/arch/x86/hvm/Kconfig index 2def0f98e2..b903764bda 100644 --- a/xen/arch/x86/hvm/Kconfig +++ b/xen/arch/x86/hvm/Kconfig @@ -1,6 +1,5 @@ menuconfig HVM bool "HVM support" - depends on !PV_SHIM_EXCLUSIVE default !PV_SHIM select COMPAT select IOREQ_SERVER diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 245030beea..66ee1e7c9c 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -3,10 +3,10 @@ config VIDEO bool =20 config VGA - bool "VGA support" if !PV_SHIM_EXCLUSIVE + bool "VGA support" select VIDEO depends on X86 - default y if !PV_SHIM_EXCLUSIVE + default y help Enable VGA output for the Xen hypervisor. =20 --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423896; cv=pass; d=zohomail.com; s=zohoarc; b=F3ikJPVtP68kdObrfNBYfRtBt8Zig4wdFWTWpO7sveSIiSUvee0xWnyW3WKcu9Fzn1MxXLCD/vtZYhXXQsDsUvFq0a1/NSjtfja0a+sxku+RGfsFg4ggj6BpahbWBgh/WJ6Hz56IOYzd1xpq2xEERCf4oHQt0FZO6sp0r3CKUUQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423896; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IInfV2ukP7/cIfBLXmKwCiycp7vzTCpHzRB2edrn7tA=; b=OlLm9wQSvyi0nYfqis0rDCaFhvdNTnL3R13sopInRrYGQLl16WmNx83Mwf1sRr5KUFbPQNB6o8plFAwdljX7PzKqUilYxhKUa5fR7TYY271gLDiK7fukVQwOLrcNY1PvXpT6pjPFOSOeVyrpuBGO6Az8jkJcyJICSSzfJBlwTGY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748423896512462.6694102689406; Wed, 28 May 2025 02:18:16 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999062.1379790 (Exim 4.92) (envelope-from ) id 1uKCv9-0001oK-DV; Wed, 28 May 2025 09:17:59 +0000 Received: by outflank-mailman (output) from mailman id 999062.1379790; Wed, 28 May 2025 09:17: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 1uKCv9-0001nX-7g; Wed, 28 May 2025 09:17:59 +0000 Received: by outflank-mailman (input) for mailman id 999062; Wed, 28 May 2025 09:17:58 +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 ) id 1uKCv8-0001jE-6p for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:17:58 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2060d.outbound.protection.outlook.com [2a01:111:f403:2415::60d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a340abee-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:17:56 +0200 (CEST) Received: from SN4PR0501CA0114.namprd05.prod.outlook.com (2603:10b6:803:42::31) by MW4PR12MB6827.namprd12.prod.outlook.com (2603:10b6:303:20b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.26; Wed, 28 May 2025 09:17:52 +0000 Received: from SN1PEPF00036F42.namprd05.prod.outlook.com (2603:10b6:803:42:cafe::98) by SN4PR0501CA0114.outlook.office365.com (2603:10b6:803:42::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.15 via Frontend Transport; Wed, 28 May 2025 09:17:52 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F42.mail.protection.outlook.com (10.167.248.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:17:52 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:17:48 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: a340abee-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rN0KWN0Cj7UQ7m5uKuGlie0Kr4uUvGzGzxqWOI3SF32pCPtAl70EMWW1gKzVIbWE0CqGiGKAixRA9Kpo1sMgG+K8C8SwGM3z8aTB6KU6VtRIrTCtiYfifiJ6HzQcTUKI1Sbl/OmUcO8hXu/yX+b5PreZnOHIGRoSO98mKLb6p8a98x+bvuPUszcXx683+cY7NOJ6pc+K5Q66D02YUUzZLgQTrfrsLOEwS5ux3UhYTP1vU+NXYN34lfoV3W7J9N1UM8tuUaraMjDZggBU5U3bI6fwUOgiYNY6ILqenMhxOgk01hYGRjgBqG4IOo2CSy1Rzrp5aVVl6Kw7HkNV3J/yeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=IInfV2ukP7/cIfBLXmKwCiycp7vzTCpHzRB2edrn7tA=; b=ZEntzBlcHHYccXcyiXdlpeSIvehJbF4C0FGlTpj2pc7etUs9pnRxMrqsPgdYdvLPwjRIgSUh3XKvdA9TCwA+ODXl16wq+iGP+pXKmtNCZ262BFqgSaJnzDhP6Jx66mB2yl81L7C7tKWSpIUEdatfBzTxerqaZYsq7Q+Z/XkoVmqfekj0ckHwnYGksrqpBrvK+REpB4fJuXc+CfL9LfdbuIb984AJ0OWdksEIfGISOq1RpdkT4RnBJ1asQtEJ2bDKs2g+yAtPh1/HLSpxfxz2+flD9GfJvdDEBl8NsUU+B/W7sc/H/R+DEM4b1nTMNMTraWBPmkfIuwrLaHQakSBeQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IInfV2ukP7/cIfBLXmKwCiycp7vzTCpHzRB2edrn7tA=; b=U2WkvG00t2wc5ivWH5T+jZtKgdt2qlRJoBoVSk8zBTkScjQunEJI+xv1qVuDdpWgW03r7CnQpSjd7F3YB41clsrIfmDvss9TtJoyb9tbGtkMED/xTCjkbAMr+1acrzaRYpzBlwn728/OGPr2W1nXjS318aeRRbDSzEFIC6dRX3A= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Stefano Stabellini , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , "Stefano Stabellini" , Sergiy Kibrik , Penny Zheng Subject: [PATCH v4 04/20] xen: introduce CONFIG_SYSCTL Date: Wed, 28 May 2025 17:16:52 +0800 Message-ID: <20250528091708.390767-5-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F42:EE_|MW4PR12MB6827:EE_ X-MS-Office365-Filtering-Correlation-Id: 6af7723b-2623-4f05-a6d8-08dd9dc885eb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RUm6UfY61yUKgzzTGCB5svrBqvDANV084lmt9bRDIx9zxNjbbmhSg5VXuBsf?= =?us-ascii?Q?XImz05P9kJ1eNiDHDqYIYSmpEefFEkiFtjTgNcukQoo1vHHG0c9aDxcHAKWZ?= =?us-ascii?Q?jLAao3GpBcZUCdVAoknYUQ1ctuwxz/rt6SoFTBHJJB1UDKvrVYjwEXPe8ux8?= =?us-ascii?Q?pLWmIJRRSUjDAufGIysoW0q3k10OU4JUboQr90G8fqngGhp7T9gcMuMHFnZN?= =?us-ascii?Q?LUthFXpKB/n8Dy1hNUJRRgy6gYGe/P2qlIEaq0IvLzSokQSj5LeNetrRe/AT?= =?us-ascii?Q?lcouxOQNnnZJZ7oeMBVCxn+fURLAsoeKBS1nkemAdihOCWEv1oKcjCbU+oOG?= =?us-ascii?Q?jLvSbEaN6XF7zMrhDfz8skudzW8JiO171FArBu5bsaoo9ODF5iuIxZ4FOB72?= =?us-ascii?Q?nNobK2em/qYu/Hd5rt2zMib0zy9Er66N4MxufCBr+P0V5ZdbJtjO1vKWVNI0?= =?us-ascii?Q?EPYG0W+mChYTn8sZBeCL9gqSR06WzqXPxwNsO5ZsrG1zSOO4Zyi1LrH/9evy?= =?us-ascii?Q?NAbFBdjPFnqkImHvw/ebfR26+Z0bahXY/QMf4GOaOLXrYycN2FBnacDsr6Bd?= =?us-ascii?Q?wGhLxyhs3eRiqI3C/uj83oLidG9Tb0SbkQV41KcPiwwHElvjIFiDCZjIaMz9?= =?us-ascii?Q?crKvje5XuEuh6euSBOAVomXO2+vVQ8xf6gwo2RQGPnrXW7ivwp6OKSgKIjS6?= =?us-ascii?Q?IJg9Slk2ZifiG00QL5p/cUUez2nNJ2ep7muqAQOT8KO+JzI7DE48kHK32ylP?= =?us-ascii?Q?tIkpmlgAt6Upu0Id1Qkz60ji7kQjff3dvDCEK94K+Voz+vFtQdoUPd8pfmNp?= =?us-ascii?Q?mDrd/aoqEKF4NmW+go3pZGwCG91OZHrFhRNSB944vPAtXA/t1fnKMqhHiW01?= =?us-ascii?Q?ocDuNaA3oRcNzMe7yPdsivgqe4p6Epxv9qKLmWGXF+2cclRQNmfaK2zp12SJ?= =?us-ascii?Q?7uAVPweDdsXNRGhbpek8psD8kHMvtUSOF1GpB1GjrZ8iV7HneQAzPLYj1BMi?= =?us-ascii?Q?q8vB7+JZtP56lFwZ2QlJCn6qKCSu5Av18wAX6RQ45ZqpNPBXzXeT+QDK7vpG?= =?us-ascii?Q?WGZd0afnmABwlOryTs11FH+wCXJW73/xudgPqhZgSD0QxV/NOpCFa9AbfLUW?= =?us-ascii?Q?S6khBsKh64t8P4WG5tzei3QHPDxR0Wo0m+JyIs3thS5D0dXhODBnM9/8KdK+?= =?us-ascii?Q?2RcV8dyyxSx56CqG0XwVV62aiyO0u6HGhbn7eM5zrFIvtcudlncTTD0DD79F?= =?us-ascii?Q?7YbeBQ8guCA+Sn8ZB0ZOTnCyqy8xr8YGLVc6F2P0nx8dNAma7/grYMZlinh9?= =?us-ascii?Q?by5pzZ2eN1Ks0qLtEGNwpuCpw+hyz8J/O+ximPxNY6Vk1uQsjvEU1PHOd3ZE?= =?us-ascii?Q?F953eIdsfJc1+hbtZ1y8DtR/5Melwz/Zr0/IP21mQwAb8/rjUYboY6L8rn4/?= =?us-ascii?Q?IaJyxOCKD2zCBTKMi/sRIQvE4iH2r384lyupQqLucsSrSM8GD19A0V8rT/SA?= =?us-ascii?Q?JCggcwz/srcP7uzZq4Uussil3NmVq6JoIRlY?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:17:52.1677 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6af7723b-2623-4f05-a6d8-08dd9dc885eb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F42.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6827 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423897343116600 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini We introduce a new Kconfig CONFIG_SYSCTL, which shall only be disabled on some dom0less systems or PV shim on x86, to reduce Xen footprint. Making SYSCTL without prompt is transient and it will be fixed in the final patch. Also, we will also state unsetting SYSCTL in pvshim_defconfig to explicitly make it unavailable for PV shim in the final patch. Signed-off-by: Stefano Stabellini Signed-off-by: Sergiy Kibrik Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v2 -> v3: - remove "intend to" in commit message --- v3 -> v4: - introduce the option without prompt (simply "defbool y") to eliminate the need for transient "#ifdef CONFIG_SYSCTL" - calling out the transient scenario in commit message --- xen/common/Kconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 3d66d09397..28e6ac2142 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -579,4 +579,15 @@ config BUDDY_ALLOCATOR_SIZE Amount of memory reserved for the buddy allocator to serve Xen heap, working alongside the colored one. =20 +menu "Supported hypercall interfaces" + visible if EXPERT + +config SYSCTL + bool "Enable sysctl hypercall" + def_bool y + help + This option shall only be disabled on some dom0less systems, + to reduce Xen footprint. +endmenu + endmenu --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423896; cv=pass; d=zohomail.com; s=zohoarc; b=fxs195YDFbz7NuTcjYWU6ASvxaeaziNFmT+PiEmmci7zehmD7QAIqnCqNg6qROH9V+/PGVtUK89846x/CEHP53jPzXY1IIkZTD3q6UhB7joMCjtqbEg0JMra4k5W44DN4Kt+tSwzjjtkfqP+vJpgOBlCmgaoifaSkrgpcxSZGMk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423896; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XWDCQOD66ZKbLyRJ3ZdoNMgnP/71ZQbglzYq68MUnMQ=; b=jGWN2sSP6hHko8aPqVObtO+JKZD1oi69PIr/w5XNrSntfzs7LjMec8zQ6USI44Ervxsh1UXsbQdrwkTIAV5LZ/bAK2fUB1q0N25UrEycEh+5MdEiEEKd0HTcK/MPQhfv5WU/c3Z0eP0BvUSVkGfWNYsr+A+Si3T8+X9eCWi315U= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 174842389673745.01424927948415; Wed, 28 May 2025 02:18:16 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999063.1379805 (Exim 4.92) (envelope-from ) id 1uKCvA-0002FV-RK; Wed, 28 May 2025 09:18:00 +0000 Received: by outflank-mailman (output) from mailman id 999063.1379805; Wed, 28 May 2025 09:18:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCvA-0002EX-MK; Wed, 28 May 2025 09:18:00 +0000 Received: by outflank-mailman (input) for mailman id 999063; Wed, 28 May 2025 09:17:59 +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 ) id 1uKCv9-0001jE-6t for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:17:59 +0000 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on20624.outbound.protection.outlook.com [2a01:111:f403:2408::624]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a4871c12-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:17:57 +0200 (CEST) Received: from SN7PR18CA0015.namprd18.prod.outlook.com (2603:10b6:806:f3::6) by SA0PR12MB4366.namprd12.prod.outlook.com (2603:10b6:806:72::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.27; Wed, 28 May 2025 09:17:54 +0000 Received: from SN1PEPF00036F41.namprd05.prod.outlook.com (2603:10b6:806:f3:cafe::54) by SN7PR18CA0015.outlook.office365.com (2603:10b6:806:f3::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.19 via Frontend Transport; Wed, 28 May 2025 09:17:54 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F41.mail.protection.outlook.com (10.167.248.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:17:53 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:17:51 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: a4871c12-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E3aUIuUz0AG6CxhWJB11fyYZwqROfw4TFutkkodra1GAycoyY0I2ZkFMc4otD745YQRUpsmJsBjwoWeQGQEsQSh2DpDdtjfaxWbIWt7szwgagsurnyi/hG3B39uQvw4TF8IASg9ViFfUdSij9uGMo1Y8C87rfdGYbhUllo1ikT3WkK6nJWn/VaxxXMr06zNMY5NCXUbl0QyFCEYLUzUEz60CtMTCLa2Fu9n0Qkk7XtUDgpPkn7SzWCv3ubElhYGfDbrSl/MoetvU9Qk5DWFyDQsgFDJ8z6i5eNMs40xE36XQRrETU6WGVYyAvWa6pdbst+rlYpYSvHE2hKYnq0iLDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=XWDCQOD66ZKbLyRJ3ZdoNMgnP/71ZQbglzYq68MUnMQ=; b=xpnhPImnB73CSTsAbAwuXlRNBiSoLzb9XvuI3a2HBcBAKOTZfRZ5iEoc7uaL77owWMRCG4Y6uhkocHC0HvjX0Z22+ZySYjMENOsOwTEABc+PMTbSj2ZxqtMyHiC+LGMzWdTdf0J5O3If7QlCjEtQYHknQvvas3zdcxeeyaHM8e4FKWHy2ut3in1DmpBrj+BOD+FGOt6jX6hXFPr6b9ojiqoRmv1Eut59PdWvgbs3/GKTWgTUliZJ/+ruy6cDSVo+c9RzEQ0bb0B7yI7NMUaechmkKTerJF3PM1dfTf5WbGhkwT+ZZVS0FAJnDZ9YNC1SVXrZHMjlaNN7CjLheWUM/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XWDCQOD66ZKbLyRJ3ZdoNMgnP/71ZQbglzYq68MUnMQ=; b=2vZSF/Vfm9rc4GL50HJKlTHW9qUgXfz7IpFBwjEz4EYRFD0dbBkISPKPBZVoCSkJtqlnVHpH6WfWH1fhlxd51XpcRel7wdqRgluA3iv1JdR25Ew9cd9xTBN9N+mZn2OTKEZ+PJ06gCONvxjtkCUogxoATDoiYMY3lTK2yVCUD2I= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , "Daniel P. Smith" , Stefano Stabellini Subject: [PATCH v4 05/20] xen/xsm: wrap around xsm_sysctl with CONFIG_SYSCTL Date: Wed, 28 May 2025 17:16:53 +0800 Message-ID: <20250528091708.390767-6-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F41:EE_|SA0PR12MB4366:EE_ X-MS-Office365-Filtering-Correlation-Id: 2388eed9-0070-4b79-4c89-08dd9dc886d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VEUdW4W8l6HYAwK1vUez4gxzVaffOJPXtITZyFiGYdEkrk4W8EkdEkjpNAtk?= =?us-ascii?Q?c2/lbDb2xg6ROe1aZOCxj/eggy9gHnQw0DzxMI8ltFQjY/YRwhQWCbhxD1jJ?= =?us-ascii?Q?Da69drKAon8hqZFWoRkHPqyq02JoPNTRLoW3GTcLJrSZ9WkmMqVBzhZGQUZR?= =?us-ascii?Q?gpiJbU6yPG0yFi8w7X+K1yKNbKPYjGJ+tNBiRhNFotaIzqvop9sZjp2K2FAg?= =?us-ascii?Q?8INDiKxUzoz29cXJ14D5Bj/8AoNqu28p6alF4Pi2qdbNAph62ms5NcjJy/K1?= =?us-ascii?Q?rIhlvDBuj0LwpUajQm4sCHTtb294TzVO5AnWHt+MOwpp+pklZLSNhOdy7K+p?= =?us-ascii?Q?mbQe96B9ug25XP4HnU0DFwI2Ki9f+Mai2fSx8FqoqrdoPjHQyPi/jyztR+yl?= =?us-ascii?Q?znHZttENgvN3lU7Hf0sgk4KUtd60GAFr/6E1IBVpmKDImEFIcq8xHu70KecW?= =?us-ascii?Q?h8R4Dt4MRJlVO33aKLcQTtdsJUujSx8EZnBXWBAmLVp+z4RS24mIR+Jgwk0f?= =?us-ascii?Q?hPzsvGkp7cDq0cbRHbZPaudJbL51zZU2Nu6trsNRwX74RaJhGqPM+I3InV8m?= =?us-ascii?Q?qkX4Ped9SRgceR0uNIgaiansPU01/SM2dESXf5D9RKxoauW1uqQGJSsaiBLk?= =?us-ascii?Q?AOsVRVzkZ8beT0FuIcs3F/lkynANGmyIUrMx9IdhSWFVymBQ0zmv0gr1n+sl?= =?us-ascii?Q?Uyq0+qCCaV9e/pc6keU9dD37vFAFR+qKwqGpdMQq1XLuZruZDc5rACbhyx2g?= =?us-ascii?Q?04f5yMV8M+qJTCgjFvfxrOwAPAmdppfJvMN5dPoU+dVaA8jw7t9koxU8G2W8?= =?us-ascii?Q?Iijz2Ne+WpCOvHiygZhs869Qz1KVNn6nF4X1/2LzZxQ315cQUdPjGuklvq78?= =?us-ascii?Q?q43BfX5sH8NoTt8jPH2RW1+0+h8KFFXfNA8rDVEEMQTRwNHwnCbxR3FvknGK?= =?us-ascii?Q?ZaFgIqDhaa/m9ivuMVashW2Rf0n44k/Fd+fNgEkCIizZdiXT5D12XiMck0PG?= =?us-ascii?Q?d99qKUsMS8TfyAkTKiOYGgAMKLH8RKh2ATcEQCfHM5jK/5KwseXayoLRtUi8?= =?us-ascii?Q?t4wz0FOzlBZxfzLbZoYesDrb3lUaiSx1/tg0pOF1x4rE6i4O8tYVWUFKW08K?= =?us-ascii?Q?Pqtp15PI3x78kg81DxQY9/lcwy9RfftWhTiUP6CV6EyMPIp87h9bPoQ3A8A4?= =?us-ascii?Q?+fDk3tX8TvynkjeOd5t1eLnrdcfipw3+7qKrO3cS4uX0Lx8Hl6FCGri+90Je?= =?us-ascii?Q?bur+locHgLhJpYduVaNxq21x4YwGQxnUAs3ILdJvJIWWwmsCvXqrcswp3IaO?= =?us-ascii?Q?hSrR+sY0JHiYTjwH0HB1mepYlBbarhQewfqPEzxucHl3RZu4NWmomeXfXokC?= =?us-ascii?Q?2YsZmdNo/JRUV0mo0avkGx2UaTfBobgRsO2+Rny8dF+KJCqLqH6dJCHAyFks?= =?us-ascii?Q?pBwWn9daVKdVrNKJdDnrxSFmSbg5lmBnz0ApmY/ZPFvU41Inu9WUa89LQeHl?= =?us-ascii?Q?atSHxmR0GZL16S/MW2/YBhAc9mPgAxqo/VUa?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:17:53.6852 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2388eed9-0070-4b79-4c89-08dd9dc886d4 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F41.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4366 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423897336116600 Content-Type: text/plain; charset="utf-8" As function xsm_sysctl() is solely invoked in sysctl.c, we need to wrap around it with CONFIG_SYSCTL Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/include/xsm/xsm.h | 4 ++++ xen/xsm/dummy.c | 2 ++ xen/xsm/flask/hooks.c | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 24acc16125..22e2429f52 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -261,7 +261,11 @@ static inline int xsm_domctl(xsm_default_t def, struct= domain *d, =20 static inline int xsm_sysctl(xsm_default_t def, int cmd) { +#ifdef CONFIG_SYSCTL return alternative_call(xsm_ops.sysctl, cmd); +#else + return -EOPNOTSUPP; +#endif } =20 static inline int xsm_readconsole(xsm_default_t def, uint32_t clear) diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 93fbfc43cc..93a0665ecc 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -22,7 +22,9 @@ static const struct xsm_ops __initconst_cf_clobber dummy_= ops =3D { .sysctl_scheduler_op =3D xsm_sysctl_scheduler_op, .set_target =3D xsm_set_target, .domctl =3D xsm_domctl, +#ifdef CONFIG_SYSCTL .sysctl =3D xsm_sysctl, +#endif .readconsole =3D xsm_readconsole, =20 .evtchn_unbound =3D xsm_evtchn_unbound, diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 6a53487ea4..3a43e5a1d6 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -856,6 +856,7 @@ static int cf_check flask_domctl(struct domain *d, unsi= gned int cmd, } } =20 +#ifdef CONFIG_SYSCTL static int cf_check flask_sysctl(int cmd) { switch ( cmd ) @@ -933,6 +934,7 @@ static int cf_check flask_sysctl(int cmd) return avc_unknown_permission("sysctl", cmd); } } +#endif /* CONFIG_SYSCTL */ =20 static int cf_check flask_readconsole(uint32_t clear) { @@ -1884,7 +1886,9 @@ static const struct xsm_ops __initconst_cf_clobber fl= ask_ops =3D { .sysctl_scheduler_op =3D flask_sysctl_scheduler_op, .set_target =3D flask_set_target, .domctl =3D flask_domctl, +#ifdef CONFIG_SYSCTL .sysctl =3D flask_sysctl, +#endif .readconsole =3D flask_readconsole, =20 .evtchn_unbound =3D flask_evtchn_unbound, --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423907; cv=pass; d=zohomail.com; s=zohoarc; b=TNfHoiK/0ssJZbSywOy9QeepjDpHsY7tBfmZC4ysu2o73+3EClMhqzUB7GZaRA43h2eTX0w3s0P7zZBmR5onvga4ps78O9M4r7759/APMov3BLlvnnRa5ybi4FISOn1W129LcMSz3lo2MEgxniSnjziu/LSKZNwX8mIwJ9Anndg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423907; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qImUlx0P5uZHWU7BQHSJftezN9uBylMqS/nrwHVyNac=; b=VTJsMfjllOSnSutvZYoAcM8xGqCJ5ddkj3To0O+HuhXvKhl7EFTTLxlz2ggcaWlV50TSZs5gYQGhleUozIpJG9Ceu0UYlGTEBHkfy22b3UK1Bf4e/pboMddpDlmsFdw685OE55LYFW67RGt+9FJxYp3tk45oEzOeaBScqYTR2uk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 174842390773252.77657131210174; Wed, 28 May 2025 02:18:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999067.1379816 (Exim 4.92) (envelope-from ) id 1uKCvG-0002ir-2i; Wed, 28 May 2025 09:18:06 +0000 Received: by outflank-mailman (output) from mailman id 999067.1379816; Wed, 28 May 2025 09:18:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCvF-0002ia-VB; Wed, 28 May 2025 09:18:05 +0000 Received: by outflank-mailman (input) for mailman id 999067; Wed, 28 May 2025 09:18:05 +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 1uKCvF-0000yL-8a for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:05 +0000 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on20607.outbound.protection.outlook.com [2a01:111:f403:2405::607]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a85e61ee-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:18:03 +0200 (CEST) Received: from MW4PR04CA0062.namprd04.prod.outlook.com (2603:10b6:303:6b::7) by SN7PR12MB7105.namprd12.prod.outlook.com (2603:10b6:806:2a0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Wed, 28 May 2025 09:17:59 +0000 Received: from SN1PEPF00036F3F.namprd05.prod.outlook.com (2603:10b6:303:6b:cafe::cd) by MW4PR04CA0062.outlook.office365.com (2603:10b6:303:6b::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8792.19 via Frontend Transport; Wed, 28 May 2025 09:17:58 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F3F.mail.protection.outlook.com (10.167.248.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:17:58 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:17:53 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: a85e61ee-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B66ofrYcdS8hRX4OqQIujY8x5VZyws54qL9DTCYX8wkTCgNTqtw1i2CVLCsPPMt8CIbtnYp3XlHp3VwwaLbC3qqDJyp5l8FYEkyKCCRGUQYNmc0paJ6M1Uhm7CvMRkhiySjN+B4ZkckEBxzCgHV3C+zj+Ko5k+5DQtc+HURT2BStQqassOo4RQShS4+t5o/+Rb8omUnFZ6WASnVBvhgIazStbHwFSH6DmxYM+QdcE37NkxL0pZaxN52WMzhux9/zrHoNUTeOBd/v6AxFlFOqPN2o3BxhRk9Ocbor3YeAD8wjWeucDdQwfBc0Ukiw+xIqkQhYY1Zq25PUVIOEhXaNHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qImUlx0P5uZHWU7BQHSJftezN9uBylMqS/nrwHVyNac=; b=lfXCN/48/qlOsu0zGLNsegQ+6/plB1EdTce/z9fCHjMuHXB3AgoPJDBOq5UvmhiKRvr1YnVOJegHNh/X4HyrcYnhqDMv3YL7YlpiF0fyRe60nPrew1quaZq+78nIN2gOZl+qkFPCPHp4M3C5267iAAaQ1K/GpOFVgT95MGHsXMI86Wa3YcqZkGlPL7xSpS9MfAFRZm1/i6oXQLXaQT0k7lvzQbd8HtiAuRU4BeqBJWwKJ+aR0/wDFf21Bp1e7gupNyqou7SB67PdJffLMUdzBaf1WT/76vHsQY0Z5edGSBt2BjRy3RgyWztC4SFY1EyGnewoGzLSLZnz2rILqGm6Kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qImUlx0P5uZHWU7BQHSJftezN9uBylMqS/nrwHVyNac=; b=jlINwZBveFZu5KTSCPWLDxguqyFPVEi33vY06XnyrljL5Bclo1mbDjsaWNo2h6/Jp5J5IMoLSlZ/vTQ09s6r6VpyS1BPjicyuSHkb66Tobb4FstCRr5tQ+cDRQasqcaEmn6TXWeVGCTqmfVyujbkx7/M7CdAnlaVfuBCSXp0rnY= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , "Julien Grall" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , "Daniel P. Smith" Subject: [PATCH v4 06/20] xen/sysctl: wrap around XEN_SYSCTL_readconsole Date: Wed, 28 May 2025 17:16:54 +0800 Message-ID: <20250528091708.390767-7-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3F:EE_|SN7PR12MB7105:EE_ X-MS-Office365-Filtering-Correlation-Id: b0c19b35-1c55-41fc-c8e7-08dd9dc88971 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Rschc184AdWvIMqbMStz/gIZkMGjGRtGkmuh3ZLbVZsXAI6VgDhHU2ebCd9q?= =?us-ascii?Q?HJizJPuMZtdV5gihk2dizNbqCUKGMBpOe3Rsjicwsm5ER/2pHzOKejUSgeq+?= =?us-ascii?Q?CzDjZ6/fonAD/Y+gNUKxXqUarI0U4EirAN1neqHVi91x0Go5We97eOz8jX3C?= =?us-ascii?Q?+K6Oeo3+PbpmyWit1RljS7ygxq+37ds+tu5FyEYDnRlOJuOHQ3zgIuxPV0Ae?= =?us-ascii?Q?s/UGKpb5TWU+FiJK2OagNP/64q2Gi+YOw+FyMMQyMf8tgFjfTIboayHLW7k4?= =?us-ascii?Q?cPaJzzMio87TYwy1mMWAXT4zWEYEjdMg5N1wWGKxz8+vlOnImx4FOX5+Jmcm?= =?us-ascii?Q?6woFAppqYzTpI/Co4LOkXX6r9l+1OLSe8QbyZCPCx7I2WBSlIChe60NkwhXd?= =?us-ascii?Q?qFYzeuZGMOp3c0AtitNC8ix0X/INhSvkrELS3mOlpfWHNJLelZwtQaddi2MR?= =?us-ascii?Q?4ZHuZPAqjrlAGLOF+dyIW0XQ20cV8tRsUFSuzFhxaLbbo51YL1KZmFZ5/BnX?= =?us-ascii?Q?tPVPLrlpqkBu8FWKKSVHqoEypTPzi8Ki/svWTpARUecg2R4TXtSayELP1fAa?= =?us-ascii?Q?dOO3LJKQ7oR+JGUklTDR/Jt5DcgAeT3VhH9FeogJufw5GFs1R/7UULRF/APN?= =?us-ascii?Q?R4XmGkevp0NkgF//zFuumelo2A32+Bp3o2gLT+QffrWcmFcGG8vOHTM+SLCX?= =?us-ascii?Q?barj8nfpQs8afPObUhFizSBlLEsEeC3I65bna7hwOGQmBiIzUwTm90GiSUNF?= =?us-ascii?Q?A247RT3386aOAAvdehE4b0Tg2T76qP0fhQNiyIqcmqwsF86IlgAyGcr6h5mJ?= =?us-ascii?Q?3hOhR8q02ffoEz8U1k0wAYFgLn/E7Y+OTYDcfrQwHlSNvbUgvFSXONSMWc83?= =?us-ascii?Q?NYW00gsHCKWUKd/94qK14iQdQVtIK6bdTHe3IfumQtcigZYGWqpbeQVG4lD3?= =?us-ascii?Q?U7buVAuuSLw7zJIBfhCgfWsoo4mE6HPrl0hwBRACLTXdqVXl/6LxUZxu9XaA?= =?us-ascii?Q?Ni206UN7vVQBrfI8fs5NhKUGO90Mpzr3UoTp4snSnN1467UKt9wuUF46nwjS?= =?us-ascii?Q?aoJ1HLGZTuk3dz0XFZZQixgNDKKbjeRXcPnRaLxCfU1SJOE7aXStfq7+6DpZ?= =?us-ascii?Q?fgfniyeu3nPzdMEYjS9AIiw0XohjL/iANxyWM39eiOK7q1kWZH69q2a0ho1T?= =?us-ascii?Q?dugqMCNGT6YINXEsygq7/LUfi/K3e6QW6p4VWRJ3uzuBonet1vxzhTX4hjgF?= =?us-ascii?Q?+UGjCPrpn6p2WASbNiX32qyZ0Zt7eKDA+heBTfHQHaG6H+XQI1LrHXPT09H9?= =?us-ascii?Q?BinXvcVhs9VbED2u05uRcDbSeM5oy1eJ+IpATdFhOfq91RDh8mmGIamdDxz4?= =?us-ascii?Q?oyVXMxbf/Wbgr9hlUjDtq4irKlqCKG+NYBHDLiIX42Q/EPcOFMeVsBqyvxx4?= =?us-ascii?Q?5DhB2zyWzEk4gQdeDNl5PMN6KMpIbMX9SEMC5cqdTu9Lg2jDRh8bm6VJApaj?= =?us-ascii?Q?2nSwCK1NPLDCqJ2Zts/qJfq1/VeO/kh4Gpcj?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:17:58.0779 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0c19b35-1c55-41fc-c8e7-08dd9dc88971 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F3F.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7105 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423909418116600 Content-Type: text/plain; charset="utf-8" The following functions is to deal with XEN_SYSCTL_readconsole sub-op, and shall be wrapped: - xsm_readconsole() - read_console_ring() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v2 -> v3: - move #endif up ahead of the blank line --- v3 -> v4: - remove transient "#ifdef CONFIG_SYSCTL" --- xen/drivers/char/console.c | 2 ++ xen/include/xsm/xsm.h | 4 ++++ xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index c15987f5bb..2413cd6c51 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -368,6 +368,7 @@ static void conring_puts(const char *str, size_t len) conringc =3D conringp - conring_size; } =20 +#ifdef CONFIG_SYSCTL long read_console_ring(struct xen_sysctl_readconsole *op) { XEN_GUEST_HANDLE_PARAM(char) str; @@ -410,6 +411,7 @@ long read_console_ring(struct xen_sysctl_readconsole *o= p) =20 return 0; } +#endif /* CONFIG_SYSCTL */ =20 =20 /* diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 22e2429f52..042a99449f 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -270,7 +270,11 @@ static inline int xsm_sysctl(xsm_default_t def, int cm= d) =20 static inline int xsm_readconsole(xsm_default_t def, uint32_t clear) { +#ifdef CONFIG_SYSCTL return alternative_call(xsm_ops.readconsole, clear); +#else + return -EOPNOTSUPP; +#endif } =20 static inline int xsm_evtchn_unbound( diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 93a0665ecc..cd0e844fcf 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -24,8 +24,8 @@ static const struct xsm_ops __initconst_cf_clobber dummy_= ops =3D { .domctl =3D xsm_domctl, #ifdef CONFIG_SYSCTL .sysctl =3D xsm_sysctl, -#endif .readconsole =3D xsm_readconsole, +#endif =20 .evtchn_unbound =3D xsm_evtchn_unbound, .evtchn_interdomain =3D xsm_evtchn_interdomain, diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 3a43e5a1d6..df7e10775b 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -934,7 +934,6 @@ static int cf_check flask_sysctl(int cmd) return avc_unknown_permission("sysctl", cmd); } } -#endif /* CONFIG_SYSCTL */ =20 static int cf_check flask_readconsole(uint32_t clear) { @@ -945,6 +944,7 @@ static int cf_check flask_readconsole(uint32_t clear) =20 return domain_has_xen(current->domain, perms); } +#endif /* CONFIG_SYSCTL */ =20 static inline uint32_t resource_to_perm(uint8_t access) { @@ -1888,8 +1888,8 @@ static const struct xsm_ops __initconst_cf_clobber fl= ask_ops =3D { .domctl =3D flask_domctl, #ifdef CONFIG_SYSCTL .sysctl =3D flask_sysctl, -#endif .readconsole =3D flask_readconsole, +#endif =20 .evtchn_unbound =3D flask_evtchn_unbound, .evtchn_interdomain =3D flask_evtchn_interdomain, --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423911; cv=pass; d=zohomail.com; s=zohoarc; b=UFvFzVanWezPyQNAaCGEQjOA0mmF6xW3cMKM8sh3pAj/cqJLqmM2h9LNYx+hiZyVPpfH7+UMAi7R3Cfib5SxNhQEpIcWTduYJzZCHxssSjgXhai9GNFx665culF6wUBWu34DXYSS8INxgSZcuBBNtscGHROQxp4R8rAupvQ2m2Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423911; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=70fq929cQ9GiOjsrnLMlQKa27q483NDF8TNgSR1MjVQ=; b=UWihpIZT2qSeW1aC6/IEtzWJGvu5VYxlUBoEhYfYxFHHB3vyN7NhZHSHNsTV+pxINg/tsARnPc/MnGMlE/bbWo/NVzUp0RYhRr183L2TAvgJLKRLNAQ/PmY32nRMQqLaJ/QYjE3GOTiTdZmswSqLFvZPu90zF+bM+p/gM0BYhcQ= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748423911943178.76420251131674; Wed, 28 May 2025 02:18:31 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999070.1379836 (Exim 4.92) (envelope-from ) id 1uKCvK-0003WQ-Qj; Wed, 28 May 2025 09:18:10 +0000 Received: by outflank-mailman (output) from mailman id 999070.1379836; Wed, 28 May 2025 09:18:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCvK-0003VK-Mq; Wed, 28 May 2025 09:18:10 +0000 Received: by outflank-mailman (input) for mailman id 999070; Wed, 28 May 2025 09:18:09 +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 ) id 1uKCvJ-0001jE-9I for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:09 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20616.outbound.protection.outlook.com [2a01:111:f403:2417::616]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a97c655d-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:18:06 +0200 (CEST) Received: from SN7PR18CA0001.namprd18.prod.outlook.com (2603:10b6:806:f3::15) by DS0PR12MB8574.namprd12.prod.outlook.com (2603:10b6:8:166::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.33; Wed, 28 May 2025 09:18:01 +0000 Received: from SN1PEPF00036F41.namprd05.prod.outlook.com (2603:10b6:806:f3:cafe::a7) by SN7PR18CA0001.outlook.office365.com (2603:10b6:806:f3::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.23 via Frontend Transport; Wed, 28 May 2025 09:18:00 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F41.mail.protection.outlook.com (10.167.248.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:00 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:17:56 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: a97c655d-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=eXF9U7y6lzDyogwcLUNAtbUQwiZ6wmZ9odE0a0nKmTFrqRkQYXWmWoiogAW/O7kGcb1to+LN4xPTfbCGUcBDzaxdlxjlu90+XSNHWcdrpaRXgcb5/RTn9ZqAxCcSkYSESmIiJMjlcKQyhfxy9tBFuowqNVKNz/heYmcEt3vgqA1Z/opNqTTlWEuUA6L3/rFMia7t0rvdU81tcNn2teHYRU6VZMdqr6hdIjV/CgX8ndeUgArcM+GFPFl+jJV5LZOlhXsAWGozxtkvBdO8ZHCV5nmHPRnKDOo0ekWcwQtsU7acP3VvtNtJ+H2QUAvULxG2ZuVONjZHuz+qZ/Z3jLNAxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=70fq929cQ9GiOjsrnLMlQKa27q483NDF8TNgSR1MjVQ=; b=B3jIKwNTW0L1vOV/gdsNnvjS5Ke7ccX4mlKYJqg8dOvdudJvDaJXlrN9MGF+FBtUauYcpB3Pvv4mnDijmqH2bq7zeYUzIV5ZwggLI738jqwVUfPTgmuO/lrP1d6AVr8lzSDaLRs+70YUQdZa82W+WkrzJUiH5Ld7R/F6uaseFiFVvUVaYu4FOb/yC9lHcm41kEFeNABRBdydZot7TIlWBEvl7vjfVlKbe7OHfluOe3Zztai+cZSUx7ErV0gwX72hvBDn9HzxSvTxy1shXJ4i5C9PQTYgoQtEm1gFTX51S6wFXWHIIwMrMiWtDuozooNjX8tgnSjaxhQw0kHha6n+/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=70fq929cQ9GiOjsrnLMlQKa27q483NDF8TNgSR1MjVQ=; b=UlLoxdgv82JA9wp4x1vfPBJkMENBX5hgfTxdRsA8/Ofv+dsexLkJDioElUBii8nIL5pn68xHV0WS0/iIpvWC5MmX5nZ0af4RqaHMQ2CN6DzF3FKf4ar0YRdneuYENJcMGthxMmS99N2++dwG6VDBR86QTWUfLumhYPR3v2dSRpo= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , "Julien Grall" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v4 07/20] xen/sysctl: make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Date: Wed, 28 May 2025 17:16:55 +0800 Message-ID: <20250528091708.390767-8-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F41:EE_|DS0PR12MB8574:EE_ X-MS-Office365-Filtering-Correlation-Id: 62911c85-73b2-4c7b-8aea-08dd9dc88b0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jJ/upueOVX+P5yogIG7XRKTgTazZSeNT8MvayBtU19/m+sjQpb7NHeFSEudP?= =?us-ascii?Q?IxU1NoxpB7U1GLezmGk+bgx6vqr0Upnks1nqKQIzlF+Op8mGlhd0MjxhwMkr?= =?us-ascii?Q?QiTkUrwRks1iIFMfOM3jnnGCqnrrYQB95l0FScGR9bSyKxGl4kYYXw7Da8wj?= =?us-ascii?Q?l+n5V88l34lL5LbsvADqNW4oEXcO7qssXhu/d572/zR6HGTPbphGCgGrSg9y?= =?us-ascii?Q?A1blFY0mKlsv4oZsV+VtOR3RcZeSNsif+3w99pnaNfnVJdy2NVf1g9/urIR8?= =?us-ascii?Q?jx1lZUj2sHezm3b/fqzEVlhMyzaImJXMollY4yY679v8dfMUwrg1kJWP5z58?= =?us-ascii?Q?DTmMynCIOPvDESLAgI1wtpxiqlZ5GR1nPlbyR8oSZTe9MAcFYVh2gBFTbMj2?= =?us-ascii?Q?51rwWdvJCfh7rTc2jb9HTOpc5kA4+EfbPxaRDzi9K9ZL93UnxKvBDSPOgk/u?= =?us-ascii?Q?lf/GJkqdkXMW7E3QISEMd0/+juh2zh1DeOhIy5k1/Npns/L6wdJsyV3/n0HB?= =?us-ascii?Q?jy81vAJWJHMPfFANEHb54VWSY00hLw+OVvOtznHi/FCq2fNyg0yrCOWfzCkK?= =?us-ascii?Q?twQcg5w8BykjoIGybFjCEWW/d7LH9SaYcXxnZyaHqHSQYHfwVMteRqNhiU6L?= =?us-ascii?Q?QlyO4c6f1I7T5X82Wy5z4tU1qSSDeY1e3+P3wxvbyTWXGBJHadUQKDKjLdX/?= =?us-ascii?Q?Aa5+mkovT2ZVISAy+MOvi+dAQynvtEgwjsEySSUYBDb0cMOXacZADrIzIb/f?= =?us-ascii?Q?gsRPHUYyR3VnAA8/QP6dVjdtYQR6c/uNZtbFamMRhWszgBU2mN03megLdMin?= =?us-ascii?Q?/GroBXfaXUCMmOQZvbw4M/GiS0hmH013r2koNYJZm17WPDSqW27ifNJZ+UvN?= =?us-ascii?Q?z6gxZpDWUm3KEaawT/KH2OpehHsnTAC8Baj9FAtVN/Uf3kngvp9SG1t/cTcT?= =?us-ascii?Q?ctYuSALiUdQW6079ueCnSG92DAOeOhyaYo3t1t7DcSnbwj9xpfiYFKmSThfM?= =?us-ascii?Q?7Hh0QksfR3RauTkZBKrUNldvhtPEJYqEcqTFmx7dzm30lclKayP4rtRJg2v4?= =?us-ascii?Q?tSFoimVbuqIKsIOP+s9EuRSZBv/SEWp/uVAzmD/U3THla3Blavh5V67Rj17G?= =?us-ascii?Q?d13ZuKf6J1dqp1l8gL/qfYUAEdGik+3Fp2x0CTJWIQwcj6N3sABZUxKIyHDk?= =?us-ascii?Q?0kKkAxEaGdZpIgVAGLJuEs5aHSlEXSpfpTL0hhUHSjPjFK+wchsU8bG3pDhu?= =?us-ascii?Q?dUv0VLHfFoqg7j4pdOX2nxNRXtj2jkJ2AVgQIQ+XqeydN2V7AHiSADfjiAVS?= =?us-ascii?Q?alv8BuZcynLZKlwgQQtH3shXEaaPFEKg+XNFaMjMcDg5PUnqHpn8Gt8g3ChF?= =?us-ascii?Q?hPeTU750SfWDDecMj+iuKc8a+mneXPVRFz5GgXOfYA2Wb5KOYAcoBDhCivur?= =?us-ascii?Q?RZrpdLqOCQXwUU9e16k5yaO554n+VSnVxco8+5PrnEJSU0Bc/VqU44AswfpG?= =?us-ascii?Q?t9SUzUmyOCXZnPHTOphNJfjLTOBnjmhm0ZS2?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:00.7643 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62911c85-73b2-4c7b-8aea-08dd9dc88b0b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F41.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8574 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423913310116600 Content-Type: text/plain; charset="utf-8" Users could only access trace buffers via hypercall XEN_SYSCTL_tbuf_op, so we shall make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- xen/common/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 28e6ac2142..d84906df24 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -547,6 +547,7 @@ config DTB_FILE config TRACEBUFFER bool "Enable tracing infrastructure" if EXPERT default y + depends on SYSCTL help Enable tracing infrastructure and pre-defined tracepoints within Xen. This will allow live information about Xen's execution and performance --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423905; cv=pass; d=zohomail.com; s=zohoarc; b=TbUlYry4Xu37QcIoDf6w3fxqPe/vq+d0a4na9eFhwqB8T6Sj8k3ge3ZlB0XUHMA4ISf9SOufh28r7sjlskSfYdLXWUknW1gceNtMvQ2iSVAz3u+SKtzi2p74oPb4NrQjGAPkCd5qganUYeFF2ZBMpOn29mL56RXAhcaAJ8XgrMU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423905; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NI/6AN7Kc6qmUPgrDZbatiRRdKNwzya65ykPb1EYoB8=; b=Zcbr/I7VwN0i/zF6Zmzylz8ulvrD+8yKX32Fri2KT6lSYNyc1XjzXML5NTmPRRbqZpYhjU9YPDn3lnA1evY8Mv5AscvUs6rYQQVJdHflgnF24C4fc4gRJzG2CvOP4PQS6AyMNEBz9kvCQG22rBh3CJhPSEeeamgI+BaQlhzlg6k= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748423905104593.3355111571282; Wed, 28 May 2025 02:18:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999069.1379826 (Exim 4.92) (envelope-from ) id 1uKCvJ-0003BD-FN; Wed, 28 May 2025 09:18:09 +0000 Received: by outflank-mailman (output) from mailman id 999069.1379826; Wed, 28 May 2025 09:18:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCvJ-0003B6-CJ; Wed, 28 May 2025 09:18:09 +0000 Received: by outflank-mailman (input) for mailman id 999069; Wed, 28 May 2025 09:18:08 +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 ) id 1uKCvI-0001jE-96 for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:08 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on20602.outbound.protection.outlook.com [2a01:111:f403:2415::602]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id a9c3109e-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:18:06 +0200 (CEST) Received: from SN7PR18CA0015.namprd18.prod.outlook.com (2603:10b6:806:f3::6) by PH7PR12MB7020.namprd12.prod.outlook.com (2603:10b6:510:1ba::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.21; Wed, 28 May 2025 09:18:03 +0000 Received: from SN1PEPF00036F41.namprd05.prod.outlook.com (2603:10b6:806:f3:cafe::fe) by SN7PR18CA0015.outlook.office365.com (2603:10b6:806:f3::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.19 via Frontend Transport; Wed, 28 May 2025 09:18:03 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F41.mail.protection.outlook.com (10.167.248.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:03 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:17:59 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: a9c3109e-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gjZktzLymzXFzcWhDSCBI5r+c61LqGTP9wQk1uLSrasc3vk0tN3XX+OIDDXTKw6ESRQ51C15cuWvlRNUY/CHi2+nJzvCjCmUywb0P6nuGzysEP98LLGrmSJS1cqCqFJZ2jmrfxayspKhpEbXv3ceuTzvRdCQFdPDADcrP3V7zLoKMU0VlIcGa81Idp1g163Gj8GZm32eS5fu3iilI/psR3v6TDb5VhNpXcvXvKbkoYaqtHIU2yL97PljonfQvDXvi3zgdiyuDbzwAUna81OJvm0X968/JGsK+7cMJ8RU0ktRSkl1wYct+sWD33tYN0dUxE8EE0yVplNztK+z0b2gZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=NI/6AN7Kc6qmUPgrDZbatiRRdKNwzya65ykPb1EYoB8=; b=O1jgzCCNksDS/8lqvCGvC2v01yXBkUh2oRtyR+Yo43gZA2eDz09IBagq6h1Dfd0zvnIYbDRHT0cnvndbC8+0lE3dbAzKtkkz4U2ETwF6+8mtulNBMtMtwlNmsXcpCXTZ32zs6O+FkTINH14d+FHhualayug8tpVW0z8rL/zSTfBW6T6ueZmh7WCu/x3ijDMVKCTHDGWGQngxmONyC93v4x2Ql58SBTjvMZFbwCIa+XRtMVCzuqccSqmXcVB1cF6vA7K4r5/pP3tlGWHgPZktvnJQ50V+UAHx+1n0W4f0Gv546m8aH159XVagehpfQaWTr+/MjiorfX1EJTisvIUaxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NI/6AN7Kc6qmUPgrDZbatiRRdKNwzya65ykPb1EYoB8=; b=T9HC93Sg9ZujVTZ179v+ooynKI8q3CAEGWmC1UAZjQ5IrE0wtzm2C+qRAsHaZ7ggNf9P3I+0XvzKDvIPSttApIzGFQLgnkIkk6VDApcMHQoMjN8O38bQ27tHkw86TEG+R55yTJAUSRAXjIahoaN4fes6cP3FuidMhVVj+x6QNcY= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Dario Faggioli , Juergen Gross , George Dunlap , Stefano Stabellini Subject: [PATCH v4 08/20] xen/sysctl: wrap around XEN_SYSCTL_sched_id Date: Wed, 28 May 2025 17:16:56 +0800 Message-ID: <20250528091708.390767-9-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F41:EE_|PH7PR12MB7020:EE_ X-MS-Office365-Filtering-Correlation-Id: 9509008b-acce-4e44-af6c-08dd9dc88c78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Dwqw1CJ04FDWf9MVfHsVlWuImI20jFrl6Ajm86uJsW+x8oGBpHqUq5y63qzH?= =?us-ascii?Q?XdvM6DjXu1oIYfhnUITfKlVWRWgdbrw0cxWl91cmrA4yghh5boCN3ozP2yrr?= =?us-ascii?Q?PZlr0NNGf1vo1d+wJDy40zpxdDXTmRi6vhxNAgc7bNgWoxoeZP5YfdB5wg85?= =?us-ascii?Q?1remH6jK2YEZAHJr8xT18I+GeLG4KgUDnAzRDfLTEnZ1KuSaEz2Rmk/vDOGE?= =?us-ascii?Q?oCRdxyNeuwmFAFNF1U0haOOLOQv4rPKntYJLKurzfRZEKW5SViackie49Vka?= =?us-ascii?Q?Xl8mK01huss0fgSAaFEPyWGaQp3uvmhaSHJhd/2kMdYH+kSMHlrk0scFDaKX?= =?us-ascii?Q?9gHZnKeks0Wcj7VRgAFhivAoTR/wbgY2uCKb36ym6QCMFnGDB/0//tQHvTr6?= =?us-ascii?Q?2vx9kU1x8h8XdbTZszOl/ZGg7CHe0iG0PkE6lTdQyrLzm72fdHCYdY7tFZeS?= =?us-ascii?Q?bZoyfXZBiUU50mievaWKanKIz38jdFhltMLiqMIfsi0rxck3TqBXRAJ6MoMJ?= =?us-ascii?Q?JbJ+Qr4yt4cnhO1yOUDV5CiZRndlOqZRJqoMeImjV5iT5b+vIVxrH4GSsEmw?= =?us-ascii?Q?9cMbPpTmexKhTErMX8Lffc1eT4t+AS64xoLSDPRga8CxIPn5i5Nj5pQRrnon?= =?us-ascii?Q?KSn/2Xfp0ZEpyLR3iYR23cA27CRMWffl3ciOg2sP4Adl7ae3Mkdb5AfGfuCe?= =?us-ascii?Q?H7SuLPQL9MtFkUR6ENpVDHlw4aa8sy8V9ZPbVMUKIf9+BMSjy6wjNdn8xNIP?= =?us-ascii?Q?Y7Hz6V8VP57EjWrKhrSInFFDLFdP9f5cZc6+hhEZIJpuX1rljxyuZKPOraBB?= =?us-ascii?Q?qaCLsEZfwzOn8krXZWgB2NBZnUdc88W8v1O9W2ib1TQmGP37IwL+DDIe5cY6?= =?us-ascii?Q?gDVWAwynOrQh5DgjNNUQyfqBJQXS37ik/FOfJUiQkOtIu7DLnMVYaXCrNZy0?= =?us-ascii?Q?Ijjor1u/c8anZBcsCY22rPAYJRbtcCWwW+v0BG1w+O7Tzj0xfygXUFWg4CTH?= =?us-ascii?Q?oZ5ueoP/6s9T5rn/vWKVwcyshofObX6n82I9kF1338AljqHwWARS6pXZIbMV?= =?us-ascii?Q?m6qvLNfl7Bhsfr/KcRRq4x9qUKOWiigfB6ppgx2F17yKJpOW7xkMi1sTmE1g?= =?us-ascii?Q?UpCvucuZGsUZ/HMWPDNR1Gq7HlmlmgM6byORKXeByh92y3HOlQWx2PafyONX?= =?us-ascii?Q?8VK/NRH1/hfWnxCqB+M4C2nX9MGob66wSDFqiBt5rGWLrsDx3g/mgS0nGNx+?= =?us-ascii?Q?J7m2koVKBfVhGJ6W823S8ej+1ZKg/lcBp2usMPh023vafV34c57Gw1aH1Yla?= =?us-ascii?Q?pzrMpUtjPwzgGexR67MMJfIXg6GQ2epk4bQiylDn2HC49PymnUfyLedwGZuR?= =?us-ascii?Q?t0teSyDRpOZMhnIbnO84NP7GNTWA5DkvAwGJ1Y/8R+3JaoCt1vKcfXCG+uHl?= =?us-ascii?Q?snz8xV31RFYHHJD+vaXI0MNHEeQk+HhyTVzLB1ZsNPkVOJcIu4AsWooi/7bs?= =?us-ascii?Q?VAh5CHj1fhL/QGDsteR8E6FFfRQCVVAlQGkP?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:03.1578 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9509008b-acce-4e44-af6c-08dd9dc88c78 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F41.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7020 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423907352116600 Content-Type: text/plain; charset="utf-8" The following function shall be wrapped: - scheduler_id() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v3 -> v4: - remove transient "#ifdef CONFIG_SYSCTL" --- xen/common/sched/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 9043414290..13fdf57e57 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -2069,11 +2069,13 @@ long do_set_timer_op(s_time_t timeout) return 0; } =20 +#ifdef CONFIG_SYSCTL /* scheduler_id - fetch ID of current scheduler */ int scheduler_id(void) { return operations.sched_id; } +#endif =20 /* Adjust scheduling parameter for a given domain. */ long sched_adjust(struct domain *d, struct xen_domctl_scheduler_op *op) --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748423906; cv=pass; d=zohomail.com; s=zohoarc; b=NhO/evulXN0mUJXQKOkf7IBR01cx13e4/quPwDU8V1O4f2Wlx4WxRMNhN5GeOGYJ2CsLaeu1zvfylCfQaA4TJkGx+XocBk6ymHVjx+fZCT4pXUKhKGTVgSxAR5IsBiEVSXPx1L7bAzSv8+unqxd7F0s1CEF7Zuj/Rofxd9Yrdu0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748423906; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DO6UlKiuVPi7TbpfR8fz/JNSlwLaSYSXABlcKqP5Puo=; b=fpNvtG709n3VUHhqWseqdrfol+iYVmm7Y9MTx/Blp6qTiOyuH438zV0P/zezv3cHz9XZA4nrI1jPLv3NriQ08IxCnSunJyYT5GtYcKJEpvmm9D97WO9BS/cbKxVG6OlDqNAmyspnLAsccz0s0MOM3InP/K4ODzMc8JhoAArTKW8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748423906986147.51877277620474; Wed, 28 May 2025 02:18:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999071.1379845 (Exim 4.92) (envelope-from ) id 1uKCvM-0003oF-6Z; Wed, 28 May 2025 09:18:12 +0000 Received: by outflank-mailman (output) from mailman id 999071.1379845; Wed, 28 May 2025 09:18:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCvM-0003np-1j; Wed, 28 May 2025 09:18:12 +0000 Received: by outflank-mailman (input) for mailman id 999071; Wed, 28 May 2025 09:18:10 +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 ) id 1uKCvK-0001jE-9a for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:10 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2061c.outbound.protection.outlook.com [2a01:111:f403:2414::61c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id aada3f53-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:18:07 +0200 (CEST) Received: from SN7PR18CA0012.namprd18.prod.outlook.com (2603:10b6:806:f3::35) by SA0PR12MB4494.namprd12.prod.outlook.com (2603:10b6:806:94::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.29; Wed, 28 May 2025 09:18:04 +0000 Received: from SN1PEPF00036F41.namprd05.prod.outlook.com (2603:10b6:806:f3:cafe::60) by SN7PR18CA0012.outlook.office365.com (2603:10b6:806:f3::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.30 via Frontend Transport; Wed, 28 May 2025 09:18:04 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F41.mail.protection.outlook.com (10.167.248.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:04 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:01 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: aada3f53-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cQSx5LbZ6+mjE4TN9TPP6BtZ4Anv15FvVEGDUAD4dUgWP3kvJqvS7DfbhwKYVXNT0AZ3mm8XNm78HfOtk5nP7epwl91fxPb4kg3xsbrjcKXRub7lxYdEvDsEn0IXpg8QNx4RrXvlt4BXAk5MTkFhWaSwYABnzee/2MhQyjmfZgCrKREWQqqPAlUR9ED9SEIJTBbVmJT+ASEXNiKg7VcBaRvjHQVQITxA1gNPvnMSqYbOd+OTBnoND+Gjmqh9SyTOaMhiINpsLtPGV2C9PgaUkvsQuHJZguHNwtNg/aikJ0OKb5cxpfK1EyIkUPg7Syqq8AtFDfrJKnZrS9SeXetkqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=DO6UlKiuVPi7TbpfR8fz/JNSlwLaSYSXABlcKqP5Puo=; b=JqgNkudZdkEQk4FPwK1fz8zQZGHqr/aNvwoQybKaDNeI0WmvsUtK7P6Mrcht6lgiD1fS+vc1dTrTu+s8lwKJvqmidpIakDox+pcQDPCu24G1Izd3EOrv7R+O44SOZxebt+9RVFX1lsj+f7qx3NWfflr028wRjT9qYTYVZPl5mUd3yRw1GsmU7pyOSPY9KTrxeN5BTxnIVFiyZgGvWRVwitvh8LwU35wjcYdBUrkdcVtDnJ4BcU/8OYOq7hKysSCfxL7rwjAHNzDPk8nE5Ff3+8WmnWZt+xNNU3ig/QGtOt64hwETS9GX62hjiHISiI+btyrnStjE+KaycCrIzn2kyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DO6UlKiuVPi7TbpfR8fz/JNSlwLaSYSXABlcKqP5Puo=; b=MGTnZqcN4Ylgmf9HSbkPpK/jUXECcEjLBYn2JRs+KB9x9Q00qoMH5F/3AXrL/mVS+ZvSo0CJKVRdKjch6xzQx8w1lTjixGRoxe8kfeXBkJ1ZmZgou0+9zR6wnVrBac8AyJffCO0a2+NC3Wva81tH9p6zYcZ5GcrGNum+i6jfeY0= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , "Julien Grall" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v4 09/20] xen/sysctl: wrap around XEN_SYSCTL_perfc_op Date: Wed, 28 May 2025 17:16:57 +0800 Message-ID: <20250528091708.390767-10-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F41:EE_|SA0PR12MB4494:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b6c2526-3b3d-4cb6-af9a-08dd9dc88d14 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8txRWvdFF1nBVuc7xNza9emlU+IoflcYqeaupPi5psuScCpRxw2us+LXTr0C?= =?us-ascii?Q?+gGDT/B+BmCL6ojpIJby1RNJSkK7ku8jb7ZPJd+L1iVqGhkLiYAd7j5XURzK?= =?us-ascii?Q?lvzsQZNjqmkoQ5byEYoG/9ZNyrfYENwDhtJcNax2O7BCOpvN4e9rrAK8HRyN?= =?us-ascii?Q?NcVy8ahTTC/YtIztt7mMbiIgFJPca6lF3s4KiLQVOrQFupCm9g46rcj9YdOo?= =?us-ascii?Q?adKJDlP7Au35VtbdHAEvP2x1WePOJ7W5LzruUScHYeLXOc3BmteyOMQqvT2w?= =?us-ascii?Q?6O+cHffcEwzc/VbjW1k1McGXwrb9wf43QE1lzTdWr5VPupbjvxTPJ9lkDNEv?= =?us-ascii?Q?vNiGY6+nYtVHWWNmkPF55hrbuwS3IVRJEEWqDqMXuovto+3x5+skct1fiReU?= =?us-ascii?Q?Rx616FH83B4m/txiDV9/TC5lzpUA4UWCfyk139L4gA8LZAAj1CadqGwzJjMj?= =?us-ascii?Q?v3OG5L262Dxn9Ykh0VeHbzVaPJBWil7KCDWaOL7UuBucYNxUWq9xDUiNuqfR?= =?us-ascii?Q?nx0w5YM7c2ocLhgNFaBMQsxsjd35yvQt5vnUR5MBCKTvlOjjNAJ6gJ8Cq+Kv?= =?us-ascii?Q?M4WKUFdvPG6dKxKcaMvUGubEDoe4QNw9/pjzDV9faELi5T79NNE0jHu5YFuD?= =?us-ascii?Q?ydWhj+YlujRFb3UTmuJUwiGDW6swkBwlACy7FgU7WzywJyI6XgtSZomxlgMP?= =?us-ascii?Q?9FhftV0eV710vlgGKPbPUgY5RRJGaSpqTpLCmNpDNSW4HeE9jhL6zfbpbhgx?= =?us-ascii?Q?MPbLUxV3957Fzjfp5agnMz7QAV9ZSyFDK5jjaQzmy8j5yzFPqXYqLs8+O0ot?= =?us-ascii?Q?8JZHgh3MKA5i2VY4EzJMnNGwcWIOq4ZMTJ828Wawn2uvbFXz1ejnqyGYODTO?= =?us-ascii?Q?1/lZF0YWTpx5QyRPD9vq201DR7sKoo7q66UPe4gg8LLa6Ij9UMUrHbEvktCb?= =?us-ascii?Q?xFAZ5Qi+y+DlNZiwNlLS7KzqfpAEY2KtP2EAIZ+6OsIboNC+2Vfh5re2dfvi?= =?us-ascii?Q?7P32vtBvpF3zTC6jMfTf0eS4FPJkbHM55NsAlTMEVLx6bXmGuGOWghdgTUw0?= =?us-ascii?Q?pi5G2tMcfvjRIfKJzcBKZKhWouI6uTCUKibgN9dmGj/ZriACDnpYj9u5xYhU?= =?us-ascii?Q?yZCBFbXIzUBzBIZ7gnlp3xZ0E2yYWPZQGCr4IRFBJdm9YdmSTi2hqX9cYLWN?= =?us-ascii?Q?didgjq2umbDaY0vKJ6aXYpBNJYEp+r/FheGsLdOl95WeVA3AWaM9lnmUwIbz?= =?us-ascii?Q?/YNdwQdq/6FrPr2PY0a0Jo8FpB0DhsFeEgPSHD+ybuJwn0o/jwVKYWn1Rxw8?= =?us-ascii?Q?phntOFcKr1P4kXKqYvEqEoqvpylSK9d5T6ttF26tpiS9FIUmJf56y8+hG+Ty?= =?us-ascii?Q?wyqkT/izDFUJgIK672E720s+agjHbwQw+HWIaj4M6WIKeluuryaF2nFdMjPS?= =?us-ascii?Q?ssfofIJEN3HMecAbS12TX7Qxp4MqPjs+Ccl1r/xT5DFMUOARACSnYvxiWAR5?= =?us-ascii?Q?1cTmDHdWz/i/1liwZMNP/Fa2QHVb1jMWMxeB?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:04.1798 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b6c2526-3b3d-4cb6-af9a-08dd9dc88d14 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F41.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4494 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748423907364116600 Content-Type: text/plain; charset="utf-8" perfc_control() and perfc_copy_info() are responsible for providing control of perf counters via XEN_SYSCTL_perfc_op in DOM0, so they both shall be wrapped. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v2 -> v3: - add the blank line --- v4 -> v5: - remove transient "#ifdef CONFIG_SYSCTL" --- xen/common/perfc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/common/perfc.c b/xen/common/perfc.c index 8302b7cf6d..0f3b89af2c 100644 --- a/xen/common/perfc.c +++ b/xen/common/perfc.c @@ -149,6 +149,7 @@ void cf_check perfc_reset(unsigned char key) } } =20 +#ifdef CONFIG_SYSCTL static struct xen_sysctl_perfc_desc perfc_d[NR_PERFCTRS]; static xen_sysctl_perfc_val_t *perfc_vals; static unsigned int perfc_nbr_vals; @@ -265,6 +266,7 @@ int perfc_control(struct xen_sysctl_perfc_op *pc) =20 return rc; } +#endif /* CONFIG_SYSCTL */ =20 /* * Local variables: --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424102; cv=pass; d=zohomail.com; s=zohoarc; b=oBt+9rM1y88A66eWOTguUJGYuVM2KbWOpsE+seBzaeQov3JDnFm5uIGUx6fOQHjPdY6hIl2C4etZKb1kzz12xl1OK7oUoFuDVSsWDn/oXt+vmrdArO57RT0qKuxlxSu1qrg/Jm6sDA0t07FxjdhOmhkOoI7V78bnT2/+18vJtVU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424102; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6PNM5kmGchxaBPy9UTeIPhmjlaI6cmNBtQ+7yjRXB+Y=; b=AGj2kbZ8wrWyR/OcP88euqu93IO4b/u2Mhfa6wlSD/HAhuIooiQhKcKFFrE/WpycmtJnprzDZG48d3mlt1//zWfv+oezPvN1PDdwSNpZ+h30GBuFBlBXb+CyLAb3z8RY/oMkEPcJdaxiqPlEFsDhEYRMW8LLY0+IoT3vAOZ9S9s= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 174842410239267.97950951069788; Wed, 28 May 2025 02:21:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999173.1379925 (Exim 4.92) (envelope-from ) id 1uKCyY-0002SG-RT; Wed, 28 May 2025 09:21:30 +0000 Received: by outflank-mailman (output) from mailman id 999173.1379925; Wed, 28 May 2025 09:21:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCyY-0002S9-OS; Wed, 28 May 2025 09:21:30 +0000 Received: by outflank-mailman (input) for mailman id 999173; Wed, 28 May 2025 09:21:29 +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 1uKCvO-0000yL-9J for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:14 +0000 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on20628.outbound.protection.outlook.com [2a01:111:f403:2407::628]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ace5f501-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:18:12 +0200 (CEST) Received: from SN7PR18CA0011.namprd18.prod.outlook.com (2603:10b6:806:f3::19) by SA1PR12MB6845.namprd12.prod.outlook.com (2603:10b6:806:25c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.26; Wed, 28 May 2025 09:18:07 +0000 Received: from SN1PEPF00036F41.namprd05.prod.outlook.com (2603:10b6:806:f3:cafe::39) by SN7PR18CA0011.outlook.office365.com (2603:10b6:806:f3::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.32 via Frontend Transport; Wed, 28 May 2025 09:18:07 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F41.mail.protection.outlook.com (10.167.248.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:07 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:04 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: ace5f501-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FW+Sn6Qsmmzm5l9wGcSElkVrbgCfddXKslUdSX8xIplM8crnXGOzbwBRrNoPxlpVjX6QP0GKfx8ywr85ruYV6HnpPDNQ832ppjBQmKm2v+PWTAYtOSW73N5kb4jLt44cJOM6WlC1oNxDuUrBOiDnpbPnBRUGwJ2/YHF2axg0loMrjFJSbU/tYFoyOcfPk53SXdAkIrR96q9uqnpiYrc4KpTKw19wjg5UACK3VrwngRXVPOF8GdUZ79L+DKHR7R9J6UPbYMWkwJqqwwL0YeXfF/zE6w6rWQGBTtA32al4Dh2AFwA473zlSK9L3oGQUlU/U2SRp8UidAa5Cs4uphbPGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=6PNM5kmGchxaBPy9UTeIPhmjlaI6cmNBtQ+7yjRXB+Y=; b=UlZio1P/jjlObvX7fsIr1uiCHol1Vcf5A4ptTAXexd/qiibkn6tXIcf+FEz+TBFStSE3pVc5UedS58Yw+1gGjA24+rap/LYWSIwPoKrT+Ew6PtgUoFsincOqUT8HsosccOw0Xmm7SFNaHgX2N9ScoAxYD9wyrs8QbJlYbknEJARCx+a1q1MSlx1Nm5gJQseM0CYIpvHgeTBqv7PYZgilvr24+V4/Poy3kgBVIg0MlWUkoeDl08O2nJk+m3M6gKUY0cwMjT8m0+VscZAQNDaXXeDpqohjmC73PnLSRFMwfeh5hiVIZz7fS1nohkqbc31YjOm53w6GRUK4qn+Tg2VmYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6PNM5kmGchxaBPy9UTeIPhmjlaI6cmNBtQ+7yjRXB+Y=; b=dV26dEczxQnKEcq4MhFBfZoJikIkSxcK4u9I4Xghq5Hy+Pi6zdON8GqeB4Gh0Suey57JZt5Zis4vSF1nVuNWEw/NjyiYdQaS5tFacybCwPYmVIqu9cLYLANB10TnyVTCQpdajvQ9mZHtImKpPwmxCdmnTBn2YtSu2hTQUW2w1SM= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , "Julien Grall" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v4 10/20] xen/sysctl: wrap around XEN_SYSCTL_lockprof_op Date: Wed, 28 May 2025 17:16:58 +0800 Message-ID: <20250528091708.390767-11-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F41:EE_|SA1PR12MB6845:EE_ X-MS-Office365-Filtering-Correlation-Id: 50c9b3e5-0fb3-43e3-5069-08dd9dc88ec7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AvVEUYrLCpXVU7eof8HpKhyFoej6DzYJTNnic3tefaw4wQNUESW5yq/89hQR?= =?us-ascii?Q?2EkXxElq7H0PMeTXmWkpkG7qLTSSQEJscjdiVL5KPgyu87r0Hg/xD+V0dw5/?= =?us-ascii?Q?o7ITDifYwRD/5VB0Hr4QYytwmdZ7KUARg+Dnwj9FuvHSqpsROPshUf/AlqrL?= =?us-ascii?Q?bTaCye0DWsU1VE5a5GtEAxSQxTSdr0jiTmY7ZCFUILHaL2x3vW8pAbPYXXPk?= =?us-ascii?Q?wqooN4o271utJGQO8S8xMlt5vCwuYaCvASmXBA1djVTDgyk8th32OZpG8Gb+?= =?us-ascii?Q?e/0PAaAr3TlAzP0g0JpsR1fDuQru04xRunlyQHzgwodfwGX4EvQhjit8dZum?= =?us-ascii?Q?fRXLpxSzucEaaqLfb2zZkYporDNwDCkolWp4moulX6NAh4FyIbhgJpWe8How?= =?us-ascii?Q?HJCgCILwhiUBndEBE+RRzoqTxg/ajS9OjTwr41ci834BpIk6GGa6peiFxwep?= =?us-ascii?Q?3WAd5eoapwksU/sIuuUnnGITJlY+QppcuW+6SFKA8yWiagShlalrdX6L522P?= =?us-ascii?Q?QGoORhohIpEsaQP6/LN4r9CDzFwiqGO7rWmJs34cY3h294yeHFVxfqud0ycn?= =?us-ascii?Q?tjZ67XjRMR0ajxu80ZXPPMMdBkTLUcX+PCrJBEjNlle6YnHe6+uJw7wdU7EH?= =?us-ascii?Q?3otbcMsLMnZpcsPBr3T+q+XGbzBPcIAE76O3ji7aI2PMQL7vYA29k76dio/u?= =?us-ascii?Q?f3EfWgGmBjggqFCDZnyhnQ+yYwTLdecgXW2vX04MiHuXFZNoCMj8rAtFHr+T?= =?us-ascii?Q?YF+4Q9vQ7nF58VQdsYsJ7aCImSc/QZGctppcjCQf6nVX0eix1JiEKeBxP2ln?= =?us-ascii?Q?ruBbi6dgoWAgPe9bW3rWgZQ4APxcoqTu01+XpvHcjX7TkR7KCwHUcBjMsl7i?= =?us-ascii?Q?IVk+0knZVyiTd0SgFm7LhS3eSDrfjgHY+kL+t+GSB/eeF1BW6pCtm6Dx+632?= =?us-ascii?Q?Z3lJepqiYJOkJxriqjhYv6Ds0XV4Bwl8mXPyoS1ve7AYgpHgKD6mxxLpOCLG?= =?us-ascii?Q?Yik5bK7dmlOuBBJpkG08GKxNoahy39LbspZQGeJLNmpdGu9X+IX4hy44zFfG?= =?us-ascii?Q?JlrcKuL35QDmvUPb0K81NtsRjQb1EO2vqaKDAXMt88pSaYaK2UvwPcDU9xc2?= =?us-ascii?Q?MrxCLs1JWt5iVTf3pf+kbq0BQDO/z89h/rEaWMGdSdYulSWTq/QCUMGTKDQT?= =?us-ascii?Q?us60T0/O1gzfR+KCQ0IaOQaU08p49TWZHN9TQ1T1mQlIx3oWB1qR49ubCRcY?= =?us-ascii?Q?deq4QbM+AThTTuY09u3gNG0mayrhsJKPhuSzWU67FVD+4gF+viQMUdBVau4K?= =?us-ascii?Q?Q+WEo82q7VGzUCaeJ0hOjk3opIDQ7yl7JuAtcGFbEr6VXxYmmqg79wDGDhf1?= =?us-ascii?Q?Su+VNwSzn2EXEF/0iF8lWjlvb6GEf2N0ciArxhC5Dc01ASN7E51UsKOaR4B+?= =?us-ascii?Q?vxduGW9mUN6HLk9erkRhlHMIru3GpSqNm5bEHbbPA7CSCXBzSmXhv+xvWYp5?= =?us-ascii?Q?reee1ELt1Vy/TwpOkDtTKeXxbe43aVrH8lae?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:07.0280 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 50c9b3e5-0fb3-43e3-5069-08dd9dc88ec7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F41.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6845 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424103844116600 Content-Type: text/plain; charset="utf-8" The following function is only to serve spinlock profiling via XEN_SYSCTL_lockprof_op, so it shall be wrapped: - spinlock_profile_control() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v2 -> v3: - add the blank line --- v3 -> v4: - removw transient "#ifdef CONFIG_SYSCTL" --- xen/common/spinlock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 38caa10a2e..0389293b09 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -690,6 +690,7 @@ void cf_check spinlock_profile_reset(unsigned char key) spinlock_profile_iterate(spinlock_profile_reset_elem, NULL); } =20 +#ifdef CONFIG_SYSCTL typedef struct { struct xen_sysctl_lockprof_op *pc; int rc; @@ -749,6 +750,7 @@ int spinlock_profile_control(struct xen_sysctl_lockprof= _op *pc) =20 return rc; } +#endif /* CONFIG_SYSCTL */ =20 void _lock_profile_register_struct( int32_t type, struct lock_profile_qhead *qhead, int32_t idx) --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424107; cv=pass; d=zohomail.com; s=zohoarc; b=QwX0NsrUuZjWQXspUYcAGqKqlFQTLQ6z/6xrCe0xkY3OAe83Jp4Rh3ysSGl3xV9fErGyX9EIv6HN0rP6hxiQCDDkQlRxmbp1EeuGYesP3+06cwxUZZAdpICihxVRzShAolIwOdOgJMkbJbHjPNAM8imS/8ij0Vj4zEqj3maAuB8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424107; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wH1LeeUj74zVDul7zCADDjPOAKRJmw7rKR7R0MHgDlg=; b=cYu8myMdAjf90YuuH2Xo8eJFAsV2ZGFSaA/vZr4w1mohfaYzwFJ6ZWiVQiMw1H3AaeZ1qMpG53+frW19y5LbYz9fJgOjjD/1+RmO8G0fprATdZr+kRw3azjeRp3WiGglucXjZQAjZ7zympmMwRcoSkwZdnftXllBuZ09ECn4/hg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 174842410706093.5055929221088; Wed, 28 May 2025 02:21:47 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999182.1379936 (Exim 4.92) (envelope-from ) id 1uKCyd-0002xa-4Y; Wed, 28 May 2025 09:21:35 +0000 Received: by outflank-mailman (output) from mailman id 999182.1379936; Wed, 28 May 2025 09:21:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCyd-0002xT-0W; Wed, 28 May 2025 09:21:35 +0000 Received: by outflank-mailman (input) for mailman id 999182; Wed, 28 May 2025 09:21:33 +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 1uKCvX-0000yL-BD for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:23 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2062d.outbound.protection.outlook.com [2a01:111:f403:2414::62d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id afb24bc7-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:18:16 +0200 (CEST) Received: from MW4PR04CA0073.namprd04.prod.outlook.com (2603:10b6:303:6b::18) by DS4PR12MB9611.namprd12.prod.outlook.com (2603:10b6:8:277::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.26; Wed, 28 May 2025 09:18:10 +0000 Received: from SN1PEPF00036F3F.namprd05.prod.outlook.com (2603:10b6:303:6b:cafe::79) by MW4PR04CA0073.outlook.office365.com (2603:10b6:303:6b::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.31 via Frontend Transport; Wed, 28 May 2025 09:18:10 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F3F.mail.protection.outlook.com (10.167.248.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:09 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:06 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: afb24bc7-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ROPC4IOnguJsLeDd5VT2sFrGa7reUTPiYywNR0hdRDi7jJ8phzmEyXxY4hriKEm3Ofh5o1ow+kSiigv+r1dZxhvCZUu2ZFkus8otGl/PmSMOm4ZaW0YLBymRJ4O8+6Au31HaXM4xzZJ0ph9aiA5eocjMgyWG8Ucay31z/3X2hL/RqIUr1dJQkcvhO8B8wVzHtfMrj/uoiAiS4UsuPUOdxceWHBEkm1R2L/D8o6TofNGGbPJ0u2pvPesW6Ss/XcybuWw9f8JyRnDxiDe95PokUPcq4hjM1ni/4juurbMNaHQW2Qd5zH80XgYAej6GxTUItYrkI9ZJM+mosJUAoQN7dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=wH1LeeUj74zVDul7zCADDjPOAKRJmw7rKR7R0MHgDlg=; b=JqTLogGPNwqD+U7jcRKMRZlD0PMWVoGsSQLFJ4UEDkYAYcrnLnVguh8hyByYOyT/zuW7QTgJpK6kp1ns/82IOP69VOuHY3uELb+KIIVtqBf57LzfLGYzMFPeJDtSvAaXu/tjXxSJ2HJqNFliJ4V23ccxnjInVZ4fVx6+t1YLJ6NN+9uQSzYOni63aoXfu7jHi3NNa1drl91lWLnXSRV0aXC1negc9wOIvAQ2CSedOuBiIncFtKslFx55QnHZJmPhKJhTwAQBPM0b0Rbi3IVGi6cjVZBM2mvMwU5dVdPbYe8GuQeIZdCpG14SXaocHY8AfBuQLSSJrXiagDwjv8Tmyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wH1LeeUj74zVDul7zCADDjPOAKRJmw7rKR7R0MHgDlg=; b=piguZJfRVjPSr5kZ5SQIqiWqZ2v9V9x32B+jTZ6TLbCnhmxmPthtM32iEiZsHOMPQEyNcUkThTDLp6DOHuA9Lck0vW2iRGKXKz9/t7jAi0saBT7oEn1nlIcLAY/1Yz5NHhY8a5/KEB1iwQpLhNqbr9mJQHIT02wtzxHtTnEvWeQ= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Anthony PERARD , Michal Orzel , "Julien Grall" , Stefano Stabellini Subject: [PATCH v4 11/20] xen/pmstat: introduce CONFIG_PM_OP Date: Wed, 28 May 2025 17:16:59 +0800 Message-ID: <20250528091708.390767-12-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3F:EE_|DS4PR12MB9611:EE_ X-MS-Office365-Filtering-Correlation-Id: 28468554-2eb2-45a1-0f40-08dd9dc89089 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?djhzpybgUPM9devfRrxxtXo+aUwb+Z5rGPRPj9p5tSNwOjMThgxakT56VFZ8?= =?us-ascii?Q?PnPZemYJfGLKBYBaKH98xmi114xx6ushN5AJsT9hsU5leD/MLKP7jpdNbRXC?= =?us-ascii?Q?QTREKeXXMa4SVd39zRaG6GEWAZQ6gZMBiBleoQe9kycglftuiYeRlLsTd5UF?= =?us-ascii?Q?3/5EmVBJwLhp+YQ9cBzD1m6z53VEx0FGz198THgK5ZwHqmcUEu6/EJdg49so?= =?us-ascii?Q?8AAu73moNrq3fw16BYBRNo28Tn3mSf/FLEvRzNTCWIyRNL154aSLCSJ06b5y?= =?us-ascii?Q?+7BQ8eTHdzQIpVrNm5M6zbPa+DJhrn6Aj1zR3AcbhXb8cSpyYFzOtomBLfi6?= =?us-ascii?Q?8+jS/NyJo5GcdxuInoRKMRelBklvwe7bmCviXpFGdFssJoEq97y7GVJhMiS0?= =?us-ascii?Q?crwLGjfcLsfSwCcvWxYfgt1MQF+XrhH9SBSxUqa6QtW+TEO5GBb5qxVKXLB9?= =?us-ascii?Q?TTZeR9DPldqcLewomicIjsbgvBuG7kRumbdHTLEKjN67YH8oZTJXDaO20h6z?= =?us-ascii?Q?dnwvx/czyhnYzqIeHmEz9O4SgmfwM5KL+HfHe9FH8Bni5+pINfbXC69nJ5MT?= =?us-ascii?Q?96byStK34L1m0d2jVhwTFcGxy2HTMegJ6sbtWE7vQUwCUSYhUGpxx0kMsHXS?= =?us-ascii?Q?TfBLtHncU4VVkJdL3Sa9I60geA496PW6aovSlIYnz1TKEifvPvS+QLXmIQCs?= =?us-ascii?Q?UiVsGzWoDg6lANuHh+1Q4M9+rZvxfe3XrSJJwFAp+tRMDmEvpK/ll4/2UmV2?= =?us-ascii?Q?IXsiY/yIOlx+QK5xXgwGpgX2B6Iae5O2yG9gUNW5AHiG4hwZ3XPmrb5a9gXZ?= =?us-ascii?Q?fhRhdbSF7sdzP+8T+ccN+Ze9pV75F5VpoAIsX+HN/pCxIMtko66BKthmNefY?= =?us-ascii?Q?NVpCuZJRwRQDw27qnyLfU6Qky4avkw65WmusZsoJyP4+ykXhVof5xpEg8iso?= =?us-ascii?Q?mazPMnwbUbkPkB974zmG2B6JUOcKm4HtHvziebqWk2MRio0eb6HDLq2UBH8n?= =?us-ascii?Q?Yto4QxBR3S6pP91Jl1b2u6E90u47l0+pcpHzny+5BstUjZKhr7XNv0eotrSF?= =?us-ascii?Q?42II9bRCDmA8O0NpgOPbxE7Zfl73BLKw8X6h2bMNiaW+hl55836Jus/BHhJ3?= =?us-ascii?Q?drsavQBTTt9Gts/hBiy3yeD82vMAShUhK2nMNkc2K7h4VPT7dsSPgFc5mdjQ?= =?us-ascii?Q?elAhnObpTR4Fh5iqpX3+qJdiHsuSB/ZWJYAG/AR3XF2AZ8QUpxnWMfZwPjJQ?= =?us-ascii?Q?xJeGZdYWF6aEDJqimsXFr97mCx0hP8ubtTZ97rPypMdDaXH84wOeohyhGIGN?= =?us-ascii?Q?E8CGUQQOf7vlF/sQjb/myLgPqEWkKRYIZ0BFzsWTT84AhHsBNeGRmIAGSjd5?= =?us-ascii?Q?tn8Vqg7T3ctp89jpCmtLKpcm61ZWTuYOr6lbo9dGF7yLPy71iHGVhJs7WqN1?= =?us-ascii?Q?ihs8MQhWkBPhpB6mAicQg10Db9WLHt8ch9p3n2agu3xWcRyiyMlrod4FHUr2?= =?us-ascii?Q?Hlny5UnbpX2aUjAPb3CeVNHbPdYmLdupBaJ/?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:09.9755 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28468554-2eb2-45a1-0f40-08dd9dc89089 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F3F.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9611 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424108183116600 Content-Type: text/plain; charset="utf-8" We move the following functions into a new file drivers/acpi/pm-op.c, as they are all more fitting in performance controling and only called by do_pm_op(): - get_cpufreq_para() - set_cpufreq_para() - set_cpufreq_gov() - set_cpufreq_cppc() - cpufreq_driver_getavg() - cpufreq_update_turbo() - cpufreq_get_turbo_status() We introduce a new Kconfig CONFIG_PM_OP to wrap the new file. Also, although the following helpers are only called by do_pm_op(), they ha= ve dependency on local variable, we wrap them with CONFIG_PM_OP in place: - write_userspace_scaling_setspeed() - write_ondemand_sampling_rate() - write_ondemand_up_threshold() - get_cpufreq_ondemand_para() - cpufreq_driver.update() - get_hwp_para() Various style corrections shall be applied at the same time while moving th= ese functions, including: - add extra space before and after bracket of if() and switch() - fix indentation - drop all the unnecessary inner figure braces Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- v2 -> v3 - new commit --- v3 -> v4: - rename the file to pm-op.c - drop all the unnecessary inner figure braces - be consistent with the comment on the #endif --- xen/arch/x86/acpi/cpufreq/hwp.c | 6 + xen/arch/x86/acpi/cpufreq/powernow.c | 4 + xen/common/Kconfig | 7 + xen/common/sysctl.c | 2 + xen/drivers/acpi/Makefile | 1 + xen/drivers/acpi/pm-op.c | 397 +++++++++++++++++++ xen/drivers/acpi/pmstat.c | 357 ----------------- xen/drivers/cpufreq/cpufreq_misc_governors.c | 2 + xen/drivers/cpufreq/cpufreq_ondemand.c | 2 + xen/drivers/cpufreq/utility.c | 41 -- xen/include/acpi/cpufreq/cpufreq.h | 3 - 11 files changed, 421 insertions(+), 401 deletions(-) create mode 100644 xen/drivers/acpi/pm-op.c diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hw= p.c index d5fa3d47ca..e4c09244ab 100644 --- a/xen/arch/x86/acpi/cpufreq/hwp.c +++ b/xen/arch/x86/acpi/cpufreq/hwp.c @@ -466,6 +466,7 @@ static int cf_check hwp_cpufreq_cpu_exit(struct cpufreq= _policy *policy) return 0; } =20 +#ifdef CONFIG_PM_OP /* * The SDM reads like turbo should be disabled with MSR_IA32_PERF_CTL and * PERF_CTL_TURBO_DISENGAGE, but that does not seem to actually work, at l= east @@ -508,6 +509,7 @@ static int cf_check hwp_cpufreq_update(unsigned int cpu= , struct cpufreq_policy * =20 return per_cpu(hwp_drv_data, cpu)->ret; } +#endif /* CONFIG_PM_OP */ =20 static const struct cpufreq_driver __initconst_cf_clobber hwp_cpufreq_driver =3D { @@ -516,9 +518,12 @@ hwp_cpufreq_driver =3D { .target =3D hwp_cpufreq_target, .init =3D hwp_cpufreq_cpu_init, .exit =3D hwp_cpufreq_cpu_exit, +#ifdef CONFIG_PM_OP .update =3D hwp_cpufreq_update, +#endif }; =20 +#ifdef CONFIG_PM_OP int get_hwp_para(unsigned int cpu, struct xen_cppc_para *cppc_para) { @@ -639,6 +644,7 @@ int set_hwp_para(struct cpufreq_policy *policy, =20 return hwp_cpufreq_target(policy, 0, 0); } +#endif /* CONFIG_PM_OP */ =20 int __init hwp_register_driver(void) { diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufr= eq/powernow.c index 69364e1855..12fca45b45 100644 --- a/xen/arch/x86/acpi/cpufreq/powernow.c +++ b/xen/arch/x86/acpi/cpufreq/powernow.c @@ -49,6 +49,7 @@ static void cf_check transition_pstate(void *pstate) wrmsrl(MSR_PSTATE_CTRL, *(unsigned int *)pstate); } =20 +#ifdef CONFIG_PM_OP static void cf_check update_cpb(void *data) { struct cpufreq_policy *policy =3D data; @@ -77,6 +78,7 @@ static int cf_check powernow_cpufreq_update( =20 return 0; } +#endif /* CONFIG_PM_OP */ =20 static int cf_check powernow_cpufreq_target( struct cpufreq_policy *policy, @@ -324,7 +326,9 @@ powernow_cpufreq_driver =3D { .target =3D powernow_cpufreq_target, .init =3D powernow_cpufreq_cpu_init, .exit =3D powernow_cpufreq_cpu_exit, +#ifdef CONFIG_PM_OP .update =3D powernow_cpufreq_update +#endif }; =20 unsigned int __init powernow_register_driver(void) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index d84906df24..712c29b1a0 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -591,4 +591,11 @@ config SYSCTL to reduce Xen footprint. endmenu =20 +config PM_OP + bool "Enable Performance Management Operation" + depends on ACPI && HAS_CPUFREQ && SYSCTL + default y + help + This option shall enable userspace performance management control + to do power/performance analyzing and tuning. endmenu diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index c2d99ae12e..daf57fbe56 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -174,7 +174,9 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_s= ysctl) case XEN_SYSCTL_get_pmstat: ret =3D do_get_pm_info(&op->u.get_pmstat); break; +#endif =20 +#ifdef CONFIG_PM_OP case XEN_SYSCTL_pm_op: ret =3D do_pm_op(&op->u.pm_op); if ( ret =3D=3D -EAGAIN ) diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile index 2fc5230253..1d811a51a7 100644 --- a/xen/drivers/acpi/Makefile +++ b/xen/drivers/acpi/Makefile @@ -6,6 +6,7 @@ obj-bin-y +=3D tables.init.o obj-$(CONFIG_ACPI_NUMA) +=3D numa.o obj-y +=3D osl.o obj-$(CONFIG_HAS_CPUFREQ) +=3D pmstat.o +obj-$(CONFIG_PM_OP) +=3D pm-op.o =20 obj-$(CONFIG_X86) +=3D hwregs.o obj-$(CONFIG_X86) +=3D reboot.o diff --git a/xen/drivers/acpi/pm-op.c b/xen/drivers/acpi/pm-op.c new file mode 100644 index 0000000000..b6c590967e --- /dev/null +++ b/xen/drivers/acpi/pm-op.c @@ -0,0 +1,397 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +/* + * 1. Get PM parameter + * 2. Provide user PM control + */ +static int cpufreq_update_turbo(unsigned int cpu, int new_state) +{ + struct cpufreq_policy *policy; + int curr_state; + int ret =3D 0; + + if ( new_state !=3D CPUFREQ_TURBO_ENABLED && + new_state !=3D CPUFREQ_TURBO_DISABLED ) + return -EINVAL; + + policy =3D per_cpu(cpufreq_cpu_policy, cpu); + if ( !policy ) + return -EACCES; + + if ( policy->turbo =3D=3D CPUFREQ_TURBO_UNSUPPORTED ) + return -EOPNOTSUPP; + + curr_state =3D policy->turbo; + if ( curr_state =3D=3D new_state ) + return 0; + + policy->turbo =3D new_state; + if ( cpufreq_driver.update ) + { + ret =3D alternative_call(cpufreq_driver.update, cpu, policy); + if ( ret ) + policy->turbo =3D curr_state; + } + + return ret; +} + +static int cpufreq_get_turbo_status(unsigned int cpu) +{ + struct cpufreq_policy *policy; + + policy =3D per_cpu(cpufreq_cpu_policy, cpu); + return policy && policy->turbo =3D=3D CPUFREQ_TURBO_ENABLED; +} + +static int read_scaling_available_governors(char *scaling_available_govern= ors, + unsigned int size) +{ + unsigned int i =3D 0; + struct cpufreq_governor *t; + + if ( !scaling_available_governors ) + return -EINVAL; + + list_for_each_entry(t, &cpufreq_governor_list, governor_list) + { + i +=3D scnprintf(&scaling_available_governors[i], + CPUFREQ_NAME_LEN, "%s ", t->name); + if ( i > size ) + return -EINVAL; + } + scaling_available_governors[i-1] =3D '\0'; + + return 0; +} + +static int get_cpufreq_para(struct xen_sysctl_pm_op *op) +{ + uint32_t ret =3D 0; + const struct processor_pminfo *pmpt; + struct cpufreq_policy *policy; + uint32_t gov_num =3D 0; + uint32_t *data; + char *scaling_available_governors; + struct list_head *pos; + unsigned int cpu, i =3D 0; + + pmpt =3D processor_pminfo[op->cpuid]; + policy =3D per_cpu(cpufreq_cpu_policy, op->cpuid); + + if ( !pmpt || !pmpt->perf.states || + !policy || !policy->governor ) + return -EINVAL; + + list_for_each(pos, &cpufreq_governor_list) + gov_num++; + + if ( (op->u.get_para.cpu_num !=3D cpumask_weight(policy->cpus)) || + (op->u.get_para.freq_num !=3D pmpt->perf.state_count) || + (op->u.get_para.gov_num !=3D gov_num) ) + { + op->u.get_para.cpu_num =3D cpumask_weight(policy->cpus); + op->u.get_para.freq_num =3D pmpt->perf.state_count; + op->u.get_para.gov_num =3D gov_num; + return -EAGAIN; + } + + if ( !(data =3D xzalloc_array(uint32_t, + max(op->u.get_para.cpu_num, + op->u.get_para.freq_num))) ) + return -ENOMEM; + + for_each_cpu(cpu, policy->cpus) + data[i++] =3D cpu; + ret =3D copy_to_guest(op->u.get_para.affected_cpus, + data, op->u.get_para.cpu_num); + + for ( i =3D 0; i < op->u.get_para.freq_num; i++ ) + data[i] =3D pmpt->perf.states[i].core_frequency * 1000; + ret +=3D copy_to_guest(op->u.get_para.scaling_available_frequencies, + data, op->u.get_para.freq_num); + + xfree(data); + if ( ret ) + return -EFAULT; + + op->u.get_para.cpuinfo_cur_freq =3D + cpufreq_driver.get ? alternative_call(cpufreq_driver.get, op->cpui= d) + : policy->cur; + op->u.get_para.cpuinfo_max_freq =3D policy->cpuinfo.max_freq; + op->u.get_para.cpuinfo_min_freq =3D policy->cpuinfo.min_freq; + op->u.get_para.turbo_enabled =3D cpufreq_get_turbo_status(op->cpuid); + + if ( cpufreq_driver.name[0] ) + strlcpy(op->u.get_para.scaling_driver, + cpufreq_driver.name, CPUFREQ_NAME_LEN); + else + strlcpy(op->u.get_para.scaling_driver, "Unknown", CPUFREQ_NAME_LEN= ); + + if ( IS_ENABLED(CONFIG_INTEL) && + !strncmp(op->u.get_para.scaling_driver, XEN_HWP_DRIVER_NAME, + CPUFREQ_NAME_LEN) ) + ret =3D get_hwp_para(policy->cpu, &op->u.get_para.u.cppc_para); + else + { + if ( !(scaling_available_governors =3D + xzalloc_array(char, gov_num * CPUFREQ_NAME_LEN)) ) + return -ENOMEM; + if ( (ret =3D read_scaling_available_governors( + scaling_available_governors, + (gov_num * CPUFREQ_NAME_LEN * + sizeof(*scaling_available_governors)))) ) + { + xfree(scaling_available_governors); + return ret; + } + ret =3D copy_to_guest(op->u.get_para.scaling_available_governors, + scaling_available_governors, + gov_num * CPUFREQ_NAME_LEN); + xfree(scaling_available_governors); + if ( ret ) + return -EFAULT; + + op->u.get_para.u.s.scaling_cur_freq =3D policy->cur; + op->u.get_para.u.s.scaling_max_freq =3D policy->max; + op->u.get_para.u.s.scaling_min_freq =3D policy->min; + + if ( policy->governor->name[0] ) + strlcpy(op->u.get_para.u.s.scaling_governor, + policy->governor->name, CPUFREQ_NAME_LEN); + else + strlcpy(op->u.get_para.u.s.scaling_governor, "Unknown", + CPUFREQ_NAME_LEN); + + /* governor specific para */ + if ( !strncasecmp(op->u.get_para.u.s.scaling_governor, + "userspace", CPUFREQ_NAME_LEN) ) + op->u.get_para.u.s.u.userspace.scaling_setspeed =3D policy->cu= r; + + if ( !strncasecmp(op->u.get_para.u.s.scaling_governor, + "ondemand", CPUFREQ_NAME_LEN) ) + ret =3D get_cpufreq_ondemand_para( + &op->u.get_para.u.s.u.ondemand.sampling_rate_max, + &op->u.get_para.u.s.u.ondemand.sampling_rate_min, + &op->u.get_para.u.s.u.ondemand.sampling_rate, + &op->u.get_para.u.s.u.ondemand.up_threshold); + } + + return ret; +} + +static int set_cpufreq_gov(struct xen_sysctl_pm_op *op) +{ + struct cpufreq_policy new_policy, *old_policy; + + old_policy =3D per_cpu(cpufreq_cpu_policy, op->cpuid); + if ( !old_policy ) + return -EINVAL; + + memcpy(&new_policy, old_policy, sizeof(struct cpufreq_policy)); + + new_policy.governor =3D __find_governor(op->u.set_gov.scaling_governor= ); + if ( new_policy.governor =3D=3D NULL ) + return -EINVAL; + + return __cpufreq_set_policy(old_policy, &new_policy); +} + +static int set_cpufreq_para(struct xen_sysctl_pm_op *op) +{ + int ret =3D 0; + struct cpufreq_policy *policy; + + policy =3D per_cpu(cpufreq_cpu_policy, op->cpuid); + + if ( !policy || !policy->governor ) + return -EINVAL; + + if ( hwp_active() ) + return -EOPNOTSUPP; + + switch( op->u.set_para.ctrl_type ) + { + case SCALING_MAX_FREQ: + { + struct cpufreq_policy new_policy; + + memcpy(&new_policy, policy, sizeof(struct cpufreq_policy)); + new_policy.max =3D op->u.set_para.ctrl_value; + ret =3D __cpufreq_set_policy(policy, &new_policy); + + break; + } + + case SCALING_MIN_FREQ: + { + struct cpufreq_policy new_policy; + + memcpy(&new_policy, policy, sizeof(struct cpufreq_policy)); + new_policy.min =3D op->u.set_para.ctrl_value; + ret =3D __cpufreq_set_policy(policy, &new_policy); + + break; + } + + case SCALING_SETSPEED: + { + unsigned int freq =3Dop->u.set_para.ctrl_value; + + if ( !strncasecmp(policy->governor->name, + "userspace", CPUFREQ_NAME_LEN) ) + ret =3D write_userspace_scaling_setspeed(op->cpuid, freq); + else + ret =3D -EINVAL; + + break; + } + + case SAMPLING_RATE: + { + unsigned int sampling_rate =3D op->u.set_para.ctrl_value; + + if ( !strncasecmp(policy->governor->name, + "ondemand", CPUFREQ_NAME_LEN) ) + ret =3D write_ondemand_sampling_rate(sampling_rate); + else + ret =3D -EINVAL; + + break; + } + + case UP_THRESHOLD: + { + unsigned int up_threshold =3D op->u.set_para.ctrl_value; + + if ( !strncasecmp(policy->governor->name, + "ondemand", CPUFREQ_NAME_LEN) ) + ret =3D write_ondemand_up_threshold(up_threshold); + else + ret =3D -EINVAL; + + break; + } + + default: + ret =3D -EINVAL; + break; + } + + return ret; +} + +static int set_cpufreq_cppc(struct xen_sysctl_pm_op *op) +{ + struct cpufreq_policy *policy =3D per_cpu(cpufreq_cpu_policy, op->cpui= d); + + if ( !policy || !policy->governor ) + return -ENOENT; + + if ( !hwp_active() ) + return -EOPNOTSUPP; + + return set_hwp_para(policy, &op->u.set_cppc); +} + +int do_pm_op(struct xen_sysctl_pm_op *op) +{ + int ret =3D 0; + const struct processor_pminfo *pmpt; + + switch ( op->cmd ) + { + case XEN_SYSCTL_pm_op_set_sched_opt_smt: + { + uint32_t saved_value =3D sched_smt_power_savings; + + if ( op->cpuid !=3D 0 ) + return -EINVAL; + sched_smt_power_savings =3D !!op->u.set_sched_opt_smt; + op->u.set_sched_opt_smt =3D saved_value; + return 0; + } + + case XEN_SYSCTL_pm_op_get_max_cstate: + BUILD_BUG_ON(XEN_SYSCTL_CX_UNLIMITED !=3D UINT_MAX); + if ( op->cpuid =3D=3D 0 ) + op->u.get_max_cstate =3D acpi_get_cstate_limit(); + else if ( op->cpuid =3D=3D 1 ) + op->u.get_max_cstate =3D acpi_get_csubstate_limit(); + else + ret =3D -EINVAL; + return ret; + + case XEN_SYSCTL_pm_op_set_max_cstate: + if ( op->cpuid =3D=3D 0 ) + acpi_set_cstate_limit(op->u.set_max_cstate); + else if ( op->cpuid =3D=3D 1 ) + acpi_set_csubstate_limit(op->u.set_max_cstate); + else + ret =3D -EINVAL; + return ret; + } + + if ( op->cpuid >=3D nr_cpu_ids || !cpu_online(op->cpuid) ) + return -EINVAL; + pmpt =3D processor_pminfo[op->cpuid]; + + switch ( op->cmd & PM_PARA_CATEGORY_MASK ) + { + case CPUFREQ_PARA: + if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_PX) ) + return -ENODEV; + if ( !pmpt || !(pmpt->perf.init & XEN_PX_INIT) ) + return -EINVAL; + break; + } + + switch ( op->cmd ) + { + case GET_CPUFREQ_PARA: + ret =3D get_cpufreq_para(op); + break; + + case SET_CPUFREQ_GOV: + ret =3D set_cpufreq_gov(op); + break; + + case SET_CPUFREQ_PARA: + ret =3D set_cpufreq_para(op); + break; + + case SET_CPUFREQ_CPPC: + ret =3D set_cpufreq_cppc(op); + break; + + case GET_CPUFREQ_AVGFREQ: + op->u.get_avgfreq =3D cpufreq_driver_getavg(op->cpuid, USR_GETAVG); + break; + + case XEN_SYSCTL_pm_op_enable_turbo: + ret =3D cpufreq_update_turbo(op->cpuid, CPUFREQ_TURBO_ENABLED); + break; + + case XEN_SYSCTL_pm_op_disable_turbo: + ret =3D cpufreq_update_turbo(op->cpuid, CPUFREQ_TURBO_DISABLED); + break; + + default: + printk("not defined sub-hypercall @ do_pm_op\n"); + ret =3D -ENOSYS; + break; + } + + return ret; +} diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index abfdc45cc2..61b60e59a2 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -330,360 +330,3 @@ int do_get_pm_info(struct xen_sysctl_get_pmstat *op) =20 return ret; } - -/* - * 1. Get PM parameter - * 2. Provide user PM control - */ -static int read_scaling_available_governors(char *scaling_available_govern= ors, - unsigned int size) -{ - unsigned int i =3D 0; - struct cpufreq_governor *t; - - if ( !scaling_available_governors ) - return -EINVAL; - - list_for_each_entry(t, &cpufreq_governor_list, governor_list) - { - i +=3D scnprintf(&scaling_available_governors[i], - CPUFREQ_NAME_LEN, "%s ", t->name); - if ( i > size ) - return -EINVAL; - } - scaling_available_governors[i-1] =3D '\0'; - - return 0; -} - -static int get_cpufreq_para(struct xen_sysctl_pm_op *op) -{ - uint32_t ret =3D 0; - const struct processor_pminfo *pmpt; - struct cpufreq_policy *policy; - uint32_t gov_num =3D 0; - uint32_t *data; - char *scaling_available_governors; - struct list_head *pos; - unsigned int cpu, i =3D 0; - - pmpt =3D processor_pminfo[op->cpuid]; - policy =3D per_cpu(cpufreq_cpu_policy, op->cpuid); - - if ( !pmpt || !pmpt->perf.states || - !policy || !policy->governor ) - return -EINVAL; - - list_for_each(pos, &cpufreq_governor_list) - gov_num++; - - if ( (op->u.get_para.cpu_num !=3D cpumask_weight(policy->cpus)) || - (op->u.get_para.freq_num !=3D pmpt->perf.state_count) || - (op->u.get_para.gov_num !=3D gov_num) ) - { - op->u.get_para.cpu_num =3D cpumask_weight(policy->cpus); - op->u.get_para.freq_num =3D pmpt->perf.state_count; - op->u.get_para.gov_num =3D gov_num; - return -EAGAIN; - } - - if ( !(data =3D xzalloc_array(uint32_t, - max(op->u.get_para.cpu_num, - op->u.get_para.freq_num))) ) - return -ENOMEM; - - for_each_cpu(cpu, policy->cpus) - data[i++] =3D cpu; - ret =3D copy_to_guest(op->u.get_para.affected_cpus, - data, op->u.get_para.cpu_num); - - for ( i =3D 0; i < op->u.get_para.freq_num; i++ ) - data[i] =3D pmpt->perf.states[i].core_frequency * 1000; - ret +=3D copy_to_guest(op->u.get_para.scaling_available_frequencies, - data, op->u.get_para.freq_num); - - xfree(data); - if ( ret ) - return -EFAULT; - - op->u.get_para.cpuinfo_cur_freq =3D - cpufreq_driver.get ? alternative_call(cpufreq_driver.get, op->cpui= d) - : policy->cur; - op->u.get_para.cpuinfo_max_freq =3D policy->cpuinfo.max_freq; - op->u.get_para.cpuinfo_min_freq =3D policy->cpuinfo.min_freq; - op->u.get_para.turbo_enabled =3D cpufreq_get_turbo_status(op->cpuid); - - if ( cpufreq_driver.name[0] ) - strlcpy(op->u.get_para.scaling_driver, - cpufreq_driver.name, CPUFREQ_NAME_LEN); - else - strlcpy(op->u.get_para.scaling_driver, "Unknown", CPUFREQ_NAME_LEN= ); - - if ( IS_ENABLED(CONFIG_INTEL) && - !strncmp(op->u.get_para.scaling_driver, XEN_HWP_DRIVER_NAME, - CPUFREQ_NAME_LEN) ) - ret =3D get_hwp_para(policy->cpu, &op->u.get_para.u.cppc_para); - else - { - if ( !(scaling_available_governors =3D - xzalloc_array(char, gov_num * CPUFREQ_NAME_LEN)) ) - return -ENOMEM; - if ( (ret =3D read_scaling_available_governors( - scaling_available_governors, - (gov_num * CPUFREQ_NAME_LEN * - sizeof(*scaling_available_governors)))) ) - { - xfree(scaling_available_governors); - return ret; - } - ret =3D copy_to_guest(op->u.get_para.scaling_available_governors, - scaling_available_governors, - gov_num * CPUFREQ_NAME_LEN); - xfree(scaling_available_governors); - if ( ret ) - return -EFAULT; - - op->u.get_para.u.s.scaling_cur_freq =3D policy->cur; - op->u.get_para.u.s.scaling_max_freq =3D policy->max; - op->u.get_para.u.s.scaling_min_freq =3D policy->min; - - if ( policy->governor->name[0] ) - strlcpy(op->u.get_para.u.s.scaling_governor, - policy->governor->name, CPUFREQ_NAME_LEN); - else - strlcpy(op->u.get_para.u.s.scaling_governor, "Unknown", - CPUFREQ_NAME_LEN); - - /* governor specific para */ - if ( !strncasecmp(op->u.get_para.u.s.scaling_governor, - "userspace", CPUFREQ_NAME_LEN) ) - op->u.get_para.u.s.u.userspace.scaling_setspeed =3D policy->cu= r; - - if ( !strncasecmp(op->u.get_para.u.s.scaling_governor, - "ondemand", CPUFREQ_NAME_LEN) ) - ret =3D get_cpufreq_ondemand_para( - &op->u.get_para.u.s.u.ondemand.sampling_rate_max, - &op->u.get_para.u.s.u.ondemand.sampling_rate_min, - &op->u.get_para.u.s.u.ondemand.sampling_rate, - &op->u.get_para.u.s.u.ondemand.up_threshold); - } - - return ret; -} - -static int set_cpufreq_gov(struct xen_sysctl_pm_op *op) -{ - struct cpufreq_policy new_policy, *old_policy; - - old_policy =3D per_cpu(cpufreq_cpu_policy, op->cpuid); - if ( !old_policy ) - return -EINVAL; - - memcpy(&new_policy, old_policy, sizeof(struct cpufreq_policy)); - - new_policy.governor =3D __find_governor(op->u.set_gov.scaling_governor= ); - if (new_policy.governor =3D=3D NULL) - return -EINVAL; - - return __cpufreq_set_policy(old_policy, &new_policy); -} - -static int set_cpufreq_para(struct xen_sysctl_pm_op *op) -{ - int ret =3D 0; - struct cpufreq_policy *policy; - - policy =3D per_cpu(cpufreq_cpu_policy, op->cpuid); - - if ( !policy || !policy->governor ) - return -EINVAL; - - if ( hwp_active() ) - return -EOPNOTSUPP; - - switch(op->u.set_para.ctrl_type) - { - case SCALING_MAX_FREQ: - { - struct cpufreq_policy new_policy; - - memcpy(&new_policy, policy, sizeof(struct cpufreq_policy)); - new_policy.max =3D op->u.set_para.ctrl_value; - ret =3D __cpufreq_set_policy(policy, &new_policy); - - break; - } - - case SCALING_MIN_FREQ: - { - struct cpufreq_policy new_policy; - - memcpy(&new_policy, policy, sizeof(struct cpufreq_policy)); - new_policy.min =3D op->u.set_para.ctrl_value; - ret =3D __cpufreq_set_policy(policy, &new_policy); - - break; - } - - case SCALING_SETSPEED: - { - unsigned int freq =3Dop->u.set_para.ctrl_value; - - if ( !strncasecmp(policy->governor->name, - "userspace", CPUFREQ_NAME_LEN) ) - ret =3D write_userspace_scaling_setspeed(op->cpuid, freq); - else - ret =3D -EINVAL; - - break; - } - - case SAMPLING_RATE: - { - unsigned int sampling_rate =3D op->u.set_para.ctrl_value; - - if ( !strncasecmp(policy->governor->name, - "ondemand", CPUFREQ_NAME_LEN) ) - ret =3D write_ondemand_sampling_rate(sampling_rate); - else - ret =3D -EINVAL; - - break; - } - - case UP_THRESHOLD: - { - unsigned int up_threshold =3D op->u.set_para.ctrl_value; - - if ( !strncasecmp(policy->governor->name, - "ondemand", CPUFREQ_NAME_LEN) ) - ret =3D write_ondemand_up_threshold(up_threshold); - else - ret =3D -EINVAL; - - break; - } - - default: - ret =3D -EINVAL; - break; - } - - return ret; -} - -static int set_cpufreq_cppc(struct xen_sysctl_pm_op *op) -{ - struct cpufreq_policy *policy =3D per_cpu(cpufreq_cpu_policy, op->cpui= d); - - if ( !policy || !policy->governor ) - return -ENOENT; - - if ( !hwp_active() ) - return -EOPNOTSUPP; - - return set_hwp_para(policy, &op->u.set_cppc); -} - -int do_pm_op(struct xen_sysctl_pm_op *op) -{ - int ret =3D 0; - const struct processor_pminfo *pmpt; - - switch ( op->cmd ) - { - case XEN_SYSCTL_pm_op_set_sched_opt_smt: - { - uint32_t saved_value =3D sched_smt_power_savings; - - if ( op->cpuid !=3D 0 ) - return -EINVAL; - sched_smt_power_savings =3D !!op->u.set_sched_opt_smt; - op->u.set_sched_opt_smt =3D saved_value; - return 0; - } - - case XEN_SYSCTL_pm_op_get_max_cstate: - BUILD_BUG_ON(XEN_SYSCTL_CX_UNLIMITED !=3D UINT_MAX); - if ( op->cpuid =3D=3D 0 ) - op->u.get_max_cstate =3D acpi_get_cstate_limit(); - else if ( op->cpuid =3D=3D 1 ) - op->u.get_max_cstate =3D acpi_get_csubstate_limit(); - else - ret =3D -EINVAL; - return ret; - - case XEN_SYSCTL_pm_op_set_max_cstate: - if ( op->cpuid =3D=3D 0 ) - acpi_set_cstate_limit(op->u.set_max_cstate); - else if ( op->cpuid =3D=3D 1 ) - acpi_set_csubstate_limit(op->u.set_max_cstate); - else - ret =3D -EINVAL; - return ret; - } - - if ( op->cpuid >=3D nr_cpu_ids || !cpu_online(op->cpuid) ) - return -EINVAL; - pmpt =3D processor_pminfo[op->cpuid]; - - switch ( op->cmd & PM_PARA_CATEGORY_MASK ) - { - case CPUFREQ_PARA: - if ( !(xen_processor_pmbits & XEN_PROCESSOR_PM_PX) ) - return -ENODEV; - if ( !pmpt || !(pmpt->perf.init & XEN_PX_INIT) ) - return -EINVAL; - break; - } - - switch ( op->cmd ) - { - case GET_CPUFREQ_PARA: - { - ret =3D get_cpufreq_para(op); - break; - } - - case SET_CPUFREQ_GOV: - { - ret =3D set_cpufreq_gov(op); - break; - } - - case SET_CPUFREQ_PARA: - { - ret =3D set_cpufreq_para(op); - break; - } - - case SET_CPUFREQ_CPPC: - ret =3D set_cpufreq_cppc(op); - break; - - case GET_CPUFREQ_AVGFREQ: - { - op->u.get_avgfreq =3D cpufreq_driver_getavg(op->cpuid, USR_GETAVG); - break; - } - - case XEN_SYSCTL_pm_op_enable_turbo: - { - ret =3D cpufreq_update_turbo(op->cpuid, CPUFREQ_TURBO_ENABLED); - break; - } - - case XEN_SYSCTL_pm_op_disable_turbo: - { - ret =3D cpufreq_update_turbo(op->cpuid, CPUFREQ_TURBO_DISABLED); - break; - } - - default: - printk("not defined sub-hypercall @ do_pm_op\n"); - ret =3D -ENOSYS; - break; - } - - return ret; -} diff --git a/xen/drivers/cpufreq/cpufreq_misc_governors.c b/xen/drivers/cpu= freq/cpufreq_misc_governors.c index 0327fad23b..e5cb9ab02f 100644 --- a/xen/drivers/cpufreq/cpufreq_misc_governors.c +++ b/xen/drivers/cpufreq/cpufreq_misc_governors.c @@ -64,6 +64,7 @@ static int cf_check cpufreq_governor_userspace( return ret; } =20 +#ifdef CONFIG_PM_OP int write_userspace_scaling_setspeed(unsigned int cpu, unsigned int freq) { struct cpufreq_policy *policy; @@ -80,6 +81,7 @@ int write_userspace_scaling_setspeed(unsigned int cpu, un= signed int freq) =20 return __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L); } +#endif /* CONFIG_PM_OP */ =20 static bool __init cf_check cpufreq_userspace_handle_option(const char *name, const char *val) diff --git a/xen/drivers/cpufreq/cpufreq_ondemand.c b/xen/drivers/cpufreq/c= pufreq_ondemand.c index 06cfc88d30..0126a3f5d9 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -57,6 +57,7 @@ static struct dbs_tuners { =20 static DEFINE_PER_CPU(struct timer, dbs_timer); =20 +#ifdef CONFIG_PM_OP int write_ondemand_sampling_rate(unsigned int sampling_rate) { if ( (sampling_rate > MAX_SAMPLING_RATE / MICROSECS(1)) || @@ -93,6 +94,7 @@ int get_cpufreq_ondemand_para(uint32_t *sampling_rate_max, =20 return 0; } +#endif /* CONFIG_PM_OP */ =20 static void dbs_check_cpu(struct cpu_dbs_info_s *this_dbs_info) { diff --git a/xen/drivers/cpufreq/utility.c b/xen/drivers/cpufreq/utility.c index 723045b240..987c3b5929 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -224,47 +224,6 @@ int cpufreq_driver_getavg(unsigned int cpu, unsigned i= nt flag) return policy->cur; } =20 -int cpufreq_update_turbo(unsigned int cpu, int new_state) -{ - struct cpufreq_policy *policy; - int curr_state; - int ret =3D 0; - - if (new_state !=3D CPUFREQ_TURBO_ENABLED && - new_state !=3D CPUFREQ_TURBO_DISABLED) - return -EINVAL; - - policy =3D per_cpu(cpufreq_cpu_policy, cpu); - if (!policy) - return -EACCES; - - if (policy->turbo =3D=3D CPUFREQ_TURBO_UNSUPPORTED) - return -EOPNOTSUPP; - - curr_state =3D policy->turbo; - if (curr_state =3D=3D new_state) - return 0; - - policy->turbo =3D new_state; - if (cpufreq_driver.update) - { - ret =3D alternative_call(cpufreq_driver.update, cpu, policy); - if (ret) - policy->turbo =3D curr_state; - } - - return ret; -} - - -int cpufreq_get_turbo_status(unsigned int cpu) -{ - struct cpufreq_policy *policy; - - policy =3D per_cpu(cpufreq_cpu_policy, cpu); - return policy && policy->turbo =3D=3D CPUFREQ_TURBO_ENABLED; -} - /********************************************************************* * POLICY * *********************************************************************/ diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/= cpufreq.h index 241117a9af..0742aa9f44 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -143,9 +143,6 @@ extern int cpufreq_driver_getavg(unsigned int cpu, unsi= gned int flag); #define CPUFREQ_TURBO_UNSUPPORTED 0 #define CPUFREQ_TURBO_ENABLED 1 =20 -int cpufreq_update_turbo(unsigned int cpu, int new_state); -int cpufreq_get_turbo_status(unsigned int cpu); - static inline int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event) { --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424083; cv=pass; d=zohomail.com; s=zohoarc; b=bRMmQamaKpEAeM9OH6vb1yJQMTrYUr4ifPJMruOQ90uo8n1y9zqYZsVqnm4veeLgw22dwacCZSl4hWfZ2lWtRtSvtmWgOkk5IpVPQfJjtOrMV2D2rnRhbHjaoV2Zr3iip/oq9L4DfG3u1tT8LsT5OAo9r4zAGGEDahoBtT/BZp8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424083; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tIqBzSuJ/XN3+20akguQcfadUFZOlGGGnySlPyMwy4g=; b=WVHlhV5g+UmJ9vigp4Jnj/+K8omYl6BjWwCtYCc6s72wImhsvl4o2AAeaOvlQJDCtnPvmoZpNcCyngMr9EdWDjyrEZupbWv2DD9I/f/U4KRWZezBbbX0CGbQEmlv5PmV7X+OrUwdV2hNz/My6i8I6jGgc/3YKeZJnp6+QvHHGEA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748424083926124.0051965039778; Wed, 28 May 2025 02:21:23 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999150.1379892 (Exim 4.92) (envelope-from ) id 1uKCyE-0000X4-TT; Wed, 28 May 2025 09:21:10 +0000 Received: by outflank-mailman (output) from mailman id 999150.1379892; Wed, 28 May 2025 09:21:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCyE-0000W4-OX; Wed, 28 May 2025 09:21:10 +0000 Received: by outflank-mailman (input) for mailman id 999150; Wed, 28 May 2025 09:21:09 +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 1uKCvZ-0000yL-BG for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:25 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2062f.outbound.protection.outlook.com [2a01:111:f403:2415::62f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b0de1479-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:18:18 +0200 (CEST) Received: from SN7PR18CA0009.namprd18.prod.outlook.com (2603:10b6:806:f3::17) by PH0PR12MB8049.namprd12.prod.outlook.com (2603:10b6:510:28f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.29; Wed, 28 May 2025 09:18:13 +0000 Received: from SN1PEPF00036F3C.namprd05.prod.outlook.com (2603:10b6:806:f3:cafe::69) by SN7PR18CA0009.outlook.office365.com (2603:10b6:806:f3::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.30 via Frontend Transport; Wed, 28 May 2025 09:18:13 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F3C.mail.protection.outlook.com (10.167.248.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:12 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:09 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: b0de1479-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BQeVAEFQBwvVZKSbcqoFemztvRmo1skfN60fKd6jLfrDpJehsQm3cWlNI2KTuetNJD5UpnhBayqLOGpR+DblkoEwm4RWRqa+5doYY6XtLd9Y422t/L/jOTFeax4VawBl2B+7Y1SPkKtQ6ZjMbgkpz4avN/DB5k2zLRmxBeJvXzBWq6LalRtmGxGttvKtJycKO1K8DSM+uDNZYELe0hIptFtVcZR7+ORSa3U+3T1pZx5sravwj3QOepltyNQIjI3QBphma/toGcRkjcak7YjaNixLUNShDwMHSyh4jQqSroqJVVDiElhbxYjsKmHFCPQMyNVZtrkdgtLimuhPakE8OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=tIqBzSuJ/XN3+20akguQcfadUFZOlGGGnySlPyMwy4g=; b=QkBky4/Mx+cpF0jeWUP1FK+O8uBseKg4dYj2CLYCaszOiynxD8Kt8CeOwIIL22pKRQkaerv22ULSewz9FxOZon8jMc/8cAP1PlR4EuzbYgFERFjJEp7zvNXVw6V2oftULv4gbOe5OOmbALwPI3kcWRZoMDl9N3eiPCgO79n1XOAhPhrC2lBXofseV0RVPfJKg/EiV43qIgBvaS6Gh75aobmgEKxqCyt+kOtWM2k4kT7gMuf/goSbaMMJkN+M9MkKYmDAyP5Nsk8ViOOfrcFhh3DFnpNExp5hc97odStXFA5ARlCS/krlvs0PZb/opyaVzLk3qm0mruMNQqS8De9ebw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tIqBzSuJ/XN3+20akguQcfadUFZOlGGGnySlPyMwy4g=; b=ypad468D1fBrDtuea59G688umcvfh8R5eBGu96zDnWPzSB2HtSbBFg18wniKr5dmFjBEcxkX1S+sHuIbPvKdqvk5CvSR6RnT7e+Dg1QwGGsmMVR7LG2OXKtyAA7V5XzXawZQ+DJYUarhqOnwgcQZZExtbC45iZkts/BSv+NDUdw= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Anthony PERARD , Michal Orzel , "Julien Grall" , Stefano Stabellini Subject: [PATCH v4 12/20] xen/sysctl: introduce CONFIG_PM_STATS Date: Wed, 28 May 2025 17:17:00 +0800 Message-ID: <20250528091708.390767-13-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3C:EE_|PH0PR12MB8049:EE_ X-MS-Office365-Filtering-Correlation-Id: 45cf8487-88cb-4750-064e-08dd9dc8924e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Lr1nGnRiOflKVtTZ+kiT7WNfvWqcNnrUHsYYZxPWIFZ+kJydpT7gEsH+xhls?= =?us-ascii?Q?4yP8Beq8O+COtHsMw1OhtgFO7FztxZe6/QAIPfyPAkOnB8vidOX17+sPZXd/?= =?us-ascii?Q?8lh3h3m5QGoQXp+77zD3RvtXYj0mPUJEXh6OuIUMbGSohm7+xSNTLtveCGsU?= =?us-ascii?Q?1vtouPAp3XQxbvYxy7UmoA4Rns3UOwgN+vLoG11VA2S++MQeqoIF98N3MlkU?= =?us-ascii?Q?MZV8Okiz/iEXQhwxN9/Fg35zLr6hYKnddyghwUqi8WuvKUYz4EuTkkyfO/vU?= =?us-ascii?Q?TnydtY7j+p+b3w7XnPfKBPMs/OWdVCei99Ud56H9j1+wWDnq6+b6chbv9Tsi?= =?us-ascii?Q?FV5OxmSGoOuPdY587fXksLGWp/EzHAIGsefAN/ShVuCkf/jGo5ag7x9dhj9X?= =?us-ascii?Q?LVPPaDf/9CIJE1SvIBMNC3S6iEXPihIk5DWadgMM1yvbkCkvxDNsULkivYK0?= =?us-ascii?Q?WAZ/J4nvW+kXTGHYiXWhtxmYgxR++jBu9eSwKEFL+TahG3w2GmwHsc6/seH5?= =?us-ascii?Q?Kf9dfcM4buYZpv6iR8chwcbLpjFy3M4dwFd4m1okLXjc52ReJxHJFFY1K4Uv?= =?us-ascii?Q?fzux36tu1vAMxZVEcb/6Krq2xyaT5Pwzznjr2XOaef/Rc3S3ee+9YsPPnJqn?= =?us-ascii?Q?UW7ph+MmSLGIaJgIbTj/b5kAk4P2hrm+L9kumwI+Nc8QDZtKO+NvntLhvR1V?= =?us-ascii?Q?qI5gx/akn4xB5Cq/87gquN2Pk+Ot02tnixBzfpoDARGDrO8L/wLKb/98b9s7?= =?us-ascii?Q?mKd+94oPHAz0IraM7vXZZR9cGkCZJlmmmmLLOOZCFk7CUwuZgVca+mSshmF3?= =?us-ascii?Q?2z+R2Ud3YTJ8Jd4u9vDWAi9+RW1gXl7XZWpfQxxdamnF8Fr24NHcEk+xq9Qt?= =?us-ascii?Q?dJzyo3Zw1FAcLiqoTKUNMhaMvgVBHV+s6HitViSccJpWBeO37BK2K1p7kTNB?= =?us-ascii?Q?BSbXytbgaP+Z/qLHRRWuJfdBh/Mq5Pw4M5yZeZcfnypuDL2uikxckdTBK1ej?= =?us-ascii?Q?GfiBJasOzBTJ2/LDV5ix9kWT0GaNzvTeCXpr5CJ2t0usdSeYITxGRYgwOB5U?= =?us-ascii?Q?i+l+rYXGgpVYUpsp3W+CpbprXivmrMbaYIDbEKNFtvSBegswbb5JvEHtncX3?= =?us-ascii?Q?5nY/b7wmi/+FFgEk+ZMjK2xq0uH2HWq1fC1KeBmFCDteEqd9f8JYRjiGkfjj?= =?us-ascii?Q?aMt9ofjfRCmcxD39eLRRq1lZ8yJpr76Qm2KI9ct7ytY0mqu8NqZ1y1GyHPSZ?= =?us-ascii?Q?eBrVR0Ro488lfYq3PR6DIO9HNLQDXxQm1En8NGVW9WhHoPLiSCfUCZiFKfDb?= =?us-ascii?Q?fjbKiV4Sg1o/nKrJ/xOI+ci+APUOXklP1kE0K4TRWsa1eyEvbmul3Ri4DFag?= =?us-ascii?Q?tF0641vYdG/euZ6no2MU3gD6ceN/Ar1jYf3sWPscTH3sNcKrNLNPHLTCwrT6?= =?us-ascii?Q?gou2dpTg01x7bQ8+vdIbcsk1DvhE2d8IYiJ/0m0qdHn49bxrvCmyF3PjfH50?= =?us-ascii?Q?vsmLtDBHthKBIePpl9hLQrpiYi+om0GJWxoF?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:12.9439 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45cf8487-88cb-4750-064e-08dd9dc8924e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F3C.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8049 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424085604116600 Content-Type: text/plain; charset="utf-8" We introduce a new Kconfig CONFIG_PM_STATS for wrapping all operations regarding performance management statistics. The major codes reside in xen/drivers/acpi/pmstat.c, including the pm-statistic-related sysctl op: do_get_pm_info(). CONFIG_PM_STATS also shall depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- v1 -> v2: - rename to CONFIG_PM_STATS - fix indention and stray semicolon - make code movements into a new commit - No need to wrap inline functions and declarations --- v2 -> v3: - sepearte functions related to do_pm_op() into a new commit - both braces shall be moved to the line with the closing parenthesis --- v3 -> v4: - be consistent with the comment on the #endif --- xen/arch/x86/acpi/cpu_idle.c | 2 ++ xen/common/Kconfig | 8 ++++++++ xen/common/sysctl.c | 2 +- xen/drivers/acpi/Makefile | 2 +- xen/include/acpi/cpufreq/processor_perf.h | 10 ++++++++++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 1dbf15b01e..974d81b4d6 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1493,6 +1493,7 @@ static void amd_cpuidle_init(struct acpi_processor_po= wer *power) vendor_override =3D -1; } =20 +#ifdef CONFIG_PM_STATS uint32_t pmstat_get_cx_nr(unsigned int cpu) { return processor_powers[cpu] ? processor_powers[cpu]->count : 0; @@ -1612,6 +1613,7 @@ int pmstat_reset_cx_stat(unsigned int cpu) { return 0; } +#endif /* CONFIG_PM_STATS */ =20 void cpuidle_disable_deep_cstate(void) { diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 712c29b1a0..9bf632973e 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -598,4 +598,12 @@ config PM_OP help This option shall enable userspace performance management control to do power/performance analyzing and tuning. + +config PM_STATS + bool "Enable Performance Management Statistics" + depends on ACPI && HAS_CPUFREQ && SYSCTL + default y + help + Enable collection of performance management statistics to aid in + analyzing and tuning power/performance characteristics of the system endmenu diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index daf57fbe56..5207664252 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -170,7 +170,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_s= ysctl) op->u.availheap.avail_bytes <<=3D PAGE_SHIFT; break; =20 -#if defined (CONFIG_ACPI) && defined (CONFIG_HAS_CPUFREQ) +#ifdef CONFIG_PM_STATS case XEN_SYSCTL_get_pmstat: ret =3D do_get_pm_info(&op->u.get_pmstat); break; diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile index 1d811a51a7..477408afbe 100644 --- a/xen/drivers/acpi/Makefile +++ b/xen/drivers/acpi/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_X86) +=3D apei/ obj-bin-y +=3D tables.init.o obj-$(CONFIG_ACPI_NUMA) +=3D numa.o obj-y +=3D osl.o -obj-$(CONFIG_HAS_CPUFREQ) +=3D pmstat.o +obj-$(CONFIG_PM_STATS) +=3D pmstat.o obj-$(CONFIG_PM_OP) +=3D pm-op.o =20 obj-$(CONFIG_X86) +=3D hwregs.o diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/c= pufreq/processor_perf.h index 6de43f8602..a9a3b7a372 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -9,9 +9,19 @@ =20 unsigned int powernow_register_driver(void); unsigned int get_measured_perf(unsigned int cpu, unsigned int flag); +#ifdef CONFIG_PM_STATS void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to); int cpufreq_statistic_init(unsigned int cpu); void cpufreq_statistic_exit(unsigned int cpu); +#else +static inline void cpufreq_statistic_update(unsigned int cpu, uint8_t from, + uint8_t to) {} +static inline int cpufreq_statistic_init(unsigned int cpu) +{ + return 0; +} +static inline void cpufreq_statistic_exit(unsigned int cpu) {} +#endif /* CONFIG_PM_STATS */ =20 int cpufreq_limit_change(unsigned int cpu); =20 --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424065; cv=pass; d=zohomail.com; s=zohoarc; b=PinN5ppyjuqndZuA+66GHcUkw/r8UX4m+RLvPRbQ0u1oNPIGwiF4pGcr0V9ThlHA9IS7e1h9BmYd46BCfQ66NvZHRo+qU0/9UP3usJFHw1HLCayrB72uvn2mPIdjKfvsYorSdSQT8LP6ygBUURL3gkXlPKHIXJ+G/Q8Nx9VwD9c= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424065; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WurO22YY37NaFn6R/aK5cXS4C2DatHBPKOP8khrxpEY=; b=I67WybD/qk0MoZHGhvCkhl+q/beY+spFqB5q3hf8F23ZCMDRakB+oIGZtU6Fjmv7zyGbs4EwoJYcJD+hsiz7O4AlmhkG0cgO1nDf0NYJhwxlkGWx0LRIYhLr+zQkFEzbx0jBJ867HJKOeqYe1r7sOAREy5Gy7ZP4ZsdASItPwnM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17484240659111005.3158804225114; Wed, 28 May 2025 02:21:05 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999123.1379876 (Exim 4.92) (envelope-from ) id 1uKCxy-0007yD-7k; Wed, 28 May 2025 09:20:54 +0000 Received: by outflank-mailman (output) from mailman id 999123.1379876; Wed, 28 May 2025 09:20:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCxy-0007y4-4g; Wed, 28 May 2025 09:20:54 +0000 Received: by outflank-mailman (input) for mailman id 999123; Wed, 28 May 2025 09:20:53 +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 1uKCva-0000yL-BG for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:26 +0000 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on20613.outbound.protection.outlook.com [2a01:111:f403:2418::613]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b0e8e1b0-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:18:18 +0200 (CEST) Received: from SN7PR18CA0004.namprd18.prod.outlook.com (2603:10b6:806:f3::13) by DS0PR12MB6485.namprd12.prod.outlook.com (2603:10b6:8:c6::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.30; Wed, 28 May 2025 09:18:15 +0000 Received: from SN1PEPF00036F3C.namprd05.prod.outlook.com (2603:10b6:806:f3:cafe::51) by SN7PR18CA0004.outlook.office365.com (2603:10b6:806:f3::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.30 via Frontend Transport; Wed, 28 May 2025 09:18:15 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F3C.mail.protection.outlook.com (10.167.248.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:15 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:12 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: b0e8e1b0-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ykJq8yy1UHtKmFvNbnv1JBg7SzJTkhbzaYyWhQSedH/cKIpu/lZtiDEXblp/datB5q3DVT9DtkHKyXnzU+k1OKog5halHZJJuYhGE9s4u12cgFa2uieMcoKkrqANxF+Q/2/tS7v/PEcjVBLwDPzYKxZFe2lFQdBSRu5g46J9iHD4GIjoZZoGjJfn1shA5I0vxhyA6lhxd0FS7vewWg6NPEyUkmUXm7FjYwXs6L4FLQQ3ddnslCqnl2qvg6IgFuHInPRMnqzC/pRcjbjaWPt+aN8LTR5k6bw8e1i6DdilCxE2v9T7UShy9S+///VSq5DuwUV8r9ND5fjBEqk0Ty8wYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=WurO22YY37NaFn6R/aK5cXS4C2DatHBPKOP8khrxpEY=; b=yiqZytG1XXqN2UXcUX1UTuFgmaaaUmhy/NODRZ5D7U+WwzKgPWrolgXDSmPcdG6x17gjbfbifg3I/shucm+h5hFno7KUPe8VQvG1kOIGIz8JMgdzwYRfQEwmbSpk9ehavPN4Ushcm0UnLg011B4XaTdglIghp7berk+tELTINpyozuydNG+SE1z/hZmCtNhDL/+4YYvhPNb9fU8BUKvVfkt1TfNBOA4A/U2+BY1YyXlorRwUIeZj/6ENS2wpbqykxY41J3u6Gs41XSQrt0Rasjq7NHieBG0ia+6SZSLTJRuHP5uLnYTtxaLOBLUjszYoCPIxem6a9CD6xoaxjs5hjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WurO22YY37NaFn6R/aK5cXS4C2DatHBPKOP8khrxpEY=; b=v0GwN7HhBMpIFJ3g9/DBdKRaMeQBHyz7Ll9+iNJmX0YaCxKNMFKrLyWE/3ozjOIX/aPHTIkyaU2FLfZ0qDOLXEvr8ko1tYrzEiwQ0lInjEdY/bnIZyjX0gX9lUYwICCJgu08lEKdIdUzFymzwswVxOp7d8/IBQXFpo0DcAPAjac= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , "Julien Grall" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , "Daniel P. Smith" Subject: [PATCH v4 13/20] xen/sysctl: wrap around XEN_SYSCTL_page_offline_op Date: Wed, 28 May 2025 17:17:01 +0800 Message-ID: <20250528091708.390767-14-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3C:EE_|DS0PR12MB6485:EE_ X-MS-Office365-Filtering-Correlation-Id: c5f79078-27e1-4d13-c6ee-08dd9dc893c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nIeEmvyZMha014u5xvbK/IZcBcV22JBIvxbVm9IhzUWs/3g1tbFXUIcjym12?= =?us-ascii?Q?7hn3eGa3PgR+OjwUpTcej4O/VoyOxaAhr8FMjqVn/jubNfa/T61jEzvYslz0?= =?us-ascii?Q?o8J/A/V2O84dRSvUyvQtaSSHDO0VAQtjilCx2CMaZ1rhbtyCeikw6JpIvaHb?= =?us-ascii?Q?5XdxTLH7+D4RGfmJmqj3apImkpfAAwaAFXrEH0JuvLkGRZe4H8q69+xtm/b5?= =?us-ascii?Q?351javU7Zcpm2EN4AT/ZO/XId04tmuE43M07eqMqd1aT8Co3/zxG/pNy8zuT?= =?us-ascii?Q?Q5BDyYLixn1WwFe6dm3P/I+3XJWPoi2qizZDmZhNfPDCfC2AElR0LgXfxxpi?= =?us-ascii?Q?NdQhv8eIBCt7ISGLVTPwe82mb7fuLeJXzKbcl6JJzqycorNTzCa9AwTcPVA/?= =?us-ascii?Q?OftEzA3OcbbwiOZoQP3Nkj4t06V1DpqTp7RjEhhSvMpPPPDT++XBf/Uu4f0k?= =?us-ascii?Q?E/x8QQyJBtg5axB5ZL5hu3N/rMhV07N44LgjZLkUoP/qevDlXTV0MKWV1mgn?= =?us-ascii?Q?zwa/HRPuziMBbuejeKe+zfiDKsLDoYOtqzwklKnjn3NowmuCibcReIXcer5l?= =?us-ascii?Q?4VWEHnHKLyYVDT8fRZQ2jDew3T2BafgMjZWQ/oxKSp+kqKksDONpyfyfOkpd?= =?us-ascii?Q?ySESZ1Py+aN/fAXNf0voJbKLLRKh1Npq4jwtuZnnO+eVrX6tT2/IxkR671p7?= =?us-ascii?Q?AHpODspuJtCGyZrqlZ17JtaRMX/hY4iuJaH0NTiov3bL82+u0xNWJFBau0sV?= =?us-ascii?Q?8P+7UiOc7msTI8mT8F3KTHjfhfe/G2vip7NdLuYoAayyG8/Zv2r3FdnFYyYn?= =?us-ascii?Q?o78uG5MotvNJo1oTuwDDLmykssbWgmYYIKuFMnGgL//tL0nC7I5q5lgHg4+w?= =?us-ascii?Q?z05oqfFYnqggjWwn5+HMnH0MUhuOU3jQFIZ4MQJIrMv2ZggA4K72xiWfQ56Y?= =?us-ascii?Q?YbSHBrtH01n1DVt5u9FEh083IM53F+2xVgt35L3jWFkrua4uvyOe2eXFI91t?= =?us-ascii?Q?SyIspVLY1Sas+YlamzOKvFbHvw8dk7BIjMKloQr57ZJABahmvg1KvXrm/sCA?= =?us-ascii?Q?7EIkBvl4fPcN7/7gvuM2lyhGg/zCcOBucyk0trvS26ZUxiaZaNLc4upUwoe8?= =?us-ascii?Q?YZzYnaWfCs8BZ8+g1ADATEwqj7+LYJ1HyfXGjzKiiQCx2+hZM0ao3Ny1eNy+?= =?us-ascii?Q?nTOWLxg6kxVRSx/bHMhCteC4+E2nHxWg5tX3gFHk51FOr7B26GRANCiVfnnb?= =?us-ascii?Q?7A2gAOBmJ1kBXvnlThcBDYAFo3RNQPlvdu0ePHagzZd0V3248m0//LrN3JO8?= =?us-ascii?Q?TlKzTXGWWHrGMMtRh3ouCoiTX9SZ0BsZ2MgxilXtIMFMTg6/6ZX0zknU/+W7?= =?us-ascii?Q?/ZBnzvK6h1qk63873Hv+CdRuMpkuxf1s5d8r6SIQC0l5pwhDA4ob95n+bfdv?= =?us-ascii?Q?7UN+oasN9Qwv2N1eN0/zgKs2/UUmO5BJHYhGqZ7FGAVgOY5VIJkFDbdG7gf4?= =?us-ascii?Q?s1a4VHKtApulPOohYwaKALDNJaIyLf9xk01O?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:15.3798 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c5f79078-27e1-4d13-c6ee-08dd9dc893c1 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F3C.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6485 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424067436116600 Content-Type: text/plain; charset="utf-8" The following functions are only to deal with XEN_SYSCTL_page_offline_op, then shall be wrapped: - xsm_page_offline() - online_page() - query_page_offline() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v1 -> v2: - add transient #ifdef in sysctl.c for correct compilation - no need to wrap declarations - place the #ifdef inside the function body to have less redundancy --- v3 -> v4: - remove transient "#ifdef CONFIG_SYSCTL" --- xen/common/page_alloc.c | 2 ++ xen/include/xsm/xsm.h | 6 ++++++ xen/xsm/dummy.c | 2 ++ xen/xsm/flask/hooks.c | 6 ++++++ 4 files changed, 16 insertions(+) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b204f22f50..dec4cb2ab1 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1779,6 +1779,7 @@ int offline_page(mfn_t mfn, int broken, uint32_t *sta= tus) return 0; } =20 +#ifdef CONFIG_SYSCTL /* * Online the memory. * The caller should make sure end_pfn <=3D max_page, @@ -1863,6 +1864,7 @@ int query_page_offline(mfn_t mfn, uint32_t *status) =20 return 0; } +#endif /* CONFIG_SYSCTL */ =20 /* * This function should only be called with valid pages from the same NUMA diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 042a99449f..5ac99904c4 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -138,7 +138,9 @@ struct xsm_ops { int (*resource_setup_gsi)(int gsi); int (*resource_setup_misc)(void); =20 +#ifdef CONFIG_SYSCTL int (*page_offline)(uint32_t cmd); +#endif int (*hypfs_op)(void); =20 long (*do_xsm_op)(XEN_GUEST_HANDLE_PARAM(void) op); @@ -597,7 +599,11 @@ static inline int xsm_resource_setup_misc(xsm_default_= t def) =20 static inline int xsm_page_offline(xsm_default_t def, uint32_t cmd) { +#ifdef CONFIG_SYSCTL return alternative_call(xsm_ops.page_offline, cmd); +#else + return -EOPNOTSUPP; +#endif } =20 static inline int xsm_hypfs_op(xsm_default_t def) diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index cd0e844fcf..d46413ad8c 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -96,7 +96,9 @@ static const struct xsm_ops __initconst_cf_clobber dummy_= ops =3D { .resource_setup_gsi =3D xsm_resource_setup_gsi, .resource_setup_misc =3D xsm_resource_setup_misc, =20 +#ifdef CONFIG_SYSCTL .page_offline =3D xsm_page_offline, +#endif .hypfs_op =3D xsm_hypfs_op, .hvm_param =3D xsm_hvm_param, .hvm_param_altp2mhvm =3D xsm_hvm_param_altp2mhvm, diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index df7e10775b..45c12aa662 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1206,10 +1206,12 @@ static int cf_check flask_resource_unplug_core(void) return avc_current_has_perm(SECINITSID_DOMXEN, SECCLASS_RESOURCE, RESO= URCE__UNPLUG, NULL); } =20 +#ifdef CONFIG_SYSCTL static int flask_resource_use_core(void) { return avc_current_has_perm(SECINITSID_DOMXEN, SECCLASS_RESOURCE, RESO= URCE__USE, NULL); } +#endif /* CONFIG_SYSCTL */ =20 static int cf_check flask_resource_plug_pci(uint32_t machine_bdf) { @@ -1274,6 +1276,7 @@ static int cf_check flask_resource_setup_misc(void) return avc_current_has_perm(SECINITSID_XEN, SECCLASS_RESOURCE, RESOURC= E__SETUP, NULL); } =20 +#ifdef CONFIG_SYSCTL static inline int cf_check flask_page_offline(uint32_t cmd) { switch ( cmd ) @@ -1288,6 +1291,7 @@ static inline int cf_check flask_page_offline(uint32_= t cmd) return avc_unknown_permission("page_offline", cmd); } } +#endif /* CONFIG_SYSCTL */ =20 static inline int cf_check flask_hypfs_op(void) { @@ -1948,7 +1952,9 @@ static const struct xsm_ops __initconst_cf_clobber fl= ask_ops =3D { .resource_setup_gsi =3D flask_resource_setup_gsi, .resource_setup_misc =3D flask_resource_setup_misc, =20 +#ifdef CONFIG_SYSCTL .page_offline =3D flask_page_offline, +#endif .hypfs_op =3D flask_hypfs_op, .hvm_param =3D flask_hvm_param, .hvm_param_altp2mhvm =3D flask_hvm_param_altp2mhvm, --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424058; cv=pass; d=zohomail.com; s=zohoarc; b=F13KO2vNjqdVQY4x+jxfX2JrA9W7993T0k7FADXZQRzwThuucyw1Q7EXJBWf8NBakka1Dm9VYkPoqcItkU3ZFuyNVr8fcn6AR43/cABNKsuVKz8AX1CE5TSXhFcRExwnrcDcPUCK+6kqFaGwLKhhfJiQXhroIM8hbExi2+GFToQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424058; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IdgLxZJojMqTzA4uMqMuY2FrEHyVqR+LGLe1iCymvs4=; b=m2/2WYRa4S3jvh6dppWFYPgSaGbfb4ddZAWjx0iM3jCAYhpx2+khxDuEkjowl3ve+vnq/kJgz9DGa4jbYok/IB9XycT8BJrD+7jg0sKWDH7Oewhxd9ZHCYjL9oo5BZldmR8fZv+D2wo3eT4HQKCX0VBz+QdgMKHJHqzFJt+DOig= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748424058238589.8992263827354; Wed, 28 May 2025 02:20:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999109.1379867 (Exim 4.92) (envelope-from ) id 1uKCxr-0007VU-2U; Wed, 28 May 2025 09:20:47 +0000 Received: by outflank-mailman (output) from mailman id 999109.1379867; Wed, 28 May 2025 09:20:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCxq-0007VI-SJ; Wed, 28 May 2025 09:20:46 +0000 Received: by outflank-mailman (input) for mailman id 999109; Wed, 28 May 2025 09:20:45 +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 ) id 1uKCvX-0001jE-PE for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:23 +0000 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20615.outbound.protection.outlook.com [2a01:111:f403:2413::615]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b3682bc8-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:18:22 +0200 (CEST) Received: from MW4PR04CA0074.namprd04.prod.outlook.com (2603:10b6:303:6b::19) by IA0PPF80FB91A80.namprd12.prod.outlook.com (2603:10b6:20f:fc04::bd5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.32; Wed, 28 May 2025 09:18:18 +0000 Received: from SN1PEPF00036F3F.namprd05.prod.outlook.com (2603:10b6:303:6b:cafe::8b) by MW4PR04CA0074.outlook.office365.com (2603:10b6:303:6b::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.19 via Frontend Transport; Wed, 28 May 2025 09:18:17 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F3F.mail.protection.outlook.com (10.167.248.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:17 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:15 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: b3682bc8-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sJ15Noy+EYTuZ+7buvWGPQwUo7rULps5eL1uMG9TzTB+fDe4clR/bjcjHkTX6aVF/Lk8pheAT9IoaZLcauFWPaI1ionvCbb4/YCJQoYmH1Y0RVhJM1mvisQhAorzhYM5rhsMQptbVgkTyGXUXmp2ybTn9mf/DBu2wFY/VeTOCBI7kOY3IGAvEqA+h2QAkcO8Cw4tLLVj1kmSZKumEUdQ+Z07l9cEFIOwtyBj17ev1PLhY1T+aZD8ar5DTBEjks5s28WW8+J7CMp+Fg1X8nubSKRy4of/nBuqb2ZWO0lJsJJlmtikT/KCYFLrYd5V8ryj26Py8T9t0VOMgjt/i8lqNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=IdgLxZJojMqTzA4uMqMuY2FrEHyVqR+LGLe1iCymvs4=; b=rWqO9Q4ddkHtt8iJG9ZJjFcC4pzkvq2VsYQ5EvpKib+5TdoJ6zn0XrR5Ts61CodISXOy+3lvku875GK4i7UV28Rawe0r1HMYXKOoXEwedj5pL3Rn+o/ndOOuTNmx7dfjKDR8X5kDuOB+vEUErHoDpocgtmVjPcqsWZIaQLv3ABShlsXqAOQ33hyBg6s3wCB5jy7TQbzBaKXTKw3SAQVyb+GG45s6z3Ti4BJQDagsVtTDm+ck92BSevMo/UHJZ9CCAetX0LOwOzdvgVwmrdPwXGtR/jpoXvDMTfSIaXnLfwiGYbT8Hzw3noaYUXIHDij1DZ1ZAkUCpiOYxa82OPSuaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IdgLxZJojMqTzA4uMqMuY2FrEHyVqR+LGLe1iCymvs4=; b=tHyE8dFktuxkOlRrCjAxiWEQpZ7rSXORnCPpCElrszlq9WBwhhMJmZ4VPx2NUiBThT/Vgs0GTHF9iiTsHgi2ylA8d06hw72zr27Qw1KPIl6m4jicjwNHi1EVp6F8FOn9zP2Km4Den1QIet4rhkODTXPPHrvs4LbEynftic14TTc= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Dario Faggioli , Juergen Gross , George Dunlap , Stefano Stabellini Subject: [PATCH v4 14/20] xen/sysctl: wrap around XEN_SYSCTL_cpupool_op Date: Wed, 28 May 2025 17:17:02 +0800 Message-ID: <20250528091708.390767-15-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3F:EE_|IA0PPF80FB91A80:EE_ X-MS-Office365-Filtering-Correlation-Id: 47fa69c0-a522-4ab9-4c54-08dd9dc89522 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mJyVDGlnX6/kadcqdRkjrkA0ym3J1w8o2gyDpvUYLBBx/RVrQCPmyZhR+Ga5?= =?us-ascii?Q?2qqmsLENPsrTLXCIW3T/FuMPaCuk0tgp0lmKJ7QF4jGrO0l+Ryp5qwoRfqyY?= =?us-ascii?Q?fLf4F1VJ0pWR+xJiXd+h3c0AcPpgbT/T++2qe/L93DzxSmUDZlvy+8TwRN9r?= =?us-ascii?Q?7NC08IElglODrydTn3uOjp7zjJfAmaND2GatI2ZtcllhZDg2ThYQfpe2wPIu?= =?us-ascii?Q?1Ol7bntNwc85hPtdTp4YmsjeQSXMgJBqQPsqowM9DeB6cyUs921yI6tN/G3O?= =?us-ascii?Q?A9qq9NmdnQaTxfYwlfjvmRBkOj8MSsauzrjT9IYa70rJw45+1Kmi8xIL7BRy?= =?us-ascii?Q?xGQ9uhnUaZ+Pv4rcrNa74H0PDQsPbdfTB7kfPfGD/U29/u0qY1mI8PdmlAqQ?= =?us-ascii?Q?07ZgNEvKpLMVzL1E1aBWjMRWRfhWLgUBX7ugs3XU0I6SR054mNkPnT+63Di5?= =?us-ascii?Q?3W/cTTxaa+7HYw063iSPd+1g4Y64l8y3hiJrQplqw5Q24/Y9EI2t9usTYstk?= =?us-ascii?Q?eq7CymoE4Ths4bnoknZMLmrIAUitfy0NWQYEjO5Xw8cJzOryOM55MXDyiBnI?= =?us-ascii?Q?qxCya6ebYBAFoEgp9cglGUwWz20vDMCfzye+7REXXyAtT70UGNF/C8+n+XC9?= =?us-ascii?Q?+hyczAUbhUwZTKD9ALzh1UUW7tnzEt1mntcMcCHZnMHYl1XMwRqANqF7AJSC?= =?us-ascii?Q?xXQ5Acm11/cc+P8tIkuiWPWra5Ak9i4PSXMiv9QciS0ohBV3t9R0695lm9L6?= =?us-ascii?Q?SDYynWsXSAsnhQutcsqit9E1rzpgkwJVOyPOsHLOfYM2s0UeXKTN1Vfwwyaw?= =?us-ascii?Q?pX2ymhWJ9eVQnRyHZI0rbUC+/OgMHhB28UjDZ1Vpu+1JsfWxnAHIfNdsVj6r?= =?us-ascii?Q?XuMA7s1mnOvqnFB0+5MVtT7ivWvuGVt6/IbUsmVktQmRyshOpxctagqHrkpH?= =?us-ascii?Q?2kxjEDPRTq0Y0vTwobyjAWk8rri3fqxeAKghLEwlHjuiq/0wp8G8t9xvtwo9?= =?us-ascii?Q?zFwc1zf/IsjE221MI1CQsFdMXCZxZzYHb+CiXuvOSKW92FuYTmuyPa64JzVL?= =?us-ascii?Q?EUC8KkS8aVKmyUHXyQAFVBYfohVkuOy7TwOTxsIqO7SxviQOgi7A+nTfGQIC?= =?us-ascii?Q?sFkc6rLiTfpVQQH1nzfyHyfS9IhYX2TUj4BKOgQlKZnSwuOhnu/Vat5vjh0Z?= =?us-ascii?Q?NosfQNaiFSUWT3JwZH/QntkTqihJDpBj1gHhchs7/cesSqqoC3qDzc8Hy85v?= =?us-ascii?Q?wB+ZLjCfH6v7Wmux0q+m7vQnwhPfubOOvH9PIy8cc5HGuwRzybvDVHHe95D4?= =?us-ascii?Q?agqQV9UM2QcXHfiSlayNGwgACSmHjU2akj46FcOIwsXSHUNp1rEVOPjtNGd/?= =?us-ascii?Q?ZcRLuglXRYGeymOi4JeNXXE5VCjojHyNsfX3TVWtIDX+atI5ONNT8VtKGnLF?= =?us-ascii?Q?3lyrn90TZgED9Xh1Wi9KWmKRIMnKZtchnY5bjKfhWiA+cNTXKMQJfxx0Tqt8?= =?us-ascii?Q?3ziAZTQx/uyldG0+uAbSl9e4PdLdZkH74f1F?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:17.6909 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47fa69c0-a522-4ab9-4c54-08dd9dc89522 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F3F.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPF80FB91A80 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424059188116600 Content-Type: text/plain; charset="utf-8" Function cpupool_do_sysctl is designed for doing cpupool related sysctl operations, and shall be wrapped. The following static functions are only called by cpupool_do_sysctl(), then shall be wrapped too: - cpupool_get_next_by_id - cpupool_destroy - cpupool_unassign_cpu_helper - cpupool_unassign_cpu Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v1 -> v2: - no need to wrap declaration - add transient #ifdef in sysctl.c for correct compilation --- v2 -> v3 - move #endif up ahead of the blank line --- v3 -> v4: - remove transient "#ifdef CONFIG_SYSCTL" --- xen/common/sched/cpupool.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 3d02c7b706..f5459c2779 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -241,10 +241,12 @@ struct cpupool *cpupool_get_by_id(unsigned int poolid) return __cpupool_get_by_id(poolid, true); } =20 +#ifdef CONFIG_SYSCTL static struct cpupool *cpupool_get_next_by_id(unsigned int poolid) { return __cpupool_get_by_id(poolid, false); } +#endif /* CONFIG_SYSCTL */ =20 void cpupool_put(struct cpupool *pool) { @@ -352,6 +354,7 @@ static struct cpupool *cpupool_create(unsigned int pool= id, =20 return ERR_PTR(ret); } +#ifdef CONFIG_SYSCTL /* * destroys the given cpupool * returns 0 on success, 1 else @@ -379,6 +382,7 @@ static int cpupool_destroy(struct cpupool *c) debugtrace_printk("cpupool_destroy(pool=3D%u)\n", c->cpupool_id); return 0; } +#endif /* CONFIG_SYSCTL */ =20 /* * Move domain to another cpupool @@ -568,6 +572,7 @@ static int cpupool_unassign_cpu_start(struct cpupool *c= , unsigned int cpu) return ret; } =20 +#ifdef CONFIG_SYSCTL static long cf_check cpupool_unassign_cpu_helper(void *info) { struct cpupool *c =3D info; @@ -633,6 +638,7 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsi= gned int cpu) } return continue_hypercall_on_cpu(work_cpu, cpupool_unassign_cpu_helper= , c); } +#endif /* CONFIG_SYSCTL */ =20 /* * add a new domain to a cpupool @@ -810,6 +816,7 @@ static void cpupool_cpu_remove_forced(unsigned int cpu) rcu_read_unlock(&sched_res_rculock); } =20 +#ifdef CONFIG_SYSCTL /* * do cpupool related sysctl operations */ @@ -975,6 +982,7 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) =20 return ret; } +#endif /* CONFIG_SYSCTL */ =20 unsigned int cpupool_get_id(const struct domain *d) { --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424116; cv=pass; d=zohomail.com; s=zohoarc; b=CfGcAGOqDUN1zSIBS4EFZLLdALdHWjgAl4iqk2eEOpcrIUR2t5Zlhl8j/Ge2MRiAz7CVQWED26SuNGNF6oNSijtrisNU2yqsJefnQELa5SIDhct4B2gZjZZCuuKzVGEbMxwkQEmfeQGImB6pgv1DqQtlaMMx5FDd7OjG60l2ico= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424116; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WvykzEStZK73rMFsbUxdbGQm1JqJFz8VY0tKPFQ221s=; b=Q+RZtTYMbd2uFNdLR2h4Vo0bcYlQeovF6039Y6luPS1gdazMrUnLhkG8P2ysJFriquU1onaI2N7oAeQtefRl7S74+8Y2Qxv4fD3kQDGg8VV8tnd7jqH+X5oVktraAHrWviviZKlpZcshypbbKIPuD7N2DoFhvpVPOGiYvvlPkas= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748424116347422.05785755453667; Wed, 28 May 2025 02:21:56 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999193.1379945 (Exim 4.92) (envelope-from ) id 1uKCyl-0003ZU-E7; Wed, 28 May 2025 09:21:43 +0000 Received: by outflank-mailman (output) from mailman id 999193.1379945; Wed, 28 May 2025 09:21:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCyl-0003Yt-Ax; Wed, 28 May 2025 09:21:43 +0000 Received: by outflank-mailman (input) for mailman id 999193; Wed, 28 May 2025 09:21:42 +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 1uKCvg-0000yL-CE for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:32 +0000 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20601.outbound.protection.outlook.com [2a01:111:f403:2416::601]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b62d924a-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:18:28 +0200 (CEST) Received: from SN6PR04CA0076.namprd04.prod.outlook.com (2603:10b6:805:f2::17) by MW6PR12MB8959.namprd12.prod.outlook.com (2603:10b6:303:23c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.26; Wed, 28 May 2025 09:18:21 +0000 Received: from SN1PEPF00036F43.namprd05.prod.outlook.com (2603:10b6:805:f2:cafe::fe) by SN6PR04CA0076.outlook.office365.com (2603:10b6:805:f2::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.31 via Frontend Transport; Wed, 28 May 2025 09:18:21 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F43.mail.protection.outlook.com (10.167.248.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:20 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:17 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: b62d924a-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P5et037tC/7RRkvqF5EO4oFP4+xDatJeafXkC0kxlTH2/kNvh+QJJjvPg7jbvsrCUlOKEa0PcdqcerT+Ty69KoVBrhSdu3GTQ8rsFZ4292tWCjZA8+lsoEi7UlqoPYL0ZhLZbJ2AYEMxmiHmIGJXphmLt/IGs5V31ojMjWQZICQISmFGenLlv21YyRTdbVL7aW0kyPz43gAtQFuhy4eZiygaJkYqvUCqWfwtYignOWdX9eIKEG7MD5Sb9zkxisUenNx2XnR6Frv3gH5VUBDQx6wGvRXLLNk2TDJrhJZsyUSfy0aFHt+aJw61C3gzENHovpIAoaesoGPcWzDnZuTpcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=WvykzEStZK73rMFsbUxdbGQm1JqJFz8VY0tKPFQ221s=; b=tNWVTjPgU8otA5+X2P4AmAKvWWie5d6r+oQC2JP+DiESyEJHt1UXsAfoRSqz1NxrQHb+QTHx1x51olnMBmf4tKdEas0XHOxcHQcamZNZhiA1gxCB15W9Vngt5oSCq08eIniR+NcBxDfZX/jPce797RgITh2B1q03DcYvWIPKiF1QjOqxWihDHA5KKGrVEeikqVVdZ+uL43LjjvyG46Th1Tw6LpBVeI9W4AKomMUHU7EZSVrLGCMTePRYXKWrBP+B2k0AkqWSmKSik3uZgMn/ZWRHeDdtQLhJAUlb/8ByBGzY0T+xVah1v1lzw/g7vAEkydScNhg0O4DYZ3SKI07CTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WvykzEStZK73rMFsbUxdbGQm1JqJFz8VY0tKPFQ221s=; b=o1W3UDU1+1YlwdjEt9N/iSKcMwD3Sm2duEYFDUTynXsKpAPiNwqilbdomXoOWwBRHe5vjXAAz8GYLCzue5Uu1JnHRIH1TIyIJG6h0NWDxvp/5hPw7Q/LtDzxixtEOQavY6wu5WXvDGZRIgzOm6xiQV4V5euQXXvgeQInBuq3iFs= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: , CC: , Penny Zheng , Nathan Studer , Stewart Hildebrand , "Dario Faggioli" , Juergen Gross , George Dunlap , "Daniel P. Smith" , Stefano Stabellini Subject: [PATCH v4 15/20] xen/sysctl: wrap around XEN_SYSCTL_scheduler_op Date: Wed, 28 May 2025 17:17:03 +0800 Message-ID: <20250528091708.390767-16-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F43:EE_|MW6PR12MB8959:EE_ X-MS-Office365-Filtering-Correlation-Id: ef92bdba-e0bc-4ef3-72b6-08dd9dc896e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?KCkgcrT1/Vgo8B+EV7PAS1Gi1fElV+NibqnKK6/C/w9D51fidC+DWiKBL8Ri?= =?us-ascii?Q?ZaYrIE3qqyyBgOIrL0xSYJWx515/qcB+0nq4h5K75HcgwbAkdqc1fjcIJN5p?= =?us-ascii?Q?e/Az8xJFHhzEokHoZ/s6w8xM70zQ9YIdcb4dkRXC62YZXHkqLKqbBo5f6KLZ?= =?us-ascii?Q?tOzmA4MKnXYGjbzEzP9gb/eo9r2JHruXj/aFAe5tYlw0FEpwvbjItf0ukWud?= =?us-ascii?Q?YbxL6GfNQQB1BtGMDAKGXltY0lt3k0WVKOMbypGVRtyw57eg25nm6+Kh0o5j?= =?us-ascii?Q?FZgjsb2855L0YfNPinPhL3pvC19mZgRavsKGC8jug90vUYC1Dxc5a9k9lZpC?= =?us-ascii?Q?92t77YT1+Mg73bR3CCrOg6nYGtz5WlxWSQYorY7Gl7a1cSYtLnxjyvvSkv8K?= =?us-ascii?Q?axaw3XdJh0hUgHkh0nqQpThbb3wMdBvFgLTh56bWyFRD14zjuRgGWVfjr/e0?= =?us-ascii?Q?0J2sSKpr0NQUrOpnAHEB0z128TsWfM41W60QxoHogcPv5bdVWlJG/xFelheO?= =?us-ascii?Q?9f7fbc8B6hPh1eDPArsuOt3Oi62sQ6xNnndLbQTyX0khdoIDh9i0wZtNe0PL?= =?us-ascii?Q?G9IvZ3RGjwKSz28r2hgkOqNNZE1ejzekTUXIZQVLcKiimEdaUW12vJ3JseA3?= =?us-ascii?Q?f2r7k3VoVYzPaDEmz0BUlUGC6JSgz92DW7CnQqfUm26jigczFiepeHJ6q+LV?= =?us-ascii?Q?Y0OMVqwH12WiDaY196gGA1YBT82m/uF5roaSJpak9sOZkzOXA70IAMg9cwtj?= =?us-ascii?Q?/rIGEyBuUJEh+tcV5ANyr0MECOKU0SufAJ6BzjBMBwYcccx0GNEk2ljN/nuD?= =?us-ascii?Q?cR3xsaLxS+csoivUhjXXHdka+TfVinBNeFwkoTYMhZ21zslSs9Jh1d6rbY02?= =?us-ascii?Q?mMEoDxbhS0gTfT9cauXn2XxoifX+TM1OCQf4vIUgXvBegQtu/qylgobg26pC?= =?us-ascii?Q?YwhkKpNdz1/Otshau3CMmT0poSA0uYoIm/UaR+pkOu+vYV3l7kkZWPyU6O5t?= =?us-ascii?Q?sJ8toPDNs2p0WkvIfCvJrBROjyEj3Ln1nSfsYM29QRnZmKmvMVQXCNfH2yke?= =?us-ascii?Q?h3TPfoz3q02KUU/x7n0h0qO9znLfdFdG6TkW+GI76cNPO74Sltj7jzS9rr+F?= =?us-ascii?Q?H4u+Xbm1p5yeR2TEAPORPRMUfl52cwK0lYrHOui6nvMgoQ7p1+iqPA+NbyeY?= =?us-ascii?Q?P+8clT7YiGdhRYdT5g0nOOkdy7eJ4LJgNxjhEa7w1K/YS2kgvgfN5Rinrpd8?= =?us-ascii?Q?jQd4jJonNvyZgL8FszX/wesvUOnfg0DYxOm0UYgbEwXdZjBdCbPVLGhbPyEI?= =?us-ascii?Q?NV0+4YMrdNfVwMmF6kflsdB0giOjlIgU3irn2caby4BEtChkyOJOxnJh34s0?= =?us-ascii?Q?1RX3cBJ//MuPYApbFD0/JdSLJuS8SVEh3H7bWXkOP2zBqOUz7T++rqo7JG2y?= =?us-ascii?Q?RMDyp5DSMaGqD1iv4TLsJBASnCmAI8SOEChnbpJhRRBK4PBrqqWS0CxhPvjd?= =?us-ascii?Q?B2Ziz8PikSeNx8X5driIOyrKQ/wsq6T5xwmg?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:20.6324 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef92bdba-e0bc-4ef3-72b6-08dd9dc896e3 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F43.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8959 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424118301116600 Content-Type: text/plain; charset="utf-8" Function sched_adjust_global is designed for XEN_SYSCTL_scheduler_op, so itself and its calling flow, like .adjust_global, shall all be wrapped. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Stewart Hildebrand #a653 --- v1 -> v2: - no need to wrap declarations - add transient #ifdef in sysctl.c for correct compilation --- v2 -> v3: - move #endif up ahead of the blank line --- v3 -> v4: - remove transient "#ifdef CONFIG_SYSCTL" --- xen/common/sched/arinc653.c | 6 ++++++ xen/common/sched/core.c | 2 ++ xen/common/sched/credit.c | 4 ++++ xen/common/sched/credit2.c | 4 ++++ xen/common/sched/private.h | 4 ++++ xen/include/xsm/xsm.h | 4 ++++ xen/xsm/dummy.c | 2 ++ xen/xsm/flask/hooks.c | 4 ++++ 8 files changed, 30 insertions(+) diff --git a/xen/common/sched/arinc653.c b/xen/common/sched/arinc653.c index 432ccfe662..3c014c9934 100644 --- a/xen/common/sched/arinc653.c +++ b/xen/common/sched/arinc653.c @@ -220,6 +220,7 @@ static void update_schedule_units(const struct schedule= r *ops) SCHED_PRIV(ops)->schedule[i].unit_id); } =20 +#ifdef CONFIG_SYSCTL /** * This function is called by the adjust_global scheduler hook to put * in place a new ARINC653 schedule. @@ -334,6 +335,7 @@ arinc653_sched_get( =20 return 0; } +#endif /* CONFIG_SYSCTL */ =20 /************************************************************************** * Scheduler callback functions * @@ -653,6 +655,7 @@ a653_switch_sched(struct scheduler *new_ops, unsigned i= nt cpu, return &sr->_lock; } =20 +#ifdef CONFIG_SYSCTL /** * Xen scheduler callback function to perform a global (not domain-specifi= c) * adjustment. It is used by the ARINC 653 scheduler to put in place a new @@ -692,6 +695,7 @@ a653sched_adjust_global(const struct scheduler *ops, =20 return rc; } +#endif /* CONFIG_SYSCTL */ =20 /** * This structure defines our scheduler for Xen. @@ -726,7 +730,9 @@ static const struct scheduler sched_arinc653_def =3D { .switch_sched =3D a653_switch_sched, =20 .adjust =3D NULL, +#ifdef CONFIG_SYSCTL .adjust_global =3D a653sched_adjust_global, +#endif =20 .dump_settings =3D NULL, .dump_cpu_state =3D NULL, diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 13fdf57e57..ea95dea65a 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -2112,6 +2112,7 @@ long sched_adjust(struct domain *d, struct xen_domctl= _scheduler_op *op) return ret; } =20 +#ifdef CONFIG_SYSCTL long sched_adjust_global(struct xen_sysctl_scheduler_op *op) { struct cpupool *pool; @@ -2140,6 +2141,7 @@ long sched_adjust_global(struct xen_sysctl_scheduler_= op *op) =20 return rc; } +#endif /* CONFIG_SYSCTL */ =20 static void vcpu_periodic_timer_work_locked(struct vcpu *v) { diff --git a/xen/common/sched/credit.c b/xen/common/sched/credit.c index a6bb321e7d..6dcf6b2c8b 100644 --- a/xen/common/sched/credit.c +++ b/xen/common/sched/credit.c @@ -1256,6 +1256,7 @@ __csched_set_tslice(struct csched_private *prv, unsig= ned int timeslice_ms) prv->credit =3D prv->credits_per_tslice * prv->ncpus; } =20 +#ifdef CONFIG_SYSCTL static int cf_check csched_sys_cntl(const struct scheduler *ops, struct xen_sysctl_scheduler_op *sc) @@ -1298,6 +1299,7 @@ csched_sys_cntl(const struct scheduler *ops, out: return rc; } +#endif /* CONFIG_SYSCTL */ =20 static void *cf_check csched_alloc_domdata(const struct scheduler *ops, struct domain *dom) @@ -2288,7 +2290,9 @@ static const struct scheduler sched_credit_def =3D { =20 .adjust =3D csched_dom_cntl, .adjust_affinity=3D csched_aff_cntl, +#ifdef CONFIG_SYSCTL .adjust_global =3D csched_sys_cntl, +#endif =20 .pick_resource =3D csched_res_pick, .do_schedule =3D csched_schedule, diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index 0a83f23725..0b3b61df57 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -3131,6 +3131,7 @@ csched2_aff_cntl(const struct scheduler *ops, struct = sched_unit *unit, __clear_bit(__CSFLAG_pinned, &svc->flags); } =20 +#ifdef CONFIG_SYSCTL static int cf_check csched2_sys_cntl( const struct scheduler *ops, struct xen_sysctl_scheduler_op *sc) { @@ -3162,6 +3163,7 @@ static int cf_check csched2_sys_cntl( =20 return 0; } +#endif /* CONFIG_SYSCTL */ =20 static void *cf_check csched2_alloc_domdata(const struct scheduler *ops, struct domain *dom) @@ -4232,7 +4234,9 @@ static const struct scheduler sched_credit2_def =3D { =20 .adjust =3D csched2_dom_cntl, .adjust_affinity=3D csched2_aff_cntl, +#ifdef CONFIG_SYSCTL .adjust_global =3D csched2_sys_cntl, +#endif =20 .pick_resource =3D csched2_res_pick, .migrate =3D csched2_unit_migrate, diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index c0e7c96d24..d6884550cd 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -356,8 +356,10 @@ struct scheduler { struct sched_unit *unit, const struct cpumask *hard, const struct cpumask *soft); +#ifdef CONFIG_SYSCTL int (*adjust_global) (const struct scheduler *ops, struct xen_sysctl_scheduler_op *sc); +#endif void (*dump_settings) (const struct scheduler *ops); void (*dump_cpu_state) (const struct scheduler *ops, int cpu); void (*move_timers) (const struct scheduler *ops, @@ -510,11 +512,13 @@ static inline int sched_adjust_dom(const struct sched= uler *s, struct domain *d, return s->adjust ? s->adjust(s, d, op) : 0; } =20 +#ifdef CONFIG_SYSCTL static inline int sched_adjust_cpupool(const struct scheduler *s, struct xen_sysctl_scheduler_op *op) { return s->adjust_global ? s->adjust_global(s, op) : 0; } +#endif =20 static inline void sched_move_timers(const struct scheduler *s, struct sched_resource *sr) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 5ac99904c4..6e1789c314 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -57,7 +57,9 @@ struct xsm_ops { int (*domain_create)(struct domain *d, uint32_t ssidref); int (*getdomaininfo)(struct domain *d); int (*domctl_scheduler_op)(struct domain *d, int op); +#ifdef CONFIG_SYSCTL int (*sysctl_scheduler_op)(int op); +#endif int (*set_target)(struct domain *d, struct domain *e); int (*domctl)(struct domain *d, unsigned int cmd, uint32_t ssidref); int (*sysctl)(int cmd); @@ -244,10 +246,12 @@ static inline int xsm_domctl_scheduler_op( return alternative_call(xsm_ops.domctl_scheduler_op, d, cmd); } =20 +#ifdef CONFIG_SYSCTL static inline int xsm_sysctl_scheduler_op(xsm_default_t def, int cmd) { return alternative_call(xsm_ops.sysctl_scheduler_op, cmd); } +#endif =20 static inline int xsm_set_target( xsm_default_t def, struct domain *d, struct domain *e) diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index d46413ad8c..8d44f5bfb6 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -19,7 +19,9 @@ static const struct xsm_ops __initconst_cf_clobber dummy_= ops =3D { .domain_create =3D xsm_domain_create, .getdomaininfo =3D xsm_getdomaininfo, .domctl_scheduler_op =3D xsm_domctl_scheduler_op, +#ifdef CONFIG_SYSCTL .sysctl_scheduler_op =3D xsm_sysctl_scheduler_op, +#endif .set_target =3D xsm_set_target, .domctl =3D xsm_domctl, #ifdef CONFIG_SYSCTL diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 45c12aa662..a7cb33a718 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -626,6 +626,7 @@ static int cf_check flask_domctl_scheduler_op(struct do= main *d, int op) } } =20 +#ifdef CONFIG_SYSCTL static int cf_check flask_sysctl_scheduler_op(int op) { switch ( op ) @@ -640,6 +641,7 @@ static int cf_check flask_sysctl_scheduler_op(int op) return avc_unknown_permission("sysctl_scheduler_op", op); } } +#endif /* CONFIG_SYSCTL */ =20 static int cf_check flask_set_target(struct domain *d, struct domain *t) { @@ -1887,7 +1889,9 @@ static const struct xsm_ops __initconst_cf_clobber fl= ask_ops =3D { .domain_create =3D flask_domain_create, .getdomaininfo =3D flask_getdomaininfo, .domctl_scheduler_op =3D flask_domctl_scheduler_op, +#ifdef CONFIG_SYSCTL .sysctl_scheduler_op =3D flask_sysctl_scheduler_op, +#endif .set_target =3D flask_set_target, .domctl =3D flask_domctl, #ifdef CONFIG_SYSCTL --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424080; cv=pass; d=zohomail.com; s=zohoarc; b=chkDG6o7lc6wD6QutmHU8Mi6cF1llleQYmsOca5eGwv2mD+h0uJV4DGFtklg5mnGTfLpAx4pg+RGVTSWcxbb9slVBpW+Xih3tsn8dpNW4CV0IY9AgxAIADLwTsGVRLOWOSjmr31XPDJ/+ZzaQTPZcehN43UMZgsbgxjpMlJUwak= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424080; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=MvEuxjyrKHpeWz5xkr9emMjeZhe7QGQkfrKWTsEegww=; b=SIR4xaEieC+a07aK+cmfrJ4hE4uqwCdZqK5aPpK7Uj7MXqekkhJGsEHZBhNSdXxnkWBq17DP01yVSPqXhK6anP6tOrtEPg99QemTn5R5DBOvD/cjbKcx95rU7tn6S+th7wmH5ntLpqeUoraMukMC4L2JeDmTfqmgB0NssCgi388= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748424080561341.5026884498923; Wed, 28 May 2025 02:21:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999144.1379886 (Exim 4.92) (envelope-from ) id 1uKCyE-0000Qu-Gp; Wed, 28 May 2025 09:21:10 +0000 Received: by outflank-mailman (output) from mailman id 999144.1379886; Wed, 28 May 2025 09:21:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCyE-0000Qn-DY; Wed, 28 May 2025 09:21:10 +0000 Received: by outflank-mailman (input) for mailman id 999144; Wed, 28 May 2025 09:21:08 +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 ) id 1uKCvg-0001jE-C8 for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:32 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2061b.outbound.protection.outlook.com [2a01:111:f403:2415::61b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b704d4ce-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:18:29 +0200 (CEST) Received: from SN7PR04CA0163.namprd04.prod.outlook.com (2603:10b6:806:125::18) by DM6PR12MB4418.namprd12.prod.outlook.com (2603:10b6:5:28e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.25; Wed, 28 May 2025 09:18:25 +0000 Received: from SN1PEPF00036F40.namprd05.prod.outlook.com (2603:10b6:806:125:cafe::7a) by SN7PR04CA0163.outlook.office365.com (2603:10b6:806:125::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.31 via Frontend Transport; Wed, 28 May 2025 09:18:25 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F40.mail.protection.outlook.com (10.167.248.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:25 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:20 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: b704d4ce-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JxtMNzr+s/Jp7BgiIHOxtMJKJS1oc5+wzHWPxCODge/hcKhrkDKIrheVDO7Uwk//Wwl/HxK0apXumzcy77TN/Ggy2EaZzLaQ1JiBrLaGpCMYxbk/RJIsHCa60CjyxWuDQR9jehJGf32QPo619kXBGr7nbW+bsMtkF2L/P+10v8x+eJU7lzGyx44il+3Gzkpg3nh97ZlzkI7PzsDt+lsVwfyx7V5+1u5p8yYS28qMg4s2v0UXaAP6x8pvJaZS0KR21aOXpreRumcDeTLHCfkyckybJpt3gIL6JxyPb6cu9156n0kSoDSIfXcsGtgjXORs/9YjPlVpxXaS9H3hSCWQsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=MvEuxjyrKHpeWz5xkr9emMjeZhe7QGQkfrKWTsEegww=; b=Th5B1gAs4e0ZQi5S2hLwXoapaNQpQsf+x6w6C5lDwK8R4cNPSzfvWh1iarV6yZaJ2RMGaS8BYsVZK1yh74NDK6h1ICvAnY1km941SmDLOKlt8/OS6jS849UHMKsBpXL3Y7zujd30SVrg6emXllqZ0cjGPgLPuliKwotYYF2PqZnjbkYXfvRfNIZ5u+e8xdO01ySwj6Pwx7t3xQ8zAOJiUhgIoQPbrqWcExnT+nOF4DUqMtn9brO4h9pYrPyPedp/5hu20/Nrl7ILrEMTuiqWo1BPgbblzcvDtHu/l1cRBI0v5znF3srAtaJPTNSYcjwGRXWhlKN4SydAX1z8PNo6bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MvEuxjyrKHpeWz5xkr9emMjeZhe7QGQkfrKWTsEegww=; b=k/OgSanCbOn/9N9I2aVjZ5Tfsn512dFEC7mGlqFRSHsyqWaQ/YxvixjH8I+sKlZS995IE3kvAzDqUart/j885ilYWHQbsdsmPrvrRZWpWq+hg/SXKILBYLvXqBdfxDKnRgGoIRQP8R9G99rETRQuQacSoa9VJQQlUxd7astH1V0= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , "Volodymyr Babchuk" , Andrew Cooper , Anthony PERARD , "Jan Beulich" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Alistair Francis , "Bob Eshleman" , Connor Davis , Oleksii Kurochko Subject: [PATCH v4 16/20] xen/sysctl: wrap around XEN_SYSCTL_physinfo Date: Wed, 28 May 2025 17:17:04 +0800 Message-ID: <20250528091708.390767-17-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F40:EE_|DM6PR12MB4418:EE_ X-MS-Office365-Filtering-Correlation-Id: fa155ca8-bb51-4066-1644-08dd9dc89983 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?culF3llLHhx9VxWqBxXaKFZfyStp9ITzCEZFTzYMcGpYKC3QKTcjrH+qjfPU?= =?us-ascii?Q?Eqec0bV2vRZvj3AjWP6znsMUmtj6ZjAoOHC34IAxnEqlLoh37iSmN89PgyyR?= =?us-ascii?Q?6+VA8NB1aRTEoIXtAeqoo1FzL0PUyh/icdDz4ePu7VPH9jVdtr0dXgZaS8pA?= =?us-ascii?Q?/eKmUMb/Y876x2jUHl5VeZnyo39VgSoqkfcIXJZO+Y/RbCS/U8eQaIOwF9+G?= =?us-ascii?Q?jyqtJBAC1FIj44QvPPQNBjUe+KQVpRpQ86FbGnX+3NHdIQkmsrZAsrXH9/1W?= =?us-ascii?Q?QUKm2iU4p29tvvNBU5sbd/kRACowwWXWZE9FPd/72RIW6V4DpATcCusNX4VU?= =?us-ascii?Q?bfiNZL5BsYHClVw4rjKbPsTuR+TvAttzF5GekR66ysKgtAoJHBFwwrQcR6U8?= =?us-ascii?Q?7FAHwRpPZqOtLbR5a07w9i5WYO+gZEH9GODuIhYozmgHn9Ubre0sVtmn/NMW?= =?us-ascii?Q?6C6E2OVql5CpVtf1x4LGGyMzQ2A5eg1q5M+vT87Yv90yhSluN8MGDqQbt+BY?= =?us-ascii?Q?HeJ6FE8b/iBMA62z9RPcNw5ZVqM9fa7xTZXC5RDG2wkOqQYHDOIYnIYBnlux?= =?us-ascii?Q?fMsHNtOXp8QZWPG8sVs/gHDU+UHIx5suTMigpHtbPF0YyT5FXoideiWhWEbi?= =?us-ascii?Q?lajKYWLWr9FFx/kQY8yTfXMyGGevvActMqztAXYaxSWZOjocsBVJ430QgB5R?= =?us-ascii?Q?BdjlrtrtFTdMFf+Ye+eUeFoD3ePUK/9kSgsaBATvyvUitkTs5qnf0UiMq9y2?= =?us-ascii?Q?g7b4fx3YK/PvrYg+lnVVR46mQtO8ZyujeezOJ5WpZaJBnjMSQeCneNXB6KC8?= =?us-ascii?Q?Galfu+mF2UUQ8Ywf7uH7l15P4TcLTaYcUHaE/JA5MvnpOzzrDue941luA6yv?= =?us-ascii?Q?JDkQ0bbhvHAGW8ueIDWEp4s3unqjuXACrvm2/wqUHXV1LwnQt8GdAzzFJeSU?= =?us-ascii?Q?US2fPzHgPoMQE2Dd0BD35mIdkZ4av5xFlQhuVNgxOqztEouYYkuvgE+dL/yB?= =?us-ascii?Q?oIs2T5xXb4piAhjxZyJpwXWwjNd9N/tlWUXBgIUZHH/D2s+OEBmdZfleij+x?= =?us-ascii?Q?uk4raRgL3/SL309JzWTujvCU9v58BEWGEbQg3JawZMu0A40mchpK5tzXNdti?= =?us-ascii?Q?zR5xUVpNgKBvE4k16DIha0OoTSSC8yUryxhLKq3bYF/Vz/ZzgX8fNK0UK+2W?= =?us-ascii?Q?EpsOLQ2nj0UjgZsgdNDJ1/z9sWt5fdjTKSmjxwbfMfJW3u++Lc8B3unji6g2?= =?us-ascii?Q?mF5XFeGdH7qYlfFqNnkNmn/N44yQ6AluzJw9A1pqUpVaddQTtIKqnhqL/o3v?= =?us-ascii?Q?s8WJIj+snDhJ8I7tbGbB+1zBJAPlrLs5ISPesLD/AENJu1QhEzgtlLZoP+1z?= =?us-ascii?Q?NQPekh3JnGtEA4sNRIiaRBVRxMSoJBKW0HIhW5044E8MPEQH5xLmm3iwBx57?= =?us-ascii?Q?jqcK2Tyz34CWC8rKw0YZNtSbsPLrgvVJ2W7Vp5FZNTGnxAvEwQnNsxfz//j0?= =?us-ascii?Q?6TawHmsmABa7jst1QglfH/qcbK8ANrUacuBF?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:25.0352 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fa155ca8-bb51-4066-1644-08dd9dc89983 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F40.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4418 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424081534116600 Content-Type: text/plain; charset="utf-8" The following functions are only used to deal with XEN_SYSCTL_physinfo, then they shall be wrapped: - arch_do_physinfo() - get_outstanding_claims() Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- v1 -> v2: - no need to wrap declaration - add transient #ifdef in sysctl.c for correct compilation --- v2 -> v3: - move #endif up ahead of the blank line --- v3 -> v4: - remove transient "#ifdef CONFIG_SYSCTL" --- xen/arch/arm/sysctl.c | 2 ++ xen/arch/riscv/stubs.c | 2 ++ xen/arch/x86/sysctl.c | 2 ++ xen/common/page_alloc.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c index 32cab4feff..2d350b700a 100644 --- a/xen/arch/arm/sysctl.c +++ b/xen/arch/arm/sysctl.c @@ -15,6 +15,7 @@ #include #include =20 +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { pi->capabilities |=3D XEN_SYSCTL_PHYSCAP_hvm | XEN_SYSCTL_PHYSCAP_hap; @@ -22,6 +23,7 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) pi->arch_capabilities |=3D MASK_INSR(sve_encode_vl(get_sys_vl_len()), XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); } +#endif =20 long arch_do_sysctl(struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 83416d3350..295456d0c8 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -321,10 +321,12 @@ long arch_do_sysctl(struct xen_sysctl *sysctl, BUG_ON("unimplemented"); } =20 +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { BUG_ON("unimplemented"); } +#endif /* CONFIG_SYSCTL */ =20 /* p2m.c */ =20 diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 1b04947516..f64addbe2b 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -91,6 +91,7 @@ static long cf_check smt_up_down_helper(void *data) return ret; } =20 +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { memcpy(pi->hw_cap, boot_cpu_data.x86_capability, @@ -104,6 +105,7 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) if ( IS_ENABLED(CONFIG_SHADOW_PAGING) ) pi->capabilities |=3D XEN_SYSCTL_PHYSCAP_shadow; } +#endif /* CONFIG_SYSCTL */ =20 long arch_do_sysctl( struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysc= tl) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index dec4cb2ab1..8177d12f50 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -601,6 +601,7 @@ out: return ret; } =20 +#ifdef CONFIG_SYSCTL void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pa= ges) { spin_lock(&heap_lock); @@ -608,6 +609,7 @@ void get_outstanding_claims(uint64_t *free_pages, uint6= 4_t *outstanding_pages) *free_pages =3D avail_heap_pages(MEMZONE_XEN + 1, NR_ZONES - 1, -1); spin_unlock(&heap_lock); } +#endif /* CONFIG_SYSCTL */ =20 static bool __read_mostly first_node_initialised; #ifndef CONFIG_SEPARATE_XENHEAP --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424091; cv=pass; d=zohomail.com; s=zohoarc; b=PrxUkUsLKv7BTyRFU60jCQo0XnMwrE5d2Uxknqq5it8bmabhrmFXDG0pp/HNco1sl81g9MjLM502L9rg0mTucDfiqE9zmA01QBGAUgoeIAP2gR9WnANY8kCjQMyevlTX/IezGP049K5TTV0lbuFAApWmyrN9dmT20IdeIL0xG50= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424091; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2b2CWzsDEAqRVTo0xhsHOqqreygQWWop6mCIRDuco4A=; b=PDvwraZswjmbcHXQLNJ7aCHwbjEQ3iBSSnxvl1GRuyXs22ynLhHZYmGnorEp9a3ZbvTi9a+pgANFEgbPZOkNIOYTLDbslX2AscP22g3rMCvJLRK7sX3zWsB9vm8HIjZnadD8U7LqKS0G9dR2PTxOqD3RRuf2wBML7vtWK0SnWxM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 174842409184978.33622629561194; Wed, 28 May 2025 02:21:31 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999159.1379916 (Exim 4.92) (envelope-from ) id 1uKCyK-0001N4-BL; Wed, 28 May 2025 09:21:16 +0000 Received: by outflank-mailman (output) from mailman id 999159.1379916; Wed, 28 May 2025 09:21:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCyK-0001Mu-7J; Wed, 28 May 2025 09:21:16 +0000 Received: by outflank-mailman (input) for mailman id 999159; Wed, 28 May 2025 09:21:15 +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 ) id 1uKCvi-0001jE-3Z for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:34 +0000 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on20621.outbound.protection.outlook.com [2a01:111:f403:2418::621]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b9464088-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:18:32 +0200 (CEST) Received: from SN7PR04CA0171.namprd04.prod.outlook.com (2603:10b6:806:125::26) by MN0PR12MB5715.namprd12.prod.outlook.com (2603:10b6:208:372::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.22; Wed, 28 May 2025 09:18:28 +0000 Received: from SN1PEPF00036F40.namprd05.prod.outlook.com (2603:10b6:806:125:cafe::b2) by SN7PR04CA0171.outlook.office365.com (2603:10b6:806:125::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.24 via Frontend Transport; Wed, 28 May 2025 09:18:27 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F40.mail.protection.outlook.com (10.167.248.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:27 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:24 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: b9464088-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RLtur3S3WV0wcqKvk+on1WNcVJcJulyyexWi9HxSpm25idw/bLwpg2gyResbvTw1s6QFf+cO2Sq+BfaZ019LyDI7ooxKYul1Qza08VLWPYJVctRcumPpvJJXgmSVuviGtJnredF1ibIk5UhmCZGtQEoYpFzQMLpA9FvtVEBVZjRuA4Z5QvdID/1/HKU32fzaiIim6Y1IFnk/w4ewOyaFx29bHLPSjN2nEefRwMod98iN79PqlhpAXLWodqjDG146nnlctHc/+PIL1dAbCZc/qxY0wkBG+vgPsUzGx2DxVePUMekbxqkvl/GmVOw9HQFTzRKeASXs3tUxD018cTLXDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=2b2CWzsDEAqRVTo0xhsHOqqreygQWWop6mCIRDuco4A=; b=NISe/asblfRxa9zlYK1+Sh1lsqldnM6u7MYZC7LzXTABWLcFoR3g6Vp/7VDlbbTimkw1vt7hZfyKE4N4KbM70f8uN6Hn4OQ8t7APCe5BWHCXK51HZE5BaiZoMUY2Kl3bkPznKtP6HDbp0qIiA0nLDeG2fpTX3z0YJUkYdTWaEzif3dMMh88ewYf49hBm92ZTrra3lmSDIt73zZ/03etpAntul5dLg6kKML7knGEIRJ/s+PV1NgIl7lJTdmkYKmBcuS52Wr6hXNgRpjmE0VA8uq6Va5fmqrUWMvXyATJQ6EZhf4n5mGVz24JFwTlu5uS65nlDuKPkVz3QqZSX4C5T/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2b2CWzsDEAqRVTo0xhsHOqqreygQWWop6mCIRDuco4A=; b=W6IdlsFOUAtA6zoA70Pa9U5GJywONShbMXHvGeFso/b0QKSz/6pttoNwDH8O58JKjq/bRCVkQRcl7CkFIdNEoGRdl8xyDLsLaTBW+2+bzjO6UcRhlvX6h0SAIqXE9y78y5ipf1XTIj/9ME9y5B1C2SjlP3PghvsBONpVhV6UCXc= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , "Julien Grall" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v4 17/20] xen/sysctl: make CONFIG_COVERAGE depend on CONFIG_SYSCTL Date: Wed, 28 May 2025 17:17:05 +0800 Message-ID: <20250528091708.390767-18-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F40:EE_|MN0PR12MB5715:EE_ X-MS-Office365-Filtering-Correlation-Id: bb4e859a-66eb-4e93-5f21-08dd9dc89b1c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Me2XFMA6aVSso6CoXpMa+edIQWr/OzPM7b2Qe5ywoDXC1ssFTynUpqkYcip1?= =?us-ascii?Q?dnb8uer+vZyo99Pjr9sUfkqXUxzqzMJoT7rS9R/8lN5BmBe62ota6eka9uTy?= =?us-ascii?Q?/HYrgJE4uzeKAqcwvOniL9XS1yRCakiYKB1rhO/W0zHuILxybZeRX+IZjGJc?= =?us-ascii?Q?xB2lhFqh1w46ZOFvpYS11hUiofTVz/zOhxylwCnuj/VVjNG4S82xDIPGNuJG?= =?us-ascii?Q?j2IUKzBZffKtVaJadKhO3xOa8VGMRoTRjvM/dlnOX0DQtTbW7CxcO9wCdINN?= =?us-ascii?Q?NTKsMoVD/j/UWXAQ90dZQb/lHTqH7hOlRNITYny+U3/1qMXOqZ90WqYdIbbN?= =?us-ascii?Q?gVNK5Cku3RHOZVloU877v0Cw563/xd7r3IsnpgtkOw/sbdYZXCCKr/8/+o6z?= =?us-ascii?Q?3ZE1+4StmePXcPeWzBUNsbbhrYrtf9BhxmWPnluMjWzAjgajH9NM9IyyroXT?= =?us-ascii?Q?5YT3orB0SfydaDCPlegYWtsS2JZ+jBA1QX0TztTO6XjDQZbiuEsBSl8x6Vy6?= =?us-ascii?Q?RY7nwO04JdZq/NP+vGh7uGyFehq4UyNfkDEjF6GqTSkU6ykfFGpfUeBYCygw?= =?us-ascii?Q?RvXRmbIzwaol2THqysWmCYyQQKJZsB7LQ6jGhgmm2z38QnrTSymi7nx2WvB6?= =?us-ascii?Q?KP0/it+C87ocF8U0slyJuYDsgV/rzaccTQ5A1yW5nmu9KUXXW6Ip+WDElsvq?= =?us-ascii?Q?GQYXyYgSAJsy/VSGgNYj2lzdV8Ad3/USQPEXptHKNhxnT5NLT/OyXsd3+vBy?= =?us-ascii?Q?eRSiqSiEbKUIik1Y8C+cDiIO8k7WbexWnGYvXVOucYR4NKSkEaQZk8pr2y8s?= =?us-ascii?Q?rJxGL05aFOL9sa9IWvajScaojSDETfrQziNK/BAJKlTBe42zaCF0pfdHsgo+?= =?us-ascii?Q?a8LHMqTS281hyGSJXkyaNafYOxy8k3mSf+4HVd+cHO11YxWvinEmdsYhgpsv?= =?us-ascii?Q?UmPORGqm7EsrVS119bgjJK1iS6d1PEq8MuWjrRRwe1oU89hnI8X7ZXBS3Ycz?= =?us-ascii?Q?QxAeYN6L6Tc7th7W9uCZzHaY1U64Hoqxh7hlVaBdUf4wdulBjSLFf+XVkpxD?= =?us-ascii?Q?tvrAqEpW2sV3pGKZcBWi2oLed94TCeURkHDbRyyUdK93c88yTo4fX0Hgero+?= =?us-ascii?Q?xyLYdEw8r36fW9ZrXbN94VjLFxf78E1PxFNoBPWEBNwoZOm0bIMC1W4FaS04?= =?us-ascii?Q?GXrceRR/hVfhKNjFqw4/xe2YVb1UIw/8AYZU7RY88SEXZxd7Erb03TnWGpE7?= =?us-ascii?Q?25vWzxEYzLyqJLCUHiTeUHAK+aJv8w5/mt2QdaH6rOhgJ/h32aJNLSV+Vnc1?= =?us-ascii?Q?T/IPlGY+qpFN7qy6DSKTxlANB7RLCTHmAIvGeMexKRqL6fmtwFNYKubsQT2v?= =?us-ascii?Q?jaUKBvOEUDPorYEUsHr+kVqlWLSTK3gT+wAD5V0nqhr+1t4X27KydL3WSOCk?= =?us-ascii?Q?vbqvbekUouclxmEfSCCxcGACyU21oox7Y24wdN+Zd8rSnMn1432Qeyp568kh?= =?us-ascii?Q?EF9vWwVYYAyfBKIHfGrXQvBQkM+/6iwOhFcJ?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:27.7183 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb4e859a-66eb-4e93-5f21-08dd9dc89b1c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F40.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5715 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424093681116600 Content-Type: text/plain; charset="utf-8" All coverage-related op shall be wrapped around with CONFIG_SYSCTL, so we shall make CONFIG_COVERAGE depend on CONFIG_SYSCTL. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v1 -> v2: - commit message refactor --- v3 -> v4: - commit message refactor --- xen/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index d14093017e..c4198f0ac8 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -37,7 +37,7 @@ config SELF_TESTS =20 config COVERAGE bool "Code coverage support" - depends on !LIVEPATCH + depends on !LIVEPATCH && SYSCTL select SUPPRESS_DUPLICATE_SYMBOL_WARNINGS if !ENFORCE_UNIQUE_SYMBOLS help Enable code coverage support. --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424129; cv=pass; d=zohomail.com; s=zohoarc; b=S9Vb4HwcbzFkjaybmK6aX3C1Dwrp3wiwHyP5O206bMHCgKfkNH7b80xKBMrnk6QnYg6gYZTvNSwt7+UMnBVt3GnK4/uEBPRhdpBzjZzMM3kc3lc2+LS+1fRwnaTM4X80dW+GKVo2QGhVyINPciTpsOSvQMNsQsK6NQr25ME/mM0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424129; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gOftosmSTRdHCsGYzRWYjX+g0KG6mzuEbqn5MK0YPV0=; b=Qf44z680yzG30KaSF74tk7OC+8+Qj5u4Wc4Logxjzf/1FbNsnnBckimsd7zDORwuA1o2yJIlZGFWRneXNXISAaU+rBBeeYYqy5S0fMtlugo72P1agTwaMRdnyyAXL4CxhTT4BkdxjrLeC5ee1uOEPYIhdT10nxpQrqJ/dYwYxTs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748424129636107.80967611001108; Wed, 28 May 2025 02:22:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999207.1379956 (Exim 4.92) (envelope-from ) id 1uKCyy-0004Sm-N4; Wed, 28 May 2025 09:21:56 +0000 Received: by outflank-mailman (output) from mailman id 999207.1379956; Wed, 28 May 2025 09:21:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCyy-0004Sb-JY; Wed, 28 May 2025 09:21:56 +0000 Received: by outflank-mailman (input) for mailman id 999207; Wed, 28 May 2025 09:21:55 +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 ) id 1uKCvk-0001jE-Lp for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:36 +0000 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2062d.outbound.protection.outlook.com [2a01:111:f403:2416::62d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ba54bcb0-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:18:35 +0200 (CEST) Received: from SN7PR04CA0171.namprd04.prod.outlook.com (2603:10b6:806:125::26) by IA0PPF002462CFE.namprd12.prod.outlook.com (2603:10b6:20f:fc04::bc4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.34; Wed, 28 May 2025 09:18:30 +0000 Received: from SN1PEPF00036F40.namprd05.prod.outlook.com (2603:10b6:806:125:cafe::64) by SN7PR04CA0171.outlook.office365.com (2603:10b6:806:125::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.24 via Frontend Transport; Wed, 28 May 2025 09:18:30 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F40.mail.protection.outlook.com (10.167.248.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:30 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:27 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: ba54bcb0-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AjuELbdaXhMWVxsUtaaXb6HSARbxXtQK5BDHkdG1PybExbzXydwlefr2wYOKfhfVoidz3LEtJBxEEj07MjCEWLEeHwmc/Futy9xknwFnjYuR7xLqvZO+3jNqCtbI178/XrDoC3hn27b9dtJ2mMiMLr/N6GAlUoSj20h5borO2Oy0fI7MXN/0EftSSunNHjClGo1w88xLvzLL6nFw/DPqr4MPdoxQ6SHmOt71tqw84Saz1SPMycNJlGzLhZVuyqg8STVwoy9fF80Vs3lWOds8lVnzjNX507toYMuRY+mCQMKknXwtTHvqecFrokwTnGSNkvjszcW4XVfAVkas7RVn9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=gOftosmSTRdHCsGYzRWYjX+g0KG6mzuEbqn5MK0YPV0=; b=vG7J7SnWDYB5Y1g8wLRe0pWwTTb3jTgfjZoonwUcQKK8NCvFvnZU28KTTLB0nw07dZJB2JapfuZpyqwqhWBLKX3ZRRqxG3H6CeHc1rxhd/hdn6W+pWY+rCqWyPdX6mjrkJIz9NCZLphB9GGJYm2Q6d/TbaL9Ciy9Yrphh4qlJfFmXam+WAnxstyCSPaktPIvU8ULPyYsMmdI/XW4RLexwBqPF1uUDQvhR4bxmG/iNpS7j+tJuk4sNVqocgLqpvOZKebUrleBWW/MAYUwvLFEpfDTGct/SQa//qyyvw9+VZvsNx/Jr40SeBlV+VKbG5Ql4pGq114HNya7Qf+zmaCtOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gOftosmSTRdHCsGYzRWYjX+g0KG6mzuEbqn5MK0YPV0=; b=ySbxMAlrwrsP2rURHoE7A3ucJeJkTG/pL1I0WEIWZj+cvlIjrVZtznO+41ITH0gWHR5s7N95WPCzpcNpl9tW1X+bKyFybj8szAzrp79gcOk7Z6175ZOLdVj8av+oN2iopYTspFU5EopyJHQLr7flXm8MHBNknfDIjJCMQt+dDRQ= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , "Julien Grall" , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v4 18/20] xen/sysctl: make CONFIG_LIVEPATCH depend on CONFIG_SYSCTL Date: Wed, 28 May 2025 17:17:06 +0800 Message-ID: <20250528091708.390767-19-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F40:EE_|IA0PPF002462CFE:EE_ X-MS-Office365-Filtering-Correlation-Id: b078c20c-e79b-4a94-1842-08dd9dc89c8f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Wpeo6lyzhNUFuzEHr8kFXHf2zVTG9Z7ZasZHdfWLMjE1huzNK0UcrPNqvx6D?= =?us-ascii?Q?LbHICavaN1KdluO8gt085nBdSwBBtJ/oKLiYe5pH9cQZ2GymuV+nnWI/5XIS?= =?us-ascii?Q?UbxG3cEvV6/dKw0v2ZiHuJhKbIaoKIfRc9HOrx6BsQBpz5EqVPkOt1HL4xLI?= =?us-ascii?Q?7y/d4DosvrjhZPDgeu+6HWR9T7EqNGb/3iocm5Ewg//m0MTwH+AuP0YOtbMo?= =?us-ascii?Q?vGEyMtXI9LpaVCU/DoZRgl8CArueid4R3XTMdsdVk2BkLthe934i/cKYvi/2?= =?us-ascii?Q?Qpd6XSeiv9SpzFL7ha1ov21nV3y+p2Hpr3Oa/31jsQQrQ2Be0eBTDbhbEV1g?= =?us-ascii?Q?MW0dXnUUH1MoAH0CP6CaqvoIBsZ6TlULGW3p8kO+63bFSmVNBbQcr79w/QMN?= =?us-ascii?Q?IxOot0sr8/OA/GPkjO+N9W+9viDP6Ok8jDyFfIREhrHi9zPz9s3CgH/eswXM?= =?us-ascii?Q?m30gNGJN+/xSP4wsziceHt69Shp0QuzWXXYGMM9zSJyA1sLMFOyQYMQ9IpbY?= =?us-ascii?Q?mLWb9yDTms3Azn9KwY/S0nKDcVOsyTWYfex8+9JLPkEZmsPFGOKeSzTf28M6?= =?us-ascii?Q?mBdOmac6/KUDvNdLrihvWvaTgGINTyUThugK70SsLUaCiquCZIp5xd6iGaXV?= =?us-ascii?Q?SB43mIkyHrB1O8dtdbLrkbuW/q+2U8RtZIzPjj6TU/zNipJ9Jh+pBkmv7rH1?= =?us-ascii?Q?s8esKLFlHq2R6TRvc5tmg5CnVK9Py7is5JyLcjpHG/DPnuMg0Ld0/2dLKPVP?= =?us-ascii?Q?zeY7gp/D/XxAVVrtL8+I8stwX2u4cfwhN3VSda3gne7+MlOH5FbwzM3Aw24/?= =?us-ascii?Q?YbzV5mNTgiZoHak9qMBuackOkM+KhSC83YaeoAOHoVdxHktSWqcyb93Szknm?= =?us-ascii?Q?S3l99LrSJDiyY0BJKs70vcKRDYoCvHlCpDv/zYvBDqgzCDrC7N9pXy6msVFB?= =?us-ascii?Q?8H2O2hLePvMjrk/Kxb7I7rUWtO09+oosPZzLxora3MDck5qM6H0g4bvcWBnx?= =?us-ascii?Q?S+7WrWsQNOSNcPcou5vx6gSRRFY+iQY4UHXA03QQLoUqKaMliNoS35HlZNzO?= =?us-ascii?Q?s3FA4OK9RHbfgR5ceL2UH5uwoAC/LoR3gB7vfD7i62+Xu7aZuVw5nwNO+ocS?= =?us-ascii?Q?DDBLrn3T0GeQovTplNyKwD8lONpm9nZMVzWrTLS+XD37nGp2VRZBDpfI7Mz8?= =?us-ascii?Q?DXIw8ossZzKK7NprTWnLAQTKmIcHTJY7dhiTaSJu8hA66Q5wBTDOyhtwc2pT?= =?us-ascii?Q?zX0diDLyBKj/sWbpMVyp1kQMjGsC8b0cwK+2W2rrfhVi4pff4XlHVBvd6SpC?= =?us-ascii?Q?yQ2HSErdlnhEHQazJBs1ExbdGXdzRuX6I9b85dLe/9hgDWXsWEjNPF+/nwBX?= =?us-ascii?Q?dzqhDKsMdPN6lWintESM0l8cuCYvrDU0FaacLd71I/Dnh+MS0BbGHDOZUkLA?= =?us-ascii?Q?mePuu/TnWm3ZTHf18gGeL2jEACH3zQ5W7uBWW4DpYMSOj91Cmz1FXlnVEmsS?= =?us-ascii?Q?EnsvW6lvLi7wU3/VQUXYtJi6ikLEOlqAHvn6?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:30.1464 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b078c20c-e79b-4a94-1842-08dd9dc89c8f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F40.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPF002462CFE X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424130259116600 Content-Type: text/plain; charset="utf-8" LIVEPATCH mechanism relies on LIVEPATCH_SYSCTL hypercall, so CONFIG_LIVEPAT= CH shall depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v1 -> v2: - commit message refactor --- xen/common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 9bf632973e..e3b6fd6ec4 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -455,7 +455,7 @@ config CRYPTO config LIVEPATCH bool "Live patching support" default X86 - depends on "$(XEN_HAS_BUILD_ID)" =3D "y" + depends on "$(XEN_HAS_BUILD_ID)" =3D "y" && SYSCTL select CC_SPLIT_SECTIONS help Allows a running Xen hypervisor to be dynamically patched using --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424051; cv=pass; d=zohomail.com; s=zohoarc; b=naNJwZj/Vmz57ENdTv4ucfz0y5WGrcZx5Gn8DrUkWt7f/J73vyjgtjxay2w6bTEO9p/2oj9Rk91y/ifg2GKp65ngxb33lPr0fRl8eEGCZ4DR59qyHX/8RUmA6jGzYT+lwb0OjrEuBEpKP/LwYIwnjftyBr/ivJLMLUYWPTRr8rQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424051; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=us3XyiiEJ1jpBaIa5d6mu+gEoTYclWxk5heaEhLXVv0=; b=EgBYhqGDPT5M1YhkhaJSZ6GxD4aS7AbCWONDKiBNi1/rBwuTRQVXwo5H7Oq0gFoch4BOENHEbwWWKFEVrteAE5KvDWOPjbL8IkdG1HMprieQCdcMc3zEcvs93syTgTVJunqJpzvaggFFKYrBI1kW2aZ9ndUFJDmk5pWrR/dqtE4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748424051053579.1275980603108; Wed, 28 May 2025 02:20:51 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999103.1379856 (Exim 4.92) (envelope-from ) id 1uKCxh-00078g-Kk; Wed, 28 May 2025 09:20:37 +0000 Received: by outflank-mailman (output) from mailman id 999103.1379856; Wed, 28 May 2025 09:20:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCxh-00078Z-He; Wed, 28 May 2025 09:20:37 +0000 Received: by outflank-mailman (input) for mailman id 999103; Wed, 28 May 2025 09:20:36 +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 1uKCvs-0000yL-0D for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:44 +0000 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on20605.outbound.protection.outlook.com [2a01:111:f403:240a::605]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bf03691b-3ba4-11f0-a2fe-13f23c93f187; Wed, 28 May 2025 11:18:43 +0200 (CEST) Received: from SN7PR18CA0009.namprd18.prod.outlook.com (2603:10b6:806:f3::17) by PH0PR12MB7079.namprd12.prod.outlook.com (2603:10b6:510:21d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.26; Wed, 28 May 2025 09:18:35 +0000 Received: from SN1PEPF00036F3C.namprd05.prod.outlook.com (2603:10b6:806:f3:cafe::ef) by SN7PR18CA0009.outlook.office365.com (2603:10b6:806:f3::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.30 via Frontend Transport; Wed, 28 May 2025 09:18:35 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F3C.mail.protection.outlook.com (10.167.248.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:34 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:29 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: bf03691b-3ba4-11f0-a2fe-13f23c93f187 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bqEIoEtyMbT7mazyXLDeQZveaD2Xkr1HjysOWYRBmaJTAETGUd5DO+waHQxIFj3FjUlQqT8LRn9sk83KwGhLAVXCe5GU7AwRmazbnEsMWMVbx5d1+4SxRz7h1og7nVzEs07TgWeLsNhYlMj7Ik6RZu4eicbOgFQyyQn53akagHpXLPn+E5FBavgsybjundFqlfKXFoDx34YE9VIw/ApUnEGolKp4OHsKANYskAvKUsLfLOK2aBqr0sGVDnaGN0yJlKe6v6l415Tfq7h2/6wm/WpTBpj+GGg4/LN5lWDabGE0ZW685dcdgp9vLxQarFDwtHZUOvaGtqCAcSOzuKdxZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=us3XyiiEJ1jpBaIa5d6mu+gEoTYclWxk5heaEhLXVv0=; b=QNRzCHXrohzv1DfFURMLZchFFi/JTzVn12m48XWXJk/3LEz6rDZVnSXb1RD0qu4aDkYNvwWJdjmwKKr90yLFMAySMt5LCggnOvt5pJbky49XzfMJIqn3ZIY1VHVgPBo3PPRkhGhNkhda2LG2ST7tgUbtlVEp5cQV1miu6Zbqg6xI0IhpVMg/QedlyEOsO/850bDHBkEaBLvu+h8YkFaN668+e70YQEZqgUlQvp7gyjIgtQlXKWnnnJ4rd5zGskAnk/JJma8Sa66GseLoZe/TcH4vyd1tJ9FLcGa8y4pRsWsTnmhJo2YkgiP2Og2Q0698wnYOMXDQtk/liYJahD+Mkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=us3XyiiEJ1jpBaIa5d6mu+gEoTYclWxk5heaEhLXVv0=; b=Y48suomkiZkd7U0uceyFN3JcY/4AaKVSUbbrDUSZ2tVnmLo3L7CEg2pMYP/93bQPzFcf6ismwv+M37qluOvS82HqmLbzWpRv4er84ur52xwKZ9G0fTieTOOJJwhZTDUCVkF/zIj1izmKQnDaPu/64HUZ7W/wP6hqTGar26Dymr4= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , "Volodymyr Babchuk" , Alistair Francis , Bob Eshleman , "Connor Davis" , Oleksii Kurochko , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , "Stefano Stabellini" , Sergiy Kibrik Subject: [PATCH v4 19/20] xen/sysctl: wrap around arch-specific arch_do_sysctl Date: Wed, 28 May 2025 17:17:07 +0800 Message-ID: <20250528091708.390767-20-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3C:EE_|PH0PR12MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: 256563e6-d0eb-485b-a43b-08dd9dc89f05 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?FJG7a1T1UAyxnnL3LGwyUKUz1vmNOSoWNHc+MUPOtuaEiIvrJs15vgXyv8Op?= =?us-ascii?Q?2kLfsW/w0KM0+Qt1L1QvWoDt22bkVOqrUrQ5CCYa/j2raBT7NEuTX+YW7anq?= =?us-ascii?Q?CXv7oSyyIN584M3/0K7aWi5qtieeW9EQW39/V4QSVsL9Lyl1L8n4xbKECMvo?= =?us-ascii?Q?3OeNRCyvntX6vGH/o+Lw04XmfPf/q5Cb71JBTDy4Z9BnxnEKmz5kIH49Rsuf?= =?us-ascii?Q?ctcb4TsY3CGwVx+4lTg0uN2dt3niUgCtFkJSYQHiRZ8IsJubXdC6mHwEbutP?= =?us-ascii?Q?/A3L0OmgOcQEeiGCm+xb8SKQWLGYcIg6BH9esai2rJLHNl+VYExkQQHMJHmi?= =?us-ascii?Q?zMBBmN6oK6KwKt/2/Edlk69dL/ZyPcmeP4yBfT+jWi/G3GYCwr0UhSEyK/eG?= =?us-ascii?Q?2fzFQ5b/0rUaoiGCTTyQHCrBnF+rkbKn8DvgPzHpYsuDMywDnwRTxAK8SCzQ?= =?us-ascii?Q?XZBOfNe0MbFoYcLGYLqY/TNINka/M7MhOtX/tdqWV0gImKN/B8XihZIxVz9j?= =?us-ascii?Q?KPw0TvmBe0V7Kiy96BsFlRIswT+GXkQdS6gGbLebk5hbcXfGsvtIrt8jSx0R?= =?us-ascii?Q?lJkLLb+DC/BcFVEgXJkf/Qe8g/BOIpBfN9xYr81bYfYi9PuAnC3+hCBHRhjj?= =?us-ascii?Q?PUEr6YE023qwCForQE/PDP3GD9BqMp7Kb6IfDjNwCbE86B7s3QmE5IbThT02?= =?us-ascii?Q?wrO/fc9NR72tNbZpvSHbyVIFxIMp5k8TDKWnioWj24Rq8kBifsIjMx7RcwLu?= =?us-ascii?Q?17hCOnIiKpEmScLaRdZC01F16t09qeDQRm93b4dQxC+i4fl42WWBPJ8BTsWD?= =?us-ascii?Q?q95mVW4b6Ddjel79qOOm8IhrSBwkGQ5A3JFqN+LxuQu0rP8QpGPoMmWWRPaB?= =?us-ascii?Q?fl3w0J+Ujsjt3uWNo1Oyw0toRkVSuIIArmTck2eVaQVYzVX7MpoAFoiOE9HH?= =?us-ascii?Q?u79N5f+rF0ri5iZzHijJfqp3kzfb0Bc5ddcT5Hg4bA1aYVbEOgJzfyeWM3gP?= =?us-ascii?Q?02nSvoZcz+kejeTQwuSITi8lLpCFxMD3joa17/npS8okGFKifvzHMoVznsnl?= =?us-ascii?Q?D4Mj5d4By77wxbdpqV9lAFRCjo+3MsUCtyP8VsudmkFhR19MdGZbRUEGGVZJ?= =?us-ascii?Q?zzNIZX3YCkBo3VEh3wS3JsMcZrbLm/HfRkkVvQvpEMQS5D1RlbCVxjywTRYR?= =?us-ascii?Q?b/aBPmXe5yT323BwKCN2wy1LETeKmO+pQBpJW5Y9ANBdgUdG/1ruwCrYtCIb?= =?us-ascii?Q?PQ6S1BiZ2lgPVUo1kNpwpk54QZq88AyumUMqRPBnvCh7pb8u6rrts44urX5Y?= =?us-ascii?Q?GFN/+OjEULxwyRAw3rmXTsH1/A0mSZmHtUHR9715xdXC54TtZT9LBXaHaN1C?= =?us-ascii?Q?pyZQFJHIjKS1bn3DF+uf6BaSx2N5RHayL/e/rEsynWgShsDZhyB7hIHZiq62?= =?us-ascii?Q?0xYg2/3YgAsgtyQYmIFJrchVg59RWYc4fGqxYx08447afrNZPfDG3Dob6+1U?= =?us-ascii?Q?cTI2X6KyPNU3hX++ijUkjOIUHaNfkHUU+R++?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(36860700013)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:34.2805 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 256563e6-d0eb-485b-a43b-08dd9dc89f05 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F3C.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7079 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424053422116600 Content-Type: text/plain; charset="utf-8" Function arch_do_sysctl is to perform arch-specific sysctl op. Some functions, like psr_get_info() for x86, DTB overlay support for arm, are solely available through sysctl op, then they all shall be wrapped with CONFIG_SYSCTL Also, remove all #ifdef CONFIG_SYSCTL-s in arch-specific sysctl.c, as we put the guardian in Makefile for the whole file. Since PV_SHIM_EXCLUSIVE needs sorting in the future, we move obj-$(CONFIG_SYSCTL) +=3D sysctl.o out of PV_SHIM_EXCLUSIVE condition. Signed-off-by: Stefano Stabellini Signed-off-by: Sergiy Kibrik Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Jan Beulich --- v1 -> v2: - use "depends on" for config OVERLAY_DTB - no need to wrap declaration - add transient #ifdef in sysctl.c for correct compilation --- v2 -> v3: - move obj-$(CONFIG_SYSCTL) +=3D sysctl.o out of PV_SHIM_EXCLUSIVE condition - move copyback out of #ifdef - add #else process for default label v3 -> v4: - remove transient "#ifdef CONFIG_SYSCTL" - move #ifdef ahead of the comment --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/Makefile | 2 +- xen/arch/arm/sysctl.c | 2 -- xen/arch/riscv/stubs.c | 2 +- xen/arch/x86/Makefile | 2 +- xen/arch/x86/psr.c | 18 ++++++++++++++++++ xen/arch/x86/sysctl.c | 2 -- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index a5aad97a68..91a77560a6 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -139,6 +139,7 @@ config HAS_ITS =20 config OVERLAY_DTB bool "DTB overlay support (UNSUPPORTED)" if UNSUPPORTED + depends on SYSCTL help Dynamic addition/removal of Xen device tree nodes using a dtbo. =20 diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 129a109d6e..dd455b4773 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -54,7 +54,7 @@ obj-y +=3D smpboot.o obj-$(CONFIG_STATIC_EVTCHN) +=3D static-evtchn.init.o obj-$(CONFIG_STATIC_MEMORY) +=3D static-memory.init.o obj-$(CONFIG_STATIC_SHM) +=3D static-shmem.init.o -obj-y +=3D sysctl.o +obj-$(CONFIG_SYSCTL) +=3D sysctl.o obj-y +=3D time.o obj-y +=3D traps.o obj-y +=3D vcpreg.o diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c index 2d350b700a..32cab4feff 100644 --- a/xen/arch/arm/sysctl.c +++ b/xen/arch/arm/sysctl.c @@ -15,7 +15,6 @@ #include #include =20 -#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { pi->capabilities |=3D XEN_SYSCTL_PHYSCAP_hvm | XEN_SYSCTL_PHYSCAP_hap; @@ -23,7 +22,6 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) pi->arch_capabilities |=3D MASK_INSR(sve_encode_vl(get_sys_vl_len()), XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); } -#endif =20 long arch_do_sysctl(struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) diff --git a/xen/arch/riscv/stubs.c b/xen/arch/riscv/stubs.c index 295456d0c8..cca3767249 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -313,6 +313,7 @@ unsigned long raw_copy_from_guest(void *to, const void = __user *from, BUG_ON("unimplemented"); } =20 +#ifdef CONFIG_SYSCTL /* sysctl.c */ =20 long arch_do_sysctl(struct xen_sysctl *sysctl, @@ -321,7 +322,6 @@ long arch_do_sysctl(struct xen_sysctl *sysctl, BUG_ON("unimplemented"); } =20 -#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { BUG_ON("unimplemented"); diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index ce724a9daa..96d63219e7 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -63,6 +63,7 @@ obj-y +=3D smpboot.o obj-y +=3D spec_ctrl.o obj-y +=3D srat.o obj-y +=3D string.o +obj-$(CONFIG_SYSCTL) +=3D sysctl.o obj-y +=3D time.o obj-y +=3D traps-setup.o obj-y +=3D traps.o @@ -78,7 +79,6 @@ ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) obj-y +=3D domctl.o obj-y +=3D platform_hypercall.o obj-$(CONFIG_COMPAT) +=3D x86_64/platform_hypercall.o -obj-y +=3D sysctl.o endif =20 extra-y +=3D asm-macros.i diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 5815a35335..499d320e61 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -133,9 +133,11 @@ static const struct feat_props { */ enum psr_type alt_type; =20 +#ifdef CONFIG_SYSCTL /* get_feat_info is used to return feature HW info through sysctl. */ bool (*get_feat_info)(const struct feat_node *feat, uint32_t data[], unsigned int array_len); +#endif =20 /* write_msr is used to write out feature MSR register. */ void (*write_msr)(unsigned int cos, uint32_t val, enum psr_type type); @@ -418,6 +420,7 @@ static bool mba_init_feature(const struct cpuid_leaf *r= egs, return true; } =20 +#ifdef CONFIG_SYSCTL static bool cf_check cat_get_feat_info( const struct feat_node *feat, uint32_t data[], unsigned int array_len) { @@ -430,6 +433,7 @@ static bool cf_check cat_get_feat_info( =20 return true; } +#endif /* CONFIG_SYSCTL */ =20 /* L3 CAT props */ static void cf_check l3_cat_write_msr( @@ -442,11 +446,14 @@ static const struct feat_props l3_cat_props =3D { .cos_num =3D 1, .type[0] =3D PSR_TYPE_L3_CBM, .alt_type =3D PSR_TYPE_UNKNOWN, +#ifdef CONFIG_SYSCTL .get_feat_info =3D cat_get_feat_info, +#endif .write_msr =3D l3_cat_write_msr, .sanitize =3D cat_check_cbm, }; =20 +#ifdef CONFIG_SYSCTL /* L3 CDP props */ static bool cf_check l3_cdp_get_feat_info( const struct feat_node *feat, uint32_t data[], uint32_t array_len) @@ -458,6 +465,7 @@ static bool cf_check l3_cdp_get_feat_info( =20 return true; } +#endif /* CONFIG_SYSCTL */ =20 static void cf_check l3_cdp_write_msr( unsigned int cos, uint32_t val, enum psr_type type) @@ -473,7 +481,9 @@ static const struct feat_props l3_cdp_props =3D { .type[0] =3D PSR_TYPE_L3_DATA, .type[1] =3D PSR_TYPE_L3_CODE, .alt_type =3D PSR_TYPE_L3_CBM, +#ifdef CONFIG_SYSCTL .get_feat_info =3D l3_cdp_get_feat_info, +#endif .write_msr =3D l3_cdp_write_msr, .sanitize =3D cat_check_cbm, }; @@ -489,11 +499,14 @@ static const struct feat_props l2_cat_props =3D { .cos_num =3D 1, .type[0] =3D PSR_TYPE_L2_CBM, .alt_type =3D PSR_TYPE_UNKNOWN, +#ifdef CONFIG_SYSCTL .get_feat_info =3D cat_get_feat_info, +#endif .write_msr =3D l2_cat_write_msr, .sanitize =3D cat_check_cbm, }; =20 +#ifdef CONFIG_SYSCTL /* MBA props */ static bool cf_check mba_get_feat_info( const struct feat_node *feat, uint32_t data[], unsigned int array_len) @@ -508,6 +521,7 @@ static bool cf_check mba_get_feat_info( =20 return true; } +#endif /* CONFIG_SYSCTL */ =20 static void cf_check mba_write_msr( unsigned int cos, uint32_t val, enum psr_type type) @@ -545,7 +559,9 @@ static const struct feat_props mba_props =3D { .cos_num =3D 1, .type[0] =3D PSR_TYPE_MBA_THRTL, .alt_type =3D PSR_TYPE_UNKNOWN, +#ifdef CONFIG_SYSCTL .get_feat_info =3D mba_get_feat_info, +#endif .write_msr =3D mba_write_msr, .sanitize =3D mba_sanitize_thrtl, }; @@ -808,6 +824,7 @@ static struct psr_socket_info *get_socket_info(unsigned= int socket) return socket_info + socket; } =20 +#ifdef CONFIG_SYSCTL int psr_get_info(unsigned int socket, enum psr_type type, uint32_t data[], unsigned int array_len) { @@ -839,6 +856,7 @@ int psr_get_info(unsigned int socket, enum psr_type typ= e, =20 return -EINVAL; } +#endif /* CONFIG_SYSCTL */ =20 int psr_get_val(struct domain *d, unsigned int socket, uint32_t *val, enum psr_type type) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index f64addbe2b..1b04947516 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -91,7 +91,6 @@ static long cf_check smt_up_down_helper(void *data) return ret; } =20 -#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { memcpy(pi->hw_cap, boot_cpu_data.x86_capability, @@ -105,7 +104,6 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) if ( IS_ENABLED(CONFIG_SHADOW_PAGING) ) pi->capabilities |=3D XEN_SYSCTL_PHYSCAP_shadow; } -#endif /* CONFIG_SYSCTL */ =20 long arch_do_sysctl( struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysc= tl) --=20 2.34.1 From nobody Fri Oct 31 09:42:14 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1748424086; cv=pass; d=zohomail.com; s=zohoarc; b=mcMQyFe+XpBnQxmeEjyV9zLt/BzSUsQpsgdzAM6+VYN3L0tw9ai+B/y2TvuaimkoAzQqs+VhKkgJnbW/CSITZjAmaD423VU7qcXCL60Xzrqf8iYxvQSUBsPmE8Q8z2vNN8tLTkHz0oFzfTgdcmlyMgifUhfgzhAV5wKYlYhyHcA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748424086; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9OgIGJyIT/gZNe8sCFDPW5ddcNiwIXM6H4cqzDnIpR8=; b=cNrDjHVURwxOe49iHXnejKT9yUxNijhBWecHsUAHxxRCIBSbhfweWZPLMUCbOPm5yoEUKVG2LIgXHi5hgvFAFVx5h2Ajum7oukGvR3Eb7KO8/SRqJ/jkCaPjw+GXBB4Z33oQDSnnM+Xqt2tBU91W3jTyN4sBaPR4J5LyqLKeCiU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17484240867464.9618821117021525; Wed, 28 May 2025 02:21:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.999153.1379906 (Exim 4.92) (envelope-from ) id 1uKCyH-00012h-2C; Wed, 28 May 2025 09:21:13 +0000 Received: by outflank-mailman (output) from mailman id 999153.1379906; Wed, 28 May 2025 09:21:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uKCyG-00012X-VS; Wed, 28 May 2025 09:21:12 +0000 Received: by outflank-mailman (input) for mailman id 999153; Wed, 28 May 2025 09:21:11 +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 ) id 1uKCvt-0001jE-VA for xen-devel@lists.xenproject.org; Wed, 28 May 2025 09:18:45 +0000 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20620.outbound.protection.outlook.com [2a01:111:f403:2412::620]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c091df84-3ba4-11f0-b894-0df219b8e170; Wed, 28 May 2025 11:18:44 +0200 (CEST) Received: from SN7P220CA0009.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::14) by CY3PR12MB9553.namprd12.prod.outlook.com (2603:10b6:930:109::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.24; Wed, 28 May 2025 09:18:39 +0000 Received: from SN1PEPF00036F3D.namprd05.prod.outlook.com (2603:10b6:806:123:cafe::bf) by SN7P220CA0009.outlook.office365.com (2603:10b6:806:123::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8769.27 via Frontend Transport; Wed, 28 May 2025 09:18:39 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F3D.mail.protection.outlook.com (10.167.248.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8769.18 via Frontend Transport; Wed, 28 May 2025 09:18:37 +0000 Received: from penny-System-Product-Name.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 28 May 2025 04:18:34 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: c091df84-3ba4-11f0-b894-0df219b8e170 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q50e1AzrIjvo3HCLlv0fr+21eXnJqcm6mNwEEMg2xlgMjzzj89BVtoOBpXt2oK4qkIpa2wFrE/ivYsKpPz7F058rsEkmhSIs4pjEVfqtf0RP3IBqKn89plRm7LXdZxJJ9uw4X3wJrVECfUXbFxyNPEgh10PgU8RlZWvHKwHlr9UKu2seNoBEfWjM1eG6PptCDlN38VpPzGu84HI4YGX82eGJOa3DhrAbhgY9STHtxAUdYkcwsZ1JW3kDh/Mccbq2N+uhYLp4qqS6CjfFUiIH+R7qi8V+WNhO5Qep+KFUFjNHqzz4v5z6vCOGB5PP/LoFtKzbekbfFFHwCSCkk4c01g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=9OgIGJyIT/gZNe8sCFDPW5ddcNiwIXM6H4cqzDnIpR8=; b=J5LOtIPiWDsM+Pk9gFWLfe7ewMFgFc8WaN2qYq8F820hcfCFC8iHWRnf1Jx22FXEzQJrJ5mY2MA1kptDlwnBc3K88fLOR7xayrTS/v3zvmwboEODFbk6qEyMOm3MsQ+VctL2Ok0aflDILwqb45ZpSgitwocmfAf2MbN5f+Ffp6Ebe1tQaM4QfkZlLq2tYU9lAbsxRohS8suMPOSh8BvZ4xUuGqiQv9FlXFmuIK81Zu3aw4tes4Pl7+oWsAE/sIfATNyKTte20/P/BnKlOpCwYRCP19uyYON8I0lvJdLoAk+Ez8M3UKYm9ZkduzA05UMj51tZ/1c5SShXN8BACQih4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9OgIGJyIT/gZNe8sCFDPW5ddcNiwIXM6H4cqzDnIpR8=; b=rET9iuTxcodOnYBSNkIWLFfQBnc7VmKaa7dpSyRQmUQka5prBz97JH+NIEQ+T2FjWde1XqAZd4iJ3a0h4PKj8ny3xZMlj0vsV1pGBqRBZm+JagvbIHiMqBSvx44x1zNNrpJcZYC/0GHbIsJzf+xPmIh/NaVpAVklTP1cOPxCkZs= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Penny Zheng To: CC: , Stefano Stabellini , "Jan Beulich" , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Anthony PERARD , Michal Orzel , "Julien Grall" , Stefano Stabellini , Sergiy Kibrik , Penny Zheng Subject: [PATCH v4 20/20] xen/sysctl: wrap around sysctl hypercall Date: Wed, 28 May 2025 17:17:08 +0800 Message-ID: <20250528091708.390767-21-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250528091708.390767-1-Penny.Zheng@amd.com> References: <20250528091708.390767-1-Penny.Zheng@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F3D:EE_|CY3PR12MB9553:EE_ X-MS-Office365-Filtering-Correlation-Id: e57dbc44-e75f-4220-35c5-08dd9dc8a0e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bTbkueuAhXjEcqwdaTjt461Fpz1wE8rmzHQLjXzDhL/YJgsJBI7gqMRi8cag?= =?us-ascii?Q?Kx5Jel6Alwp7t/YyjZswjXhINCFGl5RmCzWFlXUO23OJF29bEo7mLIgcdMQD?= =?us-ascii?Q?gqGcCXWR+n1PVScx8kpgrebUCzH/8bFlsWVg5hDhzt9KnbnCYZWaXqxEFmrQ?= =?us-ascii?Q?rQyolkwCK3vJS2Xc54vjM+LWzptvQphzTl/5VV7/Va4gXuljZtcvtFms3rMN?= =?us-ascii?Q?HMgiNpHArJbV+gX9+aqurf0GWdFIDcz/VYpl69Oox3FRWouisT0tO3iDs+EC?= =?us-ascii?Q?RgqhIOxaERY4FTKVeyft40rajyrqPW+UPixN10/3mqeoxBNM9ens5bYGwM9n?= =?us-ascii?Q?sRR77/bsOSvzscsLbnxy7kB/nO8LNgUko0/p8arR0UkbnIUHl2z90f3tJLkg?= =?us-ascii?Q?UKn/RPludy3Zq8MJ4m7FU9pPrYzqcByPKYGRhnzpoG0hHns+imEJF5a5Ai2s?= =?us-ascii?Q?ujTyA3IvmZYonDznLkIeXHoDv7mstzF+kS2vJatulqZHE3yYWvMhGQ3z0fs3?= =?us-ascii?Q?oh8hwGjWSlvGPHRLly2jFjx/k81O6+SwpVu2YrGLHniSoMwTNxWtB10uSN3d?= =?us-ascii?Q?uL7jGnvP93Q/6fmIn+a+lyRmF/pkHeHq1fxOcEco/djk8Bq/NRdy5oRDTM1D?= =?us-ascii?Q?doiZFkB6GHLnaukloNAUQlCz0uM9INirscl7gSUsceCUVga6om7ItcEI9LQD?= =?us-ascii?Q?qv9wSpxrO5cQ3rpT4bp38h4pKozvZP+mGnEC5uDsxVc7HR/f6FQOe8TeRDHM?= =?us-ascii?Q?3U/vDcx/xxaiRQjwOTtKZtjBOnwOOIgijKSQ3Bf7Vc116HwCDQ2pttMZPbNf?= =?us-ascii?Q?4gHZNHOG1d3byincY5CEuK38cZECNV49hgzcR1KfG/3+4HlirVd4ug9fUCfk?= =?us-ascii?Q?sur+VQd/iom2mSAOzC8Sy2uwkxjSfjBNfT2ryXPSY4VznQY/mXFzWEyfO/ba?= =?us-ascii?Q?z6CFQ498e6OH9dEZkEdiTaVdOq2NYBkt72MzlmyALIrcEBphdS4igzjsyh55?= =?us-ascii?Q?Zx7QmJXLddunD8/rQIfguVo6aVUEC39G5pGxcLvELwMevhBZTCImc+GIM2gz?= =?us-ascii?Q?EG7bpJgxJcVstG7SsbSqt//KbYhMhUWtJoTbX7Da3+VQgmJWrGHj9xIXptpN?= =?us-ascii?Q?OmehUSQdZ9MRJQDDYaPEUegjnjgtSC6XGfYoDIbJsI75MYblrcEQv6dOLxPF?= =?us-ascii?Q?x69LcVEqTD0r/Bhm5I95w9tfEioI8n6rlvLRYj+L38zyC90kozCAtZeQBcC0?= =?us-ascii?Q?mNZBHR4J20/AVPWOFYsky3nvs733SS1BPq/1yLdsnvcHn12iiMqrIsHKgNdg?= =?us-ascii?Q?Agh9TJ3f6lkoOpzgqt7TDW6AzolFe2zLh+6vaj9PEXpH0l7lOD7ALxr26c01?= =?us-ascii?Q?mVTKIs01BeYX/eq2s2BtG9x3hrS8OZd0MIKQhWJVSLwptJV9+3794Tn0tTlJ?= =?us-ascii?Q?tAMg1xeiBIVwfKj2Mn2NGNe/jO1sWnMLWji63Gw04McWArZzc8q25LURRJv9?= =?us-ascii?Q?6Erf3jW50ozpuzGWDwEdKtb7F8qWQtLGmd4D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2025 09:18:37.4358 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e57dbc44-e75f-4220-35c5-08dd9dc8a0e7 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F3D.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY3PR12MB9553 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1748424087622116600 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini Wrap sysctl hypercall def and sysctl.o with CONFIG_SYSCTL, and since PV_SHIM_EXCLUSIVE needs sorting in the future, we move them out of PV_SHIM_EXCLUSIVE condition at the same time. We need to make SYSCTL with prompt back and state unsetting SYSCTL in pvshim_defconfig to explicitly make it unavailable for PV shim. Signed-off-by: Stefano Stabellini Signed-off-by: Sergiy Kibrik Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v1 -> v2: - remove all transient "#ifdef CONFIG_SYSCTL"-s in sysctl.c --- v2 -> v3: - move out of CONFIG_PV_SHIM_EXCLUSIVE condition --- v3 -> v4: - make SYSCTL with prompt - state unsetting SYSCTL in pvshim_defconfig --- xen/arch/x86/configs/pvshim_defconfig | 1 + xen/common/Kconfig | 2 +- xen/common/Makefile | 2 +- xen/include/hypercall-defs.c | 8 ++++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/configs/pvshim_defconfig b/xen/arch/x86/configs/p= vshim_defconfig index 6f652e145e..7d0cd45493 100644 --- a/xen/arch/x86/configs/pvshim_defconfig +++ b/xen/arch/x86/configs/pvshim_defconfig @@ -31,3 +31,4 @@ CONFIG_EXPERT=3Dy # HYPERV_HYPERV_GUEST is not set # CONFIG_HVM is not set # CONFIG_VGA is not set +# CONFIG_SYSCTL is not set diff --git a/xen/common/Kconfig b/xen/common/Kconfig index e3b6fd6ec4..f85593a9db 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -585,7 +585,7 @@ menu "Supported hypercall interfaces" =20 config SYSCTL bool "Enable sysctl hypercall" - def_bool y + default y help This option shall only be disabled on some dom0less systems, to reduce Xen footprint. diff --git a/xen/common/Makefile b/xen/common/Makefile index 98f0873056..15ab048244 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -49,6 +49,7 @@ obj-y +=3D spinlock.o obj-$(CONFIG_STACK_PROTECTOR) +=3D stack-protector.o obj-y +=3D stop_machine.o obj-y +=3D symbols.o +obj-$(CONFIG_SYSCTL) +=3D sysctl.o obj-y +=3D tasklet.o obj-y +=3D time.o obj-y +=3D timer.o @@ -70,7 +71,6 @@ obj-$(CONFIG_COMPAT) +=3D $(addprefix compat/,domain.o me= mory.o multicall.o xlat.o ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) obj-y +=3D domctl.o obj-$(CONFIG_VM_EVENT) +=3D monitor.o -obj-y +=3D sysctl.o endif =20 extra-y :=3D symbols-dummy.o diff --git a/xen/include/hypercall-defs.c b/xen/include/hypercall-defs.c index 7720a29ade..c1081d87a2 100644 --- a/xen/include/hypercall-defs.c +++ b/xen/include/hypercall-defs.c @@ -194,8 +194,10 @@ kexec_op(unsigned long op, void *uarg) #ifdef CONFIG_IOREQ_SERVER dm_op(domid_t domid, unsigned int nr_bufs, xen_dm_op_buf_t *bufs) #endif -#ifndef CONFIG_PV_SHIM_EXCLUSIVE +#ifdef CONFIG_SYSCTL sysctl(xen_sysctl_t *u_sysctl) +#endif +#ifndef CONFIG_PV_SHIM_EXCLUSIVE domctl(xen_domctl_t *u_domctl) paging_domctl_cont(xen_domctl_t *u_domctl) platform_op(xen_platform_op_t *u_xenpf_op) @@ -273,8 +275,10 @@ physdev_op compat do h= vm hvm do_arm #ifdef CONFIG_HVM hvm_op do do do do do #endif -#ifndef CONFIG_PV_SHIM_EXCLUSIVE +#ifdef CONFIG_SYSCTL sysctl do do do do do +#endif +#ifndef CONFIG_PV_SHIM_EXCLUSIVE domctl do do do do do #endif #ifdef CONFIG_KEXEC --=20 2.34.1