Commit 8d982eda authored by Konrad Sztyber's avatar Konrad Sztyber
Browse files

dpdk: add adjustments for recent rte_power changes 



There were a couple of changes to the rte_power library:
 1) Hardware-specific code was moved out of rte_ower into individual
    drivers under the drivers/power directory.
 2) The header file was renamed rte_power.h -> rte_power_cpufreq.h.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Iac8aeb99423a21905a8bea744ccf662539b26da0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25424


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
parent dcc2ca8f

dpdkbuild/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ DPDK_LIBS = eal ring mempool pci 
DPDK_LIBS += log kvargs telemetry

# Governor required libs

DPDK_LIBS += power timer ethdev net



# rte_power drivers

DPDK_DRIVERS += power/acpi power/amd_pstate power/cppc power/intel_pstate power/intel_uncore \

		power/kvm_vm

# common crypto/compress drivers

ifeq ($(findstring y,$(CONFIG_DPDK_COMPRESSDEV)$(CONFIG_CRYPTO)$(CONFIG_VBDEV_COMPRESS)),y)

DPDK_DRIVERS += crypto/qat compress/qat common/qat

lib/env_dpdk/env.mk

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ DPDK_POWER=y 
# Since DPDK 21.02 rte_power depends on rte_ethdev that

# in turn depends on rte_net.

DPDK_LIB_LIST += rte_power rte_ethdev rte_net

# rte_power drivers, available since 24.11.0

ifneq ($(wildcard $(DPDK_LIB_DIR)/librte_power_*),)

DPDK_LIB_LIST += rte_power_acpi rte_power_amd_pstate rte_power_cppc rte_power_intel_pstate \

		 rte_power_intel_uncore rte_power_kvm_vm

endif

endif

endif

module/scheduler/dpdk_governor/dpdk_governor.c

+6 −1
Original line number Diff line number Diff line
@@ -11,8 +11,13 @@ 


#include "spdk_internal/event.h"



#include <rte_power.h>

#include <rte_common.h>

#include <rte_version.h>

#if RTE_VERSION >= RTE_VERSION_NUM(24, 11, 0, 0)

#include <rte_power_cpufreq.h>

#else

#include <rte_power.h>

#endif



static uint32_t

_get_core_avail_freqs(uint32_t lcore_id, uint32_t *freqs, uint32_t num)

test/common/autobuild_common.sh

+3 −2
Original line number Diff line number Diff line
@@ -97,8 +97,9 @@ _build_native_dpdk() { 
	# the drivers we use

	# net/i40e driver is not really needed by us, but it's built as a workaround

	# for DPDK issue: https://bugs.dpdk.org/show_bug.cgi?id=576

	DPDK_DRIVERS=("bus" "bus/pci" "bus/vdev" "mempool/ring" "net/i40e" "net/i40e/base")



	DPDK_DRIVERS=("bus" "bus/pci" "bus/vdev" "mempool/ring" "net/i40e" "net/i40e/base"

		"power/acpi" "power/amd_pstate" "power/cppc" "power/intel_pstate"

		"power/intel_uncore" "power/kvm_vm")

	local mlx5_libs_added="n"

	if [[ "$SPDK_TEST_CRYPTO" -eq 1 || "$SPDK_TEST_SMA" -eq 1 ]]; then

		intel_ipsec_mb_ver=v0.54