From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id C8A1242932;
Thu, 13 Apr 2023 13:54:31 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id E2F084114B;
Thu, 13 Apr 2023 13:54:30 +0200 (CEST)
Received: from NAM11-DM6-obe.outbound.protection.outlook.com
(mail-dm6nam11on2081.outbound.protection.outlook.com [40.107.223.81])
by mails.dpdk.org (Postfix) with ESMTP id 6B4A14114B
for <dev@dpdk.org>; Thu, 13 Apr 2023 13:54:29 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=A0UmggAkNIe0+D5W/ewh8emZpWp4j2YV8u4qMDnrlKq6HZ/6kz2B81wEJPz4ApMcmjt3JD4w53zEDdTgKkdxuAIC1M903FSj93db+h7r3wyN1pAa/gwmXYoFMGCkgnOWQz7+Kl2WOhUA7Rb7yyC6kk5sb/BoPN75ejOxM48dYWdGSCVv6YsJBUz7ZibbcxMpzErZpzDbwCds9edI/lziIHgTTAQvfeKXTUUf9oluglXzggZwd7vRZ72FtmmrJsTksFt3+G8dqMuUusOfBg7jSYfVcjF7wWr8mkC2Mzr3o37pqpe9Kr7F32plaBCqZo4aEtOgZJ7lbyMbi/zvcfw+oQ==
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=LBJQ3SH88yQuLy1godzPAHw60bLB01Lv5vh6+rwZr5A=;
b=JbTi1liHFfoAS27vSqbkf9ccxYTWIqTBTLEEBWQE1eovA1B43fyK/eKS1z34fnRrkvrxLqceekB+FqAlYk+AroW+wH5FYv47fVtQDMIGOsi+aRfhLz1fg33H7J5fxr83RfyV6G9SX3mhlkbjNTXhc4aoLJJMOVlQ6rEqxExwx7OTkW7Yn9y/oMLuGPzOIcRM8w7NqwDLsdJNV+RaAH7eA7QBtz7Wth+LsMiUAEBUDQwqD1eYotcxV7bkRxN4wCMHJQ3lzYrYHkCTMefAc397fgJ8JVQqG1l9OX5ZDj8qJZEETUDqGbCHstkss0yy1fAn9u6gYy+dLb955EojL5p6Pw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
165.204.84.17) smtp.rcpttodomain=intel.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=LBJQ3SH88yQuLy1godzPAHw60bLB01Lv5vh6+rwZr5A=;
b=hnJsLRzlsCJPK++IZB5taqZ49v2w8Q6MDtc6zJFB4OM47NsnNo5/Lvyd1ssyAtKeAD5XCjLqQIbebks2EubspKJ7WraRYwqAFQAJEBucvarMEjVRbyl+eEeb6cqTChd1p9I9voqED2a+e48qOHpmuDrTe9W4nnLRbJb5i4FczSE=
Received: from DM5PR07CA0119.namprd07.prod.outlook.com (2603:10b6:4:ae::48) by
MN6PR12MB8592.namprd12.prod.outlook.com (2603:10b6:208:478::17) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr
2023 11:54:26 +0000
Received: from DM6NAM11FT075.eop-nam11.prod.protection.outlook.com
(2603:10b6:4:ae:cafe::72) by DM5PR07CA0119.outlook.office365.com
(2603:10b6:4:ae::48) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.32 via Frontend
Transport; Thu, 13 Apr 2023 11:54:26 +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
DM6NAM11FT075.mail.protection.outlook.com (10.13.173.42) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.20.6298.32 via Frontend Transport; Thu, 13 Apr 2023 11:54:26 +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.2375.34; Thu, 13 Apr
2023 06:54:24 -0500
From: Sivaprasad Tummala <sivaprasad.tummala@amd.com>
To: <david.hunt@intel.com>
CC: <dev@dpdk.org>
Subject: [PATCH v2 3/3] power: amd power monitor support
Date: Thu, 13 Apr 2023 04:53:34 -0700
Message-ID: <20230413115334.43172-3-sivaprasad.tummala@amd.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20230413115334.43172-1-sivaprasad.tummala@amd.com>
References: <20230413115334.43172-1-sivaprasad.tummala@amd.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
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: DM6NAM11FT075:EE_|MN6PR12MB8592:EE_
X-MS-Office365-Filtering-Correlation-Id: 634f7fd0-e102-4394-6070-08db3c15d4e4
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: JlcedJ8AJzAJ+s9XZkarAojOZD/kSUErK5OeZEVOf0eB5+iIDaseXj8cGroPq8d4rZz/8fwTjC7fMNg5zb6IfIeydBoCeMJfBgmz+zO1DG6xhE2H1jrr6Cyzel/7E3GV3cKmdrjHDEdX5PoEEzsLaxRuECkN4k2sEhsgGPFvJRy/yQnMLO+7ucQyf0OYEj1oWndqrextUeOkCyJRJjVBVBkFwDbnoeo82O6FhPHP4Rq54AvM01YeWU/AtXWy3frEx7KoHgKs3ZSWP9qRi3IW4i2psLbAEbTQY1JXkglzVEr4VLeVoVsp0bkV0IZJr/n3ca83+vvoGeLOVTwR870kz8KJrZlmo31fYhbnpdudL71bUSQriRosDcMuJ+nJXoGifzRxzJiId1Z7ZCOieB+oqVaupVSnYED9mQyksd54WGP7PN7uQBIG84Ki1PLAPxy9YZ8ya+8RFF+8JghpaF275RHSC05cn16/v6ECLi/g+VxxWCOsL/2zodxAZPULs9y7Q4DQGWarU6+63lVpC+5S7s1ZK9u22UTS0o++++gE5KhH0Ec7Rw43WDWxQaZzZ4RDIYipuvzyeiEx7TtgjcJ5UXYzXykQNOPBeFaqN333hbn+TYdZScGDGNHpS3TbJiU1lKlWubPmz37Nm7JdvSCN2W8FVRw/vYUGnxOla5MO12FBfmQyB7CHiwlScT8cHs19b/7a9yRFoOdQn6h/H0xvdmMobswImTGOlfwyT+yLVJA=
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:(13230028)(4636009)(376002)(136003)(39860400002)(346002)(396003)(451199021)(46966006)(36840700001)(40470700004)(86362001)(44832011)(40460700003)(478600001)(356005)(81166007)(316002)(41300700001)(82740400003)(8676002)(8936002)(5660300002)(6916009)(70206006)(40480700001)(70586007)(36756003)(1076003)(26005)(426003)(336012)(16526019)(186003)(36860700001)(4326008)(6666004)(83380400001)(2906002)(7696005)(2616005)(82310400005)(47076005)(36900700001);
DIR:OUT; SFP:1101;
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 11:54:26.5992 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 634f7fd0-e102-4394-6070-08db3c15d4e4
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: DM6NAM11FT075.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8592
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=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 <sivaprasad.tummala@amd.com>
---
lib/eal/x86/rte_power_intrinsics.c | 83 ++++++++++++++++++++++++++++--
lib/power/rte_power_pmd_mgmt.c | 3 +-
2 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/lib/eal/x86/rte_power_intrinsics.c b/lib/eal/x86/rte_power_intrinsics.c
index f749da9b85..d688066b3a 100644
--- a/lib/eal/x86/rte_power_intrinsics.c
+++ b/lib/eal/x86/rte_power_intrinsics.c
@@ -30,6 +30,7 @@ __umwait_wakeup(volatile void *addr)
static bool wait_supported;
static bool wait_multi_supported;
+static bool amd_mwaitx_supported;
static inline uint64_t
__get_umwait_val(const volatile void *p, const uint8_t sz)
@@ -65,6 +66,76 @@ __check_val_size(const uint8_t sz)
}
}
+/**
+ * This function 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 inline int
+amd_power_monitorx(const struct rte_power_monitor_cond *pmc,
+ const uint64_t tsc_timestamp)
+{
+ const unsigned int lcore_id = rte_lcore_id();
+ struct power_wait_status *s;
+ uint64_t cur_value;
+
+ RTE_SET_USED(tsc_timestamp);
+
+ /* prevent non-EAL thread from using this API */
+ if (lcore_id >= RTE_MAX_LCORE)
+ return -EINVAL;
+
+ if (pmc == NULL)
+ return -EINVAL;
+
+ if (__check_val_size(pmc->size) < 0)
+ return -EINVAL;
+
+ if (pmc->fn == NULL)
+ return -EINVAL;
+
+ s = &wait_status[lcore_id];
+
+ /* update sleep address */
+ rte_spinlock_lock(&s->lock);
+ s->monitor_addr = pmc->addr;
+
+ /*
+ * we're using raw byte codes for now as only the newest compiler
+ * versions support this instruction natively.
+ */
+ /* set address for MONITORX */
+ asm volatile(".byte 0x0f, 0x01, 0xfa;"
+ :
+ : "a"(pmc->addr),
+ "c"(0), /* no extensions */
+ "d"(0)); /* no hints */
+
+ /* now that we've put this address into monitor, we can unlock */
+ rte_spinlock_unlock(&s->lock);
+
+ cur_value = __get_umwait_val(pmc->addr, pmc->size);
+
+ /* check if callback indicates we should abort */
+ if (pmc->fn(cur_value, pmc->opaque) != 0)
+ goto end;
+
+ /* execute MWAITX */
+ asm volatile(".byte 0x0f, 0x01, 0xfb;"
+ : /* ignore rflags */
+ : "a"(0), /* enter C1 */
+ "c"(0), /* no time-out */
+ "b"(0));
+
+end:
+ /* erase sleep address */
+ rte_spinlock_lock(&s->lock);
+ s->monitor_addr = NULL;
+ rte_spinlock_unlock(&s->lock);
+
+ return 0;
+}
+
/**
* This function uses UMONITOR/UMWAIT instructions and will enter C0.2 state.
* For more information about usage of these instructions, please refer to
@@ -81,8 +152,12 @@ 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)
- return -ENOTSUP;
+ if (!wait_supported) {
+ if (amd_mwaitx_supported)
+ return amd_power_monitorx(pmc, tsc_timestamp);
+ else
+ return -ENOTSUP;
+ }
/* prevent non-EAL thread from using this API */
if (lcore_id >= RTE_MAX_LCORE)
@@ -170,6 +245,8 @@ RTE_INIT(rte_power_intrinsics_init) {
wait_supported = 1;
if (i.power_monitor_multi)
wait_multi_supported = 1;
+ if (i.amd_power_monitorx)
+ amd_mwaitx_supported = 1;
}
int
@@ -178,7 +255,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 (!wait_supported && !amd_mwaitx_supported)
return -ENOTSUP;
/* prevent buffer overrun */
diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
index ca1840387c..048a41dc29 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -447,7 +447,8 @@ check_monitor(struct pmd_core_cfg *cfg, const union queue *qdata)
bool multimonitor_supported;
/* check if rte_power_monitor is supported */
- if (!global_data.intrinsics_support.power_monitor) {
+ if ((!global_data.intrinsics_support.power_monitor) &&
+ (!global_data.intrinsics_support.amd_power_monitorx)) {
RTE_LOG(DEBUG, POWER, "Monitoring intrinsics are not supported\n");
return -ENOTSUP;
}
--
2.34.1