Skip to contentSkip to conversation

fix misc dma driver build errors

PATCH In review Bruce Richardson 3 participants 6 messages Jun 23, 2022 – Jun 26, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover fix misc dma driver build errors

The use of function attributes to enable AVX2 on idxd builds is not supported by older compilers, so we need additional checks in the dma/idxd driver to disable that in cases where it is not buildable.

This fix revealed further issues with the older rawdev driver, which only gets build when the dma driver is disabled.

Bruce Richardson (3):
raw/ioat: fix build error for missing rte_errno raw/ioat: fix build when ioat dmadev enabled dma/idxd: fix non-AVX builds with older compilers

 drivers/dma/idxd/meson.build           | 11 +++++++++++
 drivers/raw/ioat/ioat_common.c         |  2 ++
 drivers/raw/ioat/ioat_private.h        |  4 ++--
 drivers/raw/ioat/ioat_rawdev.c         |  2 --
 drivers/raw/ioat/rte_idxd_rawdev_fns.h |  1 +
 5 files changed, 16 insertions(+), 4 deletions(-)

--
2.34.1

#1 lore raw

PATCH 1/3 raw/ioat: fix build error for missing errno

The inline functions in rte_idxd_rawdev_fns.h make use of rte_errno, but the header with its definition is not included by that file leading to build errors.

Fixes f82c87eb14a4 ("raw/ioat: move idxd functions to separate file")
---
 drivers/raw/ioat/rte_idxd_rawdev_fns.h | 1 +
 1 file changed, 1 insertion(+)
drivers/raw/ioat/rte_idxd_rawdev_fns.h +1 -0
index 3ea25f6ca9..a07892faa0 100644
@@ -16,6 +16,7 @@
  */
 
 #include <stdint.h>
