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 30B61430C3; Mon, 21 Aug 2023 18:10:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A09F43286; Mon, 21 Aug 2023 18:10:06 +0200 (CEST) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mails.dpdk.org (Postfix) with ESMTP id BB30F43279 for ; Mon, 21 Aug 2023 18:10:01 +0200 (CEST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1bdbbede5d4so27117725ad.2 for ; Mon, 21 Aug 2023 09:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692634200; x=1693239000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ous8OGMzLdtisG9RJb+umFQunlv+xwUlovBg00lHXBk=; b=T6KLS7FoY9T2VxW7DaLHr9rBA+J5Lhlgi8UVRYvLl4sbehhQfT7XYfrCcwMlFipuaA 1fD/ft3nf6skTdOCW2GCg6coMaPyjUPbzcnMYXuHTz1n4+8K70cnR1BGVn6Qw8KCoCSD adLZ3Z0IDwbrFDAwJen5/q2I+0DOFurKgQE3DL9GDyKVIhpL+HQnVs3eP36qoveerNHy TCmsCRDvrvX5cI5wcrpFzxAOL74J94CugJBVqFtu6YdoBpGDwRCDxoZuzfESYGeY/ZoO EMq8k5LBrNEx+wpsNBOSOVfr7bR+F4iL81ifiIl3buEPpE7+neTed0QLPT8i2lYW5KSK vqaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692634200; x=1693239000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ous8OGMzLdtisG9RJb+umFQunlv+xwUlovBg00lHXBk=; b=kMeRIvF3N/AlKeCxoWIV1r0F4GIGMmR1uMJc8/hKnVMRwmJkq/yyJhSkCuz3b9oKDs iNzXxl2/OudOiMzdhJ18vmq7LZRI+rp/1TbEVP/r1l+MJn2HQWaaVBQP2O0HzLQuAK+o sU2ToH9DFl5o9nVwzuPvCEtXiGsj46vp8dLwFDIjt90RwhDzrwu48xXEWHHZRQAZ0IyJ /EA9k8tIWgfPMf6diJCxCujdhZ9M6pYT95zYpxpX5oLvB3w4IU3uI69uoUiNi6qoZWCN 6y6iHwiilqrbtfNgzdB01y6hVMuFLiip+FwVCOqHqoHOo/xSL401L7UbSp928I38SVZF pQ0w== X-Gm-Message-State: AOJu0YxIBtNxI3P70VjRBezB4UsdwBCJxP1BX+21+oXNfRQ2TGsqzlr1 hutFIQ95TDscRKhd5qFEDdEuHhYNsjlHctEKpdjiaIir X-Google-Smtp-Source: AGHT+IHawwUrVkuaaztG056J4OYRh3IYAAeXzS6mqgvkOTv1QvLOZQHJ3gRTcFcjibnYHNGZhl+VGA== X-Received: by 2002:a17:903:183:b0:1b6:6f12:502e with SMTP id z3-20020a170903018300b001b66f12502emr8621679plg.49.1692634200637; Mon, 21 Aug 2023 09:10:00 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id i1-20020a17090332c100b001bf2dcfe352sm7208159plr.234.2023.08.21.09.10.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 09:10:00 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , David Hunt , Anatoly Burakov Subject: [PATCH v13 09/21] power: convert RTE_LOGTYPE_POWER to dynamic type Date: Mon, 21 Aug 2023 09:09:09 -0700 Message-Id: <20230821160921.383832-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230821160921.383832-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20230821160921.383832-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Use dynamic log type for power library. Also replace use of RTE_LOGTYPE_USER1 with lib.power.guest. Signed-off-by: Stephen Hemminger Acked-by: David Hunt --- lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- lib/power/guest_channel.c | 3 ++- lib/power/power_common.c | 2 ++ lib/power/power_common.h | 2 ++ lib/power/power_kvm_vm.c | 1 + lib/power/rte_power.c | 1 + 7 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index 6f04f75f9a25..5ec3c16250f5 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -357,7 +357,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_LPM, "lib.lpm"}, - {RTE_LOGTYPE_POWER, "lib.power"}, {RTE_LOGTYPE_METER, "lib.meter"}, {RTE_LOGTYPE_SCHED, "lib.sched"}, {RTE_LOGTYPE_PORT, "lib.port"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 04dfb3443ea4..a1949e606395 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -36,7 +36,7 @@ extern "C" { #define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */ /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */ -#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */ + /* was RTE_LOGTYPE_POWER */ #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */ #define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */ #define RTE_LOGTYPE_PORT 13 /**< Log related to port. */ diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c index 7b2ae0b6506f..4932a0528691 100644 --- a/lib/power/guest_channel.c +++ b/lib/power/guest_channel.c @@ -17,7 +17,8 @@ #include "guest_channel.h" -#define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1 +RTE_LOG_REGISTER_SUFFIX(guest_channel_logtype, guest, INFO); +#define RTE_LOGTYPE_GUEST_CHANNEL guest_channel_logtype /* Timeout for incoming message in milliseconds. */ #define TIMEOUT 10 diff --git a/lib/power/power_common.c b/lib/power/power_common.c index 1e09facb863f..bf77eafa886b 100644 --- a/lib/power/power_common.c +++ b/lib/power/power_common.c @@ -12,6 +12,8 @@ #include "power_common.h" +RTE_LOG_REGISTER_DEFAULT(power_logtype, INFO); + #define POWER_SYSFILE_SCALING_DRIVER \ "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_driver" #define POWER_SYSFILE_GOVERNOR \ diff --git a/lib/power/power_common.h b/lib/power/power_common.h index c1c713927621..c3fcbf4c1000 100644 --- a/lib/power/power_common.h +++ b/lib/power/power_common.h @@ -10,6 +10,8 @@ #define RTE_POWER_INVALID_FREQ_INDEX (~0) +extern int power_logtype; +#define RTE_LOGTYPE_POWER power_logtype #ifdef RTE_LIBRTE_POWER_DEBUG #define POWER_DEBUG_TRACE(fmt, args...) \ diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c index 6a8109d44959..db031f43105a 100644 --- a/lib/power/power_kvm_vm.c +++ b/lib/power/power_kvm_vm.c @@ -8,6 +8,7 @@ #include "rte_power_guest_channel.h" #include "guest_channel.h" +#include "power_common.h" #include "power_kvm_vm.h" #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent" diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c index 63a43bd8f5ae..db0e7705a9ef 100644 --- a/lib/power/rte_power.c +++ b/lib/power/rte_power.c @@ -10,6 +10,7 @@ #include "rte_power.h" #include "power_acpi_cpufreq.h" #include "power_cppc_cpufreq.h" +#include "power_common.h" #include "power_kvm_vm.h" #include "power_pstate_cpufreq.h" -- 2.39.2