net/af_packet: run on kernel without qdisc bypass support
authorTudor Cornea <tudor.cornea@keysight.com>
Wed, 14 Jul 2021 09:28:11 +0000 (12:28 +0300)
committerThomas Monjalon <thomas@monjalon.net>
Fri, 23 Jul 2021 08:30:23 +0000 (10:30 +0200)
Some older kernels do not support the PACKET_QDISC_BYPASS socket
option. Such an example is the CentOS 7 kernel (3.10).

If we only check for the definition of PACKET_QDISC_BYPASS, it might mean
that we will not be able to compile the PMD driver on a newer platform,
and run in on a machine with an older kernel.

Setting the socket option only if it is specifically requested from
the EAL arguments, allows us to have a way to run the PMD compiled
against newer kernel headers, on platforms having older kernels.

Signed-off-by: Tudor Cornea <tudor.cornea@keysight.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
drivers/net/af_packet/rte_eth_af_packet.c

index 2e90e29..b73b211 100644 (file)
@@ -748,18 +748,18 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
                        goto error;
                }
 
+               if (qdisc_bypass) {
 #if defined(PACKET_QDISC_BYPASS)
-               rc = setsockopt(qsockfd, SOL_PACKET, PACKET_QDISC_BYPASS,
-                               &qdisc_bypass, sizeof(qdisc_bypass));
-               if (rc == -1) {
-                       PMD_LOG_ERRNO(ERR,
-                               "%s: could not set PACKET_QDISC_BYPASS on AF_PACKET socket for %s",
-                               name, pair->value);
-                       goto error;
-               }
-#else
-               RTE_SET_USED(qdisc_bypass);
+                       rc = setsockopt(qsockfd, SOL_PACKET, PACKET_QDISC_BYPASS,
+                                       &qdisc_bypass, sizeof(qdisc_bypass));
+                       if (rc == -1) {
+                               PMD_LOG_ERRNO(ERR,
+                                       "%s: could not set PACKET_QDISC_BYPASS on AF_PACKET socket for %s",
+                                       name, pair->value);
+                               goto error;
+                       }
 #endif
+               }
 
                rc = setsockopt(qsockfd, SOL_PACKET, PACKET_RX_RING, req, sizeof(*req));
                if (rc == -1) {