From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 027C7A0A0F; Wed, 30 Jun 2021 07:33:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A495640040; Wed, 30 Jun 2021 07:33:02 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80073.outbound.protection.outlook.com [40.107.8.73]) by mails.dpdk.org (Postfix) with ESMTP id 80CC64003C for ; Wed, 30 Jun 2021 07:33:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UmYEvAvtVnbcQm1MzGSgVJH8ENhRFUwsv3tot+DqMLk=; b=W4qP/83IPmW8nPOrnKKCghrbgtWFtJzoApBrVrgSO3ez3FVfXah2BEC1/9GyqDTtKrL7feaib8NEGxrJp4/VRfvOubyPwMWYjrkgDtTkBXbwL+fcrZtnntkQYfkQDQCuRMvVowwtR3PrGK3yTkOjUyGGSG+E/AUHaNyXm8bK1sg= Received: from AM6PR10CA0012.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::25) by DBBPR08MB4458.eurprd08.prod.outlook.com (2603:10a6:10:c8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.23; Wed, 30 Jun 2021 05:32:48 +0000 Received: from AM5EUR03FT025.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:89:cafe::28) by AM6PR10CA0012.outlook.office365.com (2603:10a6:209:89::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Wed, 30 Jun 2021 05:32:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dpdk.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dpdk.org; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT025.mail.protection.outlook.com (10.152.16.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Wed, 30 Jun 2021 05:32:47 +0000 Received: ("Tessian outbound e0fcff857b11:v97"); Wed, 30 Jun 2021 05:32:47 +0000 X-CR-MTA-TID: 64aa7808 Received: from 3b6906befc48.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 03DF97D7-56E7-4C7D-800F-7776923FEE03.1; Wed, 30 Jun 2021 05:32:41 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 3b6906befc48.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 30 Jun 2021 05:32:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iBNv6wyC4BzgWYcIJ8ms1daJAcbtzc2KFvBuyFPYYloJmjb/CE+NbVcHiZIFPQk7F753VAv7Jx1b/VOHuOIU84W4n/1jODrF2cXdheeKfkGExJBWs+QFSUwkglW4o87zIrSjN3xmo1SmJ5FMUlsQQhu9jh/NvV0r1R0EEZ2+XWPIXbzcxY3gdokO54P20aS9zYEpwZfaDuMQLS7inMaXHt07XmxBOiQA+ZnJpTPVPDRAOvnVyKGbwzO/RZxNdBF629GTl9+1EFENMxXy2LWTz5azWhCs4d7MezqvLcB5wQSpzFvPJoP+KPi282vVeIamLbcPyx5KmGF92F0u3PibOA== 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-SenderADCheck; bh=UmYEvAvtVnbcQm1MzGSgVJH8ENhRFUwsv3tot+DqMLk=; b=Shaedeu6TgHUbAeNFg83KZo6LDcOXKd3rYnzVjuU/EkWn27NqKHhVDAFPOySNqMqEHOG3fMgibrqRTO8sbWro8eaQiGueO/rsUa1z4AVI0lILA/EWBYYGk1+lOvm/JU24Srj3i+z3DUIyvMm9mKmNyOz9UPnqdKvJzG1pqKvwhvrmtzpetXtZWGfrvbW3R2ViyNY78e2iOZLxCcnqU5JBEqKZx18KR6vemnpvmJ0TxDtIs6gyTIUvNV1vSIMrxYoROjBscOQ9enQeKwUNNANef14zYV7ZrEdDhEGbWzsedgRchOfbyL8OK1KCiBAjHWAitUa1AVI4JVpuvgoNLbBkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UmYEvAvtVnbcQm1MzGSgVJH8ENhRFUwsv3tot+DqMLk=; b=W4qP/83IPmW8nPOrnKKCghrbgtWFtJzoApBrVrgSO3ez3FVfXah2BEC1/9GyqDTtKrL7feaib8NEGxrJp4/VRfvOubyPwMWYjrkgDtTkBXbwL+fcrZtnntkQYfkQDQCuRMvVowwtR3PrGK3yTkOjUyGGSG+E/AUHaNyXm8bK1sg= Received: from AM8PR08MB5796.eurprd08.prod.outlook.com (2603:10a6:20b:1d1::22) by AM0PR08MB3634.eurprd08.prod.outlook.com (2603:10a6:208:d6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.23; Wed, 30 Jun 2021 05:32:39 +0000 Received: from AM8PR08MB5796.eurprd08.prod.outlook.com ([fe80::548f:e4a8:de7e:5090]) by AM8PR08MB5796.eurprd08.prod.outlook.com ([fe80::548f:e4a8:de7e:5090%3]) with mapi id 15.20.4264.026; Wed, 30 Jun 2021 05:32:38 +0000 From: Richael Zhuang To: David Hunt , "dev@dpdk.org" CC: "anatoly.burakov@intel.com" , "stephen@networkplumber.org" , "reshma.pattan@intel.com" , nd , nd Thread-Topic: [PATCH v6 2/2] power: refactor pstate and acpi code Thread-Index: AQHXaCfcjZe4OrXzZE+k90qOvutuYqssEamQ Date: Wed, 30 Jun 2021 05:32:38 +0000 Message-ID: References: <20210622125853.2798-1-david.hunt@intel.com> <20210623120342.36321-1-david.hunt@intel.com> <20210623120342.36321-2-david.hunt@intel.com> In-Reply-To: <20210623120342.36321-2-david.hunt@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: 3E81F38F56495C45B9C103C0B2073256.0 x-checkrecipientchecked: true Authentication-Results-Original: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=arm.com; x-originating-ip: [203.126.0.113] x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: 8aa9a48b-8029-4657-28d2-08d93b887ee4 x-ms-traffictypediagnostic: AM0PR08MB3634:|DBBPR08MB4458: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:541;OLM:541; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: EY83Z/RWxUDRfE2GS/Rex2L3jMChgN7bxIcUKOoV4oGYic+SOKItroeteQPdzCI7FbXSyjyukkmEyKZK1spBnsOTAfPCAqpvQMOSzDYZ4+8eLv1DNNRHnhJkWayImhW+bZD4IXaPg07BcHhVaCzTs+raRMov87CPjgtsIFdUGqrD/mvAsGaSs67w2429oQwJCo7RYBov9yrIsah3825z49WYb8i5BbHqCZNEraC4cndZ9mnY6JxTIxQMtFK6JZEZJWwSNON2TpEnMOcmyxMIqmTXM/slSzt5TpNQi5UD3qD2leUBVuXtacKNXVpwjfjvAy1Gby1MIK6ZRQa3Yu0EuhHjajnVEmbnTB/I/2XF3hPkRmMIypPcxDfg+H7MnPUQ7NP8WpOrVnY+Pyl0iCLWi+XoETDGfDue7r4ztTJHV5cw3QeXIQxShswP7Lziy85LmL5QZv4h5DIWXVgIA+RR0jge+rSmdSjxuqS0NyBBeVPuQERXeS+T58pzjVSnGlgp/HZhumgYZh2p+N9KErLjGM5YDdpNwVxOal4jd5Cce0v8pyDKPZURR0frWLL3H7Vs+SkrYs/wl992flgzDqO+Dm5l5IyV9u/jFsGnSyZSsmtZ8VSWDdPj6y/Hgr3XH9sNpVFcTDAB5ZFgbGfL7O9vwg== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR08MB5796.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(396003)(39850400004)(376002)(346002)(66476007)(66556008)(66946007)(38100700002)(5660300002)(9686003)(7696005)(30864003)(86362001)(83380400001)(186003)(2906002)(122000001)(64756008)(76116006)(66446008)(55016002)(52536014)(53546011)(110136005)(54906003)(8936002)(33656002)(71200400001)(26005)(478600001)(6506007)(8676002)(4326008)(316002)(579004)(559001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?sKl2CGEGARQpaFBakQWfSQUwZppuCBPIFq/FxC5q1l+7ZkxogGNa9h+AEMw2?= =?us-ascii?Q?xnslrg8GPu06v62qyjH8HYC93gX3Cf6NKKS98kQWMBPx9lM1ItIAEYGbZERf?= =?us-ascii?Q?7yM8zAS+ctdO6ssj00H0bpoFE2pqjH1UkuhMFfnQqzNpPySE70rSa5Jn5Fc0?= =?us-ascii?Q?fRkYjWkwb17cooBwnTvYAJRYXUUc2t9lWVMmOfmiiywySlIBe7qZ+yWxwwiV?= =?us-ascii?Q?Dtt7pvWX7ISSzXPkqM6cgG8mgp9fWh5Gcdj5xxYTyEbNvhUJj75UTaKi1fsi?= =?us-ascii?Q?qjw2q0ZdcH42TQGzAFA1WJtQtDOtnACoarA3bNpU1Ls72aaCbBcd2qysEpyb?= =?us-ascii?Q?jwYyhzflIlwFr0kE28zRgsKfOIBfFeqrR8nt8rQFjY8XVXDfIwlkNKZRLQ8M?= =?us-ascii?Q?n3NWJcJsHETO1v+PlOjRHmnDhhgwDPlIIKEuIJcYlOq4AYrnGFlcX+Lz8/qN?= =?us-ascii?Q?I+Bnf0JcMN+yazUPclrnK9K1Oq1oPrqnP4vZfQC4HTBCERWKZZMk4+KOJsYW?= =?us-ascii?Q?2iM16fX0J81Z6+grKnBPjWMiesJEn7+qhawIESBqIjNoc/8+ZHEhCVpLZ9Z0?= =?us-ascii?Q?kxnJefItKZdp93UgbRXWVUhXKO4xweexKbde8TJsIkdTQXxrn11ZcmSiiOOH?= =?us-ascii?Q?/JHAs9aY/ud2yMdtXVmLDeUAkViqLS186tgdYskGT0c5J3hHhUYbUtoodKMj?= =?us-ascii?Q?xVJzp5diai/5va2u8MEdQ7Xe1SdL2G29Ly8P3p/0J0Ci3vUBHpODNsyRoQ2E?= =?us-ascii?Q?+aGUYSJP4Jn55+43slbFWJ5MP+dkQ7b2u01u3PR71Fg4chJG1Jfr3Fggrz9D?= =?us-ascii?Q?yhUydlSrb+IaBkp//fbcLBbBD8ADFRhbwQquiQQFWWmyPQBfYgpUynnxm3PU?= =?us-ascii?Q?pz417AXJppy3M1QzLjB21Hy//B3oeKzOzFNkjaJnklghrF89+R1kPkIFgjy6?= =?us-ascii?Q?DvnEFCgVw7k0EFedUxP1Yus4dXaoFA7we/Jxup5f9KvwvuZBadmqXR0JRYfi?= =?us-ascii?Q?KmSLK3sE6nnM0w/BhVtq2dRrm5XQsYr75cZB/7Jg+DCVcqSRGqfnPE+9LE8j?= =?us-ascii?Q?il5eZJblnTIaFno59Z6PvDAlF2z/3O79Ak/7MhvTu2AAibBxO0kY0xgowROz?= =?us-ascii?Q?Ddi10QQ5upf74ZxDe72kgj0Kka1kjuQNYUz9b9r9ZhbVX696NmIhe1sF3nvm?= =?us-ascii?Q?LziGPpwgQmCm/AAmCp7JRhNQOU+ikObnNfdhXZDKOZiGef8wIy2FMxT5S+fG?= =?us-ascii?Q?U8zmgeNgkUVCEHvW7IOQ2PuOr4lg22AqNGhtobEdHcpLGJrp4aoMVqCpvSt9?= =?us-ascii?Q?yY3H6K2utMcnxTW6yieO2Xrk?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3634 Original-Authentication-Results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT025.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 57b7245d-5223-4206-1f0c-08d93b887981 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HX5uiSb6isv89zLzYSWuWNuYHecUTPG1SqWbPBEqXLXxor8E8s0N/4c6AT2DFFKq2zswnnvcY7LR+Ji11P9bP0cx40BoBOO8DNEzlDp3O/HPr/9nvAgWp/LgphRAZ74D730ZEPTsi8hzabEz9jiuC1IzXqD1kzpkQSYCRsU1tg2Ho9mKPtqEifFzuO9eAkiuEAZ1bkesuJgCLrao4wzfVaS4JJigAnCYAMIjrSVNreco6piB6RYz8HpfE468+F41ayOI0j4Vy3s6w+VyGqoipAsb5jHaS84UbXi8SjtpnwIMGrtVCmro3ZbeYnkEx2M2rZ53/A9577HDg/I2SJJtfm3uYmtvGl4WmR6VuyvNx35pN0c2jRtP38e7u2c3IdyL0UfUH9S4EFbjublKR0802xtTKPxmpQEBwPbzwwDSL2Kd9oh7oiXfrGkLiEkU2zx7Kl3HwUXpw3p+v7DtgSTKxwGU/sC0y7dtWKuqoqNbTnMPGNpYKtC3JQejodEffsjp1NytWQABia+cvWbgKuFgJRzATpCnPdA5JZD8ijK6X7SqlyxeXJpLCclZBR8J4UdU4IZGyrmOFHQnk2pYX+MpdhOzt0Z07auRMNwyJuu/ulPdGCTZ6PWYy5oYOhn/BxSZBIv2cKbMt56hGDXw8V87tdo0jrFLauZt/DNvmUWuPwsCQBsgJQu10eJf7/SWP8Kx1mNZzroA1QMOwKyRxtgQTA== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(39840400004)(136003)(396003)(376002)(346002)(36840700001)(46966006)(8676002)(81166007)(8936002)(53546011)(86362001)(9686003)(82310400003)(2906002)(110136005)(47076005)(55016002)(6506007)(30864003)(83380400001)(478600001)(4326008)(5660300002)(33656002)(316002)(7696005)(36860700001)(356005)(336012)(70586007)(186003)(52536014)(70206006)(26005)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 05:32:47.9299 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8aa9a48b-8029-4657-28d2-08d93b887ee4 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT025.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4458 Subject: Re: [dpdk-dev] [PATCH v6 2/2] power: refactor pstate and acpi code 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 Sender: "dev" Hi, It looks good to me. I verified on arm platforms and didn't find any probl= em currently. BR, Richael > -----Original Message----- > From: David Hunt > Sent: Wednesday, June 23, 2021 8:04 PM > To: dev@dpdk.org > Cc: david.hunt@intel.com; anatoly.burakov@intel.com; Richael Zhuang > ; stephen@networkplumber.org; > reshma.pattan@intel.com; nd > Subject: [PATCH v6 2/2] power: refactor pstate and acpi code >=20 > From: Anatoly Burakov >=20 > Currently, ACPI and PSTATE modes have lots of code duplication, confusing > logic, and a bunch of other issues that can, and have, led to various bug= s and > resource leaks. >=20 > This commit factors out the common parts of sysfs reading/writing for ACP= I > and PSTATE drivers. >=20 > Signed-off-by: Anatoly Burakov > Signed-off-by: David Hunt >=20 > --- > changes in v5 > * fixed bugs raised by Richael Zhuang in review - open file rw+, etc. > * removed FOPS* and FOPEN* macros, which contained control statements. > * fixed some checkpatch warnings. > changes in v6 > * fixed check of fputs return, negative on error. > --- > lib/power/meson.build | 7 + > lib/power/power_acpi_cpufreq.c | 192 ++++------------ > lib/power/power_common.c | 146 ++++++++++++ > lib/power/power_common.h | 17 ++ > lib/power/power_pstate_cpufreq.c | 374 ++++++++++--------------------- > 5 files changed, 335 insertions(+), 401 deletions(-) >=20 > diff --git a/lib/power/meson.build b/lib/power/meson.build index > c1097d32f1..74c5f3a294 100644 > --- a/lib/power/meson.build > +++ b/lib/power/meson.build > @@ -5,6 +5,13 @@ if not is_linux > build =3D false > reason =3D 'only supported on Linux' > endif > + > +# we do some snprintf magic so silence format-nonliteral > +flag_nonliteral =3D '-Wno-format-nonliteral' > +if cc.has_argument(flag_nonliteral) > + cflags +=3D flag_nonliteral > +endif > + > sources =3D files( > 'guest_channel.c', > 'power_acpi_cpufreq.c', > diff --git a/lib/power/power_acpi_cpufreq.c > b/lib/power/power_acpi_cpufreq.c index 1b8c69cc8b..9ca8d8a8f2 100644 > --- a/lib/power/power_acpi_cpufreq.c > +++ b/lib/power/power_acpi_cpufreq.c > @@ -19,41 +19,10 @@ > #include "power_acpi_cpufreq.h" > #include "power_common.h" >=20 > -#ifdef RTE_LIBRTE_POWER_DEBUG > -#define POWER_DEBUG_TRACE(fmt, args...) do { \ > - RTE_LOG(ERR, POWER, "%s: " fmt, __func__, ## args); \ > -} while (0) > -#else > -#define POWER_DEBUG_TRACE(fmt, args...) -#endif > - > -#define FOPEN_OR_ERR_RET(f, retval) do { \ > - if ((f) =3D=3D NULL) { \ > - RTE_LOG(ERR, POWER, "File not opened\n"); \ > - return retval; \ > - } \ > -} while (0) > - > -#define FOPS_OR_NULL_GOTO(ret, label) do { \ > - if ((ret) =3D=3D NULL) { \ > - RTE_LOG(ERR, POWER, "fgets returns nothing\n"); \ > - goto label; \ > - } \ > -} while (0) > - > -#define FOPS_OR_ERR_GOTO(ret, label) do { \ > - if ((ret) < 0) { \ > - RTE_LOG(ERR, POWER, "File operations failed\n"); \ > - goto label; \ > - } \ > -} while (0) > - > #define STR_SIZE 1024 > #define POWER_CONVERT_TO_DECIMAL 10 >=20 > #define POWER_GOVERNOR_USERSPACE "userspace" > -#define POWER_SYSFILE_GOVERNOR \ > - "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_governor" > #define POWER_SYSFILE_AVAIL_FREQ \ >=20 > "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_available_frequen > cies" > #define POWER_SYSFILE_SETSPEED \ > @@ -135,53 +104,18 @@ set_freq_internal(struct acpi_power_info *pi, > uint32_t idx) static int power_set_governor_userspace(struct > acpi_power_info *pi) { > - FILE *f; > - int ret =3D -1; > - char buf[BUFSIZ]; > - char fullpath[PATH_MAX]; > - char *s; > - int val; > - > - snprintf(fullpath, sizeof(fullpath), POWER_SYSFILE_GOVERNOR, > - pi->lcore_id); > - f =3D fopen(fullpath, "rw+"); > - FOPEN_OR_ERR_RET(f, ret); > - > - s =3D fgets(buf, sizeof(buf), f); > - FOPS_OR_NULL_GOTO(s, out); > - /* Strip off terminating '\n' */ > - strtok(buf, "\n"); > - > - /* Save the original governor */ > - rte_strscpy(pi->governor_ori, buf, sizeof(pi->governor_ori)); > - > - /* Check if current governor is userspace */ > - if (strncmp(buf, POWER_GOVERNOR_USERSPACE, > - sizeof(POWER_GOVERNOR_USERSPACE)) =3D=3D 0) { > - ret =3D 0; > - POWER_DEBUG_TRACE("Power management governor of > lcore %u is " > - "already userspace\n", pi->lcore_id); > - goto out; > - } > - > - /* Write 'userspace' to the governor */ > - val =3D fseek(f, 0, SEEK_SET); > - FOPS_OR_ERR_GOTO(val, out); > - > - val =3D fputs(POWER_GOVERNOR_USERSPACE, f); > - FOPS_OR_ERR_GOTO(val, out); > - > - /* We need to flush to see if the fputs succeeds */ > - val =3D fflush(f); > - FOPS_OR_ERR_GOTO(val, out); > - > - ret =3D 0; > - RTE_LOG(INFO, POWER, "Power management governor of lcore %u > has been " > - "set to user space successfully\n", pi->lcore_id); > -out: > - fclose(f); > + return power_set_governor(pi->lcore_id, > POWER_GOVERNOR_USERSPACE, > + pi->governor_ori, sizeof(pi->governor_ori)); } >=20 > - return ret; > +/** > + * It is to check the governor and then set the original governor back > +if > + * needed by writing the sys file. > + */ > +static int > +power_set_governor_original(struct acpi_power_info *pi) { > + return power_set_governor(pi->lcore_id, pi->governor_ori, NULL, 0); > } >=20 > /** > @@ -195,22 +129,22 @@ power_get_available_freqs(struct > acpi_power_info *pi) > int ret =3D -1, i, count; > char *p; > char buf[BUFSIZ]; > - char fullpath[PATH_MAX]; > char *freqs[RTE_MAX_LCORE_FREQS]; > - char *s; > - > - snprintf(fullpath, sizeof(fullpath), POWER_SYSFILE_AVAIL_FREQ, > - pi->lcore_id); > - f =3D fopen(fullpath, "r"); > - FOPEN_OR_ERR_RET(f, ret); >=20 > - s =3D fgets(buf, sizeof(buf), f); > - FOPS_OR_NULL_GOTO(s, out); > + open_core_sysfs_file(POWER_SYSFILE_AVAIL_FREQ, pi->lcore_id, "r", > + &f); > + if (f =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "failed to open %s\n", > + POWER_SYSFILE_AVAIL_FREQ); > + goto out; > + } >=20 > - /* Strip the line break if there is */ > - p =3D strchr(buf, '\n'); > - if (p !=3D NULL) > - *p =3D 0; > + ret =3D read_core_sysfs_s(f, buf, sizeof(buf)); > + if ((ret) < 0) { > + RTE_LOG(ERR, POWER, "Failed to read %s\n", > + POWER_SYSFILE_AVAIL_FREQ); > + goto out; > + } >=20 > /* Split string into at most RTE_MAX_LCORE_FREQS frequencies */ > count =3D rte_strsplit(buf, sizeof(buf), freqs, @@ -250,7 +184,8 @@ > power_get_available_freqs(struct acpi_power_info *pi) > POWER_DEBUG_TRACE("%d frequency(s) of lcore %u are > available\n", > count, pi->lcore_id); > out: > - fclose(f); > + if (f !=3D NULL) > + fclose(f); >=20 > return ret; > } > @@ -262,18 +197,24 @@ static int > power_init_for_setting_freq(struct acpi_power_info *pi) { > FILE *f; > - char fullpath[PATH_MAX]; > char buf[BUFSIZ]; > uint32_t i, freq; > - char *s; > + int ret; >=20 > - snprintf(fullpath, sizeof(fullpath), POWER_SYSFILE_SETSPEED, > - pi->lcore_id); > - f =3D fopen(fullpath, "rw+"); > - FOPEN_OR_ERR_RET(f, -1); > + open_core_sysfs_file(POWER_SYSFILE_SETSPEED, pi->lcore_id, "rw+", > + &f); > + if (f =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "Failed to open %s\n", > + POWER_SYSFILE_SETSPEED); > + goto err; > + } >=20 > - s =3D fgets(buf, sizeof(buf), f); > - FOPS_OR_NULL_GOTO(s, out); > + ret =3D read_core_sysfs_s(f, buf, sizeof(buf)); > + if ((ret) < 0) { > + RTE_LOG(ERR, POWER, "Failed to read %s\n", > + POWER_SYSFILE_SETSPEED); > + goto err; > + } >=20 > freq =3D strtoul(buf, NULL, POWER_CONVERT_TO_DECIMAL); > for (i =3D 0; i < pi->nb_freqs; i++) { > @@ -284,8 +225,9 @@ power_init_for_setting_freq(struct acpi_power_info > *pi) > } > } >=20 > -out: > - fclose(f); > +err: > + if (f !=3D NULL) > + fclose(f); >=20 > return -1; > } > @@ -369,54 +311,6 @@ power_acpi_cpufreq_init(unsigned int lcore_id) > return -1; > } >=20 > -/** > - * It is to check the governor and then set the original governor back i= f > - * needed by writing the sys file. > - */ > -static int > -power_set_governor_original(struct acpi_power_info *pi) -{ > - FILE *f; > - int ret =3D -1; > - char buf[BUFSIZ]; > - char fullpath[PATH_MAX]; > - char *s; > - int val; > - > - snprintf(fullpath, sizeof(fullpath), POWER_SYSFILE_GOVERNOR, > - pi->lcore_id); > - f =3D fopen(fullpath, "rw+"); > - FOPEN_OR_ERR_RET(f, ret); > - > - s =3D fgets(buf, sizeof(buf), f); > - FOPS_OR_NULL_GOTO(s, out); > - > - /* Check if the governor to be set is the same as current */ > - if (strncmp(buf, pi->governor_ori, sizeof(pi->governor_ori)) =3D=3D 0) = { > - ret =3D 0; > - POWER_DEBUG_TRACE("Power management governor of > lcore %u " > - "has already been set to %s\n", > - pi->lcore_id, pi->governor_ori); > - goto out; > - } > - > - /* Write back the original governor */ > - val =3D fseek(f, 0, SEEK_SET); > - FOPS_OR_ERR_GOTO(val, out); > - > - val =3D fputs(pi->governor_ori, f); > - FOPS_OR_ERR_GOTO(val, out); > - > - ret =3D 0; > - RTE_LOG(INFO, POWER, "Power management governor of lcore %u " > - "has been set back to %s successfully\n", > - pi->lcore_id, pi->governor_ori); > -out: > - fclose(f); > - > - return ret; > -} > - > int > power_acpi_cpufreq_exit(unsigned int lcore_id) { diff --git > a/lib/power/power_common.c b/lib/power/power_common.c index > 67e3318ec7..4deb343dae 100644 > --- a/lib/power/power_common.c > +++ b/lib/power/power_common.c > @@ -3,13 +3,20 @@ > */ >=20 > #include > +#include > #include > #include >=20 > +#include > +#include > + > #include "power_common.h" >=20 > #define POWER_SYSFILE_SCALING_DRIVER \ > "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_driver" > +#define POWER_SYSFILE_GOVERNOR \ > + "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_governor" > +#define POWER_CONVERT_TO_DECIMAL 10 >=20 > int > cpufreq_check_scaling_driver(const char *driver_name) @@ -58,3 +65,142 > @@ cpufreq_check_scaling_driver(const char *driver_name) > */ > return 1; > } > + > +int > +open_core_sysfs_file(const char *template, unsigned int core, const char > *mode, > + FILE **f) > +{ > + char fullpath[PATH_MAX]; > + FILE *tmpf; > + > + /* silenced -Wformat-nonliteral here */ > + snprintf(fullpath, sizeof(fullpath), template, core); > + tmpf =3D fopen(fullpath, mode); > + *f =3D tmpf; > + if (tmpf =3D=3D NULL) > + return -1; > + > + return 0; > +} > + > +int > +read_core_sysfs_u32(FILE *f, uint32_t *val) { > + char buf[BUFSIZ]; > + uint32_t fval; > + char *s; > + > + s =3D fgets(buf, sizeof(buf), f); > + if (s =3D=3D NULL) > + return -1; > + > + /* fgets puts null terminator in, but do this just in case */ > + buf[BUFSIZ - 1] =3D '\0'; > + > + /* strip off any terminating newlines */ > + *strchrnul(buf, '\n') =3D '\0'; > + > + fval =3D strtoul(buf, NULL, POWER_CONVERT_TO_DECIMAL); > + > + /* write the value */ > + *val =3D fval; > + > + return 0; > +} > + > +int > +read_core_sysfs_s(FILE *f, char *buf, unsigned int len) { > + char *s; > + > + s =3D fgets(buf, len, f); > + if (s =3D=3D NULL) > + return -1; > + > + /* fgets puts null terminator in, but do this just in case */ > + buf[len - 1] =3D '\0'; > + > + /* strip off any terminating newlines */ > + *strchrnul(buf, '\n') =3D '\0'; > + > + return 0; > +} > + > +int > +write_core_sysfs_s(FILE *f, const char *str) { > + int ret; > + > + ret =3D fseek(f, 0, SEEK_SET); > + if (ret !=3D 0) > + return -1; > + > + ret =3D fputs(str, f); > + if (ret < 0) > + return -1; > + > + /* flush the output */ > + ret =3D fflush(f); > + if (ret !=3D 0) > + return -1; > + > + return 0; > +} > + > +/** > + * It is to check the current scaling governor by reading sys file, and > +then > + * set it into 'performance' if it is not by writing the sys file. The > +original > + * governor will be saved for rolling back. > + */ > +int > +power_set_governor(unsigned int lcore_id, const char *new_governor, > + char *orig_governor, size_t orig_governor_len) { > + FILE *f_governor =3D NULL; > + int ret =3D -1; > + char buf[BUFSIZ]; > + > + open_core_sysfs_file(POWER_SYSFILE_GOVERNOR, lcore_id, "rw+", > + &f_governor); > + if (f_governor =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "failed to open %s\n", > + POWER_SYSFILE_GOVERNOR); > + goto out; > + } > + > + ret =3D read_core_sysfs_s(f_governor, buf, sizeof(buf)); > + if (ret < 0) { > + RTE_LOG(ERR, POWER, "Failed to read %s\n", > + POWER_SYSFILE_GOVERNOR); > + goto out; > + } > + > + /* Save the original governor, if it was provided */ > + if (orig_governor) > + rte_strscpy(orig_governor, buf, orig_governor_len); > + > + /* Check if current governor is already what we want */ > + if (strcmp(buf, new_governor) =3D=3D 0) { > + ret =3D 0; > + POWER_DEBUG_TRACE("Power management governor of > lcore %u is " > + "already %s\n", lcore_id, new_governor); > + goto out; > + } > + > + /* Write the new governor */ > + ret =3D write_core_sysfs_s(f_governor, new_governor); > + if (ret < 0) { > + RTE_LOG(ERR, POWER, "Failed to write %s\n", > + POWER_SYSFILE_GOVERNOR); > + goto out; > + } > + > + ret =3D 0; > + RTE_LOG(INFO, POWER, "Power management governor of lcore %u > has been " > + "set to '%s' successfully\n", lcore_id, new_governor); > +out: > + if (f_governor !=3D NULL) > + fclose(f_governor); > + > + return ret; > +} > diff --git a/lib/power/power_common.h b/lib/power/power_common.h > index fab3ca995a..ef9f5fa855 100644 > --- a/lib/power/power_common.h > +++ b/lib/power/power_common.h > @@ -5,9 +5,26 @@ > #ifndef _POWER_COMMON_H_ > #define _POWER_COMMON_H_ >=20 > +#include > + > #define RTE_POWER_INVALID_FREQ_INDEX (~0) >=20 > + > +#ifdef RTE_LIBRTE_POWER_DEBUG > +#define POWER_DEBUG_TRACE(fmt, args...) \ > + RTE_LOG(ERR, POWER, "%s: " fmt, __func__, ## args) #else > #define > +POWER_DEBUG_TRACE(fmt, args...) #endif > + > /* check if scaling driver matches one we want */ int > cpufreq_check_scaling_driver(const char *driver); > +int power_set_governor(unsigned int lcore_id, const char *new_governor, > + char *orig_governor, size_t orig_governor_len); int > +open_core_sysfs_file(const char *template, unsigned int core, > + const char *mode, FILE **f); > +int read_core_sysfs_u32(FILE *f, uint32_t *val); int > +read_core_sysfs_s(FILE *f, char *buf, unsigned int len); int > +write_core_sysfs_s(FILE *f, const char *str); >=20 > #endif /* _POWER_COMMON_H_ */ > diff --git a/lib/power/power_pstate_cpufreq.c > b/lib/power/power_pstate_cpufreq.c > index 2cfc54acf3..ed10bd193b 100644 > --- a/lib/power/power_pstate_cpufreq.c > +++ b/lib/power/power_pstate_cpufreq.c > @@ -21,46 +21,13 @@ > #include "power_pstate_cpufreq.h" > #include "power_common.h" >=20 > - > -#ifdef RTE_LIBRTE_POWER_DEBUG > -#define POWER_DEBUG_TRACE(fmt, args...) do { \ > - RTE_LOG(ERR, POWER, "%s: " fmt, __func__, ## args); \ > -} while (0) > -#else > -#define POWER_DEBUG_TRACE(fmt, args...) -#endif > - > -#define FOPEN_OR_ERR_RET(f, retval) do { \ > - if ((f) =3D=3D NULL) { \ > - RTE_LOG(ERR, POWER, "File not opened\n"); \ > - return retval; \ > - } \ > -} while (0) > - > -#define FOPS_OR_NULL_GOTO(ret, label) do { \ > - if ((ret) =3D=3D NULL) { \ > - RTE_LOG(ERR, POWER, "fgets returns nothing\n"); \ > - goto label; \ > - } \ > -} while (0) > - > -#define FOPS_OR_ERR_GOTO(ret, label) do { \ > - if ((ret) < 0) { \ > - RTE_LOG(ERR, POWER, "File operations failed\n"); \ > - goto label; \ > - } \ > -} while (0) > - > /* macros used for rounding frequency to nearest 100000 */ #define > FREQ_ROUNDING_DELTA 50000 #define ROUND_FREQ_TO_N_100000 > 100000 >=20 > -#define POWER_CONVERT_TO_DECIMAL 10 > #define BUS_FREQ 100000 >=20 > #define POWER_GOVERNOR_PERF "performance" > -#define POWER_SYSFILE_GOVERNOR \ > - "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_governor" > #define POWER_SYSFILE_MAX_FREQ \ >=20 > "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_max_freq" > #define POWER_SYSFILE_MIN_FREQ \ > @@ -154,91 +121,78 @@ out: close(fd); > static int > power_init_for_setting_freq(struct pstate_power_info *pi) { > - FILE *f_min, *f_max, *f_base =3D NULL, *f_base_max; > - char fullpath_min[PATH_MAX]; > - char fullpath_max[PATH_MAX]; > - char fullpath_base[PATH_MAX]; > - char fullpath_base_max[PATH_MAX]; > - char buf_base[BUFSIZ]; > - char *s_base; > - char *s_base_max; > - uint32_t base_ratio =3D 0; > - uint32_t base_max_ratio =3D 0; > - uint64_t max_non_turbo =3D 0; > - int ret_val =3D 0; > - > - snprintf(fullpath_base_max, > - sizeof(fullpath_base_max), > - POWER_SYSFILE_BASE_MAX_FREQ, > - pi->lcore_id); > - f_base_max =3D fopen(fullpath_base_max, "r"); > - FOPEN_OR_ERR_RET(f_base_max, -1); > - if (f_base_max !=3D NULL) { > - s_base_max =3D fgets(buf_base, sizeof(buf_base), > f_base_max); > - > - /* close the file unconditionally */ > - fclose(f_base_max); > - f_base_max =3D NULL; > - > - FOPS_OR_NULL_GOTO(s_base_max, out); > - > - buf_base[BUFSIZ-1] =3D '\0'; > - if (strlen(buf_base)) > - /* Strip off terminating '\n' */ > - strtok(buf_base, "\n"); > - > - base_max_ratio =3D > - strtoul(buf_base, NULL, > POWER_CONVERT_TO_DECIMAL) > - / BUS_FREQ; > + FILE *f_base =3D NULL, *f_base_max =3D NULL, *f_min =3D NULL, *f_max = =3D > NULL; > + uint32_t base_ratio, base_max_ratio; > + uint64_t max_non_turbo; > + int ret; > + > + /* open all files we expect to have open */ > + open_core_sysfs_file(POWER_SYSFILE_BASE_MAX_FREQ, pi- > >lcore_id, "r", > + &f_base_max); > + if (f_base_max =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "failed to open %s\n", > + POWER_SYSFILE_BASE_MAX_FREQ); > + goto err; > + } > + > + open_core_sysfs_file(POWER_SYSFILE_MIN_FREQ, pi->lcore_id, > "rw+", > + &f_min); > + if (f_min =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "failed to open %s\n", > + POWER_SYSFILE_MIN_FREQ); > + goto err; > + } > + > + open_core_sysfs_file(POWER_SYSFILE_MAX_FREQ, pi->lcore_id, > "rw+", > + &f_max); > + if (f_max =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "failed to open %s\n", > + POWER_SYSFILE_MAX_FREQ); > + goto err; > + } > + > + open_core_sysfs_file(POWER_SYSFILE_BASE_FREQ, pi->lcore_id, "r", > + &f_base); > + /* base ratio file may not exist in some kernels, so no error check */ > + > + /* read base max ratio */ > + ret =3D read_core_sysfs_u32(f_base_max, &base_max_ratio); > + if (ret < 0) { > + RTE_LOG(ERR, POWER, "Failed to read %s\n", > + POWER_SYSFILE_BASE_MAX_FREQ); > + goto err; > + } > + > + /* base ratio may not exist */ > + if (f_base !=3D NULL) { > + ret =3D read_core_sysfs_u32(f_base, &base_ratio); > + if (ret < 0) { > + RTE_LOG(ERR, POWER, "Failed to read %s\n", > + POWER_SYSFILE_BASE_FREQ); > + goto err; > + } > + } else { > + base_ratio =3D 0; > } >=20 > - snprintf(fullpath_min, sizeof(fullpath_min), > POWER_SYSFILE_MIN_FREQ, > - pi->lcore_id); > - f_min =3D fopen(fullpath_min, "rw+"); > - FOPEN_OR_ERR_RET(f_min, -1); > + /* Add MSR read to detect turbo status */ > + if (power_rdmsr(PLATFORM_INFO, &max_non_turbo, pi->lcore_id) < > 0) > + goto err; > + /* no errors after this point */ >=20 > - snprintf(fullpath_max, sizeof(fullpath_max), > POWER_SYSFILE_MAX_FREQ, > - pi->lcore_id); > - f_max =3D fopen(fullpath_max, "rw+"); > - if (f_max =3D=3D NULL) > - fclose(f_min); > - FOPEN_OR_ERR_RET(f_max, -1); > + /* convert ratios to bins */ > + base_max_ratio /=3D BUS_FREQ; > + base_ratio /=3D BUS_FREQ; >=20 > + /* assign file handles */ > pi->f_cur_min =3D f_min; > pi->f_cur_max =3D f_max; >=20 > - snprintf(fullpath_base, sizeof(fullpath_base), > POWER_SYSFILE_BASE_FREQ, > - pi->lcore_id); > - > - f_base =3D fopen(fullpath_base, "r"); > - if (f_base =3D=3D NULL) { > - /* No sysfs base_frequency, that's OK, continue without */ > - base_ratio =3D 0; > - } else { > - s_base =3D fgets(buf_base, sizeof(buf_base), f_base); > - FOPS_OR_NULL_GOTO(s_base, out); > - > - buf_base[BUFSIZ-1] =3D '\0'; > - if (strlen(buf_base)) > - /* Strip off terminating '\n' */ > - strtok(buf_base, "\n"); > - > - base_ratio =3D strtoul(buf_base, NULL, > POWER_CONVERT_TO_DECIMAL) > - / BUS_FREQ; > - } > - > - /* Add MSR read to detect turbo status */ > - > - if (power_rdmsr(PLATFORM_INFO, &max_non_turbo, pi->lcore_id) < > 0) { > - ret_val =3D -1; > - goto out; > - } > - > max_non_turbo =3D > (max_non_turbo&NON_TURBO_MASK)>>NON_TURBO_OFFSET; >=20 > POWER_DEBUG_TRACE("no turbo perf %"PRIu64"\n", > max_non_turbo); >=20 > - pi->non_turbo_max_ratio =3D max_non_turbo; > + pi->non_turbo_max_ratio =3D (uint32_t)max_non_turbo; >=20 > /* > * If base_frequency is reported as greater than the maximum @@ - > 264,7 +218,20 @@ power_init_for_setting_freq(struct pstate_power_info > *pi) > out: > if (f_base !=3D NULL) > fclose(f_base); > - return ret_val; > + fclose(f_base_max); > + /* f_min and f_max are stored, no need to close */ > + return 0; > + > +err: > + if (f_base !=3D NULL) > + fclose(f_base); > + if (f_base_max !=3D NULL) > + fclose(f_base_max); > + if (f_min !=3D NULL) > + fclose(f_min); > + if (f_max !=3D NULL) > + fclose(f_max); > + return -1; > } >=20 > static int > @@ -369,53 +336,8 @@ set_freq_internal(struct pstate_power_info *pi, > uint32_t idx) static int power_set_governor_performance(struct > pstate_power_info *pi) { > - FILE *f; > - int ret =3D -1; > - char buf[BUFSIZ]; > - char fullpath[PATH_MAX]; > - char *s; > - int val; > - > - snprintf(fullpath, sizeof(fullpath), POWER_SYSFILE_GOVERNOR, > - pi->lcore_id); > - f =3D fopen(fullpath, "rw+"); > - FOPEN_OR_ERR_RET(f, ret); > - > - s =3D fgets(buf, sizeof(buf), f); > - FOPS_OR_NULL_GOTO(s, out); > - /* Strip off terminating '\n' */ > - strtok(buf, "\n"); > - > - /* Save the original governor */ > - rte_strscpy(pi->governor_ori, buf, sizeof(pi->governor_ori)); > - > - /* Check if current governor is performance */ > - if (strncmp(buf, POWER_GOVERNOR_PERF, > - sizeof(POWER_GOVERNOR_PERF)) =3D=3D 0) { > - ret =3D 0; > - POWER_DEBUG_TRACE("Power management governor of > lcore %u is " > - "already performance\n", pi->lcore_id); > - goto out; > - } > - > - /* Write 'performance' to the governor */ > - val =3D fseek(f, 0, SEEK_SET); > - FOPS_OR_ERR_GOTO(val, out); > - > - val =3D fputs(POWER_GOVERNOR_PERF, f); > - FOPS_OR_ERR_GOTO(val, out); > - > - /* We need to flush to see if the fputs succeeds */ > - val =3D fflush(f); > - FOPS_OR_ERR_GOTO(val, out); > - > - ret =3D 0; > - RTE_LOG(INFO, POWER, "Power management governor of lcore %u > has been " > - "set to performance successfully\n", pi->lcore_id); > -out: > - fclose(f); > - > - return ret; > + return power_set_governor(pi->lcore_id, POWER_GOVERNOR_PERF, > + pi->governor_ori, sizeof(pi->governor_ori)); > } >=20 > /** > @@ -425,45 +347,7 @@ power_set_governor_performance(struct > pstate_power_info *pi) static int power_set_governor_original(struct > pstate_power_info *pi) { > - FILE *f; > - int ret =3D -1; > - char buf[BUFSIZ]; > - char fullpath[PATH_MAX]; > - char *s; > - int val; > - > - snprintf(fullpath, sizeof(fullpath), POWER_SYSFILE_GOVERNOR, > - pi->lcore_id); > - f =3D fopen(fullpath, "rw+"); > - FOPEN_OR_ERR_RET(f, ret); > - > - s =3D fgets(buf, sizeof(buf), f); > - FOPS_OR_NULL_GOTO(s, out); > - > - /* Check if the governor to be set is the same as current */ > - if (strncmp(buf, pi->governor_ori, sizeof(pi->governor_ori)) =3D=3D 0) = { > - ret =3D 0; > - POWER_DEBUG_TRACE("Power management governor of > lcore %u " > - "has already been set to %s\n", > - pi->lcore_id, pi->governor_ori); > - goto out; > - } > - > - /* Write back the original governor */ > - val =3D fseek(f, 0, SEEK_SET); > - FOPS_OR_ERR_GOTO(val, out); > - > - val =3D fputs(pi->governor_ori, f); > - FOPS_OR_ERR_GOTO(val, out); > - > - ret =3D 0; > - RTE_LOG(INFO, POWER, "Power management governor of lcore %u " > - "has been set back to %s successfully\n", > - pi->lcore_id, pi->governor_ori); > -out: > - fclose(f); > - > - return ret; > + return power_set_governor(pi->lcore_id, pi->governor_ori, NULL, 0); > } >=20 > /** > @@ -473,51 +357,42 @@ power_set_governor_original(struct > pstate_power_info *pi) static int power_get_available_freqs(struct > pstate_power_info *pi) { > - FILE *f_min, *f_max; > + FILE *f_min =3D NULL, *f_max =3D NULL; > int ret =3D -1; > - char *p_min, *p_max; > - char buf_min[BUFSIZ]; > - char buf_max[BUFSIZ]; > - char fullpath_min[PATH_MAX]; > - char fullpath_max[PATH_MAX]; > - char *s_min, *s_max; > uint32_t sys_min_freq =3D 0, sys_max_freq =3D 0, base_max_freq =3D 0; > uint32_t i, num_freqs =3D 0; >=20 > - snprintf(fullpath_max, sizeof(fullpath_max), > - POWER_SYSFILE_BASE_MAX_FREQ, > - pi->lcore_id); > - snprintf(fullpath_min, sizeof(fullpath_min), > - POWER_SYSFILE_BASE_MIN_FREQ, > - pi->lcore_id); > - > - f_min =3D fopen(fullpath_min, "r"); > - FOPEN_OR_ERR_RET(f_min, ret); > - > - f_max =3D fopen(fullpath_max, "r"); > - if (f_max =3D=3D NULL) > - fclose(f_min); > - > - FOPEN_OR_ERR_RET(f_max, ret); > - > - s_min =3D fgets(buf_min, sizeof(buf_min), f_min); > - FOPS_OR_NULL_GOTO(s_min, out); > - > - s_max =3D fgets(buf_max, sizeof(buf_max), f_max); > - FOPS_OR_NULL_GOTO(s_max, out); > - > + /* open all files */ > + open_core_sysfs_file(POWER_SYSFILE_BASE_MAX_FREQ, pi- > >lcore_id, "r", > + &f_max); > + if (f_max =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "failed to open %s\n", > + POWER_SYSFILE_BASE_MAX_FREQ); > + goto out; > + } >=20 > - /* Strip the line break if there is */ > - p_min =3D strchr(buf_min, '\n'); > - if (p_min !=3D NULL) > - *p_min =3D 0; > + open_core_sysfs_file(POWER_SYSFILE_BASE_MIN_FREQ, pi->lcore_id, > "r", > + &f_min); > + if (f_min =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "failed to open %s\n", > + POWER_SYSFILE_BASE_MIN_FREQ); > + goto out; > + } >=20 > - p_max =3D strchr(buf_max, '\n'); > - if (p_max !=3D NULL) > - *p_max =3D 0; > + /* read base ratios */ > + ret =3D read_core_sysfs_u32(f_max, &sys_max_freq); > + if (ret < 0) { > + RTE_LOG(ERR, POWER, "Failed to read %s\n", > + POWER_SYSFILE_BASE_MAX_FREQ); > + goto out; > + } >=20 > - sys_min_freq =3D strtoul(buf_min, &p_min, > POWER_CONVERT_TO_DECIMAL); > - sys_max_freq =3D strtoul(buf_max, &p_max, > POWER_CONVERT_TO_DECIMAL); > + ret =3D read_core_sysfs_u32(f_min, &sys_min_freq); > + if (ret < 0) { > + RTE_LOG(ERR, POWER, "Failed to read %s\n", > + POWER_SYSFILE_BASE_MIN_FREQ); > + goto out; > + } >=20 > if (sys_max_freq < sys_min_freq) > goto out; > @@ -576,27 +451,22 @@ power_get_cur_idx(struct pstate_power_info *pi) > { > FILE *f_cur; > int ret =3D -1; > - char *p_cur; > - char buf_cur[BUFSIZ]; > - char fullpath_cur[PATH_MAX]; > - char *s_cur; > uint32_t sys_cur_freq =3D 0; > unsigned int i; >=20 > - snprintf(fullpath_cur, sizeof(fullpath_cur), > - POWER_SYSFILE_CUR_FREQ, > - pi->lcore_id); > - f_cur =3D fopen(fullpath_cur, "r"); > - FOPEN_OR_ERR_RET(f_cur, ret); > - > - /* initialize the cur_idx to matching current frequency freq index */ > - s_cur =3D fgets(buf_cur, sizeof(buf_cur), f_cur); > - FOPS_OR_NULL_GOTO(s_cur, fail); > + open_core_sysfs_file(POWER_SYSFILE_CUR_FREQ, pi->lcore_id, "r", > &f_cur); > + if (f_cur =3D=3D NULL) { > + RTE_LOG(ERR, POWER, "failed to open %s\n", > + POWER_SYSFILE_CUR_FREQ); > + goto fail; > + } >=20 > - p_cur =3D strchr(buf_cur, '\n'); > - if (p_cur !=3D NULL) > - *p_cur =3D 0; > - sys_cur_freq =3D strtoul(buf_cur, &p_cur, > POWER_CONVERT_TO_DECIMAL); > + ret =3D read_core_sysfs_u32(f_cur, &sys_cur_freq); > + if (ret < 0) { > + RTE_LOG(ERR, POWER, "Failed to read %s\n", > + POWER_SYSFILE_CUR_FREQ); > + goto fail; > + } >=20 > /* convert the frequency to nearest 100000 value > * Ex: if sys_cur_freq=3D1396789 then freq_conv=3D1400000 @@ -615,10 > +485,10 @@ power_get_cur_idx(struct pstate_power_info *pi) > } > } >=20 > - fclose(f_cur); > - return 0; > + ret =3D 0; > fail: > - fclose(f_cur); > + if (f_cur !=3D NULL) > + fclose(f_cur); > return ret; > } >=20 > -- > 2.17.1