From patchwork Wed Mar 12 04:06:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012836 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0410DC2BA1B for ; Wed, 12 Mar 2025 04:07:13 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909668.1316570 (Exim 4.92) (envelope-from ) id 1tsDN3-00073C-OE; Wed, 12 Mar 2025 04:07:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909668.1316570; Wed, 12 Mar 2025 04:07:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDN3-000733-Ko; Wed, 12 Mar 2025 04:07:05 +0000 Received: by outflank-mailman (input) for mailman id 909668; Wed, 12 Mar 2025 04:07:04 +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 1tsDN2-0006o2-Ln for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:04 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2062d.outbound.protection.outlook.com [2a01:111:f403:2415::62d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 73571b4c-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:03 +0100 (CET) Received: from BN9PR03CA0389.namprd03.prod.outlook.com (2603:10b6:408:f7::34) by PH0PR12MB7840.namprd12.prod.outlook.com (2603:10b6:510:28a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:06:58 +0000 Received: from BN1PEPF00005FFD.namprd05.prod.outlook.com (2603:10b6:408:f7:cafe::62) by BN9PR03CA0389.outlook.office365.com (2603:10b6:408:f7::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Wed, 12 Mar 2025 04:06:58 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFD.mail.protection.outlook.com (10.167.243.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:06: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; Tue, 11 Mar 2025 23:06:54 -0500 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: 73571b4c-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IzHAZFRS4Em+KPaYUrN9V4a9ZznKRZLpLp6NAvEa8+QdIHU/J+IsriCReN50BYAbHb5onVzfBRh8pRdwDr07u78AoL+kot9kYUoiRBbMSSATkwvxBdyfAsay14j6Jeo6mm+y4VA9jYja3NxF73+lHf21rsW/klRk0nlQj3HIPL08ssRQqliroAHe5W/Jm8QHLoVuK4pxCUFOkaAltrmctlYyF0IMp8hHDJEhiv4COl/KbwIWLhKPWHnz+LdSXCy6x0UlylobHqK3PBk9RO5QTW8c1cAEvd0aU7GgV/0tL91GKWnslm/cWZ7teVuqaVR3ZIQ6KojiaCncdqFkcGDVWA== 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=QbN9hLSoIYbmj6b7CVezgOjL65vV44FxolcdmjDHBPU=; b=Yqabbb3ZVXV+y2DewWh+AEZGZQsB/qZr/zLPhExay+lrvrv+8xnUum/4tXElUz2FUKLG5oK+pPSFs8fRotKdWMh13cSj5q0Dn3V/h+CyxqynmHdQT7ZJiyz2LOmW4f+LxGDsLcQ+2Y3IJep2lupJJU4c6pM8yxU4KLXENbOEZf9/XEGCZkaKLWwdyTbqkg8LfjNHe6sN09bWEjYt1Z04Y0miXPCJj9+ikSvx/gmg+b+fgG2+GZolLcPrfw0y7KYcahOFk0e1K8VvG8VeRrJvtzS4Lo1EvjhhgiVC3+5UfiZla74/ga/UEoErwbzWBHWbsiLe3hkv1ZrdiKbsM0G5nw== 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=QbN9hLSoIYbmj6b7CVezgOjL65vV44FxolcdmjDHBPU=; b=edqZhhVFxJZXFsgTJ1q9noBeWMmJB2g1SvW5cHxaEV9Z3Y8V/8lkhihYCC1dDl7JtBA0p8Ydsn+dXKmDJyOx/m1PHm3do4eSWv9IyoBEwOfvfuhcrBOEnp8WfOp30kz8BGxmkZOWVZFYma84HVryq+RuLxp1bLfYAY7kJ6HjAN8= 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 (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_Pau_Monn=C3=A9?= , "Stefano Stabellini" , Sergiy Kibrik , Penny Zheng Subject: [PATCH v1 01/19] xen: introduce CONFIG_SYSCTL Date: Wed, 12 Mar 2025 12:06:14 +0800 Message-ID: <20250312040632.2853485-2-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFD:EE_|PH0PR12MB7840:EE_ X-MS-Office365-Filtering-Correlation-Id: fde9096f-ae70-4999-a108-08dd611b5578 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: X6sxGB8ELVjXOcXA8q4hjt451rqB7Ios1o6ldDaNImP7UvonQtPWnKTC9op2zc6c42npO5ycWiRTw0yKdqsHKrZfoJJzAnyHvFtECOgstBp6anYZEvFS7KR2M2jkDV1gp58wMzXuNHbMj5A4uXm6DZ1mDn89EoyueM95N80rtZjc9XrCBqX+xWgFJzgQU3oOiLM6MoOQ+GRav60Wjl6d+7sfV3rhJSB8V1+Lc9Ho0R1WzhWTzVqZlNTS21ORQ2LaaFrW82AnWiV35vNoqfhRXPg7S+q0gxQhCqME+1bhhpxO2wg946nWWVSHyH7xsfQMT6QITN11qlrUjwxY/UM+IC/A5z66BAi1BZEt4b60ZKX2QC50B2YjSDkx+BFwFNe5Psi/QO9U+edWNjjr4jO9/czfLxKX+fbKrykZ/oFVXOVmui0JnGCCGzIuXmTNG9T0brgROCfUQ4nMFipPvYJ4ud6/zQ0GYHqTc+wfwKnXFWN9Whg6Ws1e2Y39umq9zt/eVQNp0WmZ00gvYG86D1iQ5rYXYIXzBl/7ZFtJ+bSOqUxScRgmPViWAueOVZ2xmDb5pEUMViU0WBj/HDuX5/1MxGgMhK1cQo0Bqaeq1yAZoNcbisDYOZ0Awctg8IkKKMJKCWSntQRj8XzjxG2cSeve8s/UeUbQe+6RQhhhbRrBPS7u0QDEZdyay+fLHAbAbcx6HommpuklWhTqlqofQ+fPWM+oTMMQVa7sOdT/LWTdCorj+6YnypSdhuDAIj8F1OhKythEnUVjwgpoGR5fnuvc0oqjLaGjk1lDRxlBFxodsdBzWtwNNT+GQOM30RYQLlCDcdpS5rIivfoDxgKaAsdctzxs8r6FePSaK4OD7mK0wJ3hUGrWoaSnj9zb1y2RBI/RTUmwruxIkp0fxN5tuTF+XQaZfYcOLPWpWs4qiSzXNh2fB5uciAvNUpZldU4lrbMdtWpb2CbvQMXfg1yNkRnlXgm6Yf0AX6/hyNew+nFZBAvSMiKX7Sp1+1IBo6dco7YolSZ8kaaYyVJwKGAB8Mq+tSZSu5aAyXwOOoz92DPrM9zelzKgGVBLGlJIn9MqYj4jG0+6itpd1q9u18rSsS4+7llz6KU0gGrTiRI3G88Avu5faRh1TtmtOyk8lra13FQRHQNYiYHOc9YKTszQFfXNFYVJ/h2H6RYS36LHxlrF6+LlW48NJZmq0vAj+RU3yafabIG8fMbtU9fJ7Akj1QOOM/Q086fy5lBaSVNhITxpNlNNJS21rpa5rJjLD7V/u9ktIUK83iHWDJMz9E9qLo5DZTuUmnq5LfGiGmUbLzFYH1/5wrAFvdWvoX1h+RmrxzuLgC8+Ny3ZdPbiPLO2Ik4CXDFiIEtu52m/PUFdqixklVRWVmW+kt13yAteAtF1dvLItbvaKGuFpGDRk5THBOsyIWNzoiRo2L3tcxyWlnN+EVEviMDc2i9Y/KG9muvWeioi2mY93DyC9jmZ4coJPyyUsqWV46mCIOjDCpDxYVBLOtQ= 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)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:06:58.1989 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fde9096f-ae70-4999-a108-08dd611b5578 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: BN1PEPF00005FFD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7840 From: Stefano Stabellini Signed-off-by: Stefano Stabellini Signed-off-by: Sergiy Kibrik Signed-off-by: Penny Zheng --- xen/common/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 6166327f4d..72e1d7ea97 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -519,6 +519,15 @@ config TRACEBUFFER to be collected at run time for debugging or performance analysis. Memory and execution overhead when not active is minimal. +menu "Supported hypercall interfaces" + visible if EXPERT + +config SYSCTL + bool "Enable sysctl hypercall" + depends on !PV_SHIM_EXCLUSIVE + default y +endmenu + config LLC_COLORING bool "Last Level Cache (LLC) coloring" if EXPERT depends on HAS_LLC_COLORING From patchwork Wed Mar 12 04:06:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012837 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 29D2AC28B28 for ; Wed, 12 Mar 2025 04:07:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909669.1316580 (Exim 4.92) (envelope-from ) id 1tsDN5-0007JH-V5; Wed, 12 Mar 2025 04:07:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909669.1316580; Wed, 12 Mar 2025 04:07:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDN5-0007J6-Rk; Wed, 12 Mar 2025 04:07:07 +0000 Received: by outflank-mailman (input) for mailman id 909669; Wed, 12 Mar 2025 04:07:06 +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 1tsDN4-0007Fd-SH for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:06 +0000 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2062b.outbound.protection.outlook.com [2a01:111:f403:2407::62b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 75301f12-fef7-11ef-9ab9-95dc52dad729; Wed, 12 Mar 2025 05:07:05 +0100 (CET) Received: from BN0PR02CA0017.namprd02.prod.outlook.com (2603:10b6:408:e4::22) by SA1PR12MB6702.namprd12.prod.outlook.com (2603:10b6:806:252::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:01 +0000 Received: from BN1PEPF00006002.namprd05.prod.outlook.com (2603:10b6:408:e4:cafe::3d) by BN0PR02CA0017.outlook.office365.com (2603:10b6:408:e4::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.27 via Frontend Transport; Wed, 12 Mar 2025 04:07:00 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006002.mail.protection.outlook.com (10.167.243.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:06:57 -0500 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: 75301f12-fef7-11ef-9ab9-95dc52dad729 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BNK9fj2GSoUKbulpzdaO0jpRR/vfgZtLigm/oQiRwNHHPuXxk87hL4CVGdEYEVdZLPfx7UtuIrEBX64XNC0qJbQhJWea3f9yf7xN3xAEwqsZzdV2zwLmQE3Gc+tpGEj97bybPB1NknpzKEbZOTE5FRf2G0cbwB6Sh6qpP/fGWRtmFTsFWSUQEIthSoGieJo6cLKdKWk9IvvoCHsKWvQrNL/oqDS+B1ldYVrWKeaEJl6+D6fMt9CwzQXLUsNN6iVLfsRUGQeMCUdh9beRMvCM72y73AaUXg3ELNLneKpNmdbmfj5lEVkIz9Cqlbay7Jf2dc2YNh/LzoZ596l+LxjoTw== 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=jNZ6mxJPEktxyT1PTUMdc+Ph6uJ6rlUxizi8pvIjKXg=; b=EOyZ4ZJj9hxEOmwXIIFjExSVU/USBdmbG7ElXBlFb24TF+Y/rCgb55vj58bLKXA8DLkxBtxI9HVtYupYj07z0oxosePYzAJ4wAMVVRluYHZR/dvNy6kMO3b60yTf1IQmaNYQsiLOjIlVL4dzM1TFC409PdMOeU91ajiA+nOaUuqdUae3AolUoE0V2bA0mbGvP2becXvaji1w0CevcZDjC5frD+JS5rP9vyTG3y8k4nRMlLDt/ESxCK3CRYw5YmZ1lz+FPo6Uapt7zRIpIy6Je5DQ566/Duh7XgRtl2cvqvN9bF6OC4Gl8X4IKoHMrJIVovcREzfzwPpMrU8jodyL8A== 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=jNZ6mxJPEktxyT1PTUMdc+Ph6uJ6rlUxizi8pvIjKXg=; b=KAPmM09Bxy5O31t0rGbpPPg2i81tjjbyhVGthHXjy7SGKe/2Rj37ezF+ekHu5rhf67MM0akI0sPN5zC3qpHnast7QcmQ/S9s3giwFI/T6mz+jbdXjXKa5evq4hOvt/ILekyKuAaraTH2JCUkqyNEqvX1NsMpG1W1tQJYuznKA1k= 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 (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" Subject: [PATCH v1 02/19] xen/xsm: wrap around xsm_sysctl with CONFIG_SYSCTL Date: Wed, 12 Mar 2025 12:06:15 +0800 Message-ID: <20250312040632.2853485-3-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006002:EE_|SA1PR12MB6702:EE_ X-MS-Office365-Filtering-Correlation-Id: b1f80e15-a626-4a0c-eb4e-08dd611b56ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: nAU2EQI5nYAxq0IZO3WgTArcIJ4ME8GmCzc9WjdqOH45ZDO/iu7nro4FJb1xyIXaGnkj6s4HAd9AmlAY2bdVMQd/kT2K7bjXctiRHkVlRc3Hxo01sVRL6bkKFWH/Zhqg/wiG9IpkNcDGhVMYn43V2cRR6HyySO1aDX+IJt2+YUvMfl+Vcpet6dP2r141V5asY9SLfdxm6714SZ9kMuTCIFpr9tpgGxJl4F2Nf06DMBNP/VG8YSKPyY51zy97gXiWI4zR1Fsr19DVULinpS5+2sJz3JkQYohao+93giN1b93q2pX/LOnWqxHg75PJXxubwkRFSRFLpHNRbdQ7MUhcSEaVO+vvaAu8nKf1KWXMkQwniAozqwpoNSucrbEcOsv731waJl1ENn4VJ7Uvc4dGUCw/lWObjhh6aCDRan+pnvaxenqZY205r0jejbz6vpDiEW4zhKs5qkja/ybSuZgG5vUnLX7QVC5RSKiw0xmFE3KTITfOh+0vqW0pxTl5oYMKyslPwaxM0wDd3BhMceSkpLkZAYxbAaWesNl3G1e9rlzeqcepoDpkK3VDKE3RqNvqlZr8bcQ9VMQIQ7inwSMzYG9AedrKVJzme+/2DnHpIBLTV/0NX+JIsulhOg14R+83Wx+RCA+XyIkVsllyl9FH0pTeAxERrdYnU/X4EstKJzO401U25hwjoeq9Qo0NECyIwfvJZIcGgT5/hRvlAgtI2P+nnMGqXQNqFje7Z6qMR1OWRjYZG0NB1CKXXdR/kYoima0Z5+qVazvWLbp2yIU7JfT2iy25wo7DwEhoylyKfOtNagtWTaIloXXp9AJj/gbfnf6ESMYL09HyJreTrzmmEbLSUnr4U/ASYh6MdTV0ugvwdw+q14Kl8xoBM+Jh/BdNnY+H8+9z1fwNRUl5/qJ5Qzi/oa9EytkuIZW/8HAaXklpw2lzrQ6pCRx2/m1O4dLNK7qa2YOkiPUBIYqEZryds1Rb8erkfv9heYTRTm/L+ivNi/eWbNWgabiqVm0cxi+adS2BKVz4n6VqJHg3GJMN4xGYV0lIWosh02Fh8OGDDwb94vpVyEHTUmRuDZnc4Uf/DVBX8mMDTpx1pLyd7vz2MoZu9DACnwlGMOlunxDXQ9QEaiUYT3Cv+ekH8v6SvJy0EeMNX2T7Q8i79GhTThzEeHlchnVsP/HepJTqY3sigkK2kyr4cKxsNck/WdWHvUJ+qeJwXhPpYYZbLF+TVm+J5qzGbLK1es9TP0S9M4TPXPC4l50PEgedVQso+UVlzrJBdrThh0lzbX/8spIuYSZJEIxebEYOpbYX/qkQGAgd0a3KKt2pMcYCdQ21OoolQ20TCFc3s4WgfvLgJf+E1XU0iJoS0Ml+EKu685O7EzDJSuDNZv5KLOuZmmyE75R51rOdHT6O8xIcB9qu5UZWGMQlP1hfLY/guNwXwJuEoZFxMlcv38/06idbz+HD3LDEx5mlFBBOSgZJgAV/cAtvtqsWFRR12xtP/7aiVUYrgCRYwio= 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)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:00.4422 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1f80e15-a626-4a0c-eb4e-08dd611b56ce 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: BN1PEPF00006002.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6702 Signed-off-by: Penny Zheng --- xen/include/xsm/dummy.h | 7 +++++++ xen/include/xsm/xsm.h | 9 +++++++++ xen/xsm/dummy.c | 2 ++ xen/xsm/flask/hooks.c | 4 ++++ 4 files changed, 22 insertions(+) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index a8d06de6b0..afc54a0b2f 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -180,11 +180,18 @@ static XSM_INLINE int cf_check xsm_domctl( } } +#ifdef CONFIG_SYSCTL static XSM_INLINE int cf_check xsm_sysctl(XSM_DEFAULT_ARG int cmd) { XSM_ASSERT_ACTION(XSM_PRIV); return xsm_default_action(action, current->domain, NULL); } +#else +static XSM_INLINE int cf_check xsm_sysctl(XSM_DEFAULT_ARG int cmd) +{ + return -EOPNOTSUPP; +} +#endif static XSM_INLINE int cf_check xsm_readconsole(XSM_DEFAULT_ARG uint32_t clear) { diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 8c33b055fc..276507b515 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -60,7 +60,9 @@ struct xsm_ops { int (*sysctl_scheduler_op)(int op); int (*set_target)(struct domain *d, struct domain *e); int (*domctl)(struct domain *d, unsigned int cmd, uint32_t ssidref); +#ifdef CONFIG_SYSCTL int (*sysctl)(int cmd); +#endif int (*readconsole)(uint32_t clear); int (*evtchn_unbound)(struct domain *d, struct evtchn *chn, domid_t id2); @@ -259,10 +261,17 @@ static inline int xsm_domctl(xsm_default_t def, struct domain *d, return alternative_call(xsm_ops.domctl, d, cmd, ssidref); } +#ifdef CONFIG_SYSCTL static inline int xsm_sysctl(xsm_default_t def, int cmd) { return alternative_call(xsm_ops.sysctl, cmd); } +#else +static inline int xsm_sysctl(xsm_default_t def, int cmd) +{ + return -EOPNOTSUPP; +} +#endif 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 ce6fbdc6c5..0a5fc06bbf 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 = { .sysctl_scheduler_op = xsm_sysctl_scheduler_op, .set_target = xsm_set_target, .domctl = xsm_domctl, +#ifdef CONFIG_SYSCTL .sysctl = xsm_sysctl, +#endif .readconsole = xsm_readconsole, .evtchn_unbound = xsm_evtchn_unbound, diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 389707a164..7c5e7f5879 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, unsigned int cmd, } } +#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 static int cf_check flask_readconsole(uint32_t clear) { @@ -1884,7 +1886,9 @@ static const struct xsm_ops __initconst_cf_clobber flask_ops = { .sysctl_scheduler_op = flask_sysctl_scheduler_op, .set_target = flask_set_target, .domctl = flask_domctl, +#ifdef CONFIG_SYSCTL .sysctl = flask_sysctl, +#endif .readconsole = flask_readconsole, .evtchn_unbound = flask_evtchn_unbound, From patchwork Wed Mar 12 04:06:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012839 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EADB3C2BA1B for ; Wed, 12 Mar 2025 04:07:21 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909672.1316590 (Exim 4.92) (envelope-from ) id 1tsDNA-0007cf-8K; Wed, 12 Mar 2025 04:07:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909672.1316590; Wed, 12 Mar 2025 04:07: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 1tsDNA-0007cY-4O; Wed, 12 Mar 2025 04:07:12 +0000 Received: by outflank-mailman (input) for mailman id 909672; Wed, 12 Mar 2025 04:07: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 1tsDN9-0006o2-50 for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:11 +0000 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2062b.outbound.protection.outlook.com [2a01:111:f403:200a::62b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 76d9b4e1-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:09 +0100 (CET) Received: from BN0PR02CA0015.namprd02.prod.outlook.com (2603:10b6:408:e4::20) by IA0PPFAF883AE17.namprd12.prod.outlook.com (2603:10b6:20f:fc04::be1) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.28; Wed, 12 Mar 2025 04:07:03 +0000 Received: from BN1PEPF00006002.namprd05.prod.outlook.com (2603:10b6:408:e4:cafe::e9) by BN0PR02CA0015.outlook.office365.com (2603:10b6:408:e4::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.21 via Frontend Transport; Wed, 12 Mar 2025 04:07:03 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006002.mail.protection.outlook.com (10.167.243.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:06:59 -0500 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: 76d9b4e1-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MWQmTq78xCvWDdrXeBmv6ibx0YsGReARteo1t6cC4v8UvAn6L8KFTac3ISE2tKa+lBRFcOtR14oAlvqzoCV43dsNDyBgMauJA5VCPpxR4CGEf/dFy6uRxUFkx3jJHhmCbFm6LmMAOvuRNiBcbYctWSG0Y9DT3fa9gxgWBDqimhuqYKR+dOwZEuAJEUqxN/eooZP6uL1+ZJXVfyo1q8OZ1i3j/KPmt9CYJIvxmwSt2pnGuykV4ypJq1hiJJlu96rdCEL9k2X+AF1ycA/KJyQ+S48VSxO0mWitNGLnNoW3gUiLAPFHbKaQUG2J6/YRUWZFSyP56dSqTPX6YzZ76391Ow== 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=hfJvd41dMivz5QRFtPQPjoU8VhwHzIPONjPe2MQlcts=; b=PymuyoOysdLP2dldS3Tt9E9ZMEhZ8dhxDkHxYcOmMZgBtBRHebEh5nl/FyDJjBhRf4u2MvH8Fe8J5rvesJg0aZi8g302XTd/fNAHcX5yRSBrZ1e0pn+ihRlx//fh4B83bfiE/UPyyDG2tn6INhEZyeKj5pZ9oagDKmfV7N/3RiCCAHfGhBykBnnWG5IMWeUzVdXt3HRicJ/GeLaKwb4wdwJYsHMdOFRyBrUSV8+BffE+/R2GsKA07nQuyGEq6hsI57aidyU5Q4PzHfSgAl4dgc+pI6N+SEZZ0a4KDKWS/leS4fV846p5M+D9TjS1b5+vg2gQd0CyPAU4ZHD7XqDjqQ== 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=hfJvd41dMivz5QRFtPQPjoU8VhwHzIPONjPe2MQlcts=; b=n+gy4BodC8GBmQti5umGZ8jhtF46DboCYbK6z6rmqL0Jli/HT4cKiEP5rqHrhCp3Du2M8W17de9QXNPHebnBJEo6BcxBjYSd508kjSCYNOz6f2qDL3GvFzM31cLbZpVlwcjE1rp6mg0PiMIH0Gf6jfu90dwOWxP40DkU7XssF2c= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini , "Daniel P. Smith" Subject: [PATCH v1 03/19] xen/sysctl: wrap around XEN_SYSCTL_readconsole Date: Wed, 12 Mar 2025 12:06:16 +0800 Message-ID: <20250312040632.2853485-4-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006002:EE_|IA0PPFAF883AE17:EE_ X-MS-Office365-Filtering-Correlation-Id: 9343d474-6fc9-4d37-4a2b-08dd611b58d4 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: AT32nOezBV3/d3k8muScHV5l5VPFzI6CYIwoioMVcDJHGA77DSfpzWGhT5Akx3r3N2Zs23hzWcY4JtUkBUu4Jrqb52mS7d1FBp9NYaO5sgZwg6hVWVlPjJ1OE65BpQNrqUO6hZN6ETLAbq/aortkNiUL08DA/bgvDr1S7qwSYOUeLirbgd+cOztjQC4zON7nDpi7HMbjieVVl+Udqepwlzi58KiGSIbuBYRt8VS3R3pJVy+ECJzKN9O+IpjsG+Oa9gMGyE3+D6fonVeokXooqj2kXy1FC3vTl+Co+7biKW4IC+4M2PKW2+bnkn6/jUJRlb03etCKDbg9AvBBmZ7PD3TFr2HBofGHF/Ku+ggsxzBb+8lQVlqCNpzRBrEkRgAArlaRmgo1i2hjq7FP+7T/c1bsNCuT0phYoG6yfNlwoAASULeiplsoErRsKTWZ3wwBvRjRwcp4ArXI9DIUWh9qhbHj62qLttOrDfmcqfqYt/LoMMktVyiEL+SU3i2+1GxYV3LittT9M732UqkhNbA0/1jSgWM5ENONr2HVr5xEodpyipIu0CdqPP1xQVm2Niql+otMdaGXH9b/S6a/TPZTrc8iDExmf610ljzJDIEzQKolBN5P9xSR3h+yGYWqhDAP0u514nfxAvm9JprEalFOHd4t6OUhJgvxRwQ+IKbIejgD3Df2jusUmkAyrpPp+owdAICRoFk/JOc670tAKNe2y/fFjcpD9tEl1BIMolDHmOilUhrxs3kPB/oPJjlHxMLn5CRmvIb7+b8aFI6wIArelOyP7klxaZS2WRk/zCPVy64YQ7t0/GH69CWj27DCgeJ/U3a0fWIj5V7RT2MOoRjcbPgqFIINaP4Phr5OeMQt4QfqFVwYYJ8M8Zt79JQTmwvh+Q66DKJ6cIuUBABoQQ9qaPTjSrQz9z9W5Br7NjlwiBE+7QyHS7v409GPyC05qLxBVRh07H4jc1JeDma5ZnczLxrOk1nB/UjsGn9xRvv56HDCw+7UuJ+gNOUODS9e+GiLgcDTBISw4eF7AQhbebw3ik05iuO1zQfmUKelWekOuBhSumnn+89g2yH8bmU4msqj9DLovdq1bkibGnLVV3F5lBQuP23R4BZoVr0V/kC2zKWPiG6L0IU+Th7MTq+QQP95dPqzZGGlN4gTWR1PIkgGW9xTRozZzxld1e1vXqKxHjRRXj9kYD3nGmYxDHw3FGc8bkzWWk1tlAETRSvJjqzwLM8JV6GiZsBM2hEWFHJjQSXUBB+A50lCevwT05m30FrJLBeXxpRns8LBM1vSnoF+gzz4f5VU8XSepMdLjAB6rP+/T99XQOSAEGhbChO679w8iLLRFAamUHobO04kkAoQ9N+/Brq3g7IA4cAYR6wxxo+UaD4YiS4NUspXKotUpnFVoxHRHj5nWFgMnBsVuvzD59krl64LWZJRE4avd/wjAmHeRWmG4UgJjQfa/Pc4AIIt05+LZc9Aora40eY7BWJbdDxpBrhB0zGI1nIh3gcE4FM= 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: 12 Mar 2025 04:07:03.8328 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9343d474-6fc9-4d37-4a2b-08dd611b58d4 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: BN1PEPF00006002.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPFAF883AE17 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 --- xen/drivers/char/console.c | 2 ++ xen/include/xen/console.h | 8 ++++++++ xen/include/xsm/dummy.h | 11 ++++++++--- xen/include/xsm/xsm.h | 11 ++++++++--- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2f028c5d44..6e4f3c4659 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -336,6 +336,7 @@ static void conring_puts(const char *str, size_t len) conringc = conringp - conring_size; } +#ifdef CONFIG_SYSCTL long read_console_ring(struct xen_sysctl_readconsole *op) { XEN_GUEST_HANDLE_PARAM(char) str; @@ -378,6 +379,7 @@ long read_console_ring(struct xen_sysctl_readconsole *op) return 0; } +#endif /* CONFIG_SYSCTL */ /* diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h index 83cbc9fbda..e7d5063d82 100644 --- a/xen/include/xen/console.h +++ b/xen/include/xen/console.h @@ -7,12 +7,20 @@ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ +#include #include #include #include struct xen_sysctl_readconsole; +#ifdef CONFIG_SYSCTL long read_console_ring(struct xen_sysctl_readconsole *op); +#else +static inline long read_console_ring(struct xen_sysctl_readconsole *op) +{ + return -EOPNOTSUPP; +} +#endif void console_init_preirq(void); void console_init_ring(void); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index afc54a0b2f..35d084aca7 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -186,18 +186,23 @@ static XSM_INLINE int cf_check xsm_sysctl(XSM_DEFAULT_ARG int cmd) XSM_ASSERT_ACTION(XSM_PRIV); return xsm_default_action(action, current->domain, NULL); } + +static XSM_INLINE int cf_check xsm_readconsole(XSM_DEFAULT_ARG uint32_t clear) +{ + XSM_ASSERT_ACTION(XSM_HOOK); + return xsm_default_action(action, current->domain, NULL); +} #else static XSM_INLINE int cf_check xsm_sysctl(XSM_DEFAULT_ARG int cmd) { return -EOPNOTSUPP; } -#endif static XSM_INLINE int cf_check xsm_readconsole(XSM_DEFAULT_ARG uint32_t clear) { - XSM_ASSERT_ACTION(XSM_HOOK); - return xsm_default_action(action, current->domain, NULL); + return -EOPNOTSUPP; } +#endif /* CONFIG_SYSCTL */ static XSM_INLINE int cf_check xsm_alloc_security_domain(struct domain *d) { diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 276507b515..d322740de1 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -62,8 +62,8 @@ struct xsm_ops { int (*domctl)(struct domain *d, unsigned int cmd, uint32_t ssidref); #ifdef CONFIG_SYSCTL int (*sysctl)(int cmd); -#endif int (*readconsole)(uint32_t clear); +#endif int (*evtchn_unbound)(struct domain *d, struct evtchn *chn, domid_t id2); int (*evtchn_interdomain)(struct domain *d1, struct evtchn *chn1, @@ -266,17 +266,22 @@ static inline int xsm_sysctl(xsm_default_t def, int cmd) { return alternative_call(xsm_ops.sysctl, cmd); } + +static inline int xsm_readconsole(xsm_default_t def, uint32_t clear) +{ + return alternative_call(xsm_ops.readconsole, clear); +} #else static inline int xsm_sysctl(xsm_default_t def, int cmd) { return -EOPNOTSUPP; } -#endif static inline int xsm_readconsole(xsm_default_t def, uint32_t clear) { - return alternative_call(xsm_ops.readconsole, clear); + return -EOPNOTSUPP; } +#endif static inline int xsm_evtchn_unbound( xsm_default_t def, struct domain *d1, struct evtchn *chn, domid_t id2) diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 0a5fc06bbf..4c97db0c48 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 = { .domctl = xsm_domctl, #ifdef CONFIG_SYSCTL .sysctl = xsm_sysctl, -#endif .readconsole = xsm_readconsole, +#endif .evtchn_unbound = xsm_evtchn_unbound, .evtchn_interdomain = xsm_evtchn_interdomain, diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7c5e7f5879..7c46657d97 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 static int cf_check flask_readconsole(uint32_t clear) { @@ -945,6 +944,7 @@ static int cf_check flask_readconsole(uint32_t clear) return domain_has_xen(current->domain, perms); } +#endif /* CONFIG_SYSCTL */ static inline uint32_t resource_to_perm(uint8_t access) { @@ -1888,8 +1888,8 @@ static const struct xsm_ops __initconst_cf_clobber flask_ops = { .domctl = flask_domctl, #ifdef CONFIG_SYSCTL .sysctl = flask_sysctl, -#endif .readconsole = flask_readconsole, +#endif .evtchn_unbound = flask_evtchn_unbound, .evtchn_interdomain = flask_evtchn_interdomain, From patchwork Wed Mar 12 04:06:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012838 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 420A6C28B28 for ; Wed, 12 Mar 2025 04:07:21 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909673.1316600 (Exim 4.92) (envelope-from ) id 1tsDNB-0007tf-LF; Wed, 12 Mar 2025 04:07:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909673.1316600; Wed, 12 Mar 2025 04:07: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 1tsDNB-0007tY-HE; Wed, 12 Mar 2025 04:07:13 +0000 Received: by outflank-mailman (input) for mailman id 909673; Wed, 12 Mar 2025 04:07:12 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDNA-0006o2-5z for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:12 +0000 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on20622.outbound.protection.outlook.com [2a01:111:f403:2406::622]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 77f99de0-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:10 +0100 (CET) Received: from BN0PR02CA0001.namprd02.prod.outlook.com (2603:10b6:408:e4::6) by CY8PR12MB7610.namprd12.prod.outlook.com (2603:10b6:930:9a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.28; Wed, 12 Mar 2025 04:07:06 +0000 Received: from BN1PEPF00006002.namprd05.prod.outlook.com (2603:10b6:408:e4:cafe::64) by BN0PR02CA0001.outlook.office365.com (2603:10b6:408:e4::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Wed, 12 Mar 2025 04:07:06 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006002.mail.protection.outlook.com (10.167.243.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:06 +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; Tue, 11 Mar 2025 23:07:02 -0500 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: 77f99de0-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uSWGnxpXYMyXJFJuJfCTIgehv8iLZeLVdGGKUpeZC7nLqFsUSlqUTg9XyYGV91L9dgFycLMxLNfanQXSxcw8R1z4j+Q6nhSSoPe4E65pEvzPRdwyKXceKp+91jOuzfrO/Om5vGD12XycvI5Gr359zwA1O/Nhd0P3kAbN5/mgOI3baNxTCOvGGlH0D0dupVPsKfn61iMRheXGfSeviIgK1YrH1xEmnV6NfeiXv6HDthdGs4PSFesL0434BMkknBD4xvckey1Xaa1O0OnIhJmk3dNdtUawhtcczKkYO7ElCYpg8KdWqGl+YchWVGYlOcQBfAU6i+4qFnWpV63wuPTgyg== 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=axS9aSIXrwBF9jLR7+I/Ojvre/F1Ygmqm4eXLiY7Sw8=; b=CJSX0+Ym9S86bFrSka/Qr5JmNc7fqh7rjVAdho+3cwPulJNZrAWjYEHRCI8Ge5wDDgaBbyZPX4ggkXcWooWwlDrSLii2BZ4LHmJEcTdWM829ZQLY0TuS60AeScTTsAVNsvkOxW+jmqx8Lft/C9h5PmOHtmNfRu0zc+PddrHj6ILE6YZ2/ilcw1dTQ7zhDg8s3Hqmjk04mMXcN4WH/W+w3LqWUAf36CkT3mOl+MdSXvJmf8QA+stVfGCznbpGguQgz987sUTJiZIOaoyU0DXhEezjZtksxdou0K19YlxyIv7zAmNWY+mHpnBSP343RBtVcnzGwL0PpKl4UT6n3iwruA== 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=axS9aSIXrwBF9jLR7+I/Ojvre/F1Ygmqm4eXLiY7Sw8=; b=a6nSn4Vr454FSTn6Dlx7Mr5+na6aAH9mLTjv/kN7+xHlB/1XE1aPxUMSW77WvTuINQ8AraRt+VsvhjkBcA2GpZjcGBd0tPiTL9nITRV3Abh/K8LSfhIWhe0ByqHXDFZxwUKsxgQFiTkZqIi9D4i4la2PKs2rJttprikOXU5X8dw= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 04/19] xen/sysctl: make CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Date: Wed, 12 Mar 2025 12:06:17 +0800 Message-ID: <20250312040632.2853485-5-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006002:EE_|CY8PR12MB7610:EE_ X-MS-Office365-Filtering-Correlation-Id: 890266ef-0985-4b39-c445-08dd611b5a32 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: 5E/Zkax04/8lL0//Cucc4WmwDakwHc9H42yEWTlmUakTFuhVgm+COQqyYqmzXV7jZU5TtJELzxKNQZlo7D7K1igEjcgC5dwQ3rsmXQlSEM80kPaeAxjuzlk5nDkMuvECYDFCwYt06HgHuHFvrvJQs7nL0paqxLak8G8b27KRAjtXLjJYPoEh1y8heiGzpMJQbyYDxhLxixDjtgnRnEPTWGdxLz8/z7AKcmDXfY5dXesPnZpI/P0ZBwk7gFaPfDtWsA6JgJf7tbGR+XAJfyVaCSj8YgCjuxuCA3izTPkGseUDUXxo2ZDwegN54XcZ8xTK5nMF1peRgUBaO7dtchWCCrp5WkVKVVEkXI7pszHS5ZJXjGMROx33Cn4Fg046SfWvswkj4YZs2YnNM2hl3UBsqWhiv1qDivdwtuOmJgrVrJWtCSwY2BUQmNgABYIWcfux9vmsOviR/1vgrnx52Zl0HYZ4UD39/TKbL5zzuWP+QkCqRQsYb65p0OV0RAXfo+zavbi+eJ2JeyQSDMHOZUiTvIbxHClPW/+V1HxX/Asl6ByILI7U8jHNJHl0Za9eViPCegzrArAzYtCt+L/v9TFps/g0MUPbqtALc21G9novQrmtl2tRR2JIZo09G/5DY3D88Myq86+3a55lRCVcVcMb5Fri0CkZxIBMqkrs2FToM8ElUfi4ryPbLRynjRl65n5Xd35zdnA4OIUBCNNZ8yu6CkK6G2lk2DOPFAQ1kgig9WOfVJaC4AZPHpH3gJAjQ7hw2lP8LDrCFzclAZZCJxZRp36MPp1rVFCq468zWcHXn/+3hYbnbjSzdnQX0hXW3eA3yBhK3MKe5tSp7z7FyB3lM4hB0DWSPeuH0weeZctJW6tiWPx7fJiEeWNEJCvSOmpLYS/DIe1EePAqijJ6NdFAmrQiTTMsfgmI+UQ600QXcCu2+rqoU9x/aWFNQHRZR17ErG55LHq1jdmzc4lhopbWAd6jf/grSlY7fpzbcjJgV5DXteFCDFagfJ2GNOGmgqhLZQB5hwe6REVRotIOMFNWbcTM0EORizZov/s3fO1ycy+Txnfr+B1qH+XhMDd0HND6qZ2qRTecu48tmT5mDoHsB71+0xvUsP54eyx3KJKqbapzXAcZqk7nPiaArG4L5+vGNFNLyka1J4pkYBX0zsNqC4QWO2Us2kqGpEjA71GB1ataFycvogc5yh0AA3bLbPlJjkgWNGXrRBjfi1h+lFy/e92/TCcPIrBQvcoD7Tp3H1j3FO5ud3sPAFbI+M+RKJ+fOUQAIzg5pXVQBsg1ZtviylER0h4PZTJTPxnFIL4OEGY/24CVhKhojMB8jOljf2itzjiDckfV6LvBwYtU+Lqnub++Oi0Ve9OiMLJBuhS8UQXfyEk4/+pfCI3JqL/+RdOu1GhWg+6sOb4W8C/fM5ienAkpf+3dFmyulYGOOS2+wf3dXELY6JuiZRl36X/Fnn2er0qmTh2huTcTmoqqBx9ntmBKWYoTAasIDDW2LGO9MEM= 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: 12 Mar 2025 04:07:06.1297 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 890266ef-0985-4b39-c445-08dd611b5a32 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: BN1PEPF00006002.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7610 Users could only access trace buffers via hypercal XEN_SYSCTL_tbuf_op, so this commit makes CONFIG_TRACEBUFFER depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng --- xen/common/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 72e1d7ea97..c5f4192b60 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -513,6 +513,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 From patchwork Wed Mar 12 04:06:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012840 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CF335C28B30 for ; Wed, 12 Mar 2025 04:07:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909678.1316610 (Exim 4.92) (envelope-from ) id 1tsDNF-0008IW-TW; Wed, 12 Mar 2025 04:07:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909678.1316610; Wed, 12 Mar 2025 04:07:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDNF-0008IK-Oo; Wed, 12 Mar 2025 04:07:17 +0000 Received: by outflank-mailman (input) for mailman id 909678; Wed, 12 Mar 2025 04:07:16 +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 1tsDNE-0006o2-1U for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:16 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20606.outbound.protection.outlook.com [2a01:111:f403:2417::606]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 7a28e153-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:14 +0100 (CET) Received: from BN9PR03CA0519.namprd03.prod.outlook.com (2603:10b6:408:131::14) by PH7PR12MB9073.namprd12.prod.outlook.com (2603:10b6:510:2eb::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:10 +0000 Received: from BN1PEPF00005FFF.namprd05.prod.outlook.com (2603:10b6:408:131:cafe::2d) by BN9PR03CA0519.outlook.office365.com (2603:10b6:408:131::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.27 via Frontend Transport; Wed, 12 Mar 2025 04:07:09 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFF.mail.protection.outlook.com (10.167.243.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:07:05 -0500 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: 7a28e153-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZSmlVcRQhYFo2TKTDFfb5Umk/3L9lW135zemp2Zag00QgFHqtCySlg3U6k5snHdfh2qjXIUIxW1YYiBD8HaCY7uyJ4iNEz7O/D7Zbx8eaM/KbO3v44mJgba0JxntQ9xh2VwVaaI05bAkcERjpmp0rZ43lgGreol6/riWq4XGQ5CjALqLBM9tI/tv5NK74hhgZCZi5yUEB/ED8RkIOrot2TsJRyQ6qCXA3C+Wbo9Isk7kJTIc/sE96s8M5S2NsVqqXKTeEtYU/jc+5XpAE/0q3n+tUd4qFPrhop6c13Qv1nxUv4LSEqmkMZjrK0YF85oAQmfCcQitMXH4l6bUjekxyQ== 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=MulITfmVWa9VrAVpSfm2qWFDXdm5/Mzq9x+66kMeZ7g=; b=mMpA6DUnPQoNbNpliA33T+ZAPtSswrb8Sp2PnhEcqpmm7yvcY/GXzCWcWMBcLZvRlcoCeygKK8zsGkYQrKwbutRC1nuKCuZCsWcwnMxmizmYWtgj2yTZ5XcfzntP06iACdl++/Ho+xhDKWrjgI+yYP2hT08Y/ZWJhho7LOEI0pyGU6MzQccrrmM9broJX5/yeV9A+qx5LGOkbTQLQwReaY5oDhn+ogekp6Xmlx/qUfETITojinfUtwB6p1abxlyUkDZNzcLR8oS2vnjsVzPRX3llR3TH8YnrcdPiRcOKcjpLn7YmfzythLu3IjhTRToUoF38VBOgQjbB/gNpJPpDYw== 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=MulITfmVWa9VrAVpSfm2qWFDXdm5/Mzq9x+66kMeZ7g=; b=fhFqj9wOBDtc2ZzeN/Y2T5tuu0Rxt4JI9qhp9S8TBlUS/cOOpGDu5xzbWoZhOBJAsW2Af+VAeWG/+U7+HkKjKh+ZRnRkC8TaXPJLUyHbNjswa8CfHkkyEYBMPYtkkRLtO5Fh/lWG8yUmxsm4F9ctdL53SOsitdoWxhvSdPowRf8= 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 (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 , Andrew Cooper , "Anthony PERARD" , Michal Orzel , "Jan Beulich" , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , "Stefano Stabellini" Subject: [PATCH v1 05/19] xen/sysctl: wrap around XEN_SYSCTL_sched_id Date: Wed, 12 Mar 2025 12:06:18 +0800 Message-ID: <20250312040632.2853485-6-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFF:EE_|PH7PR12MB9073:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c95c138-bf4b-4f5e-6422-08dd611b5c27 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|1800799024|7416014; X-Microsoft-Antispam-Message-Info: pJrKAHo8ZR2OoO8yVoTR9/R6qGAjFVfbJlqoV5MdeLDbRgIce/b4zReD69Z//uTPf/B9ob7OzSNxfv0B52uq/RtipQpUjzs7Ka5Zgw45oV1b1ElnHVYVwMklr4qzYpIhrbpLNoiCR0HZ15Vylkz7Dm3AirAkjcFp0WZ5kvq056K7nHWF4RSFKerfkt05yzQSKgk49iadyXMwI70ar0JBbRla8fWm0i73ez1T4tjsjt8EUwFDUfl3T5EuuT30FXCBnspK0gBBSmn+cN0Calwks8iqqsPswGj0iMfL+VkOXPWUr7hk8cE+O5qqwodivwjV7GSpeDkFer0qy+wu7Ti53a9TwiQpiU1dCOtlpwAaOWNs45CbyzebPvqkVLNvmfSKwpDQWj6NtDdOW6x8hcivOoeOmkhCezb3dFMQdb7AE5f58Nh4jv9G+bLRmsioZkefLQMT7bYCWP/pLEvKcEkgmmYFFt2tciK/bUXAJ2UFuBhAshcXjOS3NiTuyJXFISCAKs14zdglbi4wb4OJFGF8bKxpavE6+/KY4Cj9z4s0wk1PF1bmFbjzfw/yIKRq4qpvImbFaykiKeRKme/8QkSNw1LJ+m4OIFuOcaS0e/83wDKaLawbevXci+SJvzitW6LIK8LP1wgzvo+rhwGT57osFBuwDs9BURb+1Xe5H3xCakJPKPMDAeZsWlUh+uhrcyL4EkKJDSRaRgXGZXAX+RLY9HBLoZ1GyJwDDtfofVYCb3+AwVEGBgeaozl7HohHuLVN3AQzxZLorzcrzNMJdIWGm1ihsOAJlb4mPfePI872pDnUSf+5JHPZH4T7vg45TZDJmyh2ZZDlJrNvSm/Lf3hbqLIjdd+ZvZeIfsqBurvCyLU//pbU1Rj6/306urwGyb9BJY8essrXtVwsbC/zAvi7ou6tCxwPRUPS213JOwaenqIYBauAJic34jPT1Uy5Vs3BJHfeNGdpFZ3Y5jtb39iSjUOwFRq31ZKPi5bMD1mK7XqjoTtzEJ/rk6U1Cl1pxGAuJqcI1wmKhLWlsculMRqcCjeAbLXChFm/ErG7m18Uc5LE/Ta7QvSiuhrhKOCkfcV41PI3RyLqUJsTMWOk+GxAbCwtlKv6gETu3+nkIaNe7rcNSMe2sPnJRpxLpp+KVtOQUrpgUhqG8dfuyGbzwe3dmGY60Bcp4lpNks6CS6pEjRTHoemYBGpb9jXDwoVCcBF8DV7xAOQYIRpEmrXAbKQRvSN+g5cS8CFwU8w3zPJ8CZH5knwSBmQqnRFIuXpCr3inRdw2SPzPv5JhXSI2E7S1OG6AjPd3x2SwIdzIqnIGkRvbeEZmGTmSM5RnBX2srghBF+r7oLromUteJpaf2YIX6y71bH7wXNnCzC1j8TmGSDC/6pnmZTzu5AXb5HM6dS++X3VZjlWBgRMFC/nN0m/wUtvWqe3y+L3uUxOzjVK3Ec2gCN5xV3GLCBvHTNAw7X4u73HN1deKnLllGHyKiXOBDMwxWgxm20I6YoIiMiAc05w= 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)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:09.4106 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c95c138-bf4b-4f5e-6422-08dd611b5c27 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: BN1PEPF00005FFF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9073 The following function shall be wrapped: - scheduler_id Signed-off-by: Penny Zheng --- xen/common/sched/core.c | 2 ++ xen/include/xen/sched.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index d6296d99fd..ea452d8b3e 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -2052,11 +2052,13 @@ long do_set_timer_op(s_time_t timeout) return 0; } +#ifdef CONFIG_SYSCTL /* scheduler_id - fetch ID of current scheduler */ int scheduler_id(void) { return operations.sched_id; } +#endif /* Adjust scheduling parameter for a given domain. */ long sched_adjust(struct domain *d, struct xen_domctl_scheduler_op *op) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 559d201e0c..9bdeb85aa4 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -849,7 +849,14 @@ int sched_init_domain(struct domain *d, unsigned int poolid); void sched_destroy_domain(struct domain *d); long sched_adjust(struct domain *d, struct xen_domctl_scheduler_op *op); long sched_adjust_global(struct xen_sysctl_scheduler_op *op); +#ifdef CONFIG_SYSCTL int scheduler_id(void); +#else +static inline int scheduler_id(void) +{ + return -EOPNOTSUPP; +} +#endif /* * sched_get_id_by_name - retrieves a scheduler id given a scheduler name From patchwork Wed Mar 12 04:06:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012841 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2FD71C28B30 for ; Wed, 12 Mar 2025 04:07:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909680.1316615 (Exim 4.92) (envelope-from ) id 1tsDNG-0008La-AK; Wed, 12 Mar 2025 04:07:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909680.1316615; Wed, 12 Mar 2025 04:07:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDNG-0008K3-0t; Wed, 12 Mar 2025 04:07:18 +0000 Received: by outflank-mailman (input) for mailman id 909680; Wed, 12 Mar 2025 04:07:16 +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 1tsDNE-0007Fd-B8 for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:16 +0000 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2061e.outbound.protection.outlook.com [2a01:111:f403:2405::61e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 7b97dc72-fef7-11ef-9ab9-95dc52dad729; Wed, 12 Mar 2025 05:07:15 +0100 (CET) Received: from BN9PR03CA0363.namprd03.prod.outlook.com (2603:10b6:408:f7::8) by PH7PR12MB8121.namprd12.prod.outlook.com (2603:10b6:510:2b5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:12 +0000 Received: from BN1PEPF00005FFD.namprd05.prod.outlook.com (2603:10b6:408:f7:cafe::b8) by BN9PR03CA0363.outlook.office365.com (2603:10b6:408:f7::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.21 via Frontend Transport; Wed, 12 Mar 2025 04:07:12 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFD.mail.protection.outlook.com (10.167.243.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:07:08 -0500 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: 7b97dc72-fef7-11ef-9ab9-95dc52dad729 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=v+nRQqk8sw2WC0ItO7u1bW/llpoRYZFir+vc9LCvTKxwOzvYoc7tGIGDgWTQlzYpYWfNg9pAG7SgzmiKRXTp59cOOFcikOB+G44YFCHW5N5Loh6LDFS9+xUxmWKdkeW2CykEcFC1r4eQg3U+Or/mWiz9lVUsMT1iUUaA1gxbNcGoIdpWC3WvVCAV60YXKTahcb3TObGH1azT7BJSCkPu1qKnMKZ3Ze1xK5gPxLNrRZ2zQzufv37jeXQy0QD0708jd2/Fr1cNFv1ECFAbLeNUhR3Gl7K9J6ryoGS3bZk2GoD5yLm6oIYJhymMa4L6ChUQZHLyswroCCdDQSXnSpgYqA== 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=RNDtLuo2qdkeW1r6yrP9PILXWa6wrDrvqRmSKOwNmtI=; b=zV11JAtrlyBvsnmrQwdzZQZ/H8Y9JlPVJGYWYYVDy3+ZYuP9aNghZjCqdhYkasNJxut/jB0idPU3i2zEEwkWc68H0FRRz9byyjxfEUdw05syvAwJChQJJ9Pbdg6nMfFYMzfMsHpOpfOYsQf6wHSwFTUs2i6S5d2MNgnvh1XeKeVnHQJ/q0tTBYXgxywvDoByNlRr7vMXUzvGG75hCSahGokaGjgLHobKmW4k+34bWfEjoF+/YCc1Emy6SB4No9H1eE4YwVzW+xQceIXt1SBS5ppvIb2LFxvU2Mcts5drq08VimnkDtvFJj1AS5H3YXosq9QGfJb8rm44Cb8xb5qFHw== 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=RNDtLuo2qdkeW1r6yrP9PILXWa6wrDrvqRmSKOwNmtI=; b=JtVfyFPjNg04KNEqrA50mwP22xafpMCWXGZVL+vfJVV4TCmLQbNUGeQG/Wl/EOopTI/5ONxQSlpj3EB/E9cWeQP4o4LyyyLsuoE+cnZkAKQA++equCOwy65w25T+44t0mK0uTe5EUVUS+OEXIWsX7isyVofAdFpqlYdFKi1wU2Q= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 06/19] xen/sysctl: wrap around XEN_SYSCTL_perfc_op Date: Wed, 12 Mar 2025 12:06:19 +0800 Message-ID: <20250312040632.2853485-7-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFD:EE_|PH7PR12MB8121:EE_ X-MS-Office365-Filtering-Correlation-Id: 93d98f80-361e-4160-a611-08dd611b5dd5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: V5p1JWh/VUiA4M/I41vYkOq82kT5UOGm70I1Qux7pgQh4S8NdoCG9HcK4bD5uXOIcB1PnL3doQaDq88jmddeaIXBCSlUGUR32mecymuO59xJ1wrxfJPxrNwXOxj6XuL4HkS3jJqbG9lhih7cgyt3Oh91HHtkpu7M0CWXl2froMhghYhrD4vtgx/vsgaPyKxTYNh3WogP4+6QHTjtzaS/N5ll2IjjJUVq0bCraJZYtsfSg+Ufi7k56+1aS0LtFBSa52fbvGMw+ynjdZaUQHvj3mL7Q+AeOPDCNfej5ADlk/PhN+kt6oOAo5eFiVG77mSIJbHQHEGgKTzu6EI5pEB60dozM6w9NXDR7XqytkQsK5fy6AA6owNOSmaXbSN6F/Hy1msIfHoV3hO0hCYA44L6joWc11o9sYDsdprC0Z7KeWj0UnOUJvhN4f6D2fLBZMcUo73BzqD54hrDVPk3rP2tTlZiftslCRa5B0UkjMdYkba7V+lY7yWf4g4Kahqngs2HvTgXor0JmGTn5l52FpYFA/r1oFfhef0IpwEPefNmodT2sylj4Cq6bFsjS7T75FgJI71yJayzkXRrDTzYE0+lf/YaWKJsBPIMxlqvk/cVZZ72Td5fJGSi3NlyeW9EjNWpuWg64bKghny/6HOYFoP5iJ9hsEW486+Pa0BCTLS8SJpeM4ohehGDB0DHt6EyGnr99FUeQ3cV8haYHRhIZPIeB5mk/P8BFxY+IL8gSqGTPlR5ruDXwcM0kRKbbjlhtbmYAdCvtXNOb1EJ+eqfvm7auwBDmAfhKQzF1qVJHrFN2ccvlxyHw9+ZPBmeSykcB6JR9N6u79FI5JWY/X9AO7kOHa7xsQY52wYT2uErPhvH+NXK19A/3eu8UeJbKAiBQ0FtCnBOzY0O34LRVvnFDalf9Bhgjr6TwnzoPGnJKD6Iq+W7O6yQR0H5FOAdSyBNXW0R485SjHPiiKRofl+u6+2S3qTt86eLdtKdR5G17RJCmKfT4zsozl1R/Ft6HXffwdAUJYNZcfNWGezQaicKNKhQGslNa5qU6amL0JKdvVl7e2ae6uyMQXmNPk/L/98zB4M6VekTiQIenkVQzufnyCLsuZ7mBib/pSM18HvmLnI2JLFvjIyeXepIKxWnCe5xQv94a5UtgXvSCCY4+AniewHyLbqHwWU/pW8ioJWViqxM2Fh8albli7T4mUD7PqAqDSqR9PHOp1fvA8R5/YuBL4gSnZKu8Jruo5zDrd+FgV9V+GI3kILRSWWJSzAePRtYAXUPfnixlf7c4Me0v88jzRBOokRvQEA4S2Vgvj0lkOz6j01xcEnXTGhfFCahiNqafG1ngfuksZXQeIAANL6gd3a1DA2e5DJHHC79tDGV2eCD1euQJvECb00mJiY1ioI0QQwlDLDZciVMmwumuFJWCbRVe2yWd2wBlyZYmgS2YNFjmVktWYEJbvt800p2iz3lNfD96s8tKkhQ4XT4zSDgg/9Vl+4eEbyiMgy7azUOld7juWM= 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)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:12.2303 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93d98f80-361e-4160-a611-08dd611b5dd5 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: BN1PEPF00005FFD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8121 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 --- xen/common/perfc.c | 2 ++ xen/include/xen/perfc.h | 8 ++++++++ 2 files changed, 10 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) } } +#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) return rc; } +#endif /* CONFIG_SYSCTL */ /* * Local variables: diff --git a/xen/include/xen/perfc.h b/xen/include/xen/perfc.h index bf0eb032f7..6cc8af12d5 100644 --- a/xen/include/xen/perfc.h +++ b/xen/include/xen/perfc.h @@ -5,6 +5,7 @@ #include #include +#include /* * NOTE: new counters must be defined in perfc_defn.h @@ -92,7 +93,14 @@ DECLARE_PER_CPU(perfc_t[NUM_PERFCOUNTERS], perfcounters); #endif struct xen_sysctl_perfc_op; +#ifdef CONFIG_SYSCTL int perfc_control(struct xen_sysctl_perfc_op *pc); +#else +static inline int perfc_control(struct xen_sysctl_perfc_op *pc) +{ + return -EOPNOTSUPP; +} +#endif extern void cf_check perfc_printall(unsigned char key); extern void cf_check perfc_reset(unsigned char key); From patchwork Wed Mar 12 04:06:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012842 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD15DC28B30 for ; Wed, 12 Mar 2025 04:07:30 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909687.1316630 (Exim 4.92) (envelope-from ) id 1tsDNK-0000ew-HZ; Wed, 12 Mar 2025 04:07:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909687.1316630; Wed, 12 Mar 2025 04:07:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDNK-0000eH-Ce; Wed, 12 Mar 2025 04:07:22 +0000 Received: by outflank-mailman (input) for mailman id 909687; Wed, 12 Mar 2025 04:07:21 +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 1tsDNJ-0007Fd-H8 for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:21 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on20619.outbound.protection.outlook.com [2a01:111:f403:2414::619]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 7dcd120b-fef7-11ef-9ab9-95dc52dad729; Wed, 12 Mar 2025 05:07:20 +0100 (CET) Received: from BN9PR03CA0362.namprd03.prod.outlook.com (2603:10b6:408:f7::7) by DM4PR12MB6088.namprd12.prod.outlook.com (2603:10b6:8:af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.28; Wed, 12 Mar 2025 04:07:15 +0000 Received: from BN1PEPF00005FFD.namprd05.prod.outlook.com (2603:10b6:408:f7:cafe::bc) by BN9PR03CA0362.outlook.office365.com (2603:10b6:408:f7::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.21 via Frontend Transport; Wed, 12 Mar 2025 04:07:14 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFD.mail.protection.outlook.com (10.167.243.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:14 +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; Tue, 11 Mar 2025 23:07:11 -0500 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: 7dcd120b-fef7-11ef-9ab9-95dc52dad729 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mQW3Pd/vW+mDDx3dpr4Zd6FYV7VKIDWlZU7+vgtJZ+HKCyToOt3uCIthVs/GfAIlpF0OySYS5ShfPYUG2OK88y7+T3qPZc9S8WbHjVVHMfiruI4TIFOl2KfiEYJva8ru/jjiKaeucykzT1VDz/4b2OMQf7eH0ibpzapAR0q9UxC6hLyRNxIoTZ4oxTRWpZ1HOFtZ70wxoEy1vnLTShSLUKBr2wbj/YBwiqEn+XPJB5+a5xrjrD9VsUnkueF7B4+98tdPG0u1MmYDs7ky5iZxcSS4lvP+bfWDU+bxPKpIb2IMmmlM0/WzqtePRi2KL9hYTfkORPDmoep4aRhhpfHIhQ== 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=vyXPch7vdUxtYLZkn2hdqi4FR/VmMozdqU4pWrNieqE=; b=VpcpuquTXilZMM4AkHCnE70jRamVGPoQ51WG5KoVwi8b7Na6ryhP5rqUBXtgqLbjd43TkOtDw3qeZ+Bo7HSpGP53rTu3xziHzMPNI2aJ+isfuTI7fjOShmHj03g23Kmvt/j0GfXKG0bPGxXJXxX7vx4MNxfZJiMqgeDyD4DxeXYkI0TOVh+FraZz9XtFVN+xi7vu2en7FjDBa9a/odS3SR/cWtdC7aEntT7O/NlLTaYEVtmughOPlm/hFpbDRAsSoLgFvCr4n7PgA//5TFj2T9092cMbIrmS7giw0RmRsiT0m6UnRdYS9ML6HZqNf4734g1ME4FlgSmvolTH/9YY3A== 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=vyXPch7vdUxtYLZkn2hdqi4FR/VmMozdqU4pWrNieqE=; b=JLEigtTqL5x1kz0zTs8U3z0ThFZ3i1fK7GqZQCDUd16uY0WiO4gz6HT4WITq0FlEZXnzA8DdYNHbW90l5m1gWl9WJjkCo5NrMQTPx09yFsIH43cfRJHQx9H7fIKSXLBhg8H+Z3+BFODx0xFgdEBw0MUHVM+MYC4u8huWvjm0GGE= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 07/19] xen/sysctl: wrap around XEN_SYSCTL_lockprof_op Date: Wed, 12 Mar 2025 12:06:20 +0800 Message-ID: <20250312040632.2853485-8-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFD:EE_|DM4PR12MB6088:EE_ X-MS-Office365-Filtering-Correlation-Id: 7afb2d37-c9f1-4b82-323a-08dd611b5f66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: tncPJjHwSB6zCeIKlaWadR2LIkmRs6oDDgdWO9MLWbWvUUY7fjTuSRuxXWGnfZfrPia2LZ12+fVU2qhAnfFykg88MJA+C0hEsywM7jWsQcSp82RmPTQ1WdJFfdlJjw1PfP6smZKkWSUli1u3DLhfjpOcnLKyTCPuo+bzRNtPd3PTXOP5D+UBOPjuPtjil40XcXt84iBdov5ulJKdCKeh8EUWRmhFATCADyD3BeCA99UFNwy1+B3kUdk0fmyPhlQ8/KnMwgiE+6Al8eBn15x9JQ+xT11n8SIiuBAjQWHlBNibJfPnR3zZNeo/ZIFbIW7BiqCLf9GJd1qe1Ca8mkkXJOiabBXmteFQu+l/O7A7JNM7S6yDng8q+0T880GBgv2JHizgPDw7mXYnThy0ZKZSeWVK8L3wyL0qQLHBfsU7hN23gq4o7yQgSD674v3Dzi8u8xgmSkI5oJc8csV0M3Zfe0FtOTdDp35pLkT6eJgP5tm6/EszHtWGXi5hwqLcoBsNN6eZN0NCwrkNnDdbRavE/HRWvJmX8r0/YQfrPBAOCA6YhRJX6EOJtQNfICP8T3v/umfGTLGx9gDskmPaJ1YBrZFrxxEFUp6wfhd7WOBHyXJh4Xg2eotq1YzEfOvxnT/es/xCl9gpCYbajN2NWANqEOz1kuJBN4Oe5mNaB6EYmptKvM4va7QY6IvlBI3iVAQxP0yz3zNjgN4yF0W0RcfmUNLPDY31r5up6662yIbFa+Gx3nEX+QSJ1A3L+bjo409q5yTPPu7qcNZYruDno5YdirUlzX/EdYhMIojVY1JDRB8OKblFoGZvQ4iTO0dnH9hQ9CGQ7bvm4GUrQM9fp8OL40hF4GBQpICdm+m6WFtEdSgl+mHl6vMajoK8P2apOwzXZrpobIDBL5VwG+sAD19GgqWhfmrXNuM2kFQ0AM4ILzyF2Dm97785Tql0OEL/6rk6BTG+LiXJli+H0vIKLBnlJgRuqYlDbE94Boy5fXXL3YHo5Trjy97Ve0EHV3i6sYWjNDoC6sW/u37EX2KQmTjmyjfSKJmo1qt+T/d1SS6FBnoXWtLb4nBMipjo776mb2yTjBaHiCBrYUVQFwnzTjFpX2cHL9C/M6rHmCTLM3t+grq3zAmZW2Uc5rISNz4iigPB2GQAksDvxItCdTVwb4k/gjBXEecPI38pPxWNHuhaDeZSLTs9ByMqhB8ePbipMniIzHjQ+WridfMWd1o9AMQTvUn+IsSN3+s03nmMP/M5P9RPOpZ3pMGg00XlSzpT/XjviDVjwfO58B+9qT5sRqPdo+dApXgHw849fSm6l5wTeiNjHcKJns3sw7zf2BDDBjM2D27+nID1ib/hGnGvsjNZT4QZNyXfUSynR/+CnixqawvjyYxkUbn1ro40G2iyPFakewgVRRw3so2elUO+dFOJDm5ePP+ZfPK0jMVQj/w7GZjOQQDyyEiyjbbWFyc4XDSMwhPAV9v+bBlhpvPJglLjqzHaUc2LCAuuk24ssUDZPIQ= 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)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:14.8554 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7afb2d37-c9f1-4b82-323a-08dd611b5f66 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: BN1PEPF00005FFD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6088 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 --- xen/common/spinlock.c | 2 ++ xen/include/xen/spinlock.h | 7 +++++++ 2 files changed, 9 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); } +#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) return rc; } +#endif /* CONFIG_SYSCTL */ void _lock_profile_register_struct( int32_t type, struct lock_profile_qhead *qhead, int32_t idx) diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index ca9d8c7ec0..7f2a814ee0 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -164,7 +164,14 @@ void _lock_profile_deregister_struct(int32_t type, #define lock_profile_deregister_struct(type, ptr) \ _lock_profile_deregister_struct(type, &((ptr)->profile_head)) +#ifdef CONFIG_SYSCTL extern int spinlock_profile_control(struct xen_sysctl_lockprof_op *pc); +#else +static inline int spinlock_profile_control(struct xen_sysctl_lockprof_op *pc) +{ + return -EOPNOTSUPP; +} +#endif extern void cf_check spinlock_profile_printall(unsigned char key); extern void cf_check spinlock_profile_reset(unsigned char key); From patchwork Wed Mar 12 04:06:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012846 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 74657C2BA1B for ; Wed, 12 Mar 2025 04:10:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909735.1316660 (Exim 4.92) (envelope-from ) id 1tsDQR-0004Qh-N6; Wed, 12 Mar 2025 04:10:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909735.1316660; Wed, 12 Mar 2025 04:10: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 1tsDQR-0004Qa-JC; Wed, 12 Mar 2025 04:10:35 +0000 Received: by outflank-mailman (input) for mailman id 909735; Wed, 12 Mar 2025 04:10:34 +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 1tsDNT-0007Fd-JX for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:31 +0000 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20604.outbound.protection.outlook.com [2a01:111:f403:2413::604]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8266893c-fef7-11ef-9ab9-95dc52dad729; Wed, 12 Mar 2025 05:07:28 +0100 (CET) Received: from BN9PR03CA0514.namprd03.prod.outlook.com (2603:10b6:408:131::9) by SJ1PR12MB6100.namprd12.prod.outlook.com (2603:10b6:a03:45d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:18 +0000 Received: from BN1PEPF00005FFF.namprd05.prod.outlook.com (2603:10b6:408:131:cafe::fa) by BN9PR03CA0514.outlook.office365.com (2603:10b6:408:131::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.21 via Frontend Transport; Wed, 12 Mar 2025 04:07:18 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFF.mail.protection.outlook.com (10.167.243.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:07:14 -0500 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: 8266893c-fef7-11ef-9ab9-95dc52dad729 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fUkY/skRs6AhGNh00ue+kH0S0YIvqFB4j90+SU/hqO18gOjFxXuIiHo0oP5cyLILuJb7A56dekIvNb3dSiHsIwtsSYYLQHGg8gT0BUketZo11ZgQgBoxUs6gfuW8iLUrb7iGpYiDTHAF/Caq1gYQM196GhXfhvKpStxP8234O7dirJZSUok0riAXoqBqchi2TXucHRssTY00ErF+7+z0RAxtyvIILAqytRbfv6bSgM0KGHN6rtWeqa2Zmf+Zxe+gkLNrCzD71waaOk59gWOym8Hw3/zuIEH4uKgjSn8YkrtlYnFrNNSbUCaXDyUnSpBsx0VlYTk8b3+xiqYbr+UdzA== 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=wAni3E/lzkFT7UKJjTjPYxJbfFgXKFTWJ3maGSuPevQ=; b=YAuEoKgXf1qsdUOFtwhPS7lWqzBOsvgdfgd4KgF4teVyGMTILDrrl3HeJcMNTNjTAImKukkyhVoDbtR2OOZUAfHYHCMCT7fe3zbUbXO3ttNjhzrrxMv51EkgEuOi+e9pgcjF/0r9D4Nl9wV+CxCPcntMqBQlLLL01A5vigdj00XsNVFH00qgty0fGGQihv38waTntdPjCIrOGkWhz0ERHP/SRSVhqae6lWXbtPVGs5vQJB4drQFbTmnziDinalgKc9FFsoNatWGOshfRZdCMghtBxZUmLKyPzbsG29G30jrhQQO5yckcoEHsc4fciAN4+3V/v+R+rZZ87NfxXdQdDg== 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=wAni3E/lzkFT7UKJjTjPYxJbfFgXKFTWJ3maGSuPevQ=; b=QW1ZEqG1PQEHNkoitMyXYoScDDgR9Hszifea8gRhDo+GVK6bcbYuftyTiu2U6dN/AWlpb9qCIvRpwuzJigAVgnBlds0+/CgGrLHMuAZ/3vn40KkPmTG6M+Zbuig0xGToVFWUlxc3JwrCtJILqIu7bW5F8jn3IEyn1Nok7yeP6sY= 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 (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_Pau_Monn=C3=A9?= , Anthony PERARD , Michal Orzel , "Julien Grall" , Stefano Stabellini Subject: [PATCH v1 08/19] xen/sysctl: introduce CONFIG_PM_STATISTIC Date: Wed, 12 Mar 2025 12:06:21 +0800 Message-ID: <20250312040632.2853485-9-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFF:EE_|SJ1PR12MB6100:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d27497d-4eed-495c-b16a-08dd611b6146 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: t2ArOlywby/dwokjwXLLogmSr8kEl+2fh+CvPQSM1ScEpWv/cNjgnQvZMV7fHQmAYjjqB5QqVeNPQGka9rV/XlyVCccBXVWc8oh7BTURJZ+dL3YzKACnT3lEnW8wjzZ94tEv1NBdqABHqw+tc+6RtZn5xmdINBoxGQ/Hl/uN+JPk9Meoq+qMy3ECQxmGhIqeD2HJMHEQlyj+b7lkhN7Wg8gvQjUtf8xHmIQGBguzXT5SwYKu6yNICZoZpxf2rR2fzQXNv0R9hHxBEn5Qt9emgagkVmmsrTbz8pK+j6TjvNs7a1OxkROtpUQXkg9QO8mGKl12+RiPBb+YFWDc1Tq6nRYDM5hD1s/CJw11d6V2ME1tUdrj9WB5LPrpBL8xSzmjhJMu3VgU1F6c7SNwdlzizFDz0TcoTZFWaXWXKuimgWPF2cCsjlj9kNNPXI7y53U1MgIr7PfT3sCnIUN00kcvqu5+cOij/2TZDcLahpKJz1e0irbjLsMakfNs3VLWnv4dgt1vaJNIKJXpFzcGmVDBMClLK0U2fBKifRkaIQv8t+8XtqiR4VIHX4i4OiTA5FKzFu7glwjQpIoOBspekL02BS6xWNfE1ssizZZXONvfXHBP/8xpv/kf1qYI1N9+rPgg/Dqy4y3kfEPIG1bo/WZgcOVIuMfEhUlJim2AKJQPug8TzqqNDuatom8atZhabl53MeNu6nVefGDrIkNuhwr6Qt3fDx/M765FkATDKTd1w21GOQshVCVXJeE47VJlB1CZ/UcTMF3WIi6Mk71tEAMy0sSZNYrOwVze65F1ATPJYs/6ecFcUgJSVklwSsFZuIrF1IVblD5PHIWJ7wCtJ48slypV3NwLJTZ6DTxwMY5ziyvCWToOQ28FVkM7A/xHQfLHEwCUNbA2qijgVKZqMAS8yo/nDaMMgPcozw8oI9VDO9RXhZzRlP/MUibKDW9xydwToP/sZGVF+YS/qZdnwaWhEhYajOxcwi2PAEXDpXAUemkEN8UZGOJFnT/0GpepS2H73CMyOC25VNDx1XdFtg8u3Iz5lua+1J8CTXAzHCvKpUv3WB+4SXeZ5I+6itUSUjFFTBIccyZct87mQcGnVQCbl61hkO4wLBMO+iAlFZQOlczBwXiKnUzJFrKuxzax7twNHEJUNypjzmha5JDViQdS8LLwBCp+Tx6W4bGiptBcRr9PUEMKmqLy++n4iN0LyI54qONfTRJMu0PqMESpW1y6b/M/Sz5w6reoFiKdiwX4N6A5bG0iNtP5UlweFuWJr17Z22nnYUCP4+DXjhH4mieQpsl3gr3jmazZ0el/Zn6qeYpBbQM2i++s/TYhx/wYhhSIEY58ihXKRkmo9nbtHrnrln4ESzvmIAEQJlhWUVIsCa4kiYr/HwmHYEFNBFYks724eCjQkAXWoAVvUDKU+XAdv9uT1LWryZYpNO/QBwGLQqSVH1+0kGnokfb4pUpgoi/+KLOyyjK6F1LlD41xpYNTJ+xy5i+baPZbJhL8rWKAesw= 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)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:17.9887 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d27497d-4eed-495c-b16a-08dd611b6146 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: BN1PEPF00005FFF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6100 This commit introduces CONFIG_PM_STATISTIC for wrapping all operations regarding performance management statistic operations. The major codes reside in xen/drivers/acpi/pmstat.c, including two main pm-related sysctl op: do_get_pm_info() and do_pm_op(). Signed-off-by: Penny Zheng --- xen/arch/x86/acpi/cpu_idle.c | 2 + xen/arch/x86/acpi/cpufreq/hwp.c | 6 + xen/arch/x86/acpi/cpufreq/powernow.c | 4 + xen/common/Kconfig | 5 + xen/common/sysctl.c | 4 +- xen/drivers/acpi/Makefile | 2 +- xen/drivers/acpi/pmstat.c | 192 ++++++++++++++++--- xen/drivers/cpufreq/cpufreq.c | 31 +++ xen/drivers/cpufreq/cpufreq_misc_governors.c | 2 + xen/drivers/cpufreq/cpufreq_ondemand.c | 2 + xen/drivers/cpufreq/utility.c | 164 +--------------- xen/include/acpi/cpufreq/cpufreq.h | 6 + xen/include/acpi/cpufreq/processor_perf.h | 12 +- xen/include/xen/acpi.h | 2 + xen/include/xen/pmstat.h | 2 + 15 files changed, 238 insertions(+), 198 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 420198406d..9ea52def42 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1487,6 +1487,7 @@ static void amd_cpuidle_init(struct acpi_processor_power *power) vendor_override = -1; } +#ifdef CONFIG_PM_STATISTIC uint32_t pmstat_get_cx_nr(unsigned int cpu) { return processor_powers[cpu] ? processor_powers[cpu]->count : 0; @@ -1606,6 +1607,7 @@ int pmstat_reset_cx_stat(unsigned int cpu) { return 0; } +#endif /* CONFIG_PM_STATISTIC */ void cpuidle_disable_deep_cstate(void) { diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c index d5fa3d47ca..d1309e3e0a 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; } +#ifdef CONFIG_PM_STATISTIC /* * 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 least @@ -508,6 +509,7 @@ static int cf_check hwp_cpufreq_update(unsigned int cpu, struct cpufreq_policy * return per_cpu(hwp_drv_data, cpu)->ret; } +#endif /* CONFIG_PM_STATISTIC */ static const struct cpufreq_driver __initconst_cf_clobber hwp_cpufreq_driver = { @@ -516,9 +518,12 @@ hwp_cpufreq_driver = { .target = hwp_cpufreq_target, .init = hwp_cpufreq_cpu_init, .exit = hwp_cpufreq_cpu_exit, +#ifdef CONFIG_PM_STATISTIC .update = hwp_cpufreq_update, +#endif }; +#ifdef CONFIG_PM_STATISTIC 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, return hwp_cpufreq_target(policy, 0, 0); } +#endif /* CONFIG_PM_STATISTIC */ int __init hwp_register_driver(void) { diff --git a/xen/arch/x86/acpi/cpufreq/powernow.c b/xen/arch/x86/acpi/cpufreq/powernow.c index 69364e1855..0cdeeef883 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); } +#ifdef CONFIG_PM_STATISTIC static void cf_check update_cpb(void *data) { struct cpufreq_policy *policy = data; @@ -77,6 +78,7 @@ static int cf_check powernow_cpufreq_update( return 0; } +#endif /* CONFIG_PM_STATISTIC */ static int cf_check powernow_cpufreq_target( struct cpufreq_policy *policy, @@ -324,7 +326,9 @@ powernow_cpufreq_driver = { .target = powernow_cpufreq_target, .init = powernow_cpufreq_cpu_init, .exit = powernow_cpufreq_cpu_exit, +#ifdef CONFIG_PM_STATISTIC .update = powernow_cpufreq_update +#endif }; unsigned int __init powernow_register_driver(void) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index c5f4192b60..ffc6b9d4df 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -107,6 +107,11 @@ config NEEDS_LIBELF config NUMA bool +config PM_STATISTIC + bool "Enable Performance Management Statistic Operations" + depends on ACPI && HAS_CPUFREQ + default y + config STATIC_MEMORY bool "Static Allocation Support (UNSUPPORTED)" if UNSUPPORTED depends on DOM0LESS_BOOT diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index c2d99ae12e..3d605633cc 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_sysctl) op->u.availheap.avail_bytes <<= PAGE_SHIFT; break; -#if defined (CONFIG_ACPI) && defined (CONFIG_HAS_CPUFREQ) +#ifdef CONFIG_PM_STATISTIC case XEN_SYSCTL_get_pmstat: ret = do_get_pm_info(&op->u.get_pmstat); break; @@ -180,7 +180,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) if ( ret == -EAGAIN ) copyback = 1; break; -#endif +#endif /* CONFIG_PM_STATISTIC */ case XEN_SYSCTL_page_offline_op: { diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile index 2fc5230253..70156ee0a4 100644 --- a/xen/drivers/acpi/Makefile +++ b/xen/drivers/acpi/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_X86) += apei/ obj-bin-y += tables.init.o obj-$(CONFIG_ACPI_NUMA) += numa.o obj-y += osl.o -obj-$(CONFIG_HAS_CPUFREQ) += pmstat.o +obj-$(CONFIG_PM_STATISTIC) += pmstat.o obj-$(CONFIG_X86) += hwregs.o obj-$(CONFIG_X86) += reboot.o diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index df309e27b4..58cccd589b 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -43,6 +43,167 @@ DEFINE_PER_CPU_READ_MOSTLY(struct pm_px *, cpufreq_statistic_data); +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 = per_cpu(cpufreq_statistic_data, cpu); + + total_idle_ns = get_cpu_idle_time(cpu); + now = NOW(); + + delta = (now - pxpt->prev_state_wall) - + (total_idle_ns - pxpt->prev_idle_wall); + + if ( likely(delta >= 0) ) + pxpt->u.pt[state].residency += delta; + + pxpt->prev_state_wall = now; + pxpt->prev_idle_wall = total_idle_ns; +} + +void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) +{ + struct pm_px *pxpt; + struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = + &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( !pxpt || !pmpt ) { + spin_unlock(cpufreq_statistic_lock); + return; + } + + pxpt->u.last = from; + pxpt->u.cur = 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 = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock_init(cpufreq_statistic_lock); + + if ( !pmpt ) + return -EINVAL; + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( pxpt ) { + spin_unlock(cpufreq_statistic_lock); + return 0; + } + + count = pmpt->perf.state_count; + + pxpt = xzalloc(struct pm_px); + if ( !pxpt ) { + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + per_cpu(cpufreq_statistic_data, cpu) = pxpt; + + pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); + if (!pxpt->u.trans_pt) { + xfree(pxpt); + spin_unlock(cpufreq_statistic_lock); + return -ENOMEM; + } + + pxpt->u.pt = 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 = pmpt->perf.state_count; + pxpt->u.usable = pmpt->perf.state_count - pmpt->perf.platform_limit; + + for (i=0; i < pmpt->perf.state_count; i++) + pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; + + pxpt->prev_state_wall = NOW(); + pxpt->prev_idle_wall = 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 = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = 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) = NULL; + + spin_unlock(cpufreq_statistic_lock); +} + +static void cpufreq_statistic_reset(unsigned int cpu) +{ + uint32_t i, j, count; + struct pm_px *pxpt; + const struct processor_pminfo *pmpt = processor_pminfo[cpu]; + spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); + + spin_lock(cpufreq_statistic_lock); + + pxpt = per_cpu(cpufreq_statistic_data, cpu); + if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) { + spin_unlock(cpufreq_statistic_lock); + return; + } + + count = pmpt->perf.state_count; + + for (i=0; i < count; i++) { + pxpt->u.pt[i].residency = 0; + pxpt->u.pt[i].count = 0; + + for (j=0; j < count; j++) + *(pxpt->u.trans_pt + i*count + j) = 0; + } + + pxpt->prev_state_wall = NOW(); + pxpt->prev_idle_wall = get_cpu_idle_time(cpu); + + spin_unlock(cpufreq_statistic_lock); +} + /* * Get PM statistic info */ @@ -522,34 +683,3 @@ int do_pm_op(struct xen_sysctl_pm_op *op) 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 = -EFAULT; - else if ( bits[0] != ACPI_PDC_REVISION_ID || !bits[1] ) - ret = -EINVAL; - else if ( copy_from_guest_offset(bits + 2, pdc, 2, 1) ) - ret = -EFAULT; - else - { - u32 mask = 0; - - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_CX ) - mask |= ACPI_PDC_C_MASK | ACPI_PDC_SMP_C1PT; - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_PX ) - mask |= ACPI_PDC_P_MASK | ACPI_PDC_SMP_C1PT; - if ( xen_processor_pmbits & XEN_PROCESSOR_PM_TX ) - mask |= ACPI_PDC_T_MASK | ACPI_PDC_SMP_C1PT; - bits[2] &= (ACPI_PDC_C_MASK | ACPI_PDC_P_MASK | ACPI_PDC_T_MASK | - ACPI_PDC_SMP_C1PT) & ~mask; - ret = arch_acpi_set_pdc_bits(acpi_id, bits, mask); - } - if ( !ret && __copy_to_guest_offset(pdc, 2, bits + 2, 1) ) - ret = -EFAULT; - - return ret; -} diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c index 4a103c6de9..29fcfbe609 100644 --- a/xen/drivers/cpufreq/cpufreq.c +++ b/xen/drivers/cpufreq/cpufreq.c @@ -582,6 +582,37 @@ out: 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 = -EFAULT; + else if ( bits[0] != ACPI_PDC_REVISION_ID || !bits[1] ) + ret = -EINVAL; + else if ( copy_from_guest_offset(bits + 2, pdc, 2, 1) ) + ret = -EFAULT; + else + { + u32 mask = 0; + + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_CX ) + mask |= ACPI_PDC_C_MASK | ACPI_PDC_SMP_C1PT; + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_PX ) + mask |= ACPI_PDC_P_MASK | ACPI_PDC_SMP_C1PT; + if ( xen_processor_pmbits & XEN_PROCESSOR_PM_TX ) + mask |= ACPI_PDC_T_MASK | ACPI_PDC_SMP_C1PT; + bits[2] &= (ACPI_PDC_C_MASK | ACPI_PDC_P_MASK | ACPI_PDC_T_MASK | + ACPI_PDC_SMP_C1PT) & ~mask; + ret = arch_acpi_set_pdc_bits(acpi_id, bits, mask); + } + if ( !ret && __copy_to_guest_offset(pdc, 2, bits + 2, 1) ) + ret = -EFAULT; + + return ret; +} + static void cpufreq_cmdline_common_para(struct cpufreq_policy *new_policy) { if (usr_max_freq) diff --git a/xen/drivers/cpufreq/cpufreq_misc_governors.c b/xen/drivers/cpufreq/cpufreq_misc_governors.c index 0327fad23b..efdc954a4e 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; } +#ifdef CONFIG_PM_STATISTIC 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, unsigned int freq) return __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L); } +#endif /* CONFIG_PM_STATISTIC */ 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/cpufreq_ondemand.c index 06cfc88d30..ec1e605a59 100644 --- a/xen/drivers/cpufreq/cpufreq_ondemand.c +++ b/xen/drivers/cpufreq/cpufreq_ondemand.c @@ -57,6 +57,7 @@ static struct dbs_tuners { static DEFINE_PER_CPU(struct timer, dbs_timer); +#ifdef CONFIG_PM_STATISTIC 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, return 0; } +#endif /* CONFIG_PM_STATISTIC */ 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 e690a484f1..2eb3314694 100644 --- a/xen/drivers/cpufreq/utility.c +++ b/xen/drivers/cpufreq/utility.c @@ -35,168 +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); -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 = per_cpu(cpufreq_statistic_data, cpu); - - total_idle_ns = get_cpu_idle_time(cpu); - now = NOW(); - - delta = (now - pxpt->prev_state_wall) - - (total_idle_ns - pxpt->prev_idle_wall); - - if ( likely(delta >= 0) ) - pxpt->u.pt[state].residency += delta; - - pxpt->prev_state_wall = now; - pxpt->prev_idle_wall = total_idle_ns; -} - -void cpufreq_statistic_update(unsigned int cpu, uint8_t from, uint8_t to) -{ - struct pm_px *pxpt; - struct processor_pminfo *pmpt = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = - &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( !pxpt || !pmpt ) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - pxpt->u.last = from; - pxpt->u.cur = 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 = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock_init(cpufreq_statistic_lock); - - if ( !pmpt ) - return -EINVAL; - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( pxpt ) { - spin_unlock(cpufreq_statistic_lock); - return 0; - } - - count = pmpt->perf.state_count; - - pxpt = xzalloc(struct pm_px); - if ( !pxpt ) { - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - per_cpu(cpufreq_statistic_data, cpu) = pxpt; - - pxpt->u.trans_pt = xzalloc_array(uint64_t, count * count); - if (!pxpt->u.trans_pt) { - xfree(pxpt); - spin_unlock(cpufreq_statistic_lock); - return -ENOMEM; - } - - pxpt->u.pt = 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 = pmpt->perf.state_count; - pxpt->u.usable = pmpt->perf.state_count - pmpt->perf.platform_limit; - - for (i=0; i < pmpt->perf.state_count; i++) - pxpt->u.pt[i].freq = pmpt->perf.states[i].core_frequency; - - pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = 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 = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = 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) = 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 = processor_pminfo[cpu]; - spinlock_t *cpufreq_statistic_lock = &per_cpu(cpufreq_statistic_lock, cpu); - - spin_lock(cpufreq_statistic_lock); - - pxpt = per_cpu(cpufreq_statistic_data, cpu); - if ( !pmpt || !pxpt || !pxpt->u.pt || !pxpt->u.trans_pt ) { - spin_unlock(cpufreq_statistic_lock); - return; - } - - count = pmpt->perf.state_count; - - for (i=0; i < count; i++) { - pxpt->u.pt[i].residency = 0; - pxpt->u.pt[i].count = 0; - - for (j=0; j < count; j++) - *(pxpt->u.trans_pt + i*count + j) = 0; - } - - pxpt->prev_state_wall = NOW(); - pxpt->prev_idle_wall = get_cpu_idle_time(cpu); - - spin_unlock(cpufreq_statistic_lock); -} - - /********************************************************************* * FREQUENCY TABLE HELPERS * *********************************************************************/ @@ -386,6 +224,7 @@ int cpufreq_driver_getavg(unsigned int cpu, unsigned int flag) return policy->cur; } +#ifdef CONFIG_PM_STATISTIC int cpufreq_update_turbo(unsigned int cpu, int new_state) { struct cpufreq_policy *policy; @@ -417,6 +256,7 @@ int cpufreq_update_turbo(unsigned int cpu, int new_state) return ret; } +#endif /* CONFIG_PM_STATISTIC */ int cpufreq_get_turbo_status(unsigned int cpu) diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h index a3c84143af..bfef9bb523 100644 --- a/xen/include/acpi/cpufreq/cpufreq.h +++ b/xen/include/acpi/cpufreq/cpufreq.h @@ -167,7 +167,9 @@ struct cpufreq_driver { int (*init)(struct cpufreq_policy *policy); int (*verify)(struct cpufreq_policy *policy); int (*setpolicy)(struct cpufreq_policy *policy); +#ifdef CONFIG_PM_STATISTIC int (*update)(unsigned int cpu, struct cpufreq_policy *policy); +#endif int (*target)(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation); @@ -238,6 +240,7 @@ struct cpu_dbs_info_s { int8_t stoppable; }; +#ifdef CONFIG_PM_STATISTIC int get_cpufreq_ondemand_para(uint32_t *sampling_rate_max, uint32_t *sampling_rate_min, uint32_t *sampling_rate, @@ -246,6 +249,7 @@ int write_ondemand_sampling_rate(unsigned int sampling_rate); int write_ondemand_up_threshold(unsigned int up_threshold); int write_userspace_scaling_setspeed(unsigned int cpu, unsigned int freq); +#endif /* CONFIG_PM_STATISTIC */ void cpufreq_dbs_timer_suspend(void); void cpufreq_dbs_timer_resume(void); @@ -270,10 +274,12 @@ bool hwp_active(void); static inline bool hwp_active(void) { return false; } #endif +#ifdef CONFIG_PM_STATISTIC int get_hwp_para(unsigned int cpu, struct xen_cppc_para *cppc_para); int set_hwp_para(struct cpufreq_policy *policy, struct xen_set_cppc_para *set_cppc); +#endif /* CONFIG_PM_STATISTIC */ int acpi_cpufreq_register(void); diff --git a/xen/include/acpi/cpufreq/processor_perf.h b/xen/include/acpi/cpufreq/processor_perf.h index 301104e16f..2f5a4d2b7b 100644 --- a/xen/include/acpi/cpufreq/processor_perf.h +++ b/xen/include/acpi/cpufreq/processor_perf.h @@ -9,11 +9,19 @@ 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); +#ifdef CONFIG_PM_STATISTIC 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); +#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_STATISTIC */ int cpufreq_limit_change(unsigned int cpu); diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index bc4818c943..0bbbc3c15d 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -158,6 +158,7 @@ int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); extern unsigned int max_cstate; extern unsigned int max_csubstate; +#ifdef CONFIG_PM_STATISTIC static inline unsigned int acpi_get_cstate_limit(void) { return max_cstate; @@ -177,6 +178,7 @@ static inline void acpi_set_csubstate_limit(unsigned int new_limit) { max_csubstate = new_limit; } +#endif /* CONFIG_PM_STATISTIC */ #else static inline unsigned int acpi_get_cstate_limit(void) { return 0; } diff --git a/xen/include/xen/pmstat.h b/xen/include/xen/pmstat.h index 8350403e95..ad72665025 100644 --- a/xen/include/xen/pmstat.h +++ b/xen/include/xen/pmstat.h @@ -15,11 +15,13 @@ struct compat_processor_power; long compat_set_cx_pminfo(uint32_t acpi_id, struct compat_processor_power *power); #endif +#ifdef CONFIG_PM_STATISTIC uint32_t pmstat_get_cx_nr(unsigned int cpu); int pmstat_get_cx_stat(unsigned int cpu, struct pm_cx_stat *stat); int pmstat_reset_cx_stat(unsigned int cpu); int do_get_pm_info(struct xen_sysctl_get_pmstat *op); int do_pm_op(struct xen_sysctl_pm_op *op); +#endif /* CONFIG_PM_STATISTIC */ #endif /* __XEN_PMSTAT_H_ */ From patchwork Wed Mar 12 04:06:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012849 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4B4F5C28B28 for ; Wed, 12 Mar 2025 04:10:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909783.1316716 (Exim 4.92) (envelope-from ) id 1tsDQf-0006nT-C3; Wed, 12 Mar 2025 04:10:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909783.1316716; Wed, 12 Mar 2025 04:10:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDQf-0006mn-0P; Wed, 12 Mar 2025 04:10:49 +0000 Received: by outflank-mailman (input) for mailman id 909783; Wed, 12 Mar 2025 04:10:48 +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 1tsDNS-0007Fd-JK for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:30 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20631.outbound.protection.outlook.com [2a01:111:f403:2417::631]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 825a1573-fef7-11ef-9ab9-95dc52dad729; Wed, 12 Mar 2025 05:07:28 +0100 (CET) Received: from BN9PR03CA0663.namprd03.prod.outlook.com (2603:10b6:408:10e::8) by PH7PR12MB5784.namprd12.prod.outlook.com (2603:10b6:510:1d3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:20 +0000 Received: from BN1PEPF00006003.namprd05.prod.outlook.com (2603:10b6:408:10e:cafe::74) by BN9PR03CA0663.outlook.office365.com (2603:10b6:408:10e::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Wed, 12 Mar 2025 04:07:20 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006003.mail.protection.outlook.com (10.167.243.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:07:17 -0500 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: 825a1573-fef7-11ef-9ab9-95dc52dad729 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B+n53j4bARuUSWHHQgVc1V3AaS6LoxRAU3r23v/IbGMGdNtzjVhVtMCRAd6DmzB5FJ0QQyB6pgMl1Yey1BcGsyZBAtUswORElELuucKI/5nHu9vCT7up2g8By2VlRqf8GjDCQ6BDc2m/5/ASpWaM+Vr+4ks1znoNYdgEFaEAc9zweRGz0TadYsQOP0HSSK0ouSuJbW56S1D2ZRH1rq2TSFFvYmqR59xTcTw8HQdpfl+i+bJISa60VmKgV2fLjexYOVmmtU2/RY48cjc3AVNVd83a7DcGYHMm6XhXbvfE5RU37pRX4K2pmW7b63aPBC0fUhKcav0zhatTTzjjzF56MA== 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=DLEI3G0mdFjl3RZdhIhDB4K+LruSLZL23++Ti9uAVpY=; b=nosc/o+i+GfMnwj2CM2Ag73OQ/73nUfQJASvHcaKq40BcNfe1ubufJphDuwdzqmBhlt78/lTC9SY70qUkaQMPxGHKYVuZoDvtfmzleZzhzEXldnHUPfr+X7HokK46YylyLX9l54HYymKAvG3ygHJu41UeTdciXYi+gure7afo2LLdpp9vLIjp26WNtULK5S5Tu8pgesTP0juz6xYKGoFgF5Emkm2E5vdQcfmbZmYbdArSGLEjwhoR8K9jKf5Gq8OxTUCUlqz/qP2jY3ydbdwukUQ9Z7c4KHKslJW1S8OBfHaeW1WTniEgDmks7qTymDBgGkseoWRcvM+mvAvK9lc7w== 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=DLEI3G0mdFjl3RZdhIhDB4K+LruSLZL23++Ti9uAVpY=; b=nYmBK9zV0MKZ5ZOIiUSt+FrxZ/8Dysn6kkRAzILnk84UuqbASdj4tZ71vWKqNlGc3R0Fdqw5/rARf2GF6o2DyopnMwMkZQeCwgrmvaD00iI1UK1RFBTkbgjkMb8x9Vz2qvfiKB1fLGG2fQD2uBO7lMV40T5UyVzURxuSrjZWntA= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 09/19] xen/sysctl: make CONFIG_PM_STATISTIC depend on CONFIG_SYSCTL Date: Wed, 12 Mar 2025 12:06:22 +0800 Message-ID: <20250312040632.2853485-10-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006003:EE_|PH7PR12MB5784:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a89c8d5-8616-4d1b-7ba0-08dd611b62de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: GaoW1+qMbFaTXNg3rqSIx9cDvVI7CmlB6GRK2RjWu5mdKeqaZlmgAr1VAiHNd6Lg7/CMOU8wE8MgyYCH8Zplnkt0462NlEOt7XPIH6+zVuN9MFDzfvL/ylCM2ietKOrMouXrIu68q79+/tFJWds95oRlnQX2US1DmVKsG1Fn3wq2431hMfMoxTc0siQUh2WxmNgiCkZian2S9k4n4PgmF2Bp+y9SG6CtZQ7PHW7qPD0gFu4zNzBSlcna7NCE7IIljkhEs6vti21MC8kKKciRvuBWTo40PPz6utVR+j3wndwKtc5yw6NtCrwl0XYjqkKU8jk/jZLWU+/Itxm9Nh2w4eWo6A5MVkGInK2/AVgBQRe2w7J8mA2OGrym6vZyGhW3JZAcBuKJG6h+8qiZvBpUbtyTcrOxFITVFGkYBQlYHwFn6MPvSMvYXR+zQ9xC0bCGmGomwvQ3p10ATujxoCTu3KN72hXywz+cYfHmLmp1ulLQc5wAFGbeX7hdgQRiXrfx5u2xV0HxxqkcgbM+KbOeFqW1EMt+yQ8VaVUhBB3T+0ltPIWvVDmARFQ3zHmwl0tHEZvWvkvydv58kX67UJ+gBa/nFbBNYohngEnTj90ADIg45+qO87a8F2M5hEk10KwaAmrOZko1NHfps6soF7IBMo5gxXz2hreHcDQiCvTrhZFddu304bljAx5hS++lzxR/8+w/1rjVebW5M7Yqq7jI0lJmf9DOx/ZCGONhoR34GpFdyX20e0CsTW3rI2iyZxsHp9G5ltVqEL3wCNueOH6+nVV4HHRELcG4RbbdbAq1lnbqOvNrpTK+XlnTkrJ5ejTj7kxIL90AByIxQKgfZ1J5/QH7XnLWEz4F5cC9/XQE4R/qpjxGUfHeEAThqDmAvxXZY46duSszQA4elf4mq0NBrMYmT2PHJ16fJlZEGV9ww/GSOtmDG5fjv5JlnhGhVo37UiSoULc2TT1hqLCKDof7MJGwPxnbAe1D4tX6b7WQ6wUBmNDxBxfIyRyTBvNse6C+jvuzHpMub6KB/KGwd0E8bJ8rSJTk5fFd1AHcQBAMO7WNWfvS1qc7DXZOpt5mOmA58SgY9GrBBI9EaAeIOXjmqwPOSWaX7oME+WpPItpt1KO9QkDc+28oG4n4GgMmWs1Rb8MkUbFVXlMGbMdbFYiZJp1ELql0wyOB1N820qleJsYMAPT9HRTqzmx7zQc7iTrvs2231GA8bKvBlFxSdwHKAXy9Hxjvfv15JZm/52YpEliYA4gqap7fAKXpbTxFJFgDrWOo8JkRyr4BBe+ONCZg3Q8vMQDDI1Ja9c+ubS9jXqCgPVfWkfcYzb8h9z04ClmgjMB/PqhoJFcLGLkmhhpN42fAvOb+Jg0st+9d83mk/UPPAoz6eYlGTK9wetf0SSnmgS9BaFZLfGnCKjExyRgJeSchvANLlBdGfPnWS+HwUQ0fUWC5rS+RhuKQSegZIDVxBHEGf0lYwNUn8tjJx8hyp/70l8R2obZzlOY0B1uHKyY= 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)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:20.6612 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a89c8d5-8616-4d1b-7ba0-08dd611b62de 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: BN1PEPF00006003.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5784 Signed-off-by: Penny Zheng --- xen/common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index ffc6b9d4df..fbaca097ff 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -109,7 +109,7 @@ config NUMA config PM_STATISTIC bool "Enable Performance Management Statistic Operations" - depends on ACPI && HAS_CPUFREQ + depends on ACPI && HAS_CPUFREQ && SYSCTL default y config STATIC_MEMORY From patchwork Wed Mar 12 04:06:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012843 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9FBCC28B30 for ; Wed, 12 Mar 2025 04:10:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909732.1316651 (Exim 4.92) (envelope-from ) id 1tsDQQ-000489-Gg; Wed, 12 Mar 2025 04:10:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909732.1316651; Wed, 12 Mar 2025 04:10:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDQQ-00047j-Ae; Wed, 12 Mar 2025 04:10:34 +0000 Received: by outflank-mailman (input) for mailman id 909732; Wed, 12 Mar 2025 04:10:33 +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 1tsDNT-0006o2-75 for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:31 +0000 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2060b.outbound.protection.outlook.com [2a01:111:f403:2412::60b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 836ad4be-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:29 +0100 (CET) Received: from BN9PR03CA0682.namprd03.prod.outlook.com (2603:10b6:408:10e::27) by LV8PR12MB9691.namprd12.prod.outlook.com (2603:10b6:408:295::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:23 +0000 Received: from BN1PEPF00006003.namprd05.prod.outlook.com (2603:10b6:408:10e:cafe::f6) by BN9PR03CA0682.outlook.office365.com (2603:10b6:408:10e::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Wed, 12 Mar 2025 04:07:23 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006003.mail.protection.outlook.com (10.167.243.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:23 +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; Tue, 11 Mar 2025 23:07:20 -0500 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: 836ad4be-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qdfbVYZ36h95D6hcBPFiCMeJafIiaRN7AF+VmXXx2qc7/S3WPpi93cvbqb05zLZ6j7GddcyESYrIQb3Z+KTjSv9pkp6gDuVwQVjmgjjmrub6TzYTGtKTr0aFzDRR0Hh+LjA6Aov0lTPz6b3sDyPcPfkLpxtWoPfPtQkpcGAOS2Sqz05ZaOLeK0W6SEu3Jce0i4HS3ZuCaG60rRF1cmmqNi9Dmpmvl5CjfXOj3aeg3cfg0h/NdHHIQREYr8AS1AOFwa7R3weBTpZte4j5JdQfUSDdXz2nEkJVWAC3O/NK9lA10ofov84bwEZuGE11O+nECu8bjlHGQFMweb+6M1C8rA== 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=X9zemyVNubW8PfgWJd3Mg81LIUFsZ0rkITRTvoNrtMQ=; b=FUu0OsENIwGKCMIKmn2o+xt7Y9Sm+xy5fozo8zRu4q7E2gfCl5BjE+X8lHSksYN9oixmfkDxsybnOavnhlx8NllGQaPeaA8EKj/EcmJygg9UN3/BbCzr0yAh6gwOPzAn9x3V/DNcgOjAeDoyzzINrJ7eczcXHpSTOrbVAmT1z1o95Uzy1D/cxBwywZ9rezIdxv6UWMCTk7cVDe4vVHFxTYagcLAdNbQba1xv1RTvZLR3NAfVGMhILJV5NlGEUXRXoMeXerKCUl1aRFnbzEzj8UEBgxEmjzUb5zBR8926FY/ABBjs6fNMo+So3KlrQ0cSwaFR56fRFVtPaJ/u4nOVuQ== 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=X9zemyVNubW8PfgWJd3Mg81LIUFsZ0rkITRTvoNrtMQ=; b=KvB9Hw0O886ZfWbX4+YVmU38MrkY1z0tzY6xmiF2oLsDMJm6rLPDj6oAKk6rzCqg54/5rhuO4ft0ui4PkaKv2G9Lx2T04Sw1tm551cz3ChJ7CysX9AnWyfM/ZhsDX1i4GU02j6J1CZUUXHIhPUZCAVJOXPO4ozzEU9zGKMThVNU= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 10/19] xen/page: fix return type of online_page() Date: Wed, 12 Mar 2025 12:06:23 +0800 Message-ID: <20250312040632.2853485-11-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006003:EE_|LV8PR12MB9691:EE_ X-MS-Office365-Filtering-Correlation-Id: 5cd23513-25dc-4ab8-ddb5-08dd611b6486 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: YqwuKirBPBZaATopkJ+ZEnjf9oMwSTeZucyp1Vsv8oZUYeZXBHdm4vUu/R+0B14KbrOJXXPVX4tvJ9sapj++CB754+vUmQfjy4NqC623bpbXVX3gZRDlLDli3R6+D8s4wKmMX6mNwFwGiJhiuLaNzW4SoJkFNXCdwHyiVsClSj/cKBadcSbUNcQQ0mg+bTl0v6e8ptnhLvOhpO/EzmIU5mgjNO9+pw+/XMQpzq8z1++h70ySHg70arNbswCoGSnHjTYFoO8B2lnTItKGltwZmG2G/YAz7P0EBy1fkUn59AvCgOmjySaddV9G0l82J4mJd48xbyBHLB/cSMuHyDfuRbOjb5XKjlZjg8QMLY6U1Mdh99mA9KENw/0eh/GVRjM8BeCFEqtp4mOP9GWLGv3qRgaZAWMJGvb1wHTpvRTMKKcvAWy2L1Dliv8u8+idFD8l6KXtNQanLdyytaw5kCnbl8GBUUjnsi4pzrTMP7McKchAlDYXihbHruxttif1f+1atE0UrNf2JDNNoNBwvD8a98bF9obD4sBxUqzEPIua4Mv5S0XpIvrC6gJ0hO3w4idwf3Hlx8nzzXnUQ94fTc9WQqmZdbNZ2ylGiG+dTUz87n7uS6ffwWVd0/AKNbFAaZXz6iYcSZhLnKKTem0Y4x4aUWj61AdjNgyE/l1pTjHNGCDTfB5wmNjMAhWXscKPM1KEWr6dehF5tu6ZEtsdCGSdzlDusF+bcersT0FOl387tAFOlrfaI0SV5S3kav6wx8DGplBjKlyBDHxtHCit0zA08NtMX1mSimvxPWB3JO/bMFOE973EoEgPIxIZlX0/nSAZ0U1E0li5n0UKIb9fteDMPvegDPCt6QR7ouoJC/9MdKdOmdS2gQzsWi0JXqeVDkyICn8mS5kl2IAyyPAfGDK3iAuz6DC6ud/2G0TpmFANBkhpZjqNt4Seh5WBOuX+n+sxNMPnNNdwnwSaQbxP5BaUzInrj3lSc+TR/HLAmB2CoGs5tVPrAD1/OeNt2MmXis4towF+vzYGINFDy3HKr9xg/wXsYZM9l9ymH+k8O+8mQ0/bXougRtLMb9u59cUj0Tz543sV/rHO94hbsa7aoaevKjx0yBhUuIr9vuRyZiZciz7jTrWqErdjtk6uaJdtyxcDn9pZnrTBFtO8aeaHSZuJaSRIFp6cA5itOHEDJ/NAGS6LMmzgdDm/uLQinrL4CMXQhh7ZFcOsRNPYuG2uB/pR7YsTGjk8nQBpHHTKCe6vlu3mVg+n6VSU3g8QvAqfRsz2wFsOzNzM9kCfI31/WyhUlV2RraI0snIfoXjNthLzCR9EOZKRV5UEcQRlQJv3awhSe+n7FrPX4EZo03MwRQRCVNlHNPj20nXSNJqETO915W6ykBw8ptqSn1NUcxwAdkNvKO6NZSdqqHdwmkYpZAwVgW2u3XEotAktIavhtwUow1UdN0J5MFy1zjlPPihdRCyzpmIsVtoalRRxmJrp0WGVn7wyxGmlk+yUohMj6eUmmC8= 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: 12 Mar 2025 04:07:23.4581 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5cd23513-25dc-4ab8-ddb5-08dd611b6486 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: BN1PEPF00006003.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9691 This commit fixes return type of online_page(), which shall be int to include correct error value. Signed-off-by: Penny Zheng --- xen/common/page_alloc.c | 2 +- xen/include/xen/mm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 1bf070c8c5..b5ec4bda7d 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1764,7 +1764,7 @@ int offline_page(mfn_t mfn, int broken, uint32_t *status) * The caller should make sure end_pfn <= max_page, * if not, expand_pages() should be called prior to online_page(). */ -unsigned int online_page(mfn_t mfn, uint32_t *status) +int online_page(mfn_t mfn, uint32_t *status) { unsigned long x, nx, y; struct page_info *pg; diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 16f733281a..ae1c48a615 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -144,7 +144,7 @@ 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)) -unsigned int online_page(mfn_t mfn, uint32_t *status); +int online_page(mfn_t mfn, uint32_t *status); int offline_page(mfn_t mfn, int broken, uint32_t *status); int query_page_offline(mfn_t mfn, uint32_t *status); From patchwork Wed Mar 12 04:06:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BDAA9C35FF1 for ; Wed, 12 Mar 2025 04:10:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909728.1316641 (Exim 4.92) (envelope-from ) id 1tsDQP-0003na-8E; Wed, 12 Mar 2025 04:10:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909728.1316641; Wed, 12 Mar 2025 04:10:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDQP-0003nI-2g; Wed, 12 Mar 2025 04:10:33 +0000 Received: by outflank-mailman (input) for mailman id 909728; Wed, 12 Mar 2025 04:10:32 +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 1tsDNW-0006o2-Ht for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:34 +0000 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20630.outbound.protection.outlook.com [2a01:111:f403:2416::630]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 85b290a9-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:32 +0100 (CET) Received: from BN0PR02CA0005.namprd02.prod.outlook.com (2603:10b6:408:e4::10) by BL1PR12MB5803.namprd12.prod.outlook.com (2603:10b6:208:393::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:26 +0000 Received: from BN1PEPF00006002.namprd05.prod.outlook.com (2603:10b6:408:e4:cafe::49) by BN0PR02CA0005.outlook.office365.com (2603:10b6:408:e4::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Wed, 12 Mar 2025 04:07:26 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006002.mail.protection.outlook.com (10.167.243.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:26 +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; Tue, 11 Mar 2025 23:07:22 -0500 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: 85b290a9-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zRZG8EJS2LJE1VEiiC1/2R7hoIEDm3S7xm+10f8hT6mOoOhi1fdkHqTzXRxOBCDDQHw1ABjeJ7ZC3t4baiquUJGtAAyfUW7HKzGXEBtQsxIEvrvnSJsaR0jbJOj0+ucyDIjTYlLslo3NC4JjgkHDnhngF6hyw+WayvxVRqQdeyc8Hl4l+CKQoNoDRMyBxzul/ELW+vFbS3hm+Ju2M/0JlwLFcQW13RGLSOtBnGGjw5jMNszlO6TuvXy9FxOK8n4mk95cltgFo5jV7CgH9v4HdicaWqkt40b8Tq6+1J5eI7ERKpiMBkMpE/aRdITICgU6GsZ+VMUi0cKTh3L6wDkJHA== 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=CR3SsepG3t9YxiFUsfOzjKUwTZ03/Ksnj1S8vSaXtPI=; b=UVm5xzUJvvnHH/Q1K0GsTRxCvIcG309ZI8hKhOUddv5Q7EEngU5EOQImmdqTK24jOfcUtT5Tip3sTHmz8y1cEFcR3siV/ltyityHyymiafCL5Mxn83ihRxKw+S8Izdy4svZMxXPn0AVwfs6JTUgHCh8NxutlHhViBWqfGHoRys1aOvL1qaoAquyiRp8RYKe3EFTrDR+hPwvJ8tegNHlFFWUFTA33s/LzjEV+vYlJ/bxIURbDlHbJsKPmG83t6Vpj7wF0zerXZNvpRNMgIlaEa0f/fydVadNYJdCaKSDmoozo8QryduIijDPxp2fCqTR89HBhqjXZlnz3bRCcREl3TQ== 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=CR3SsepG3t9YxiFUsfOzjKUwTZ03/Ksnj1S8vSaXtPI=; b=1WqiYDPz3pj1VLbvK+eaVvrS9vRUBw0mg+6FAh60JcGnA1wffXjAdFYPnO4r+rwax8TVnhSTfUdT0JDiE3A+Rl1miFJ5gyctTVxmXc60SYuWPNdRlLNhzeElinfRJfQUJfC1qkgBlUgQ8fHRgqd2DTFQLPD7ziM0AJVi+fPuP0A= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini , "Daniel P. Smith" Subject: [PATCH v1 11/19] xen/sysctl: wrap around XEN_SYSCTL_page_offline_op Date: Wed, 12 Mar 2025 12:06:24 +0800 Message-ID: <20250312040632.2853485-12-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006002:EE_|BL1PR12MB5803:EE_ X-MS-Office365-Filtering-Correlation-Id: 73af178c-db9a-44d1-eb12-08dd611b663f 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: rPC6YSRSvXMA43gpXw78z8cFml7gzXxNu9BQg2tWpt1VMyLMkmjc328nKHRwdQK0NRcVW59yYJ2cFFdxSxWcb5FmRZqXhHeph3Nx3xVeNzpHWfEqJwFAM1YCteYD8HIr1pEEhnEgHpXPfHT5nAXw9Z8SGxISD9eQMkkM3Q6T9hKYuqQ32jCVdG0EDvpwPSL94GA+k1AFXjpdTF4NM+2REj0GCp92+EFuFnSmOX1cbOygPqPkRlHD/HKpZDTotUdcIlqxobCNusqweJUvyh8FEYZ+U4sJLqD5B4CaFLqFBUfbHeoYNCKawxq6yTYS4QUW62JCTT0gclhhLAgwWeofU8syA5FbUVFUXG896Cm2cVXk8LUZAsGKcVMkooXJisv8AVMVYlxFF4Q4BNt4SE3XKru/4CMkppXWPmbVLElIWZ9T8v1O3zW64Za2JDlBIuCRpITMnwi+LDGH9wWd6eJa6xKjr3EtKzbEIeV3+ufSrnL4NO08Vr0c/CZGp/r5edA8kuQSOSsT1Qa0pBOx8H7gWDYvoObnfyORE2RKRqzKJc30ZQiIEKEDoQ/23tG4AD0BwLsIGWwZGQSucJ9rz4xDZony9PmESqqfGLwDVSdrwAma9UkWmCe92hi3YdJbr5tqECEWXszIVykay/Tuy6bLO2tv0PVth1+V9dfXGEP7X1sGB6ABJA0a7uPsFh2TW9K8o0n0Qo7Wyh7lB/isn8/I6zdgfSxvzcGQniuntosF5yqQnQK6zgtyHHtDGxO+TXPbTWx78w83b1T6M785i2t6OgYf+vg/l85YDCne/CDVqyuoCxcWyqVA3O5aVA54AZjs6KVgJsjz8zI8wAd+k30hJalo79Jm1Bg20vECYAPSB8WqySwQz9y20/xI3n7Byx39Rzhdr1vZ/JulTK5QtUN5u/SRCyIIrOGEHzs7nfNQ8u4+SEsTAQbKnwvsZu0iD348XnEaTmYyxMK4WzgkN7JeNIpht8Kg8faa4RVe82YdhKzIzeJTZMfTtK35o0yaYSDJ4YGjhNVNdj8gxv73tUoD6Bd8AYi+CAvfRGjNsVX2BLPSX4Wcb+uhoME09uz9u7DR2mVf8C3PppVqvMhulqX+p8tLn64ZSOlsSlFS8V6RaHeL6c9vWfByhlPSQGubSXrnEmF6NlxsENROwaAAChKVmIzEvZ+Yx+EiRE7n8d8awDCFTx6znjSiXNvguCY1LAH+XyCpZNoimBHPtwfX5xE5ZfRwycPYhXOA0B9vGbLgZNoY2B3o9hdfIlKPjbweyVpMsZ+WSMeq38IBi0qmUfSjDEZbBjJVx/2yHirVStBlNGT/W70nDWzpB4cz6YE26uABc0141uepG3MS0kBesR+MB4UI4jwUHJAvJLOhfq80WF3WdfYyXm//wHBpzwsV4VdMEqVuc5qOhTHRi3icyZXQo+eOhwF3Rh5xG4mY2ukNs3vtSlHFkodQ3hOICCmmqiXSDyDH0L6JfppPDuussw6XkhjBEKWtT82jot7YTiWaFeY= 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: 12 Mar 2025 04:07:26.3485 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 73af178c-db9a-44d1-eb12-08dd611b663f 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: BN1PEPF00006002.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5803 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 --- xen/common/page_alloc.c | 2 ++ xen/include/xen/mm.h | 13 ++++++++++++- xen/include/xsm/dummy.h | 7 +++++++ xen/include/xsm/xsm.h | 9 +++++++++ xen/xsm/dummy.c | 2 ++ xen/xsm/flask/hooks.c | 6 ++++++ 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index b5ec4bda7d..7476d37238 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1759,6 +1759,7 @@ int offline_page(mfn_t mfn, int broken, uint32_t *status) return 0; } +#ifdef CONFIG_SYSCTL /* * Online the memory. * The caller should make sure end_pfn <= max_page, @@ -1843,6 +1844,7 @@ int query_page_offline(mfn_t mfn, uint32_t *status) return 0; } +#endif /* CONFIG_SYSCTL */ /* * This function should only be called with valid pages from the same NUMA diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index ae1c48a615..86bbb15890 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -144,9 +144,20 @@ 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)) -int online_page(mfn_t mfn, uint32_t *status); int offline_page(mfn_t mfn, int broken, uint32_t *status); +#ifdef CONFIG_SYSCTL +int online_page(mfn_t mfn, uint32_t *status); int query_page_offline(mfn_t mfn, uint32_t *status); +#else +static inline int online_page(mfn_t mfn, uint32_t *status) +{ + return -EOPNOTSUPP; +} +static inline int query_page_offline(mfn_t mfn, uint32_t *status) +{ + return -EOPNOTSUPP; +} +#endif /* CONFIG_SYSCTL */ void heap_init_late(void); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 35d084aca7..5f89fc98fc 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -497,11 +497,18 @@ static XSM_INLINE int cf_check xsm_resource_setup_misc(XSM_DEFAULT_VOID) return xsm_default_action(action, current->domain, NULL); } +#ifdef CONFIG_SYSCTL static XSM_INLINE int cf_check xsm_page_offline(XSM_DEFAULT_ARG uint32_t cmd) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, NULL); } +#else +static XSM_INLINE int cf_check xsm_page_offline(XSM_DEFAULT_ARG uint32_t cmd) +{ + return -EOPNOTSUPP; +} +#endif static XSM_INLINE int cf_check xsm_hypfs_op(XSM_DEFAULT_VOID) { diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index d322740de1..d6f27aa977 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -140,7 +140,9 @@ struct xsm_ops { int (*resource_setup_gsi)(int gsi); int (*resource_setup_misc)(void); +#ifdef CONFIG_SYSCTL int (*page_offline)(uint32_t cmd); +#endif int (*hypfs_op)(void); long (*do_xsm_op)(XEN_GUEST_HANDLE_PARAM(void) op); @@ -601,10 +603,17 @@ static inline int xsm_resource_setup_misc(xsm_default_t def) return alternative_call(xsm_ops.resource_setup_misc); } +#ifdef CONFIG_SYSCTL static inline int xsm_page_offline(xsm_default_t def, uint32_t cmd) { return alternative_call(xsm_ops.page_offline, cmd); } +#else +static inline int xsm_page_offline(xsm_default_t def, uint32_t cmd) +{ + return -EOPNOTSUPP; +} +#endif static inline int xsm_hypfs_op(xsm_default_t def) { diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 4c97db0c48..aa89ee5331 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 = { .resource_setup_gsi = xsm_resource_setup_gsi, .resource_setup_misc = xsm_resource_setup_misc, +#ifdef CONFIG_SYSCTL .page_offline = xsm_page_offline, +#endif .hypfs_op = xsm_hypfs_op, .hvm_param = xsm_hvm_param, .hvm_param_altp2mhvm = xsm_hvm_param_altp2mhvm, diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7c46657d97..9819cd407d 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, RESOURCE__UNPLUG, NULL); } +#ifdef CONFIG_SYSCTL static int flask_resource_use_core(void) { return avc_current_has_perm(SECINITSID_DOMXEN, SECCLASS_RESOURCE, RESOURCE__USE, NULL); } +#endif 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, RESOURCE__SETUP, NULL); } +#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 static inline int cf_check flask_hypfs_op(void) { @@ -1948,7 +1952,9 @@ static const struct xsm_ops __initconst_cf_clobber flask_ops = { .resource_setup_gsi = flask_resource_setup_gsi, .resource_setup_misc = flask_resource_setup_misc, +#ifdef CONFIG_SYSCTL .page_offline = flask_page_offline, +#endif .hypfs_op = flask_hypfs_op, .hvm_param = flask_hvm_param, .hvm_param_altp2mhvm = flask_hvm_param_altp2mhvm, From patchwork Wed Mar 12 04:06:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012850 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3417FC28B30 for ; Wed, 12 Mar 2025 04:10:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909780.1316710 (Exim 4.92) (envelope-from ) id 1tsDQe-0006fK-LJ; Wed, 12 Mar 2025 04:10:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909780.1316710; Wed, 12 Mar 2025 04:10:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDQe-0006f1-GQ; Wed, 12 Mar 2025 04:10:48 +0000 Received: by outflank-mailman (input) for mailman id 909780; Wed, 12 Mar 2025 04:10:47 +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 1tsDNb-0006o2-Ik for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:39 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20603.outbound.protection.outlook.com [2a01:111:f403:2009::603]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 86f88d1e-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:34 +0100 (CET) Received: from BN9PR03CA0424.namprd03.prod.outlook.com (2603:10b6:408:113::9) by CY5PR12MB6250.namprd12.prod.outlook.com (2603:10b6:930:22::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:30 +0000 Received: from BN1PEPF00006001.namprd05.prod.outlook.com (2603:10b6:408:113:cafe::57) by BN9PR03CA0424.outlook.office365.com (2603:10b6:408:113::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.27 via Frontend Transport; Wed, 12 Mar 2025 04:07:30 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006001.mail.protection.outlook.com (10.167.243.233) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:07:25 -0500 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: 86f88d1e-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EPZGXaZO89W7zW49ZlnWO7knZXs3o7Pwds5+lQek8m8LbTtdC7xf5XscxCTYGq7Q2/+AHCc/5TG9gFdO8fK4SCiljfckRg8WcWHg9eFYvIV7DePjI+ocz4iPw1M3MtKhS/oKIYfC5hubFoC46b0DX2hIlzo7M3BmukjUBbVObrdb8ialIAL5E71Zo5U1fUdf3vtminL72DWMktKyYr2oaHM52oDp0R5MlS43crC3z3iHTKuLN6XI93HCUW+7/iON0tvaLc/LMlW5ERO7HzQvJmosnwWA1nTbm/SfhV4lRaiuUbIMx5rohgtNufldDgaVMdyRGvBHuwP/e1kkQNgRfw== 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=I7eL6PKpkypQH6B94sjbTggVGB6Kr+OYdiNv5tTrv3c=; b=rBYV3sSXZvISoQ3Dj6dyLfGXLUj/LQjSSI1b7gXed2nSDmmV+kR+ZbWMzFmTGR8mgMVjWqQPEvuAH7ENEaxZfEFfaKfna+R3U4aHfY94Z86rxMXrk6VrS0VY/6AhBD+9CESLacpmqogNht0MJImCzxgOxP1iNPme51JsLtpqy2Nz4L0RHCR0z4u/WHxXvG6JIDPE9cZLtGmyAXs2HaIWKAonvaqCiddkhqzua8BFQ5qmig0kacLiSKyFeQj/tW/5pYmYMCAjXX4LZK7df7xrsX/9Ds3a5zbQl9SvG3PUyputrCYKuZfG8b+j0ue1itQxp3JWMdJ3pp1DPiAOQZag+Q== 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=I7eL6PKpkypQH6B94sjbTggVGB6Kr+OYdiNv5tTrv3c=; b=ygi8faLvIXsJPWSSnJ41FGvUb8nY6FO4wxzTU3K7rycLrC0cg2GDm4aZVa7gPsDwu3l7ZwN39ND2cFcjhq2qKFjx/dxS1QFfTj7RPQ7+sK9bdWJoFzPJgwaDlFGNEzzsTF0dgipmcl6VKyP1W3z8clhwXWocrypcX1vgZHLcbko= 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 (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 , Andrew Cooper , "Anthony PERARD" , Michal Orzel , "Jan Beulich" , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , "Stefano Stabellini" Subject: [PATCH v1 12/19] xen/sysctl: wrap around XEN_SYSCTL_cpupool_op Date: Wed, 12 Mar 2025 12:06:25 +0800 Message-ID: <20250312040632.2853485-13-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006001:EE_|CY5PR12MB6250:EE_ X-MS-Office365-Filtering-Correlation-Id: 2921187c-9798-456c-76db-08dd611b6880 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|82310400026|376014; X-Microsoft-Antispam-Message-Info: kAGT0S0ksHZDYHdA5zmojPU6DpTRrjnb2FazV366/xKqSG51Rq5TFRP2e07AZ3hFiGb6gvLGklX55XEsC1N9Bsi6DAUxh/X8kKtqgiWrrCbtl2zvlO6g6iVQchvp/P4jMuIPLSbZfSEvB8xleY1LGii5DFIwdsQ/l+bh/uM5zNVLQ2llxeFKVPq61LERQnApJEMIalVblSr0tJj75mthvdD46CnRNjEmmbIU5KkuZiCtDPJnisMS/vP82oexPfbuLjkrQJ8FOpDRIHpnmMkgCdLRInq3ncSOFk4qJI12Cl3jhhND9+rAMB9manrprwAi3s/3RwbcL5ABrFfjrn1bjYhy8S6ZPILa8NqAF+Tbz9qF2MtcFkr0I7F8rnLRfQEQMrRWnf+CLndpi6cCTL7l4TlSO+BQXde150T4nsRgWTutLQ3xs+d+TPBH42/PDuv1e4I79+Fxp/qmdgB8q+jCvpYUdVY7Mv6DyMdeQlIuJf/CfMjqldnne7KllGo+J9+7ouGXhFs3VVQDGGjnOFmmuajaQTO8YCrm8uyRpmyan9D1IbAbsDD2VpLLnWY7+Ebcpex/UXien3T8mOviKDawzoJKEi8L4sypDo+wXkztlu3Ik/RIx1pwGjOTD07rHVA0EkV5nYyaDhK29hixq8jtoIfJLHC/B15Q3CyWRbtNzJovHJHz9uDpULcb8HOfm0yrhiOXUHVO5JuMgxPER9GVdoy1QhKY4VF2Wct5MWzaZn77XNtIGN7zgcFfjZ4C1hJLFXOG9LKl96LSvO53Na3OPMDF7t9JNr7UmjxKChcZPNGnpIUuI5bG79Kl275vSwHMS8Frquntb0f2QD46VMbFbJMyUKIQEpO+d3qTs8gz9RKnMNZvMG1TyenovVYebJ7urU0SGlU5izjvM3RfZBjyrODLN1WSAK+QfMaNZdeu4iAg+fPb8yBQYpY+kyJfA1EEWUgMqJFX0z9eBSVBkpO9O7xUlmygQUjxV8de+0mfSE2nW8MEPPq6Zz7LXBlKMM6zN952rVGJYhMV6QgqihRWWWTY7oKduo8qh8eira3Q6WUjAcdM6d/kFayiqH20QDPSehgZNTmmitnXKVzDUXNwAemfQRyQbgi/isEPJ/z6AplpoUyr80jf7WOx30054qsV5+DmK/ihXoJ0wgGqSTgWCfeVR83U6pfeU+9XLl4SRkqs/HEP7WTr64FjH6pgSrhGI5UMWgdAgIN6BdlVvqMEU+rCoMkjiwAXLzHmV1zhTEVJOiiaq/1rSqk9RQQaBpXTznNwxf/ZxpCjuyvF28kz+awbXifeWbPQuNqSj/7Ns91sPxbp4aXVleIubThR4LGATdL9JyG7oyA4okoFR0Ttcii+uGm5axD/ke9xqC2Dhw5lAy1t8lXUkBPG/VY6MI62z1KF/QEy4pUT4xcDIP36e2t3KVQ3XfKjvgFfgZ0LVObkEPPTStBJYycArD/X5uqmnst8kt82b8WDbPqqoFgLsXmMwO0iheSKt6I+qnLvaU8= 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)(7416014)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:30.1114 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2921187c-9798-456c-76db-08dd611b6880 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: BN1PEPF00006001.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6250 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 --- xen/common/sched/cpupool.c | 9 +++++++++ xen/include/xen/sched.h | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 3d02c7b706..0efd8a4591 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); } +#ifdef CONFIG_SYSCTL static struct cpupool *cpupool_get_next_by_id(unsigned int poolid) { return __cpupool_get_by_id(poolid, false); } +#endif /* CONFIG_SYSCTL */ void cpupool_put(struct cpupool *pool) { @@ -352,6 +354,8 @@ static struct cpupool *cpupool_create(unsigned int poolid, return ERR_PTR(ret); } + +#ifdef CONFIG_SYSCTL /* * destroys the given cpupool * returns 0 on success, 1 else @@ -379,6 +383,7 @@ static int cpupool_destroy(struct cpupool *c) debugtrace_printk("cpupool_destroy(pool=%u)\n", c->cpupool_id); return 0; } +#endif /* CONFIG_SYSCTL */ /* * Move domain to another cpupool @@ -568,6 +573,7 @@ static int cpupool_unassign_cpu_start(struct cpupool *c, unsigned int cpu) return ret; } +#ifdef CONFIG_SYSCTL static long cf_check cpupool_unassign_cpu_helper(void *info) { struct cpupool *c = info; @@ -633,6 +639,7 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) } return continue_hypercall_on_cpu(work_cpu, cpupool_unassign_cpu_helper, c); } +#endif /* CONFIG_SYSCTL */ /* * add a new domain to a cpupool @@ -810,6 +817,7 @@ static void cpupool_cpu_remove_forced(unsigned int cpu) rcu_read_unlock(&sched_res_rculock); } +#ifdef CONFIG_SYSCTL /* * do cpupool related sysctl operations */ @@ -975,6 +983,7 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) return ret; } +#endif /* CONFIG_SYSCTL */ unsigned int cpupool_get_id(const struct domain *d) { diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 9bdeb85aa4..ea81832c50 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -1259,7 +1259,14 @@ static always_inline bool is_cpufreq_controller(const struct domain *d) } int cpupool_move_domain(struct domain *d, struct cpupool *c); +#ifdef CONFIG_SYSCTL int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op); +#else +static inline int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) +{ + return -EOPNOTSUPP; +} +#endif unsigned int cpupool_get_id(const struct domain *d); const cpumask_t *cpupool_valid_cpus(const struct cpupool *pool); From patchwork Wed Mar 12 04:06:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012853 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 40751C2BA1B for ; Wed, 12 Mar 2025 04:11:08 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909823.1316749 (Exim 4.92) (envelope-from ) id 1tsDQp-0000Zr-Mx; Wed, 12 Mar 2025 04:10:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909823.1316749; Wed, 12 Mar 2025 04:10: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 1tsDQp-0000Z6-GN; Wed, 12 Mar 2025 04:10:59 +0000 Received: by outflank-mailman (input) for mailman id 909823; Wed, 12 Mar 2025 04:10:58 +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 1tsDNf-0007Fd-Mc for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:43 +0000 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20609.outbound.protection.outlook.com [2a01:111:f403:2413::609]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 895300db-fef7-11ef-9ab9-95dc52dad729; Wed, 12 Mar 2025 05:07:39 +0100 (CET) Received: from BN0PR02CA0016.namprd02.prod.outlook.com (2603:10b6:408:e4::21) by CY8PR12MB8243.namprd12.prod.outlook.com (2603:10b6:930:78::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.28; Wed, 12 Mar 2025 04:07:34 +0000 Received: from BN1PEPF00006002.namprd05.prod.outlook.com (2603:10b6:408:e4:cafe::26) by BN0PR02CA0016.outlook.office365.com (2603:10b6:408:e4::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.26 via Frontend Transport; Wed, 12 Mar 2025 04:07:33 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006002.mail.protection.outlook.com (10.167.243.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:33 +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; Tue, 11 Mar 2025 23:07:29 -0500 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: 895300db-fef7-11ef-9ab9-95dc52dad729 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OQYWArfpJTBg1X/27/wYBzBce5ohn/7ZuFohpOq7FUb8qcvGOuUxM6NzdYv8adWGyhEDm2+3dMqsWNSrwYK/BYCCD5NRwIHwjvJu8Dp/7aQ0RFl2BKY+NgxS/Ktuxdp+oytQbXKwSRuVpuJOuh3BcEpVf4TMjnVOVwlCKSh1qSHTQLVseB7r/Ji8tFnf37wAsYyOxaqqB5NemMVfjxLD7rFXvYUG8v+xQATgntWmb0oLbC04moFbYxFL6acEFSdNUdP013L/jklOqZTbSHNnkKYwgugqPItdK0/AYrTPGKg4zQa8/imWF3cUwTKbvy0QUmoHdSf7ioBqHXhCgJ4Kqw== 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=2kpH7rONbEBds+fqwFkAgmEf3lzGijaWyU1/HQRi1kg=; b=adz5D4NLzsPZkdlb9z8h969ZaNu5GVeqNB39DQuhZg2l6CLCYQYWyJ9w3rLPaOWtRh7iAT/uKvVPNmTLNFaOz2zoaybgpcfqTReGg8TUq0Tk1WByK/aYkW99LoyLDdJwJ0THJTH+o8RQQkm3cxcbu2b+ftVpd0C0XBoecGE17ym3MDFERIDdeOBO7HQ9tXsFN8KEnCxoLMgBywpXeTyxDjH9lGxuO7gHiJE6xJBzXCf46k7mFOB2dcaY8P+e5O0Q7toS8JdfNFcqK87Kdla8TslEkifYDV5u5NvWPuyf/5uaUfAutAEnIpej0rjSMuUDHj1FY/P4BgPhzJp5Y7TZsA== 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=2kpH7rONbEBds+fqwFkAgmEf3lzGijaWyU1/HQRi1kg=; b=T7TZ37AxfUaauQYYZAOA6MWbU5QQsWHn7LUuZ9oBOmnoUTuaLH/aik/0LfZo8V5n3ZUvpReN/eYqR8a+cpWdyPZ0RL/9zP4RnAi8QLd7bmknMy5Z//UrWDS6m9j55STGpcQePlDQi4petzu0gNIP51+py7zspnpBJdh/O7gkJCc= 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 (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 , Andrew Cooper , "Anthony PERARD" , Michal Orzel , "Jan Beulich" , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , "Stefano Stabellini" , "Daniel P. Smith" Subject: [PATCH v1 13/19] xen/sysctl: wrap around XEN_SYSCTL_scheduler_op Date: Wed, 12 Mar 2025 12:06:26 +0800 Message-ID: <20250312040632.2853485-14-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006002:EE_|CY8PR12MB8243:EE_ X-MS-Office365-Filtering-Correlation-Id: 5399652e-75bb-4cc1-f469-08dd611b6a96 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: 3++G+noAwEwTxnJmKd3dQqQ+GzvqBDeO/RuKk7VxhDWeR6OqB23IVxLK868G3ckEbNuRCwY3bnKsujqjN66zXvK7prWvITwlB0lDNHNumjjuo071bltYppMBX9j2Y0oyMBrXFTs3bcwjeZ6iuwhg4cdiARxoFFgF+yK9CJAX3cP++nBzfotTw0Th94F7ih+JJ0oMhBrHSKgWFrU2iAgDIFcPgfrM4XzuXLLvbiNFwPy17iNvN08rCrx3MMHEDXFvBqvTWUNZOS3LY7lt7udrZLW4TAbHQiusaps+wSaU4jyweXgtWmfobAT1kGkjv+6kYkqBw3lYd1/Slt0p2Nxh7BE7wqqIW3kYMvAWuYSIOOXp1jCJv+6TrzEYFAeTo7N7jilyGHYqE3+4Ve4nicigngEd2GpRBeHbelnLHFewa6CrDhlipktV3REhvyM/+rHSJQt15UphUwAf5FUIQb3h3IsucSJEwi8mNAqybJO/g7Fsf+kkxs8QnZSVdhS6SWlXQoGPqlRsfYupcoGd08QXpFOn8GoRZBixEsEudppsNJ7l1y3dQ3Br8b00WkVE1bpFxIm0QubtvD6Am1R4T4gWWAxM+1CFiquyGfZQ/fxrpEOgn40/iyeKLkhuamPZWULW2WEXXh0aTQiPW0rQNTl+PhTVgdmk/Z1a8G3os0OxiTKszHuHptLwfy715JxEYQdVZQWkGtVjf+Kf4PLzzD7j1j5xFrnwk5ZFn74cHBZ0TTkUC2fVjgQv/IKh0H+AmohhNEdUKK8ppQKl9UrDnP8sb+SWZR57mCfXsaMMoxunovN9koYHCXL92LzTXHvZb5WjJ0pORgnPSm+ydZ9DFyQ9/FM/EiiXAdyzzc9qZJ+mfYHAQXdpgnDiO0j2SYy9XHZ5gxz4n9PYjBCqvi2OuPM0mTCz8d0wSKmPF3I14nHPtIW5BGH9xAAXUBU0CyqUxM4ZKDs8ye07rYg0ye/SMsgKREL7tG7K7aGhRc5dgZa9uzE0ePdPkSHL+b6FCj6I0f5y4YOauHMhN+s6N/7Y6RYpws0etCnlngKSN5h38lOfrEp+LdYBjFbuR9vjO58TZdl1wyLv20xqss/fwc2UROK+GooRPNypPR1bIOx2ot+mx1fL3BMtqh9RoXh4KWxss3vN2fTyA/gUqkr3eaY09IDncf4Ylhu2rWpEh+95yAGbmWMs5018Iilnb9XzHi9egk+oq/a21S7I5efOH4DewOc2099Kobd5GM1hIoMyJqCafs72YI5aEmty+67ayoE55SBtY5BbhXsHynQbG7fRm2y2QTBX8oof1DaAPxc4gfi436lJh2AqEppTryytYTo3nXq3iCUStPXYd+G/dxnfemhnIU3zU/PeClTeiYsk7yQ/tqhUcH6YBKFKZr2X9GUPaqb4VzGmVBMQ+vWtbBm1+tC4pvkdouYZNSOpH14dIuPZKKrtSqWdIQ9PxVolVenVRWRkrsvyQQpSN7N30mTecNZtsq9DnBYxAVuC3VVj557mCZA= 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)(7416014)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:33.6298 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5399652e-75bb-4cc1-f469-08dd611b6a96 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: BN1PEPF00006002.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8243 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 --- 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/xen/sched.h | 6 +++++- xen/include/xsm/dummy.h | 2 ++ xen/include/xsm/xsm.h | 4 ++++ xen/xsm/dummy.c | 2 ++ xen/xsm/flask/hooks.c | 4 ++++ 10 files changed, 37 insertions(+), 1 deletion(-) diff --git a/xen/common/sched/arinc653.c b/xen/common/sched/arinc653.c index a82c0d7314..3a2c349d38 100644 --- a/xen/common/sched/arinc653.c +++ b/xen/common/sched/arinc653.c @@ -214,6 +214,7 @@ static void update_schedule_units(const struct scheduler *ops) SCHED_PRIV(ops)->schedule[i].unit_id); } +#ifdef CONFIG_SYSCTL /** * This function is called by the adjust_global scheduler hook to put * in place a new ARINC653 schedule. @@ -328,6 +329,7 @@ arinc653_sched_get( return 0; } +#endif /* CONFIG_SYSCTL */ /************************************************************************** * Scheduler callback functions * @@ -648,6 +650,7 @@ a653_switch_sched(struct scheduler *new_ops, unsigned int cpu, return &sr->_lock; } +#ifdef CONFIG_SYSCTL /** * Xen scheduler callback function to perform a global (not domain-specific) * adjustment. It is used by the ARINC 653 scheduler to put in place a new @@ -687,6 +690,7 @@ a653sched_adjust_global(const struct scheduler *ops, return rc; } +#endif /* CONFIG_SYSCTL */ /** * This structure defines our scheduler for Xen. @@ -721,7 +725,9 @@ static const struct scheduler sched_arinc653_def = { .switch_sched = a653_switch_sched, .adjust = NULL, +#ifdef CONFIG_SYSCTL .adjust_global = a653sched_adjust_global, +#endif .dump_settings = NULL, .dump_cpu_state = NULL, diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index ea452d8b3e..e528909e5d 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -2095,6 +2095,7 @@ long sched_adjust(struct domain *d, struct xen_domctl_scheduler_op *op) return ret; } +#ifdef CONFIG_SYSCTL long sched_adjust_global(struct xen_sysctl_scheduler_op *op) { struct cpupool *pool; @@ -2123,6 +2124,7 @@ long sched_adjust_global(struct xen_sysctl_scheduler_op *op) return rc; } +#endif /* CONFIG_SYSCTL */ 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, unsigned int timeslice_ms) prv->credit = prv->credits_per_tslice * prv->ncpus; } +#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 */ 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 = { .adjust = csched_dom_cntl, .adjust_affinity= csched_aff_cntl, +#ifdef CONFIG_SYSCTL .adjust_global = csched_sys_cntl, +#endif .pick_resource = csched_res_pick, .do_schedule = 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); } +#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( return 0; } +#endif /* CONFIG_SYSCTL */ 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 = { .adjust = csched2_dom_cntl, .adjust_affinity= csched2_aff_cntl, +#ifdef CONFIG_SYSCTL .adjust_global = csched2_sys_cntl, +#endif .pick_resource = csched2_res_pick, .migrate = 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 scheduler *s, struct domain *d, return s->adjust ? s->adjust(s, d, op) : 0; } +#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 static inline void sched_move_timers(const struct scheduler *s, struct sched_resource *sr) diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index ea81832c50..5a065b3624 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -848,10 +848,14 @@ void sched_destroy_vcpu(struct vcpu *v); int sched_init_domain(struct domain *d, unsigned int poolid); void sched_destroy_domain(struct domain *d); long sched_adjust(struct domain *d, struct xen_domctl_scheduler_op *op); -long sched_adjust_global(struct xen_sysctl_scheduler_op *op); #ifdef CONFIG_SYSCTL +long sched_adjust_global(struct xen_sysctl_scheduler_op *op); int scheduler_id(void); #else +static inline long sched_adjust_global(struct xen_sysctl_scheduler_op *op) +{ + return -EOPNOTSUPP; +} static inline int scheduler_id(void) { return -EOPNOTSUPP; diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 5f89fc98fc..826db1fc69 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -148,11 +148,13 @@ static XSM_INLINE int cf_check xsm_domctl_scheduler_op( return xsm_default_action(action, current->domain, d); } +#ifdef CONFIG_SYSCTL static XSM_INLINE int cf_check xsm_sysctl_scheduler_op(XSM_DEFAULT_ARG int cmd) { XSM_ASSERT_ACTION(XSM_HOOK); return xsm_default_action(action, current->domain, NULL); } +#endif static XSM_INLINE int cf_check xsm_set_target( XSM_DEFAULT_ARG struct domain *d, struct domain *e) diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index d6f27aa977..d413a12897 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); #ifdef CONFIG_SYSCTL @@ -246,10 +248,12 @@ static inline int xsm_domctl_scheduler_op( return alternative_call(xsm_ops.domctl_scheduler_op, d, cmd); } +#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 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 aa89ee5331..6270bef308 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 = { .domain_create = xsm_domain_create, .getdomaininfo = xsm_getdomaininfo, .domctl_scheduler_op = xsm_domctl_scheduler_op, +#ifdef CONFIG_SYSCTL .sysctl_scheduler_op = xsm_sysctl_scheduler_op, +#endif .set_target = xsm_set_target, .domctl = xsm_domctl, #ifdef CONFIG_SYSCTL diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 9819cd407d..aefb7681cb 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 domain *d, int op) } } +#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 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 flask_ops = { .domain_create = flask_domain_create, .getdomaininfo = flask_getdomaininfo, .domctl_scheduler_op = flask_domctl_scheduler_op, +#ifdef CONFIG_SYSCTL .sysctl_scheduler_op = flask_sysctl_scheduler_op, +#endif .set_target = flask_set_target, .domctl = flask_domctl, #ifdef CONFIG_SYSCTL From patchwork Wed Mar 12 04:06:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012848 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4EBE9C28B28 for ; Wed, 12 Mar 2025 04:10:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909773.1316700 (Exim 4.92) (envelope-from ) id 1tsDQc-00063W-BY; Wed, 12 Mar 2025 04:10:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909773.1316700; Wed, 12 Mar 2025 04:10:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDQc-00062o-4T; Wed, 12 Mar 2025 04:10:46 +0000 Received: by outflank-mailman (input) for mailman id 909773; Wed, 12 Mar 2025 04:10: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 1tsDNe-0006o2-5P for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:42 +0000 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on20624.outbound.protection.outlook.com [2a01:111:f403:2406::624]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 89aa23cb-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:40 +0100 (CET) Received: from BN9PR03CA0384.namprd03.prod.outlook.com (2603:10b6:408:f7::29) by MN0PR12MB6197.namprd12.prod.outlook.com (2603:10b6:208:3c6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:36 +0000 Received: from BN1PEPF00005FFD.namprd05.prod.outlook.com (2603:10b6:408:f7:cafe::6c) by BN9PR03CA0384.outlook.office365.com (2603:10b6:408:f7::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Wed, 12 Mar 2025 04:07:36 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFD.mail.protection.outlook.com (10.167.243.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:36 +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; Tue, 11 Mar 2025 23:07:33 -0500 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: 89aa23cb-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=itR7QteuwxKPEia8dcRCK40yPIbtBGxfhP5Crmsu0vGLErgXVkTaaux2Dr3aGvCPn44mri5hxYoQye0qaefZaS4ymyw939jtvNr+vWEYCpQ8nKZ74Idlq/LyPwrmROJBZ/XqfiAg/BJX4VAMmseN8HnfAgcBMPp8jAiiFvjiV3o3JLgrJjoIXRnQQ9lXc6KAJeTnX7s0kqDE9HKyhZsfTfa4S9oXcUD4PoKsbv3ySC7B2xc+zBurZ6xKr8rKp0vylLwl4pnqzH9/rxKPgbHJwDhpva/LdEoRBZBMyqe2VImLmrTvyDtLa6UZ4GTgHh157zjKtd+m8FonokKnfP7eLw== 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=2Lfzt+raLQwsUIbWUmBDKcqwG8irJJi6lS1tTorK6i0=; b=keHig/CwSJqCm+BygZsK/GalnoeGLCY0A1v7mKeNotf6LFz80y9vfXp4P6grqKoYBRXFvFhMPIgXP1jAfXZG1pW6aV6Z7uqtIqLyVyfZ8rKp0OTO5a/xMVUsJ717vQxAIPO0S7j0O94N+/I4NsiiXAVZSa5Dx6zSLkLudH4onE78sA0ELbjhuyZJUVXnOdIOhbfv7mFB2vasSM+hwKJa/mUVWe9RF9kzMysI4LmdR5OxqVa2Jeqs7HodQm/g+TJK33arZ7MZMoqvilQnGE9/7YI91L7xaoBHRo6XnLEbgRK7ZpaO7ULr6r39RmmsGagYO9X0aosDfeLWpqsEmrXEww== 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=2Lfzt+raLQwsUIbWUmBDKcqwG8irJJi6lS1tTorK6i0=; b=mOfxOI1LZXPsPfL7bNBWfXYK4NoNM7DihLf/RSCFDWu9CN7wGP10iiNxzKwyesgJWRI6vBQAW7AoXbDl1nSTzMvLxbw8cOLL27p3V/96Yjq3gRgD/ub85UkIIrB/x0PxJYSFnePMx9QluxigvF5fUl7L/MKr06K1uynorMBo/p4= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 14/19] xen: make avail_domheap_pages() static Date: Wed, 12 Mar 2025 12:06:27 +0800 Message-ID: <20250312040632.2853485-15-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFD:EE_|MN0PR12MB6197:EE_ X-MS-Office365-Filtering-Correlation-Id: 9587c83f-eec0-4cd3-cb44-08dd611b6c23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: HUPmlz1eWS0DCTohCTURpWavb8aMlGx2V7TUuvRFVyCge+BX8sgNOcUEOZyruWQcCJFAMzqB4RSD1X+QfTeYC65BTghr+z9f05ZutdIf3dBK+PW53tmdDUCsj9OIDJM1v2wv3D0AHU+Yd4JelGbnj5XBYGY1MhKk/N2cvieJ9lB8L4Vi4uJwwW5rQcQgbktJObwyXwDS/bxaNJHOE/bE12OSFJmcGkfO/0Qitx0nM09urQqkeaw3jiEyd0InuTDGz8KOoVjNnvrysVbIoEkHCNAFey+qg1+jvJYehwXxNrD9/Xv42SHq5yB13cRQjAlVppeJBXLmYbKFtyUxvKkMAQw4M7YHIX767HFcccE2o9rO3TGxAQGWcxMMemG2xRh0ODA5sKS1yKnaw4RS+RI//Ehn/FO2DSP5QCGa8Od+ZQ2wUE1IASyM2ufYuyqIwtlnQPbiuGXvxIiaDo9MB3GCr3jCW1rWQXeKxcoo60ioviAbtgKsjVFBrvOStK+BLWzfDJW+4Y5hBWRSo7qXnh8Ehs95LeUado9B6JsUVjHQ0IwXJm4QWZc0vdgH0ywmYgpFrPwEzqSi3Ii59Za5/HHG9OorhjCqOMduM/FtEhEWVTZb3ggZyhr24r2hf4tEnpcEc72IPzeHhftlGVFf35tmwAChu/RQOMJ/P0zz5tm1U3XLRrC4d+NqFaU7ZStH6v59zQxFZ2T9/ZQS8WYaOu0oYXzOCjTroZt3zhqPlRYhJqOpyRUYi7LPKH/IsKFQYQSlEGwFpvp3p1ymdMwrrVZ6CARzQO9489Q9CGrfT4o6lfKsOGRF5TXL+zFFF3Fc7dfQ9XQ0a2W+iQxU6x39q4xibPLMSeJV76j2Ttb+udvYx63VljpBVui11NLb4GakL37iTBEnzc/xeDiCbaN/+FQ+yd8pfModBUUA7eOKNzBu7ENRgZGATHlz8QViLBMB/Hq3gVVxlaroGAIzOXGhm/6OA8Y8YdPe92VzLtKxAySbzRs7KfVpQRWW46w2yZVeBPRiWWCcfuTwv0Zhwkec4HklF+gTtBKW5g6qaFnroGrKmzQxZ2FgZC2xy8fuSfoxTYJW0uJvnnxSG+MgiW7bWNWEXMOXBLKbJErNI5wKzkKQjWpEAWh4Fmz4sGbB4ae1wogtfBIrlpVlj86sIeMl1fRXhwOwl+22rud/3PCERYLYmfPd/e305G807PIJquRS2j+Y1mOqS9ctXDkVGdexb29cdPYGy2BQztG2Rstmd6MGG8Gu6/VAgWp7BhMuOf9lMCa1Y2lYje2GPF74Lhw1nWk5QyTVdoWakq2aApq1qMC81Om6nn3iiRe7eQGr6UD+gAff+Wk5bKZyM9lUGe9Yqxdox2mYCO4/9klUJyt/AXXFxtmfFYtg4wgdjRatQVVcIIyxK+u2dI77b/Le8QcGLyILYOV5/wBMcb0FzGvooMPze0TkCy/OUy/JVYKVQWfyb0gRfP4Ne0t/NDKCvVhXrcxVIMvCmI2SEhgY8s9jwgON4E4= 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)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:36.2149 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9587c83f-eec0-4cd3-cb44-08dd611b6c23 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: BN1PEPF00005FFD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6197 Function avail_domheap_pages() is only invoked by get_outstanding_claims(), so it shall be static, no need to extern. Signed-off-by: Penny Zheng --- xen/common/page_alloc.c | 2 +- xen/include/xen/mm.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7476d37238..5e710cc9a1 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -2796,7 +2796,7 @@ unsigned long avail_domheap_pages_region( return avail_heap_pages(zone_lo, zone_hi, node); } -unsigned long avail_domheap_pages(void) +static unsigned long avail_domheap_pages(void) { return avail_heap_pages(MEMZONE_XEN + 1, NR_ZONES - 1, diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 86bbb15890..cbb9f2dfdb 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -140,7 +140,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)) From patchwork Wed Mar 12 04:06:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012844 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF99DC35FF2 for ; Wed, 12 Mar 2025 04:10:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909738.1316680 (Exim 4.92) (envelope-from ) id 1tsDQT-0004vd-Ej; Wed, 12 Mar 2025 04:10:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909738.1316680; Wed, 12 Mar 2025 04:10: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 1tsDQT-0004uK-70; Wed, 12 Mar 2025 04:10:37 +0000 Received: by outflank-mailman (input) for mailman id 909738; Wed, 12 Mar 2025 04:10:35 +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 1tsDNi-0006o2-VO for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:46 +0000 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2061c.outbound.protection.outlook.com [2a01:111:f403:2415::61c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8d423667-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:45 +0100 (CET) Received: from BN9PR03CA0516.namprd03.prod.outlook.com (2603:10b6:408:131::11) by DM4PR12MB6157.namprd12.prod.outlook.com (2603:10b6:8:ac::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:41 +0000 Received: from BN1PEPF00005FFF.namprd05.prod.outlook.com (2603:10b6:408:131:cafe::bb) by BN9PR03CA0516.outlook.office365.com (2603:10b6:408:131::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.21 via Frontend Transport; Wed, 12 Mar 2025 04:07:40 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFF.mail.protection.outlook.com (10.167.243.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:40 +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; Tue, 11 Mar 2025 23:07:35 -0500 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: 8d423667-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=a8OuYIsazYfIEe+j3NINNJ8Idkml1iFXEH6Q6HwXu8FG2OW4czgLIuDbVtio1p+3KSipa/OGG4BRO0kvB01EKAk/jb5Qe+/rswQn7l+1N4hBoPIIEsJZ/fQKQYUVM5moUk/tqq8m6JQaE24vlpKP9Of2SJhGf8x/OuvXsmhXShwNbRoHQTgOBDmObandCvx4oeT2hiqrWLUwlmIMOTyOcsahH6sWWPILpU6sdhxgAvPVxkXMnyyyDSbWscjdLKBBWd1GRXaRMxWdhN7/I9IZheznKr08h1vzmY8Lj/bcl6OmsX8tJLyk4iufzw+GWcfLWzUm8yjvlUa8LjtBv2wAaw== 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=ozeJEycapjvZKrcQkyhn4SVuw83QMUCRxt1yd+qjAcc=; b=jQvskxi4E5yKmJloexAYz4xmtmve7QSTzfjeTaQc9ceAD6QLpAhPhpa2kSSyhxXRVb3stOjwXIYKftraCe4jez5fJfBIkCOdkMzIKgbV09/otNY2GHI2P5hgAcSI7v2KqR5sVIa+sUJWQt8Ett2dfyqjvluuUadWGIu+VI5MzOHRoLywQ2Uy8Q5yLCSvu58v6/SnUoDARHco8tnnpblCHQI/aToQ1CGH0FxrcPR17KexyMKqxC1YA00hJRkb/QokcxPEks1pnWNvtWrqF/7jBLhdWpLKMCdcQgPtoqjoTsRoSeLpeDAArpdJ+P4yagCC7Z2L9hBchB2Ckq/uwy6O4w== 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=ozeJEycapjvZKrcQkyhn4SVuw83QMUCRxt1yd+qjAcc=; b=4hTZKX6l6Cwt0OU0rWIZ8Mt9HP6yd1ajs/7QudHyudY174Q2leuv6Q8c0TyCJjabC1TnAvIdPn/gduJe8JVfXb3ZTzWBEzD0gP3Pcz+OxUWboRQX478ZxtIJ7BGosAYHTRuHLVkAqSjJxPUgfaq85rZ4mloCyC+fToBFpM6jTx8= 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 (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_Pau_Monn=C3=A9?= , Alistair Francis , "Bob Eshleman" , Connor Davis , Oleksii Kurochko Subject: [PATCH v1 15/19] xen/sysctl: wrap around XEN_SYSCTL_physinfo Date: Wed, 12 Mar 2025 12:06:28 +0800 Message-ID: <20250312040632.2853485-16-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFF:EE_|DM4PR12MB6157:EE_ X-MS-Office365-Filtering-Correlation-Id: 0b7a6ead-dccb-4093-4f57-08dd611b6e93 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: +qEiyGRss8IVV/5ghOO3jRKQmK20TFyfVZDedb2U8Ox1Q00eRwWlhMEoX3Q5/4gKUOh2osCbMFw9iW8fuASYG6PkLb05NB6exPgtrna8kMiGdCPEBFHHyKXnILMevTmo5XEgf0QbdFB0EySpNVTagtCasS00c10M1UvjlwXt9hZJZKV+Hn6WI/xAjCUcQjnzV5csYrtWSgD1FwNKtduuytT0y+kZwTkHHrWTnTgSKwVJRUArL0SO+14P0twzx8iIYgS0DfxMtVld5DMAmJLCMkLz1xLGTzdp0c/6sUhTLRr7Z8CZ8WD2gc7LxdhBVEwpDPjNXR3C5U8a0SDTQMsS5Z4HAUGCZvVjCvgNgBCHna8M2WWKyZtqKyAtNq/j4QSdcWZrum0bjwR85gHp3GdDuP+SXIjt+DqqKSyRzco8nBDgp7dqCTzkU8mNNWvcn98GCqCeBSfg0nNIgty4gqcTELVF7oaeS2H8dkO8YqZ59nP+7R669pSbS8/awJaY19xIc8gKwsb6DTBgo3hIM7Je+D6iiIHqDDTBmd3cqfT399PpIkANBTWHy3Eqmb5jyCZs99Y3MCR550otcwy5XrbhMiJsWV3xQMN2iEeyH69hQX+0+bsa1Iq4boKkIrM02TkLohaR3OKiUGpg+Twz/XwBNqJ2c1B3Kw26TAaqzRWQQFv8N6LL7zXn2kbJLzpsDKCOekkS78jF2DaSjMaA3pVX6mTbTqluw823oWsDqwwM1r9kWopN0gjyAu7DRaMmc1WxJCGUXMc9XtoIddA4g+58Y5Dr1NxaQehzXKwj9a+bcHKasEKqTPggP2884oJA1WSpL5NWaB2CUoVdn/oaJfu+Mbghstm3diTLa0SzwsDZdiWI/JWwLaUcAUYx+aoyEnl15BvjDVCoLAF1Shvcjl92d/AxLxe2AuO/H/o/rIjlabNxa90IBGAcNGuNCqIbWiujdRgM2puJ5cR20+p0h/kvtpF5R/P0fFWb5aYJbaKKrjWQJYYK4/5CesN/ktN3FpUCKDV6ZOQ3VSLFhbxAnncreoKwFXw5AhbZi6xXECSNsbComFKPAS5d1PjL84w4ljxuJAbCmWI1+/LiUXRXPl6cuDC0Bc05YXJdxTFOVV8B52X6br2v61BTEy4uCpd/rkLva/vuWzLZGLGoW1aETeXEyr6DadHBBuAYvexSBNSSAl5au8fvKgG0o+VYnoGNbG3HrztL17FII90BV2J8D+oSIcHk/mVIeoE0PVM/cuRgF6D2M4c892esi7lLQVg8dEB6hVSjH1n5odpA+ryb67vd65c1A/8GNK0/uW9v8wA3GheQ7t0S+W8h2MBZDPLovor52kgTFdaOLsApPbGRcQNbFt+yzre+8mbpewEQ9K7PUWLk3teE+Xlnx9nYu+P9oCZ1oVcEPax5xlgrQDpprNPj0BiFmE3e7L3fg0DSo+7yLP8zzDCWXiXoEBEk9GsY3dChHuXYkuyH/FJTIRiq/9Oihakw/FnAnUDZL7WjgqeXXgI= 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)(7416014)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:40.3012 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b7a6ead-dccb-4093-4f57-08dd611b6e93 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: BN1PEPF00005FFF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6157 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 --- xen/arch/arm/sysctl.c | 2 ++ xen/arch/riscv/stubs.c | 2 ++ xen/arch/x86/sysctl.c | 2 ++ xen/common/page_alloc.c | 5 +++++ xen/include/xen/mm.h | 5 +++++ xen/include/xen/sched.h | 4 ++++ 6 files changed, 20 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 +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm | XEN_SYSCTL_PHYSCAP_hap; @@ -22,6 +23,7 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) pi->arch_capabilities |= MASK_INSR(sve_encode_vl(get_sys_vl_len()), XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); } +#endif 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 5951b0ce91..0321ad57f0 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -328,10 +328,12 @@ long arch_do_sysctl(struct xen_sysctl *sysctl, BUG_ON("unimplemented"); } +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { BUG_ON("unimplemented"); } +#endif /* p2m.c */ diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 1b04947516..d7da476379 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; } +#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 |= XEN_SYSCTL_PHYSCAP_shadow; } +#endif long arch_do_sysctl( struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 5e710cc9a1..d1c4db57a5 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -581,6 +581,8 @@ out: return ret; } +#ifdef CONFIG_SYSCTL +static unsigned long avail_domheap_pages(void); void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) { spin_lock(&heap_lock); @@ -588,6 +590,7 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) *free_pages = avail_domheap_pages(); spin_unlock(&heap_lock); } +#endif static bool __read_mostly first_node_initialised; #ifndef CONFIG_SEPARATE_XENHEAP @@ -2796,12 +2799,14 @@ unsigned long avail_domheap_pages_region( return avail_heap_pages(zone_lo, zone_hi, node); } +#ifdef CONFIG_SYSCTL static unsigned long avail_domheap_pages(void) { return avail_heap_pages(MEMZONE_XEN + 1, NR_ZONES - 1, -1); } +#endif unsigned long avail_node_heap_pages(unsigned int nodeid) { diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index cbb9f2dfdb..a63e063a46 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -131,7 +131,12 @@ int populate_pt_range(unsigned long virt, unsigned long nr_mfns); unsigned long __must_check domain_adjust_tot_pages(struct domain *d, long pages); int domain_set_outstanding_pages(struct domain *d, unsigned long pages); +#ifdef CONFIG_SYSCTL void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages); +#else +static inline void get_outstanding_claims(uint64_t *free_pages, + uint64_t *outstanding_pages) {} +#endif /* CONFIG_SYSCTL */ /* Domain suballocator. These functions are *not* interrupt-safe.*/ void init_domheap_pages(paddr_t ps, paddr_t pe); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 5a065b3624..df39c0465a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -1291,7 +1291,11 @@ struct cpupool *cpupool_create_pool(unsigned int pool_id, int sched_id); extern void cf_check dump_runq(unsigned char key); +#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi); +#else +static inline void arch_do_physinfo(struct xen_sysctl_physinfo *pi) {}; +#endif /* CONFIG_SYSCTL */ #ifdef CONFIG_BOOT_TIME_CPUPOOLS void btcpupools_allocate_pools(void); From patchwork Wed Mar 12 04:06:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012854 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 140CBC28B30 for ; Wed, 12 Mar 2025 04:11:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909833.1316761 (Exim 4.92) (envelope-from ) id 1tsDQu-0001EV-A9; Wed, 12 Mar 2025 04:11:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909833.1316761; Wed, 12 Mar 2025 04:11:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDQu-0001EG-2g; Wed, 12 Mar 2025 04:11:04 +0000 Received: by outflank-mailman (input) for mailman id 909833; Wed, 12 Mar 2025 04:11:03 +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 1tsDNl-0007Fd-8d for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:49 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2060d.outbound.protection.outlook.com [2a01:111:f403:2414::60d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8eaae1b2-fef7-11ef-9ab9-95dc52dad729; Wed, 12 Mar 2025 05:07:48 +0100 (CET) Received: from BN7PR06CA0048.namprd06.prod.outlook.com (2603:10b6:408:34::25) by PH7PR12MB5902.namprd12.prod.outlook.com (2603:10b6:510:1d6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:44 +0000 Received: from BN1PEPF00006000.namprd05.prod.outlook.com (2603:10b6:408:34:cafe::71) by BN7PR06CA0048.outlook.office365.com (2603:10b6:408:34::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.26 via Frontend Transport; Wed, 12 Mar 2025 04:07:43 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00006000.mail.protection.outlook.com (10.167.243.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:07:39 -0500 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: 8eaae1b2-fef7-11ef-9ab9-95dc52dad729 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ehZKLArNo+g2hkYGs45gAzYCfV9FwGlw9dmEP3CAVlgyyB3HIfKxu56LGPegy1N8/P7MN5/525Skm25jHTXsj0OpTMHVnq2Z5tKl9/RTYfDZobrJ/0PvnBB/4bliabml52pmHGds/+A1J6GS7rKCjW3kKR/cG7/zOu5aUmn9AcxY6dWnmFpQSYtvGG9VpqvXK+Mi33u34U+8NWbO6iLkviMEhI0tQgZM0nzRuQ9iEx30ygbnllfeGreMK6wVOIEbXNpKgLyCtXUpwOsH4MDj0sHSz8l3UVioq+kB7UKjCFlmpzkUAccHjbicvTjM9xDHzs9zX8EkewhwgvgGgqObJQ== 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=GOqgE+bQRqJSaGdfrE8a8XEAc5wqmWyygxWbNzkBWt0=; b=BJDYrCJFI+9mSbNI/4RuMavJo799b282+0nfXRaJVei4f0QjIaLFQHOf/JFWDXNxk/s0HrGEE5Qi/NVMdO7eJLKcGVAPjy7qWAgXeyuJg5PGroYCv5+71yz30ehMwocp2EHsvsg4mqAf9lDK/r63udXHcrQ5/XUjdpyUJjf54nfL4CmQINyM4Drv4RpTq9b23qDimVW5Rlx4zEHslp2E1SlymUYHiFSWFYiAsA7JKr3YFx0SOatnfHa1mOi4CUQ+DZP+6NgvN4ZRzhh71oY66xjmlLi8yMlbMQt42/3yJc3WRYfQQdQa+wGDt5pG2rzP6G9hPsrej7c867igzbpkfQ== 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=GOqgE+bQRqJSaGdfrE8a8XEAc5wqmWyygxWbNzkBWt0=; b=AAFS89iqoiWiYFeTJP7pd1IPuzj4TYxSWnuSE9ATYP2cUS4h824aPUdAZUogXaB308PQy69Ri/o5HXP4zkHKMWOVFbA9oJLfRzaNIDb99fC5rm9a8YC5UXTECw4uG7Z/RuHAOPd7l5jCLH/JKGOrT6JRekSoLi9HUandw4dXKco= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 16/19] xen/sysctl: wrap around XEN_SYSCTL_coverage_op Date: Wed, 12 Mar 2025 12:06:29 +0800 Message-ID: <20250312040632.2853485-17-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00006000:EE_|PH7PR12MB5902:EE_ X-MS-Office365-Filtering-Correlation-Id: d4c576de-a960-4b81-5276-08dd611b702e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: +DwtiM1Yq2yPb327dykMvTGwo6c3IaklmnFUJ1SQtPHcOBv4E1ELZ42sNf7qXKD7S4w7+YxAAMLOuGtQjEmAGKQdAdd/cOB295uioyCobimVzwB0LHxdchSvfb8uoTiMZT4CntSFwJxOXYfi232rRFhqqjIZujYudDHp1XQ1ktQYKdM1LV7ct39yABCBU1vH2CPYGyZhHZJY0afAdJvAETtxKNO5MEgiuBBL246UCgDM2RIjzV1HIXOQHjTSeKK0ri4Sli7X6y6L/Sies3CN3G3Aechu1dahPhVXDSOuQbx6onpYjC1xKrfl5C4aBB+MHyCveg+U6bHsdT+JnPZRamDoS4gRcJqHrQCpvKn7XhJ+VxAUQnJXYBTwUooigfNdJ/G/zwlHVpF5Ys6Tem3E2scmlv0Dyq0KxZ2wgemhyRGN8roZZsFpSJxkgnVjhsxICBd774sSPA3eallb/TSYrUXju452mKv4nnUc/0NgqFQn9epUhsU0VjWYSK+ziJa12C0siasmtb/qSdw31R1zj/OUqFgFWOCBSF7c7SP7KRaYFk+DHVe2KjtF1QEG+mkdxXE70vlwPTGLoGAfqOIrBLbRsQOUkXPuYdHnLuBCtKjOQj2veV0WTMoAB4b3MTGBB4MgCkm1O6zxqVZjfMHA+Q23xxZYHTKoyNzDn8+TwIcIc5rDroHyKxpsXHQJcSoGvfcc/aXBAx/bRat/9GT8/ctGIA1b8/2XXSnPU7xFMBVWfsfmLSHBS0Op8v5LSQi8SMRX/qr6u7AB4AdAA2DpFpQPZJO1yW2xB5k0rX3NXi1HbS32CnNmAkWqLpOyQwgdNijjMe07Ts49u7bFjt+deC6BAYg5N3wnq+UT+kExfxzxHh/HIRMBnYC10PFXwZ5b1LwnmDxWW5ab0TY36P34d6VFP6xUIdsxJSdJhz0fQZC4fdRX7XRLnddn63rthXMAjzBYshH+jD+mkwaJ+ro26K/HAkwC7wQGsbiLZVQeRI9bGumEUgzm0lRPWO9e6pfi/6wCQc/osBqwNQoigLwVm0U2uzVe1Gct++m6OneHW1c1vE/MtVPaQfAFVVP8mYuvqNXZL+k46aB5Ova3cQBDnFGjzEbAIEfegy7p+yFJRjdR6BlxKMtjLf5eMZsfo1AWNV5eMkWD05yrP/Yu5nkIiODGsXfADdQBlN5YhXGXxy3uJkEovk1up5hgdmwxea7JIcFnK8WKnZTJ55GVpda3tQv8cQKEV6AUxwQdE6Faalj3RJR26DL/L9EkSUkcAA6LchS5EV2/NkAmEUewSsXst094cE7F/ZFlyryuztltZxDRt43S0C9kyQdtZMnsQ7XZuJWMLH0dnjBr31nknG1RlQ7sDj9p+8gXg3qTKZgJ+iOY2t7QXlvKadVmEmeY/LI7SpTV+N/4Ts3c+n+emST38lggwZaTkDjpIGYxP1pvMAhobXQY5grGyNxySc3E++q+Z5IIAy1MyRhGDzgV05SYwvVGmrAhC1ZZP8s/A5/Qphw= 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)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:43.0104 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4c576de-a960-4b81-5276-08dd611b702e 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: BN1PEPF00006000.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5902 All coverage-related op shall be wrapped around with CONFIG_SYSCTL, so this commit makes CONFIG_COVERAGE depend on CONFIG_SYSCTL. Signed-off-by: Penny Zheng --- xen/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index c4a8d86912..b226ca9b6e 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -37,7 +37,7 @@ config SELF_TESTS 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. From patchwork Wed Mar 12 04:06:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012852 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1742AC28B28 for ; Wed, 12 Mar 2025 04:11:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909816.1316735 (Exim 4.92) (envelope-from ) id 1tsDQm-0008A3-Cg; Wed, 12 Mar 2025 04:10:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909816.1316735; Wed, 12 Mar 2025 04:10: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 1tsDQm-00089P-4F; Wed, 12 Mar 2025 04:10:56 +0000 Received: by outflank-mailman (input) for mailman id 909816; Wed, 12 Mar 2025 04:10: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 1tsDNo-0006o2-Tn for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:52 +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 9062ab4a-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:51 +0100 (CET) Received: from BN9PR03CA0361.namprd03.prod.outlook.com (2603:10b6:408:f7::6) by MN2PR12MB4334.namprd12.prod.outlook.com (2603:10b6:208:1d1::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.28; Wed, 12 Mar 2025 04:07:46 +0000 Received: from BN1PEPF00005FFD.namprd05.prod.outlook.com (2603:10b6:408:f7:cafe::db) by BN9PR03CA0361.outlook.office365.com (2603:10b6:408:f7::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.21 via Frontend Transport; Wed, 12 Mar 2025 04:07:45 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFD.mail.protection.outlook.com (10.167.243.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:45 +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; Tue, 11 Mar 2025 23:07:42 -0500 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: 9062ab4a-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oOsqF6UC6X57fVCQgGZpubmq+H30LMlWGVEWWZZyElh/9Cap18RJVpR7nMb5UsaWDp3BGjN0yTHq+RO0WYZwEQ37evWl6vbT+UvqXtPgM2nKqcH6EKBApb27BR2gHQCFHjoHJPJCla/eAuyDCefIv0Hm/c5IHa6YcRc192qWrBnXaHWvbDnRqO3m5jhm8Vms3zAbzDuGmcvaE46pVhVXNkNLixgauGRDAtIZIH7geFOvfp7pBYigv1feaLtKMzVChNS+aGw9WVUKosIXIoy6qcYUPOPqdgukhfAW7vVYNRYtokI9w8FO18elFeicUCKlIh8rivuUMRaCBShgHvP8Kw== 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=pVnJIwjzp8eKC2WhS+HCVSb2Ww3dYbUW05dij3RYcXo=; b=MPeEfwnO3pi5hqHnknU7qmMiPLyO7tfrCWB7NdpJz9pFr2zAvTtCQUL7gQLd/HapfpVdd0RTjMJEDeo4Yg/Hhmj3v5D02cfM5WOfyM5o7/hUQip/+u+P9W8hgrNUN/WYMKtouzkAzPoAt7PCrj3zPNEeVEYY5xKkHcA8pNFOe9YoIkunIC78ouhql95q9tF7x0yAIHgqqkHpGNIz1mjOHWlFxC145QCplFm51ubkJ01zTj3bwfGkAxY6pGMacyQqRqYkGgnTZ5EaQ5t0V3S/nCTNJF8nORJZMLL1z5L0ERy10/OX2dcbgJbEwI2S8++VvnDZmHh6rYIhveO6HhnQiQ== 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=pVnJIwjzp8eKC2WhS+HCVSb2Ww3dYbUW05dij3RYcXo=; b=YTwXDA7BVGeHme0qgSeXfY+M8A0Pi0s/e0aGO7hxotBWAmnSW0VD6crVjd8Btmqm5tQA9Lmr2d4ggEZrBQcb1ngSqSBJS+yQtFh0mdSM2PLibeJU1SVjvCubh88x8bkhZYJyD7hjcrB8AvJKhuCl9WIGtIrsu1GRMT+I5G/QmYA= 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 (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_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH v1 17/19] xen/sysctl: wrap around XEN_SYSCTL_livepatch_op Date: Wed, 12 Mar 2025 12:06:30 +0800 Message-ID: <20250312040632.2853485-18-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFD:EE_|MN2PR12MB4334:EE_ X-MS-Office365-Filtering-Correlation-Id: 901924a6-dca0-4df1-6347-08dd611b71ec 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: 4ArMTVDNvrQcShxGUJaEBePHrjgR5xbev+kERd90kzByRUBs3meDbKXnTiVsIPLztgV0fDk6ETa+n+ZZkyuYmY8+PFmxfEHpJzNroZOZ8H18dL29GVopZ62MrSqRkOJPIaOOa+nXUEfNDczpDs7L469jkzCgo2iEfddNsyzQ6vyLKyXWA0PMlBW0nCjYswslKFFuUSrL+f44T4kgYVRrHqjKAtXpavhJV2UkeXv14D3+7RwhrdTXwRIkBmQVS2HLTS7uShyYTcR+l/37zz74BRf0pgbFJn5+HrCnBUK6agMJkAzfEo6T43mWrvlCfQWiP5eQZRuEA7afwMNC+UmszUHsrrqUoMuVRxg0MvBlo08N88G44sgVHBJd5Efcc+uD6KSuo1ztCzsbDH5UVwY8+xVEizTdEz0KP1bS0saBBzF3x49Ph0Z9lDEh6UWN0YGUiyGJDUAFISVWh6c5U6iL+94u4pF6hLxNsyHWztjw1q+LYk5MRaNjwUUWg4tP3pIuYAAYtA1rAGRQiWV9OuKI86zI3IkgbwJe3fku9tTPSp3MaRgHQKAxPJGFSeyK30nJc31h3mgTN/Kg8InR+ZShvQHR9HJcBWQwp0wVs+Cb+mtkeGtt5UHQY5rsD+6sRdq0tOllXNBNAteiKpv2HDFG3ZDNWnWx9lDSErubb7slqMD/TwuNr//MiL71pK0M35J4smBxm4BmjYg2rZ4RPsNrlW3cb+5wGMlgQRwAsCni4LcvIMxNIHPcaByYLbz5QhlZ+SgNZeiIS+1vzzhNMV59QhoBxjjF4SQI6TLrfesADigTftTEtUcyYrDiAKBe+WzSAy1Juf6sDw8cGw3ILb/ZB/XxWtSXRibV1Vbl6WhWMlHDxxQsIPF42JS7xT5huXYpdb56+4YJ8bucgwK99UR+rTLcZRyhwUUd72XChEiFS9L27hptxQp2vSh+2LlQzBe7NcNZ9Vu+yyO1PQ9Qy5ZgYLbPl/Bt0ZGbAjG0wWsOYWrWBkhYOkUhSAHmmIifsy6mW8yY01egF7wY3xixVxYUQrAJI7nfypgrPDSt1JgugfuKUd2TArQVsH8ZVRnDAtZhv2Lemi/wwqYVp0KIBn0XFz1/r1h2EblsMz8U8s44tskTJcz7bAG42kdy5vf47a5EZgZ044Lf2bqxbcsZqfblQT4G5AS/1i49f6kWJckJw2Q8nSwD+Wo+1glHkI2n9SPsQkorwYSAknauVyBPyaEyTi8PzY2VDhNPUP9OsRKJTRKG6ss0JjXXlMK8TBeT4VqLpCI/nxmrdiv3Sj7RgN/97mfkrOpJhEHQ+X9wfsJp9/UJlUksWBHxM77XJ6MBzLIJklSqQvtXIPT2M0nYab+MmyYwMnN5pZ346uZ/3lBsoGLtgfdCOWTi5cBumIHGPu4xXWzDU4nqqvSHEWgTDVkRYWeSPuIsMQM5jzn4o4DwBW+tJZCvjfPbFRvu5KppvxxJtH4fiNfLQG3slwgpQjj6oIePX8nyUsuke4nXRhrNCI0= 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: 12 Mar 2025 04:07:45.9182 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 901924a6-dca0-4df1-6347-08dd611b71ec 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: BN1PEPF00005FFD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4334 LIVEPATCH mechanism relies on LIVEPATCH_SYSCTL hypercall, so CONFIG_LIVEPATCH shall depend on CONFIG_SYSCTL Signed-off-by: Penny Zheng --- xen/common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index fbaca097ff..583972f7e3 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -426,7 +426,7 @@ config CRYPTO config LIVEPATCH bool "Live patching support" default X86 - depends on "$(XEN_HAS_BUILD_ID)" = "y" + depends on "$(XEN_HAS_BUILD_ID)" = "y" && SYSCTL select CC_SPLIT_SECTIONS help Allows a running Xen hypervisor to be dynamically patched using From patchwork Wed Mar 12 04:06:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012847 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2FA64C28B28 for ; Wed, 12 Mar 2025 04:10:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909761.1316690 (Exim 4.92) (envelope-from ) id 1tsDQX-0005VC-Np; Wed, 12 Mar 2025 04:10:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909761.1316690; Wed, 12 Mar 2025 04:10:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDQX-0005V0-HI; Wed, 12 Mar 2025 04:10:41 +0000 Received: by outflank-mailman (input) for mailman id 909761; Wed, 12 Mar 2025 04:10:40 +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 1tsDNt-0006o2-1k for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:57 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on20623.outbound.protection.outlook.com [2a01:111:f403:2417::623]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9272a07f-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:55 +0100 (CET) Received: from BN9PR03CA0514.namprd03.prod.outlook.com (2603:10b6:408:131::9) by CY8PR12MB8299.namprd12.prod.outlook.com (2603:10b6:930:6c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:50 +0000 Received: from BN1PEPF00005FFF.namprd05.prod.outlook.com (2603:10b6:408:131:cafe::93) by BN9PR03CA0514.outlook.office365.com (2603:10b6:408:131::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8534.21 via Frontend Transport; Wed, 12 Mar 2025 04:07:50 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFF.mail.protection.outlook.com (10.167.243.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07:50 +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; Tue, 11 Mar 2025 23:07:45 -0500 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: 9272a07f-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XPrlNH7+r5ucrknBPN16oRBDMkLrYH7tfmzKJE4TM86DOA+rhTeU737X+jUnp7nIGkT5+tSsDIv0ibHr9uxIywVqElbHX/pYKOw68QXAORmfLcL/ptjFp7ARD5MPR8Czqh+ELZ0EStYvcdzLJ2eU4BrO1Vo6wdXT50ZhOmRN15s7dedo582yvvw5VQlg1bYJogzzUENrlj6o9CuXFcNGOCC6ZPYTcn+7Vx8GEfcIsQcTHasl01kSwnmzpkJnSqCGX3wKuJBGRWqINzzWnfEhIWhmGTFswAOmfaZ0DrliznLjSJ6zVPYYcvxP74oTNqtdQrH325xKp99VnMJdV+bS4w== 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=43BgmY4i5cZIm1j7X2+C+muvoJWuYwilxkRMR7zAawM=; b=rOZKbzUAO26c/DGIoDxv1dtx3rr0OsOt7J2RDod+9/bPQxvioTDG2G/7go2AUi8sCGkYkeJArLdjJhsT80oUbSbsu/xLfxdXx0CKLpap89IUEBC8SxVBEMeTExHycucPEGOvcl6WFnZ4/xa//6bunStxp+m1JBycKDSzFGyrZBdc6x7Wo8Hlb8kS4H4KpqlOR48Zkpxf42K6z1i/4GVLcp5JldAAowRK7/HHF/JIU0QTyEiGEbPbdyFAnMQCmm2BAuY9A0K23V3Eap+gUI36hza7o6PIXFNfCzocaATaJfF3xqMGIZNUdPq5Z7VdCPgmcm/1belY8U3dMaQOhjMplA== 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=43BgmY4i5cZIm1j7X2+C+muvoJWuYwilxkRMR7zAawM=; b=N0EqCfGDNvfYR+CWLFFWkKv7OFyQcPoSIUq3Sop0oxmanAJOqJWQItk3lB7B3eh0JHQ0mM/75eUPTYRZTVNFaG7C9i1K0Qj0CohkoNfOrVN9qYo9HBeF5NjbL9J3Q/cHXWPI9Xa7TSqOpepSLPkYc/t+1cUlhMe8SCZATnVIIiY= 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 (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_Pau_Monn=C3=A9?= , Alistair Francis , "Bob Eshleman" , Connor Davis , Oleksii Kurochko , Stefano Stabellini , Sergiy Kibrik Subject: [PATCH v1 18/19] xen/sysctl: wrap around arch-specific arch_do_sysctl Date: Wed, 12 Mar 2025 12:06:31 +0800 Message-ID: <20250312040632.2853485-19-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFF:EE_|CY8PR12MB8299:EE_ X-MS-Office365-Filtering-Correlation-Id: a6497d8c-6b44-4853-e365-08dd611b745b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: qLxWzcsuNROObUlkHKxUCO7ocpEp7Ir+wWsn//kbBZwupNDHWBUDlpJ3UA2SgiF0JvSyV1ezF3lqpRQMz/iY5l4UifIXN0uuS9Wt0Czqq27JIOZJgqG9ewQuovJNZaSDvwDblqcUf8KpB0MWTvXZFnBEgxCeSR8fujzqsXJGsZpVQAq7yyZLaxT1J28tXGlU5n7AtsTlsC7LBnp1sUVMLLw5ZKMIeb0U2EKebZjSXvd8obu/1tDTpn64bkYFOXaxJSzB2lNfVGGyP6l3gX2LHrkeCOiAmTPlLyrZj6QAiSG7ZoWLbWimb18HP/663aU6OwRqUTR7aUO/dJAPVz1+JDLa5ibvnvRtq1qWV/KkHJcpPHumObqZEsldhdRgzZQnSWBfAHBzbM91348EYzxy3wk4uW+dKHRmkfQVF4RrmovOgJgRf4UdlHZPs5TfzEz2neT+MjVN0K4G/MqM5y4KTmPI7QEnMvotY74gmULEBH/QjOhPwwgr3fxYzPb0KxrunfU90kJSPfTaHGc80wudWsCBJiVdqlbcGL1YcPQtVk0G3VMACa07Qs3ASYRsMFDT4w1bU9ONq74bGrTC5AyeECGH4WwcAkPZ8YjndEIWaYpDY0bfL6kABiDb6dLSv5UpxpJdCaLzPn4dudUE4A2i2vZG/ispsvSio1Q5AfyPAdNl6mopY+IkbyveMb7Zug5nmXuux9yeR7xa/etIgvkA2xwPVm729rmy1J73R6eAJD8s9ASwWDsbjoE8kTP6SXK9qkifsLfeoqg7BUDo37dVD7IDhCgwXC9WsSRFgYgV30TNOuhvjz1eVACemG8z0w1qK3Gw00+tYrFSMcnV7gujcT4xy7HHibX5UVCRhYE+kbrtFBpw5Y+sxeQhjhagxAi6aznOfsXLBVfVH9hBEoDEJmMP/hkgllyjpbAo0ouUyCYimlM60qRXYcvTD5RPqiPJ8afpya1bRPKFGIKjJBzvVM0F9Sk0Y9xwEBmPSE6+GU9Q6gemNBM0r9n4U5bBRT61Ug98m/QubLM94JPcf49uCxhbZk1+SX1jHc4iUqSheVJEPlnGH0FpahxOsXoyqEYhSrXmWUqfTAvSAdOO9bxFxMvXn/DG+KdfKDUhp96zgPTvk1Dk7uqu4Ue3eFVl/NzRLa46H3o8qUZ8KDA/Z8nCcai2tMt3NHPgDXlJXIm9xg1plD3FhCibqGZf/Hlc9fWhqy0AxwMLjvIrh6qWrQICeZMcwIDVxUtsDwNPapZGig2zvZa3XRlabSM/nknVMNPMIdrQ3zXeQJ3Y9thi66uM05g/zTFbdJCayL9/B7vtel71tspOUwfJDuAszIS3Xl6iDsvhC+0qKhe333aipPtqcesvM0kvS9kh9rdTDAOIoHtaXa8Xk6GHeMGSBCIGO+8CtbDLOTqjizkbQlj6d6eyv6T3ObvNnqYWYLApMqeKxLEveiXrqV2xjQwBui2juDLB+VKaoFaxzrOg2hM5KZJkKAAeolL9khobOza7674HQF8= 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)(82310400026)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:50.0200 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6497d8c-6b44-4853-e365-08dd611b745b 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: BN1PEPF00005FFF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8299 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 Signed-off-by: Stefano Stabellini Signed-off-by: Sergiy Kibrik Signed-off-by: Penny Zheng --- xen/arch/arm/Kconfig | 2 +- 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/include/asm/psr.h | 2 ++ xen/arch/x86/psr.c | 18 ++++++++++++++++++ xen/arch/x86/sysctl.c | 2 -- xen/include/xen/hypercall.h | 8 ++++++++ 9 files changed, 32 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index a26d3e1182..001e65b336 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -140,7 +140,7 @@ config HAS_ITS depends on GICV3 && !NEW_VGIC && !ARM_32 config OVERLAY_DTB - bool "DTB overlay support (UNSUPPORTED)" if UNSUPPORTED + bool "DTB overlay support (UNSUPPORTED)" if UNSUPPORTED && SYSCTL help Dynamic addition/removal of Xen device tree nodes using a dtbo. diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index fb0948f067..5819c7e4d3 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -54,7 +54,7 @@ obj-y += smpboot.o obj-$(CONFIG_STATIC_EVTCHN) += static-evtchn.init.o obj-$(CONFIG_STATIC_MEMORY) += static-memory.init.o obj-$(CONFIG_STATIC_SHM) += static-shmem.init.o -obj-y += sysctl.o +obj-$(CONFIG_SYSCTL) += sysctl.o obj-y += time.o obj-y += traps.o obj-y += 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 -#ifdef CONFIG_SYSCTL void arch_do_physinfo(struct xen_sysctl_physinfo *pi) { pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm | XEN_SYSCTL_PHYSCAP_hap; @@ -23,7 +22,6 @@ void arch_do_physinfo(struct xen_sysctl_physinfo *pi) pi->arch_capabilities |= MASK_INSR(sve_encode_vl(get_sys_vl_len()), XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); } -#endif 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 0321ad57f0..28590efb65 100644 --- a/xen/arch/riscv/stubs.c +++ b/xen/arch/riscv/stubs.c @@ -322,13 +322,13 @@ unsigned long raw_copy_from_guest(void *to, const void __user *from, /* sysctl.c */ +#ifdef CONFIG_SYSCTL long arch_do_sysctl(struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) { BUG_ON("unimplemented"); } -#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 c763f80b0b..1949c4276e 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -79,7 +79,7 @@ ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) obj-y += domctl.o obj-y += platform_hypercall.o obj-$(CONFIG_COMPAT) += x86_64/platform_hypercall.o -obj-y += sysctl.o +obj-$(CONFIG_SYSCTL) += sysctl.o endif extra-y += asm-macros.i diff --git a/xen/arch/x86/include/asm/psr.h b/xen/arch/x86/include/asm/psr.h index d21a59d98f..e466da7428 100644 --- a/xen/arch/x86/include/asm/psr.h +++ b/xen/arch/x86/include/asm/psr.h @@ -75,8 +75,10 @@ static inline bool psr_cmt_enabled(void) int psr_alloc_rmid(struct domain *d); void psr_free_rmid(struct domain *d); +#ifdef CONFIG_SYSCTL int psr_get_info(unsigned int socket, enum psr_type type, uint32_t data[], unsigned int array_len); +#endif int psr_get_val(struct domain *d, unsigned int socket, uint32_t *val, enum psr_type type); int psr_set_val(struct domain *d, unsigned int socket, diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 5815a35335..34d5de8d2c 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; +#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 /* 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 *regs, return true; } +#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( return true; } +#endif /* L3 CAT props */ static void cf_check l3_cat_write_msr( @@ -442,11 +446,14 @@ static const struct feat_props l3_cat_props = { .cos_num = 1, .type[0] = PSR_TYPE_L3_CBM, .alt_type = PSR_TYPE_UNKNOWN, +#ifdef CONFIG_SYSCTL .get_feat_info = cat_get_feat_info, +#endif .write_msr = l3_cat_write_msr, .sanitize = cat_check_cbm, }; +#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( return true; } +#endif 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 = { .type[0] = PSR_TYPE_L3_DATA, .type[1] = PSR_TYPE_L3_CODE, .alt_type = PSR_TYPE_L3_CBM, +#ifdef CONFIG_SYSCTL .get_feat_info = l3_cdp_get_feat_info, +#endif .write_msr = l3_cdp_write_msr, .sanitize = cat_check_cbm, }; @@ -489,11 +499,14 @@ static const struct feat_props l2_cat_props = { .cos_num = 1, .type[0] = PSR_TYPE_L2_CBM, .alt_type = PSR_TYPE_UNKNOWN, +#ifdef CONFIG_SYSCTL .get_feat_info = cat_get_feat_info, +#endif .write_msr = l2_cat_write_msr, .sanitize = cat_check_cbm, }; +#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( return true; } +#endif 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 = { .cos_num = 1, .type[0] = PSR_TYPE_MBA_THRTL, .alt_type = PSR_TYPE_UNKNOWN, +#ifdef CONFIG_SYSCTL .get_feat_info = mba_get_feat_info, +#endif .write_msr = mba_write_msr, .sanitize = mba_sanitize_thrtl, }; @@ -808,6 +824,7 @@ static struct psr_socket_info *get_socket_info(unsigned int socket) return socket_info + socket; } +#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 type, return -EINVAL; } +#endif /* CONFIG_SYSCTL */ 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 d7da476379..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; } -#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 |= XEN_SYSCTL_PHYSCAP_shadow; } -#endif long arch_do_sysctl( struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 15b6be6ec8..d0ea64b332 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -29,10 +29,18 @@ arch_do_domctl( struct xen_domctl *domctl, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl); +#ifdef CONFIG_SYSCTL extern long arch_do_sysctl( struct xen_sysctl *sysctl, XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl); +#else +static inline long arch_do_sysctl(struct xen_sysctl *sysctl, + XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) +{ + return -EOPNOTSUPP; +} +#endif extern long pci_physdev_op( From patchwork Wed Mar 12 04:06:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Penny Zheng X-Patchwork-Id: 14012851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03909C28B30 for ; Wed, 12 Mar 2025 04:11:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909810.1316731 (Exim 4.92) (envelope-from ) id 1tsDQl-00084v-Vr; Wed, 12 Mar 2025 04:10:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909810.1316731; Wed, 12 Mar 2025 04:10:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsDQl-00083d-Ow; Wed, 12 Mar 2025 04:10:55 +0000 Received: by outflank-mailman (input) for mailman id 909810; Wed, 12 Mar 2025 04:10:54 +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 1tsDNu-0006o2-K9 for xen-devel@lists.xenproject.org; Wed, 12 Mar 2025 04:07:58 +0000 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on20604.outbound.protection.outlook.com [2a01:111:f403:2009::604]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9431c930-fef7-11ef-9898-31a8f345e629; Wed, 12 Mar 2025 05:07:57 +0100 (CET) Received: from BN9PR03CA0529.namprd03.prod.outlook.com (2603:10b6:408:131::24) by SA3PR12MB7831.namprd12.prod.outlook.com (2603:10b6:806:311::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.27; Wed, 12 Mar 2025 04:07:53 +0000 Received: from BN1PEPF00005FFF.namprd05.prod.outlook.com (2603:10b6:408:131:cafe::45) by BN9PR03CA0529.outlook.office365.com (2603:10b6:408:131::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8511.27 via Frontend Transport; Wed, 12 Mar 2025 04:07:53 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by BN1PEPF00005FFF.mail.protection.outlook.com (10.167.243.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8534.20 via Frontend Transport; Wed, 12 Mar 2025 04:07: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; Tue, 11 Mar 2025 23:07:49 -0500 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: 9431c930-fef7-11ef-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SDCe7DGg//SkeTom5Gbu4Nv2O1deWN5N+hxoHva+v3OpebklJ16KJcarPX1cKwlsxo9oyeHc0Y8NZS2zyciPsVnsVTm+rbjzrpfetQPMMpByOrfy6Cp9LZ45JmFKwWCO11YrkfMVVFXldVKCI9LTbFnBtVdppTVb8WjQYvMFUPjN9DY8F3yHT4SKqSbEwMHm5sRcXu7KY02AU4id3s0KweM/Ul5nEP8v+KWHc3tU/5lXW0u8RkL6YRHT70yG5Zn11+d/UzMv7KfVhljBm0JHowPxNSlFHY9zAVaolkprbq/BJZFGRFP2zOIKZwyBIioBZRhOP1bi5+G67ekWGTIRFg== 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=Co/A6LtKil8nD0o6Nvn8J3GZ2QcSnUMY5PdPvBScsC0=; b=xcsoTaFATxn+TAoYBVlaHEuEFv71/s5yhJ2rdE5EiAr3CtSWt2GcB12ck/OAegRz/9jXznguvJW9MlsQPXzomwaWLQ9n3iihzHsVjPeEJGBXu6OB/7wYk3XaTdDbYTKQgI4ii8HEvWttIbzxDVdpFrLEr14/jrVEjOmjB4WKjiv3YXiZ4+3njKVVomeyp+MzROJTL4nuptKH2zyAZRL9pLk9jywJE2T3xGShW3LDl1HEQXo/cw6ZYmRvDBxQwn722j947TJxBNgKZt+TyDGIQJv/GLcsbNuclVifFiWxBVgTX0KQUPQS5sD1CyFcOUCq21bWY8ZRUzkPfbHQD3Jt9Q== 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=Co/A6LtKil8nD0o6Nvn8J3GZ2QcSnUMY5PdPvBScsC0=; b=O9+y4+wqwNGTfpl8h4Nm8p0kuLktFR9MEOiYlANCuHiX4hozbfNUzH7/zUVbby4lVEMk2UV03fG+p9CQz8ToaAmJwg+CnYNmEU7xm+EoJPx41gzS1IySe82AhYOEDE19qpIcSDhzGAcezvY8HoWpboB+uMDaDF+VlTy3sDJi/wE= 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 (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_Pau_Monn=C3=A9?= , "Stefano Stabellini" , Sergiy Kibrik , Penny Zheng Subject: [PATCH v1 19/19] xen/sysctl: wrap around sysctl hypercall Date: Wed, 12 Mar 2025 12:06:32 +0800 Message-ID: <20250312040632.2853485-20-Penny.Zheng@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250312040632.2853485-1-Penny.Zheng@amd.com> References: <20250312040632.2853485-1-Penny.Zheng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF00005FFF:EE_|SA3PR12MB7831:EE_ X-MS-Office365-Filtering-Correlation-Id: 51f7b02a-01c9-45f9-9295-08dd611b7631 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: 9hXgPN/92uI7cIKx5iidzWZht0smU5DC7mPvKacYRf35KmqRP5FAO00oBOAtJhiD+0e3eccQOBWanLTrWtdgOm59Koh3qywL3+dX4T/B+ahQkJFgOhgsqeaZMip5vt63uk4XR9Zeyu9eD/9dBulHH2P5xitbqIbXSB7VO6JSe9nHa09M63OqePlaV8PJimo2Wn76OEXF06BSfJaGrvF+0PkOGl6YFRXYDGEjEz9TF8GKRiVgmtUhVZisKOX1U7QqvfSY8Yq/z1DOnArkVsVpkLedHqywql1Mh5jLLPQ4I1EkJ/YYbVBIksvbUxByHtFfykF408hR9Qd5QnKyUFxG7myNjG0avzJz5O1UomXr+uOGQu1udLQYGV+TOkOPZ4gVEt7a1e9nWacktsy9BtqtOTZnCaL7YXRy9BH08JDParUSUmEWYIG0d2ziJ/th8hPwqNME+h3SFFz7VXd5R0nTiWPJAZh2+Lziai9SObRVRdO+zhd1hW4IQL7rDn7rKlHp6uh9yvZxeAKCESfsLYz+Z7VZnI1NgEqDtoDaisO4yC0pVqGudbv9FdkhwNyTUQ8PurC40zZ2uPeO6xC90VSplpRXpIlW3P+yf1mVorXq6CJJNlA1T6MoRFofsQbIGzNDA5GRHycs6wVJ3crU0Ou9uqjCPgMWTqtraOBWirxkGRKboG8BCN1IfmqlD9OlnQYAGLn4Sd8yKNqoooTRSOFkOV2aRsM0QAMvEGDkoo2mqP8A5OZW0Ib8mvRmY/+OsaMnu042k/QhXH6Tqw8XxEuaD8L6XwXqV50vp87hqL07AEyKPPRPHeIMKNQHhwi3RLjbs8TFmtvkVC2QIY0CxnzemgvoP5tjFJCGlAoRgLDq/VeNFvp6NzEmKYX53HofIBwJq7OUHjFoWIZv66mSFRa+DYR4sW+UOKDAIPiI4n+2O2vHpMuHgBQ8l/issoBfgEf8vHNyu7822rcWKJIJfxZ91cBttBHWV7YM2YcYiGbEI3Ddpso5u9/zBN1NIZMEJqkCV3O6GKKHMrwakeZ0DjfoESauLvjlrhk7UlGCjPSIBKg4SlsY4Efb2cbeghwM2TQShf3cBf0NQpOFcEgSrqaFskowHsAQ/LZ2T+J4wY1+gkxiqKDvwY/i6d6KspWa0fbnlLe67OcLaQHHje/e+4sHtIVUgZ5PQr9RXSrvW4yay4mKzSF9KLhCIXYsqqRYohQlNfGhXf2ftmr6ASFls251Q8vYdQ6WXlYI76zYuCvuBjJzemlhQmMXFRbPQ4hO8hE4+vZaT7ZQn7dru7ZvSZo3HEjdZLT/+hw8/woWnEvroUk3qpH2XYLbNb4i98yn2xxkRJgDmd45d/hhjbmOAm8fi1o9RQOQtgE2yUVltwUGQW4j+khCWvOX4mTv9yw23yc4CrvAwS0fdYx9XQgs2aHJfJBo24BKSogqa2YwZP7jAYEpzcf7FIg5zpxbFrBDCagNAM0pgjzgusc/OfchFBOnlhEWi18IaFyRvPqE3NpSWbU= 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)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2025 04:07:53.0825 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51f7b02a-01c9-45f9-9295-08dd611b7631 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: BN1PEPF00005FFF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7831 From: Stefano Stabellini Signed-off-by: Stefano Stabellini Signed-off-by: Sergiy Kibrik Signed-off-by: Penny Zheng --- xen/common/Makefile | 2 +- xen/include/hypercall-defs.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/common/Makefile b/xen/common/Makefile index cba3b32733..31c6fb1b71 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -69,7 +69,7 @@ obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o memory.o multicall.o xlat.o ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) obj-y += domctl.o obj-y += monitor.o -obj-y += sysctl.o +obj-$(CONFIG_SYSCTL) += sysctl.o endif extra-y := symbols-dummy.o diff --git a/xen/include/hypercall-defs.c b/xen/include/hypercall-defs.c index 7720a29ade..b2118e9adb 100644 --- a/xen/include/hypercall-defs.c +++ b/xen/include/hypercall-defs.c @@ -195,7 +195,9 @@ kexec_op(unsigned long op, void *uarg) 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 domctl(xen_domctl_t *u_domctl) paging_domctl_cont(xen_domctl_t *u_domctl) platform_op(xen_platform_op_t *u_xenpf_op) @@ -274,7 +276,9 @@ physdev_op compat do hvm hvm do_arm hvm_op do do do do do #endif #ifndef CONFIG_PV_SHIM_EXCLUSIVE +#ifdef CONFIG_SYSCTL sysctl do do do do do +#endif domctl do do do do do #endif #ifdef CONFIG_KEXEC