+#include <rte_errno.h>
 
 /*
  * Defines used in the data path for interacting with IDXD hardware.

--
2.34.1

#2 lore raw

PATCH 2/3 raw/ioat: fix build when ioat dmadev enabled

In reply to Bruce Richardson

The build of the raw/ioat driver only occurs when the equivalent dmadev drivers are disabled. Complications occur when the ioat dmadev is being built but not the idxd. In this case, only the idxd part of raw/ioat gets built, but the definition of the logtype is in the ioat part, causing build errors.

.../raw_ioat_idxd_bus.c.o: In function `idxd_vdev_mmap_wq':
idxd_bus.c:(.text+0x116): undefined reference to `ioat_pmd_logtype'

Fix this by moving the logtype definition to the common C file, and renaming it to avoid conflicts with a similarly named value in the dma/ioat driver.

Fixes ff06fa2cf3ba ("raw/ioat: probe idxd PCI")
---
 drivers/raw/ioat/ioat_common.c  | 2 ++
 drivers/raw/ioat/ioat_private.h | 4 ++--
 drivers/raw/ioat/ioat_rawdev.c  | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/raw/ioat/ioat_common.c +2 -0
index 60de41152a..e44e181e58 100644
@@ -9,6 +9,8 @@
 
 #include "ioat_private.h"
 
+RTE_LOG_REGISTER_DEFAULT(ioat_rawdev_logtype, INFO);
+
 static const char * const xstat_names[] = {
 		"failed_enqueues", "successful_enqueues",
 		"copies_started", "copies_completed"
drivers/raw/ioat/ioat_private.h +2 -2
index f032d5fe3d..7fb685a3d7 100644
@@ -18,10 +18,10 @@
 #include <rte_rawdev_pmd.h>
 #include "rte_ioat_rawdev.h"
 
-extern int ioat_pmd_logtype;
+extern int ioat_rawdev_logtype;
 
 #define IOAT_PMD_LOG(level, fmt, args...) rte_log(RTE_LOG_ ## level, \
-		ioat_pmd_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args)
+		ioat_rawdev_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args)
 
 #define IOAT_PMD_DEBUG(fmt, args...)  IOAT_PMD_LOG(DEBUG, fmt, ## args)
 #define IOAT_PMD_INFO(fmt, args...)   IOAT_PMD_LOG(INFO, fmt, ## args)
drivers/raw/ioat/ioat_rawdev.c +0 -2
index 5396671d4f..11341fcf5d 100644
@@ -28,8 +28,6 @@ static struct rte_pci_driver ioat_pmd_drv;
 #define IOAT_DEVICE_ID_BDXF	0x6f2F
 #define IOAT_DEVICE_ID_ICX	0x0b00
 
-RTE_LOG_REGISTER_DEFAULT(ioat_pmd_logtype, INFO);
-
 #define DESC_SZ sizeof(struct rte_ioat_generic_hw_desc)
 #define COMPLETION_SZ sizeof(__m128i)
 
Signature · 1 line
2.34.1
#3 lore raw

PATCH 3/3 dma/idxd: fix non-AVX builds with older compilers

In reply to Bruce Richardson

When building without AVX2 support using an older compiler e.g. gcc 4.8 on Centos/RHEL 7, we get build errors due to the use of AVX2 intrinsics. This is because the compiler does not support "__attribute__((target(AVX2)))" function attribute. Disable build of this driver such edge cases.

Generic builds using recent compilers, and all builds with a minimum baseline of AVX2 are unaffected by this change.

Fixes aa802b10237c ("dma/idxd: fix AVX2 in non-datapath functions")
---
 drivers/dma/idxd/meson.build | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/dma/idxd/meson.build +11 -0
index dcc0a297d7..c5403b431c 100644
@@ -4,6 +4,17 @@
 build = dpdk_conf.has('RTE_ARCH_X86')
 reason = 'only supported on x86'
 
+test_avx2_code = '''
+#include <x86intrin.h>
+__attribute__((target("avx2")))
+__m256i fn(void *x) { return _mm256_loadu_si256(x); }
+'''
+if build and not cc.compiles(test_avx2_code, args:machine_args)
+    build = false
+    reason = 'missing support for AVX2 function attribute'
+    subdir_done()
+endif
+
 deps += ['bus_pci']
 sources = files(
         'idxd_common.c',

--
2.34.1

Tested-by on v1 3/3
#4 lore raw

RE: [PATCH 3/3] dma/idxd: fix non-AVX builds with older compilers

Quoted 13 lines

-----Original Message-----
From: Bruce Richardson <[email protected]>
Sent: Thursday, June 23, 2022 9:50 PM
To: [email protected]
Cc: Richardson, Bruce <[email protected]>
Subject: [PATCH 3/3] dma/idxd: fix non-AVX builds with older compilers

When building without AVX2 support using an older compiler e.g. gcc 4.8 on Centos/RHEL 7, we get build errors due to the use of AVX2 intrinsics. This is because the compiler does not support "__attribute__((target(AVX2)))" function attribute. Disable build of this driver such edge cases.

Quoted 7 lines

Generic builds using recent compilers, and all builds with a minimum baseline of AVX2 are unaffected by this change.

Fixes aa802b10237c ("dma/idxd: fix AVX2 in non-datapath functions")

---

Tested env as below:
OS: CentOS7.9/kernel: 3.10.0-1160.62.1.el7.x86_64
Compiler: gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC)

Best regards,
Yu Jiang

#5 lore raw

Re: [PATCH 3/3] dma/idxd: fix non-AVX builds with older compilers

Quoted 11 lines
Quoted 11 lines

When building without AVX2 support using an older compiler e.g. gcc 4.8 on Centos/RHEL 7, we get build errors due to the use of AVX2 intrinsics. This is because the compiler does not support "__attribute__((target(AVX2)))" function attribute. Disable build of this driver such edge cases.

Generic builds using recent compilers, and all builds with a minimum baseline of AVX2 are unaffected by this change.

Fixes aa802b10237c ("dma/idxd: fix AVX2 in non-datapath functions")
Quoted 7 lines
Quoted 2 lines

---

Tested env as below:
OS: CentOS7.9/kernel: 3.10.0-1160.62.1.el7.x86_64
Compiler: gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC)

Series applied, thanks.