From patchwork Mon Oct 9 14:05:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sivaprasad Tummala X-Patchwork-Id: 132433 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5D58E4233C; Mon, 9 Oct 2023 16:06:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA48E402E1; Mon, 9 Oct 2023 16:06:06 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2068.outbound.protection.outlook.com [40.107.93.68]) by mails.dpdk.org (Postfix) with ESMTP id A686D4026B for ; Mon, 9 Oct 2023 16:06:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JpKUs4ItnGQACByj2PMVBXpp4+DFQklRNlUVCYtOG8XGuZ4Mgw68GhmROTBbuiKd1O7PyWWKNz4rw+FK9qas+LQRoMrqdeBD8+8DGXM+IS3JMKnLKGYlf4I4jJDFrK0a1er+UnkubdaKH3ISI/nXnvDe6Bl0nD8l6ab+mAvkk23U6CJZT93V3W5Bn0BfvCpVd1oFAWtLLfSfaoOPcAloDU9q07QMzOkjazsfpIYUQ3/AchL4o8DFmqWr4TgE1HB9xY0Zaz7HV1z/rPhbgMGWIIj6DyfhgiMc7vPOuJ6V+TqmpPsjN9mCUMz7vaZ/3uOrjYloItO957dA955UJxp3bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6w4ZtzPxAwU9B0b2hnrcxo41wHkxa3zqBxiEVp5niDI=; b=IwrS9sxbfZTUUqGoGNfFMWdHi/GtY5RSH8zMJBwzlyEC6K31boPWHjQqi0dM6dZyEu4s9USoMjgtXKH85Ihe/6uiFlO4I2/00Q7JQPYrbX9mAJr0Plc1Iz+fiQZ9WKTWHHJFYPBimYKRrYC7UM+GEJCk5UOpHyLE5e3RqcV+2Omhs3P91AfQ7mg6e15s/QaOPjA+w0alUEOL4v8G+rdVj2DIfIKBB/HbhpmVeds+ALhxhYGg4rKnNMhwQ08+Up6H3qIPmEqJmZXBl8/GqqyIKq1r4kg/+LX8M9w0w1I03ub60pNFTFV9mRB+Zy8yiT9S2f+IwKAkeiICVBLd6Rkcng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=6w4ZtzPxAwU9B0b2hnrcxo41wHkxa3zqBxiEVp5niDI=; b=Fxj8RUSur5Pf+kxxwWeSnvH/h+cV/BtWAJbfTrLXzQ4p29v72rjTPG+xaGcyWoa+iedge82Z1sT5Uif7w/2NsPf0TnjppbMNFb9nC2dsKZY/qWbpcgNa4xhoyQzig/SuBSHp84nhhWqtRK6qBX0+qslqzIaFDAe4l544HqND8mU= Received: from DM5PR08CA0035.namprd08.prod.outlook.com (2603:10b6:4:60::24) by SJ0PR12MB7006.namprd12.prod.outlook.com (2603:10b6:a03:486::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.24; Mon, 9 Oct 2023 14:06:03 +0000 Received: from DS2PEPF00003445.namprd04.prod.outlook.com (2603:10b6:4:60:cafe::27) by DM5PR08CA0035.outlook.office365.com (2603:10b6:4:60::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37 via Frontend Transport; Mon, 9 Oct 2023 14:06:03 +0000 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 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003445.mail.protection.outlook.com (10.167.17.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Mon, 9 Oct 2023 14:06:02 +0000 Received: from telco-siena.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.27; Mon, 9 Oct 2023 09:06:01 -0500 From: Sivaprasad Tummala To: CC: , , , , , , Subject: [PATCH v6 1/3] eal: add x86 cpuid support for monitorx Date: Mon, 9 Oct 2023 07:05:44 -0700 Message-ID: <20231009140546.862553-1-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230816185959.1331336-3-sivaprasad.tummala@amd.com> References: <20230816185959.1331336-3-sivaprasad.tummala@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003445:EE_|SJ0PR12MB7006:EE_ X-MS-Office365-Filtering-Correlation-Id: 550a6460-7319-406b-f268-08dbc8d0df5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CoqMsldUsTuGXpSj6gJPEfVc1aUlvrNIfapG/ZEU3cDZbnS2dBcQh6MenjUBLGNPul0CTewddAYSdId5eR3iHlhlxrqp/zdk9a+r1BPSq7JXzlK+0Furu8ugqFVEeHfLYdaXIosveS5Fl5uBfdaSmoo/MTKkyqlaFR9lVpup04Lve5IvFXjA+cF+mqAGDz6Ynf2hKsGihOUPGLWbhODqlTlwGxDI45mkd4ibp5j8QUzW3KksIso6LnxPih81D0x0kUA0BN0TRFjYrZ3ZItUe2HKZJqdmVSkRyxkeGznM2dAmc4aDRISQx9fmtllYQ1G8oVvg2bW6o1cWiMncndsG2RKKrLcrDpTj/ndk0t6lOOc5BIa/r6QJ+3retMx0T+jIwwQ8PrgGx34BtB43W44FnuPuqY5otFppYTInxiXybhko9mpDknd8DD3vxPtDKt6RmvNzqZG4TTRSPaAPKgbZAL8v0fqW257gTNjQupe67KAMhxfe/dwtZVGGbj9YOjYqnLk1O4s5Teld7EqQwR4dxPFx23gczKaOm3GbqqCvuzu6V1VRwSNTFCERMzEbUvabseQqhhtYAqrLW5wtFiSh7ukLVhS68k5yyfgmzicEYbtvV2ZaU0+QXiHxCysxY2GXaJP+UazswHtTylhyKMwCk3HDMLHeeviW3xoV0bHFib2nVJLdBdTNX+IC0Ghb8Gy6RzVD5/1cJ9maesDDFyBKjoTQJwc4dZac05OUlncmyPiQtpy/63HaT7eLlj/uSaKxpvDA5tvItnWLrlTrSOmquw== 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:(13230031)(4636009)(396003)(39860400002)(376002)(136003)(346002)(230922051799003)(186009)(1800799009)(82310400011)(451199024)(64100799003)(46966006)(36840700001)(40470700004)(40480700001)(40460700003)(16526019)(2616005)(336012)(1076003)(426003)(54906003)(26005)(47076005)(70206006)(36860700001)(316002)(70586007)(6916009)(8936002)(8676002)(5660300002)(4326008)(41300700001)(44832011)(6666004)(7696005)(2906002)(82740400003)(478600001)(36756003)(356005)(81166007)(86362001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 14:06:02.8308 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 550a6460-7319-406b-f268-08dbc8d0df5a 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: DS2PEPF00003445.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB7006 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add a new CPUID flag to indicate support for monitorx instruction on AMD EPYC processors. Signed-off-by: Sivaprasad Tummala Acked-by: Anatoly Burakov --- lib/eal/x86/include/rte_cpuflags.h | 1 + lib/eal/x86/rte_cpuflags.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib/eal/x86/include/rte_cpuflags.h b/lib/eal/x86/include/rte_cpuflags.h index d95bf33a16..1ee00e70fe 100644 --- a/lib/eal/x86/include/rte_cpuflags.h +++ b/lib/eal/x86/include/rte_cpuflags.h @@ -133,6 +133,7 @@ enum rte_cpu_flag_t { RTE_CPUFLAG_AVX512VP2INTERSECT, /**< AVX512 Two Register Intersection */ RTE_CPUFLAG_WAITPKG, /**< UMONITOR/UMWAIT/TPAUSE */ + RTE_CPUFLAG_MONITORX, /**< MONITORX */ }; #include "generic/rte_cpuflags.h" diff --git a/lib/eal/x86/rte_cpuflags.c b/lib/eal/x86/rte_cpuflags.c index 3fb1cb9bab..26163ab746 100644 --- a/lib/eal/x86/rte_cpuflags.c +++ b/lib/eal/x86/rte_cpuflags.c @@ -133,6 +133,7 @@ const struct feature_entry rte_cpu_feature_table[] = { FEAT_DEF(LAHF_SAHF, 0x80000001, 0, RTE_REG_ECX, 0) FEAT_DEF(LZCNT, 0x80000001, 0, RTE_REG_ECX, 4) + FEAT_DEF(MONITORX, 0x80000001, 0, RTE_REG_ECX, 29) FEAT_DEF(SYSCALL, 0x80000001, 0, RTE_REG_EDX, 11) FEAT_DEF(XD, 0x80000001, 0, RTE_REG_EDX, 20) @@ -195,5 +196,7 @@ rte_cpu_get_intrinsics_support(struct rte_cpu_intrinsics *intrinsics) intrinsics->power_pause = 1; if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_RTM)) intrinsics->power_monitor_multi = 1; + } else if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_MONITORX)) { + intrinsics->power_monitor = 1; } } From patchwork Mon Oct 9 14:05:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sivaprasad Tummala X-Patchwork-Id: 132434 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AE6284233C; Mon, 9 Oct 2023 16:06:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 56C2940A76; Mon, 9 Oct 2023 16:06:09 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2071.outbound.protection.outlook.com [40.107.243.71]) by mails.dpdk.org (Postfix) with ESMTP id 116B940282 for ; Mon, 9 Oct 2023 16:06:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JF0jNOMKv4RxSku2VFOH82ohshoT4iSuFiHaXCVvhQ+CKHBvzkXbL2Gt65t1lVrbJuvpizqfF93pRDqM0twPFyJ/MWimPMG0HmcvY00mNE5q3pEdlVVFTbe9cwofroIg7i3EzrhStrX/wRlvSPogVWvxGN0BDMeCGGCUzrkf0rSzCSKqxXDSgrpWKyr6BCmBuvqy6K7H4cXuoMoUfkZ4AFJjGpPbSSC2dI00ngwRJbRb2piqKpnbHcoE2kxCk0MOJGPwViJPwA7WDX5mnHvkIjB8qjZcuuoc+USnplW48an18tJeGRMddCXmS+XDyQrRHT22jKx2TnuvpcqnMKw3fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vocRWzP8WIs+96eRyvcwmPHHOywPGqQgeuhFZ9r+jlU=; b=jr4wucUUjR0lJZ9IzcPkWaqZTKbWwzw642u1XVnpcATG7oqWvHuIfyGiJ2rG7+H6eYEvmf/il6J/nu1gIv1tZapg/2adq0Qyx5XeEjFsP0dUdWQfu/ItxXe2VuyV+xX8uhD9pmBCtIyr0QNNdOpRjLowr9LdTtmUG0/tQf3PJ1vRTFbkrHhdFg6mTle9QjHV+fjNaawd8nQJxWERiQZVAvsaWgX1T+lt601/7xO2w82nnRnPk2TXM3aYOHMiAhhYKN7YugtxA+Fo9flWEGtf0yxk20mCPjQob5f6iBmtx0LA3Dsnb4ljO3M1ToiIl/aM4fMoDzL0PJF/6BHOspSOHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=vocRWzP8WIs+96eRyvcwmPHHOywPGqQgeuhFZ9r+jlU=; b=U8YC3cJ4M0PsxkUQoN3u24KUkRYUrBS1j0H5Y0Ypk/6cuTpD8n64t41/QDb0ewSXeB2Vqeu8SHZ9/T631l2zHrWW1JGgJdjYhWLUiQ2AQkoxrJsWQr6dYxWDyRLEM9m+GXhjAyAE0sxxhaxnLWvuwoVrsmIgQnASyTEeOu2nJDw= Received: from DM5PR08CA0047.namprd08.prod.outlook.com (2603:10b6:4:60::36) by BN9PR12MB5276.namprd12.prod.outlook.com (2603:10b6:408:101::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37; Mon, 9 Oct 2023 14:06:04 +0000 Received: from DS2PEPF00003445.namprd04.prod.outlook.com (2603:10b6:4:60:cafe::e) by DM5PR08CA0047.outlook.office365.com (2603:10b6:4:60::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36 via Frontend Transport; Mon, 9 Oct 2023 14:06:03 +0000 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 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003445.mail.protection.outlook.com (10.167.17.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Mon, 9 Oct 2023 14:06:03 +0000 Received: from telco-siena.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.27; Mon, 9 Oct 2023 09:06:02 -0500 From: Sivaprasad Tummala To: CC: , , , , , , Subject: [PATCH v6 2/3] eal: removed unnecessary checks in x86 power monitor APIs Date: Mon, 9 Oct 2023 07:05:45 -0700 Message-ID: <20231009140546.862553-2-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231009140546.862553-1-sivaprasad.tummala@amd.com> References: <20230816185959.1331336-3-sivaprasad.tummala@amd.com> <20231009140546.862553-1-sivaprasad.tummala@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003445:EE_|BN9PR12MB5276:EE_ X-MS-Office365-Filtering-Correlation-Id: 38c68856-c5d9-4d9f-afa1-08dbc8d0dffa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4dQ9sV6K3nFpn2TkT0IIzsf1qucJ5pgQV5BRwEewpmPPuHdoGiCKGnncNpeFGanZ/zHa8oyTbWqzhUU+fJsDWR5pRb14iv4+PfHqmztHnyK9YGPqKwrRYVnEj3AgKJu9SH4YLsMzNUuOsXr4bYs34lEvvqzV2Tm7kdwC2YMQWo4RiBNQm/HbQP3HjInk4jI2nXaSFkC39OhRRcYl9JoQDWSM9Cwz17+uBGCQAg8dBV5I9erH5nstzAy7uT6IGd2L0nhxD2tGVvKz6ucGg39CpjtRnCBGoALFsy9xFnkZ3s/7juXHFQp6xLovdBqxZ6AbWLu5465K9ZH9J19guNjw5qzIgcxQU1MM7+EHACqrgYIr+6x21eh1yli0kJqbky83OEiD1h3KQMnUzN0I9ik1Z7kJ5qtd+crO1PDUFK6KVJ+idEgq4gipgjEfxPE00lAijf241U68Famz4D7e8NilWE187BOp87ZWG5lINCAN5gqjaGT60KtrGSycJ6yztHtw0yW8i76AlKuNuuVhXoAYTSzP2EHelwiZPQjwbKEM9XGqTjNsoHr6rcUapXk54g83X1sdCv+9GDPbUweQXWIW5dpu6xJYPE8kq4STB6mPUqdXMEtufClazmvfrbc1NpHb/Otzc8QnKRv5tkj0AiIOJPaaqF8undFx0bExVkrY4m8CI8p7N6vkoSlJNkX6clKx6uxcJcStCtggg0UFGeifkRCfD+ipq3Hox7HEv2mZtKoD79b+uO6UQ/Y16b3284v+Tj42+jtZc/aGpy0yU/jFzA== 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:(13230031)(4636009)(346002)(39860400002)(376002)(136003)(396003)(230922051799003)(64100799003)(451199024)(1800799009)(186009)(82310400011)(36840700001)(46966006)(40470700004)(81166007)(356005)(86362001)(36756003)(40480700001)(2906002)(82740400003)(478600001)(41300700001)(44832011)(8936002)(7696005)(5660300002)(4326008)(8676002)(6666004)(83380400001)(336012)(426003)(2616005)(1076003)(40460700003)(36860700001)(70586007)(6916009)(54906003)(70206006)(16526019)(26005)(316002)(47076005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 14:06:03.8620 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 38c68856-c5d9-4d9f-afa1-08dbc8d0dffa 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: DS2PEPF00003445.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5276 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org current x86 power monitor implementation fails on platforms with only monitor supported and not power_pause. Signed-off-by: Sivaprasad Tummala Acked-by: Anatoly Burakov --- lib/eal/x86/rte_power_intrinsics.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/eal/x86/rte_power_intrinsics.c b/lib/eal/x86/rte_power_intrinsics.c index 1467a32cb3..664cde01e9 100644 --- a/lib/eal/x86/rte_power_intrinsics.c +++ b/lib/eal/x86/rte_power_intrinsics.c @@ -31,6 +31,7 @@ __umwait_wakeup(volatile void *addr) static bool wait_supported; static bool wait_multi_supported; +static bool monitor_supported; static inline uint64_t __get_umwait_val(const volatile void *p, const uint8_t sz) @@ -82,7 +83,7 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc, uint64_t cur_value; /* prevent user from running this instruction if it's not supported */ - if (!wait_supported) + if (!monitor_supported) return -ENOTSUP; /* prevent non-EAL thread from using this API */ @@ -183,6 +184,8 @@ RTE_INIT(rte_power_intrinsics_init) { wait_supported = 1; if (i.power_monitor_multi) wait_multi_supported = 1; + if (i.power_monitor) + monitor_supported = 1; } int @@ -191,7 +194,7 @@ rte_power_monitor_wakeup(const unsigned int lcore_id) struct power_wait_status *s; /* prevent user from running this instruction if it's not supported */ - if (!wait_supported) + if (!monitor_supported) return -ENOTSUP; /* prevent buffer overrun */ From patchwork Mon Oct 9 14:05:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sivaprasad Tummala X-Patchwork-Id: 132435 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 051BF4233C; Mon, 9 Oct 2023 16:06:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8316E40A81; Mon, 9 Oct 2023 16:06:10 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2075.outbound.protection.outlook.com [40.107.93.75]) by mails.dpdk.org (Postfix) with ESMTP id B283C4026B for ; Mon, 9 Oct 2023 16:06:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NQ5ujkZpFs4SCTiKQsxYUPNtpqDoulCPZkw2oJw0SBbgy+yspvE2WfjAilG/q0x7TfEKD53/CeMiYPea31WbYiQAHjcPUn61gAQSazeyjgwufghGooepL7lCd3pvkFeDafHfSMQOzoKE08ggAJRVzC4Di4HIVKSbZyNDlD0efH0rp25d68HkLlKy/DQ7I/zUB/5ytByaGz9hHyFXML9k7muK09vWUCLyoML7h4ig2KbXHhPQuDXSygwk0vKpqJI4EnitMnv9Sq+3CQ34kKPiNAbn99Rga8gFEP6/OBdCP6LhfPIm3ptvWpUZ1l+sLthEn7UkGOOWQ5oSQYbzPfLkVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ivKCXEKCcA0KwMuCfWevSRC54dcc85CrmVRahiwL99M=; b=jatG6CU+RLI2uvtyUgRiDEGen7R0MgMeeFFTxwxYNcQ7ZlH0x0h4O2FCP5gVL3lcQxjTSqQyokZuYmhY9IjK4tl4Fyq9O8jwVwtGuZvPrGlc8gY9t7yQwsrAKnoflkAD47ubNeppureuKqidlQuFK16iXgjhZ4+HN8AZN7VNlvfDHKr3d/WsiULXsh1tjmwjbTQXVMmeMwGIgmvBX4NhS+1iHPeNLAqzefY12GuoDQ10gdgZyzdwK0/68I8IJGT8cukYw534zNuJA5tDCXJ4ZG2AOTrJg7rDAEYNINwYJLDUeYgPTIEnaB76V7p0J+xBizRoTiUSxJ/KHkULNqVzOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=ivKCXEKCcA0KwMuCfWevSRC54dcc85CrmVRahiwL99M=; b=OYqMFIOVcsvUN1MxC6kkKycUW9YDipkOrhkU65ZTe7KI9Ml1QIjWWlVhBDcSERVQdYOLFtx5kSbVgpMTvOH9HiRXN5NneZo6p1UcwmlTRQt7sEVlVEzwnWw4HBpwB2x3RZXPEYq5yqr+IHahLHogpfFZ+fWjMCyBEQwSREr7hH0= Received: from CH0PR13CA0056.namprd13.prod.outlook.com (2603:10b6:610:b2::31) by DS0PR12MB9424.namprd12.prod.outlook.com (2603:10b6:8:1b4::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Mon, 9 Oct 2023 14:06:05 +0000 Received: from DS2PEPF00003444.namprd04.prod.outlook.com (2603:10b6:610:b2:cafe::18) by CH0PR13CA0056.outlook.office365.com (2603:10b6:610:b2::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.20 via Frontend Transport; Mon, 9 Oct 2023 14:06:04 +0000 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 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003444.mail.protection.outlook.com (10.167.17.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Mon, 9 Oct 2023 14:06:04 +0000 Received: from telco-siena.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.27; Mon, 9 Oct 2023 09:06:03 -0500 From: Sivaprasad Tummala To: CC: , , , , , , Subject: [PATCH v6 3/3] power: amd power monitor support Date: Mon, 9 Oct 2023 07:05:46 -0700 Message-ID: <20231009140546.862553-3-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231009140546.862553-1-sivaprasad.tummala@amd.com> References: <20230816185959.1331336-3-sivaprasad.tummala@amd.com> <20231009140546.862553-1-sivaprasad.tummala@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003444:EE_|DS0PR12MB9424:EE_ X-MS-Office365-Filtering-Correlation-Id: 6545c65d-2983-4675-20ed-08dbc8d0e089 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FTcoHvsyTVika3vcVEIG2HAvP4IRAJl353oy6BjLwNYvsujXMOL7/Nd73Wz1n+y084rFAh6NdhPKebCo/Ewbm/oyp2hFZvlzW3wW0rGuFYVsEnSIni7EfqijbyK15jwMWGfxPMdCpWeH6ViyxBFVtg/8Qw922SQvvqFC6PpCN6ea7hUN1SPasuOzxnZ35hAgtBM1v2wDhFxvTGyiP3V0YjpcsCZbQG9Mx+IlNDCFl50zGCMzS2RyYkgETznjZTnIHR8/zHydQ5Vu3ja82ISRZEFgEc+Icr7cMEnbCgojQ1FK3n3tDQndFQr76KVUkXLH2j5AODfCvTAWrEYauonO01VUPVCV7BGH1OjoOEbybgTRU9Ya4h/xwZkYSLXd5XEynQpq3+/Tb2SS0ksqqw+UxXbSV7ml60YhV6pH3X7iD+If93FjtOjYM8Emf9c/gmuRulZ616ByH4Hgz5BKSv7WmF2uX7Pd4QZG8MNB7dpX3FHijdg3oi3Iprr60uUjCz1cPpJO3zTAwea21zAyLXB431exLjjHog7k9Dl940gCzb/h1MGLoZ6WmBhZfTVx9trPe439mWh5G1veyu0E1MbnxvwwHlKeJqF3rgzzjKMIJ7+SKDiGFlSzcNOYUAUBJ/sqeT03BihNbM6yYY+VF14kraIF4wyUC65XHuWR7ae9oz31JtDn3HrVU25U8so21OCmXw0XEeETYFM18Pc1/vBxSZzxy9zSlpUT17pavgoi574z5A/iSWSMv51OrQP3RQIblGDmysTNgSlHXo4U0MRjvg== 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:(13230031)(4636009)(39860400002)(346002)(136003)(396003)(376002)(230922051799003)(82310400011)(451199024)(186009)(1800799009)(64100799003)(40470700004)(36840700001)(46966006)(7696005)(2616005)(1076003)(41300700001)(478600001)(47076005)(336012)(426003)(26005)(44832011)(83380400001)(2906002)(6916009)(70586007)(5660300002)(70206006)(54906003)(316002)(4326008)(8676002)(8936002)(16526019)(40460700003)(82740400003)(36860700001)(356005)(36756003)(81166007)(40480700001)(86362001)(6666004)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 14:06:04.8111 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6545c65d-2983-4675-20ed-08dbc8d0e089 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: DS2PEPF00003444.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9424 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org mwaitx allows EPYC processors to enter a implementation dependent power/performance optimized state (C1 state) for a specific period or until a store to the monitored address range. Signed-off-by: Sivaprasad Tummala Acked-by: Anatoly Burakov Acked-by: Konstantin Ananyev --- lib/eal/x86/rte_power_intrinsics.c | 108 ++++++++++++++++++++++------- 1 file changed, 84 insertions(+), 24 deletions(-) diff --git a/lib/eal/x86/rte_power_intrinsics.c b/lib/eal/x86/rte_power_intrinsics.c index 664cde01e9..0d2953f570 100644 --- a/lib/eal/x86/rte_power_intrinsics.c +++ b/lib/eal/x86/rte_power_intrinsics.c @@ -17,6 +17,78 @@ static struct power_wait_status { volatile void *monitor_addr; /**< NULL if not currently sleeping */ } __rte_cache_aligned wait_status[RTE_MAX_LCORE]; +/** + * This functions uses UMONITOR/UMWAIT instructions and will enter C0.2 state. + * For more information about usage of these instructions, please refer to + * Intel(R) 64 and IA-32 Architectures Software Developer's Manual. + */ +static void intel_umonitor(volatile void *addr) +{ +#if defined(RTE_TOOLCHAIN_MSVC) || defined(__WAITPKG__) + /* cast away "volatile" when using the intrinsic */ + _umonitor((void *)(uintptr_t)addr); +#else + /* + * we're using raw byte codes for compiler versions which + * don't support this instruction natively. + */ + asm volatile(".byte 0xf3, 0x0f, 0xae, 0xf7;" + : + : "D"(addr)); +#endif +} + +static void intel_umwait(const uint64_t timeout) +{ + const uint32_t tsc_l = (uint32_t)timeout; + const uint32_t tsc_h = (uint32_t)(timeout >> 32); +#if defined(RTE_TOOLCHAIN_MSVC) || defined(__WAITPKG__) + _umwait(tsc_l, tsc_h); +#else + asm volatile(".byte 0xf2, 0x0f, 0xae, 0xf7;" + : /* ignore rflags */ + : "D"(0), /* enter C0.2 */ + "a"(tsc_l), "d"(tsc_h)); +#endif +} + +/** + * This functions uses MONITORX/MWAITX instructions and will enter C1 state. + * For more information about usage of these instructions, please refer to + * AMD64 Architecture Programmer’s Manual. + */ +static void amd_monitorx(volatile void *addr) +{ +#if defined(__MWAITX__) + /* cast away "volatile" when using the intrinsic */ + _mm_monitorx((void *)(uintptr_t)addr, 0, 0); +#else + asm volatile(".byte 0x0f, 0x01, 0xfa;" + : + : "a"(addr), + "c"(0), /* no extensions */ + "d"(0)); /* no hints */ +#endif +} + +static void amd_mwaitx(const uint64_t timeout) +{ + RTE_SET_USED(timeout); +#if defined(__MWAITX__) + _mm_mwaitx(0, 0, 0); +#else + asm volatile(".byte 0x0f, 0x01, 0xfb;" + : /* ignore rflags */ + : "a"(0), /* enter C1 */ + "c"(0)); /* no time-out */ +#endif +} + +static struct { + void (*mmonitor)(volatile void *addr); + void (*mwait)(const uint64_t timeout); +} __rte_cache_aligned power_monitor_ops; + static inline void __umwait_wakeup(volatile void *addr) { @@ -76,8 +148,6 @@ int rte_power_monitor(const struct rte_power_monitor_cond *pmc, const uint64_t tsc_timestamp) { - const uint32_t tsc_l = (uint32_t)tsc_timestamp; - const uint32_t tsc_h = (uint32_t)(tsc_timestamp >> 32); const unsigned int lcore_id = rte_lcore_id(); struct power_wait_status *s; uint64_t cur_value; @@ -105,19 +175,8 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc, rte_spinlock_lock(&s->lock); s->monitor_addr = pmc->addr; - /* set address for UMONITOR */ -#if defined(RTE_TOOLCHAIN_MSVC) || defined(__WAITPKG__) - /* cast away "volatile" when using the intrinsic */ - _umonitor((void *)(uintptr_t)pmc->addr); -#else - /* - * we're using raw byte codes for compiler versions which - * don't support this instruction natively. - */ - asm volatile(".byte 0xf3, 0x0f, 0xae, 0xf7;" - : - : "D"(pmc->addr)); -#endif + /* set address for memory monitor */ + power_monitor_ops.mmonitor(pmc->addr); /* now that we've put this address into monitor, we can unlock */ rte_spinlock_unlock(&s->lock); @@ -128,15 +187,8 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc, if (pmc->fn(cur_value, pmc->opaque) != 0) goto end; - /* execute UMWAIT */ -#if defined(RTE_TOOLCHAIN_MSVC) || defined(__WAITPKG__) - _umwait(tsc_l, tsc_h); -#else - asm volatile(".byte 0xf2, 0x0f, 0xae, 0xf7;" - : /* ignore rflags */ - : "D"(0), /* enter C0.2 */ - "a"(tsc_l), "d"(tsc_h)); -#endif + /* execute mwait */ + power_monitor_ops.mwait(tsc_timestamp); end: /* erase sleep address */ @@ -186,6 +238,14 @@ RTE_INIT(rte_power_intrinsics_init) { wait_multi_supported = 1; if (i.power_monitor) monitor_supported = 1; + + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_MONITORX)) { /* AMD */ + power_monitor_ops.mmonitor = &amd_monitorx; + power_monitor_ops.mwait = &amd_mwaitx; + } else { /* Intel */ + power_monitor_ops.mmonitor = &intel_umonitor; + power_monitor_ops.mwait = &intel_umwait; + } } int