Upgrade PMDK to version 2.1.0 to enable NDCTL for engines with DCPM

PR-repos: pmdk@PR-38:11

Priority: 2
Cancel-prev-build: false
Allow-unstable-test: false
Skip-func-hw-test-large: false
Skip-func-hw-test-medium: false
Skip-func-hw-test-medium-verbs-provider: false
Skip-func-hw-test-medium-ucx-provider: false

Required-githooks: true

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>

debian/control

@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 10),
  python3-distro,
  libabt-dev,
  libucx-dev,
- libpmemobj-dev (>= 2.0.0),
+ libpmemobj-dev (>= 2.1.0),
  libfuse3-dev,
  libprotobuf-c-dev,
  libjson-c-dev,

site_scons/components/__init__.py

@@ -266,7 +266,6 @@ def define_components(reqs):
  retriever=GitRepoRetriever(),
  commands=[['make',
  'all',
- 'NDCTL_ENABLE=n',
  'BUILD_EXAMPLES=n',
  'BUILD_BENCHMARKS=n',
  'DOC=n',

utils/build.config

@@ -4,7 +4,7 @@ component=daos
 [commit_versions]
 argobots=v1.1
 fuse=fuse-3.16.2
-pmdk=2.0.0
+pmdk=2.1.0
 isal=v2.30.0
 isal_crypto=v2.23.0
 spdk=v22.01.2

utils/rpms/daos.spec

@@ -49,7 +49,7 @@ BuildRequires: libabt-devel >= 1.0rc1
 BuildRequires: libjson-c-devel
 BuildRequires: boost-devel
 %endif
-BuildRequires: libpmemobj-devel >= 2.0.0
+BuildRequires: libpmemobj-devel >= 2.1.0
 %if (0%{?rhel} >= 8)
 BuildRequires: fuse3-devel >= 3
 %else
@@ -147,11 +147,11 @@ Requires: ndctl
 # needed to set PMem configuration goals in BIOS through control-plane
 %if (0%{?suse_version} >= 1500)
 Requires: ipmctl >= 03.00.00.0423
-Requires: libpmemobj1 >= 2.0.0-1.suse1500
+Requires: libpmemobj1 >= 2.1.0-1.suse1500
 Requires: libfabric1 >= %{libfabric_version}
 %else
 Requires: ipmctl >= 03.00.00.0468
-Requires: libpmemobj >= 2.0.0-1%{?dist}
+Requires: libpmemobj >= 2.1.0-1%{?dist}
 %endif
 Requires: libfabric >= %{libfabric_version}
 Requires: mercury >= %{mercury_version}
@@ -593,7 +593,7 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 
 %changelog
 * Tue Sep 03 2024 Tomasz Gromadzki <tomasz.gromadzki@intel.com> 2.7.100-6
-- Add support for PMDK packages with NDCTL enabled in case engine is used with SCM
+- Upgrade PMDK to version 2.1.0 to enable NDCTL for engines with DCPM
  * Increase default ULT stack size to 20KiB if engine handles DCPM storage class
  * Disable NDCTL routines for 'ram' storage class
 

utils/run_utest.py

@@ -440,6 +440,7 @@ def run(self, base, memcheck, sudo):
  cmd = new_cmd
  self.last = cmd
 
+ self.env.update({"PMEMOBJ_CONF": "sds.at_create=0"})
  if self.suite.gha:
  retval = run_cmd(cmd, env=self.env)
  else:

utils/scripts/install-el8.sh

@@ -20,6 +20,7 @@ dnf --nodocs install \
  clang-tools-extra \
  cmake \
  CUnit-devel \
+ daxctl-devel \
  diffutils \
  e2fsprogs \
  file \
@@ -48,6 +49,7 @@ dnf --nodocs install \
  lz4-devel \
  make \
  ndctl \
+ ndctl-devel \
  numactl \
  numactl-devel \
  openmpi-devel \

utils/scripts/install-el9.sh

@@ -18,6 +18,7 @@ dnf --nodocs install \
  clang-tools-extra \
  cmake \
  CUnit-devel \
+ daxctl-devel \
  diffutils \
  e2fsprogs \
  file \
@@ -47,6 +48,7 @@ dnf --nodocs install \
  lz4-devel \
  make \
  ndctl \
+ ndctl-devel \
  numactl \
  numactl-devel \
  openmpi-devel \

utils/scripts/install-leap15.sh

@@ -38,6 +38,7 @@ dnf --nodocs install \
  libjson-c-devel \
  libltdl7 \
  liblz4-devel \
+ libndctl-devel \
  libnuma-devel \
  libopenssl-devel \
  libprotobuf-c-devel \

utils/scripts/install-ubuntu.sh

@@ -29,11 +29,13 @@ apt-get install \
  libcapstone-dev \
  libcmocka-dev \
  libcunit1-dev \
+ libdaxctl-devel \
  libfuse3-dev \
  libhwloc-dev \
  libibverbs-dev \
  libjson-c-dev \
  liblz4-dev \
+ libndctl-dev \
  libnuma-dev \
  libopenmpi-dev \
  libpci-dev \