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 5F8A6A0C5C; Thu, 12 Aug 2021 22:05:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFC684014D; Thu, 12 Aug 2021 22:05:44 +0200 (CEST) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mails.dpdk.org (Postfix) with ESMTP id 8042D40042 for ; Thu, 12 Aug 2021 22:05:43 +0200 (CEST) Received: by mail-pl1-f172.google.com with SMTP id f3so8755321plg.3 for ; Thu, 12 Aug 2021 13:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u7RMshKb8Dd4sWpWNRjo8P8n5nCOXPA9ngSNEIqSTaQ=; b=VA5hiXqwrM1o7tg9VtAdBv1PMgHbpTNJ7jNx3Ao/e7TY5WC+5KehPEm4gH+XVCLZb8 fZ+aZ5imn+SoGtbx9P012lSfSQKiY3j8HC3qqGK07qVstVa2Yyk68eSpJRzjqKXI7ijj y9RtyxjzpC0a8phxX9bsm0KgrsSfJ4qesd/XNFCDpmlxus3CUU1R3BkWLSV7ZdM3qtMV 2aIApkRnO6MA1aI+0hYwsDeNL9IP9Cj4OiBeyBvyNTgFDLqdZ0n505OgS+/iND9cb3wv WLJkXe2QrMGRxY8pqYE+Jfd15bbbNgUVKekyOAvLG4La7XAbNhwFjytECXIHPRvb8NzV rcQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u7RMshKb8Dd4sWpWNRjo8P8n5nCOXPA9ngSNEIqSTaQ=; b=ZlPFy4e9D/RVYfzB0wltja6mMVRTZaK8nZCi/FstNTEUAyV7gEh42VZuAbBmMEJs3+ KNabPa4M6YU6Sb/R8qL6oTPlW/R+z9agEwLKkibdiZgBdt0p1k7mdQc69BJt087hpeuE K29mdm6Dm2poFod5qQANgBGDwJa2gGTW5Tf1GKl2BpuswUkmLOw6ndTV82J0GXVv1Iam +Rd+XMCr2p++i7R9g1qQNmBjloTPWoNHDBWbYQwLO+VBvbjSBhuWeF7WDhz+X1uZa0a4 XmVkRXqiR8rTTHi6TVZLfcWyWr33fwzIH7bU0gdkwxUeX74VtF7E2UY2cxDsHPgu3Q2j Elsw== X-Gm-Message-State: AOAM533tmwZM1MwnQpLcCdD0/cw1S24DPXYimrP8HvlmQUIU83VtJYaD Gd3BSti1ljI1XOMJXj7ZU7FeG6f31Kdh/w== X-Google-Smtp-Source: ABdhPJxae2vpS7qFM+d7VUXKzJuKngzHBVnaCnbHKTnKX7cK0fMC6tnlgqLdZrwb/EJ5l7//aBxHmw== X-Received: by 2002:a17:90a:d595:: with SMTP id v21mr6083454pju.50.1628798742030; Thu, 12 Aug 2021 13:05:42 -0700 (PDT) Received: from localhost.localdomain (c-67-185-44-206.hsd1.wa.comcast.net. [67.185.44.206]) by smtp.gmail.com with ESMTPSA id y62sm4335746pfg.88.2021.08.12.13.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 13:05:41 -0700 (PDT) From: William Tu To: dev@dpdk.org Cc: Dmitry.Kozliuk@gmail.com, nick.connolly@mayadata.io Date: Thu, 12 Aug 2021 20:05:28 +0000 Message-Id: <20210812200528.60743-1-u9012063@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210811204627.213-1-u9012063@gmail.com> References: <20210811204627.213-1-u9012063@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCHv3] include: fix sys/queue.h. 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 Sender: "dev" Currently there are a couple of public header files include 'sys/queue.h', which is a POSIX functionality. When compiling DPDK with OVS on Windows, we encountered issues such as, found the missing header. In file included from ../lib/dpdk.c:27: C:\temp\dpdk\include\rte_log.h:24:10: fatal error: 'sys/queue.h' file not found The patch fixes it by removing the #include from DPDK public headers, so programs including DPDK headers don't depend on POSIX sys/queue.h. For Linux/FreeBSD, DPDK public headers only need a handful of macros for list/tailq heads and links. Those macros should be provided by DPDK, with RTE_ prefix. For Linux and FreeBSD it will just be: #include #define RTE_TAILQ_ENTRY(type) TAILQ_ENTRY(type) /* ... */ For Windows, we copy these definitions from to rte_os.h. With this patch, all the public headers should not have "#include " or "TAILQ_xxx" macros. Suggested-by: Nick Connolly Suggested-by: Dmitry Kozliuk Signed-off-by: William Tu --- v2->v3: * follow the suggestion by Dmitry * run checkpatches, there are some errors but I think either the original file has over 80-char line due to comments, or some false positive about macro. v1->v2: - follow the suggestion by Nick and Dmitry - http://mails.dpdk.org/archives/dev/2021-August/216304.html Signed-off-by: William Tu --- drivers/bus/auxiliary/private.h | 1 + drivers/bus/auxiliary/rte_bus_auxiliary.h | 5 +- drivers/bus/ifpga/rte_bus_ifpga.h | 8 +- drivers/bus/pci/pci_params.c | 2 + drivers/bus/pci/rte_bus_pci.h | 13 +- drivers/bus/pci/windows/pci.c | 3 + drivers/bus/pci/windows/pci_netuio.c | 2 + drivers/bus/vdev/rte_bus_vdev.h | 7 +- drivers/bus/vmbus/rte_bus_vmbus.h | 13 +- drivers/net/i40e/i40e_ethdev.h | 1 + drivers/net/ice/ice_dcf_ethdev.c | 1 + lib/bbdev/rte_bbdev.h | 2 +- lib/cryptodev/rte_cryptodev.h | 2 +- lib/cryptodev/rte_cryptodev_pmd.h | 2 +- lib/eal/common/eal_common_devargs.c | 2 + lib/eal/common/eal_common_fbarray.c | 1 + lib/eal/common/eal_common_log.c | 1 + lib/eal/common/eal_common_memalloc.c | 1 + lib/eal/common/eal_common_options.c | 1 + lib/eal/common/eal_trace.h | 2 + lib/eal/freebsd/include/rte_os.h | 33 ++++++ lib/eal/include/rte_bus.h | 5 +- lib/eal/include/rte_class.h | 6 +- lib/eal/include/rte_dev.h | 5 +- lib/eal/include/rte_devargs.h | 3 +- lib/eal/include/rte_log.h | 1 - lib/eal/include/rte_service.h | 1 - lib/eal/include/rte_tailq.h | 15 ++- lib/eal/linux/include/rte_os.h | 33 ++++++ lib/eal/windows/eal_alarm.c | 1 + lib/eal/windows/include/rte_os.h | 138 ++++++++++++++++++++++ lib/ethdev/rte_ethdev_core.h | 2 +- lib/hash/rte_fbk_hash.h | 1 - lib/hash/rte_thash.c | 2 + lib/ip_frag/rte_ip_frag.h | 4 +- lib/mempool/rte_mempool.h | 9 +- lib/pci/rte_pci.h | 1 - lib/ring/rte_ring_core.h | 1 - lib/table/rte_swx_table.h | 7 +- lib/table/rte_swx_table_selector.h | 5 +- lib/vhost/rte_vdpa_dev.h | 2 +- 41 files changed, 277 insertions(+), 68 deletions(-) diff --git a/drivers/bus/auxiliary/private.h b/drivers/bus/auxiliary/private.h index 9987e8b501..d22e83cf7a 100644 --- a/drivers/bus/auxiliary/private.h +++ b/drivers/bus/auxiliary/private.h @@ -7,6 +7,7 @@ #include #include +#include #include "rte_bus_auxiliary.h" diff --git a/drivers/bus/auxiliary/rte_bus_auxiliary.h b/drivers/bus/auxiliary/rte_bus_auxiliary.h index 2462bad2ba..b1f5610404 100644 --- a/drivers/bus/auxiliary/rte_bus_auxiliary.h +++ b/drivers/bus/auxiliary/rte_bus_auxiliary.h @@ -19,7 +19,6 @@ extern "C" { #include #include #include -#include #include #include @@ -113,7 +112,7 @@ typedef int (rte_auxiliary_dma_unmap_t)(struct rte_auxiliary_device *dev, * A structure describing an auxiliary device. */ struct rte_auxiliary_device { - TAILQ_ENTRY(rte_auxiliary_device) next; /**< Next probed device. */ + RTE_TAILQ_ENTRY(rte_auxiliary_device) next; /**< Next probed device. */ struct rte_device device; /**< Inherit core device */ char name[RTE_DEV_NAME_MAX_LEN + 1]; /**< ASCII device name */ struct rte_intr_handle intr_handle; /**< Interrupt handle */ @@ -124,7 +123,7 @@ struct rte_auxiliary_device { * A structure describing an auxiliary driver. */ struct rte_auxiliary_driver { - TAILQ_ENTRY(rte_auxiliary_driver) next; /**< Next in list. */ + RTE_TAILQ_ENTRY(rte_auxiliary_driver) next; /**< Next in list. */ struct rte_driver driver; /**< Inherit core driver. */ struct rte_auxiliary_bus *bus; /**< Auxiliary bus reference. */ rte_auxiliary_match_t *match; /**< Device match function. */ diff --git a/drivers/bus/ifpga/rte_bus_ifpga.h b/drivers/bus/ifpga/rte_bus_ifpga.h index b43084155a..0186f5acde 100644 --- a/drivers/bus/ifpga/rte_bus_ifpga.h +++ b/drivers/bus/ifpga/rte_bus_ifpga.h @@ -28,9 +28,9 @@ struct rte_afu_device; struct rte_afu_driver; /** Double linked list of Intel FPGA AFU device. */ -TAILQ_HEAD(ifpga_afu_dev_list, rte_afu_device); +RTE_TAILQ_HEAD(ifpga_afu_dev_list, rte_afu_device); /** Double linked list of Intel FPGA AFU device drivers. */ -TAILQ_HEAD(ifpga_afu_drv_list, rte_afu_driver); +RTE_TAILQ_HEAD(ifpga_afu_drv_list, rte_afu_driver); #define IFPGA_BUS_BITSTREAM_PATH_MAX_LEN 256 @@ -71,7 +71,7 @@ struct rte_afu_shared { * A structure describing a AFU device. */ struct rte_afu_device { - TAILQ_ENTRY(rte_afu_device) next; /**< Next in device list. */ + RTE_TAILQ_ENTRY(rte_afu_device) next; /**< Next in device list. */ struct rte_device device; /**< Inherit core device */ struct rte_rawdev *rawdev; /**< Point Rawdev */ struct rte_afu_id id; /**< AFU id within FPGA. */ @@ -105,7 +105,7 @@ typedef int (afu_remove_t)(struct rte_afu_device *); * A structure describing a AFU device. */ struct rte_afu_driver { - TAILQ_ENTRY(rte_afu_driver) next; /**< Next afu driver. */ + RTE_TAILQ_ENTRY(rte_afu_driver) next; /**< Next afu driver. */ struct rte_driver driver; /**< Inherit core driver. */ afu_probe_t *probe; /**< Device Probe function. */ afu_remove_t *remove; /**< Device Remove function. */ diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c index 3192e9c967..717388753d 100644 --- a/drivers/bus/pci/pci_params.c +++ b/drivers/bus/pci/pci_params.c @@ -2,6 +2,8 @@ * Copyright 2018 Gaëtan Rivet */ +#include + #include #include #include diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h index 583470e831..673a2850c1 100644 --- a/drivers/bus/pci/rte_bus_pci.h +++ b/drivers/bus/pci/rte_bus_pci.h @@ -19,7 +19,6 @@ extern "C" { #include #include #include -#include #include #include @@ -37,16 +36,16 @@ struct rte_pci_device; struct rte_pci_driver; /** List of PCI devices */ -TAILQ_HEAD(rte_pci_device_list, rte_pci_device); +RTE_TAILQ_HEAD(rte_pci_device_list, rte_pci_device); /** List of PCI drivers */ -TAILQ_HEAD(rte_pci_driver_list, rte_pci_driver); +RTE_TAILQ_HEAD(rte_pci_driver_list, rte_pci_driver); /* PCI Bus iterators */ #define FOREACH_DEVICE_ON_PCIBUS(p) \ - TAILQ_FOREACH(p, &(rte_pci_bus.device_list), next) + RTE_TAILQ_FOREACH(p, &(rte_pci_bus.device_list), next) #define FOREACH_DRIVER_ON_PCIBUS(p) \ - TAILQ_FOREACH(p, &(rte_pci_bus.driver_list), next) + RTE_TAILQ_FOREACH(p, &(rte_pci_bus.driver_list), next) struct rte_devargs; @@ -64,7 +63,7 @@ enum rte_pci_kernel_driver { * A structure describing a PCI device. */ struct rte_pci_device { - TAILQ_ENTRY(rte_pci_device) next; /**< Next probed PCI device. */ + RTE_TAILQ_ENTRY(rte_pci_device) next; /**< Next probed PCI device. */ struct rte_device device; /**< Inherit core device */ struct rte_pci_addr addr; /**< PCI location. */ struct rte_pci_id id; /**< PCI ID. */ @@ -160,7 +159,7 @@ typedef int (pci_dma_unmap_t)(struct rte_pci_device *dev, void *addr, * A structure describing a PCI driver. */ struct rte_pci_driver { - TAILQ_ENTRY(rte_pci_driver) next; /**< Next in list. */ + RTE_TAILQ_ENTRY(rte_pci_driver) next; /**< Next in list. */ struct rte_driver driver; /**< Inherit core driver. */ struct rte_pci_bus *bus; /**< PCI bus reference. */ rte_pci_probe_t *probe; /**< Device probe function. */ diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c index d39a7748b8..d7bd5d6e80 100644 --- a/drivers/bus/pci/windows/pci.c +++ b/drivers/bus/pci/windows/pci.c @@ -1,6 +1,9 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright 2020 Mellanox Technologies, Ltd */ + +#include + #include #include #include diff --git a/drivers/bus/pci/windows/pci_netuio.c b/drivers/bus/pci/windows/pci_netuio.c index 1bf9133f71..a0b175a8fc 100644 --- a/drivers/bus/pci/windows/pci_netuio.c +++ b/drivers/bus/pci/windows/pci_netuio.c @@ -2,6 +2,8 @@ * Copyright(c) 2020 Intel Corporation. */ +#include + #include #include #include diff --git a/drivers/bus/vdev/rte_bus_vdev.h b/drivers/bus/vdev/rte_bus_vdev.h index fc315d10fa..2856799953 100644 --- a/drivers/bus/vdev/rte_bus_vdev.h +++ b/drivers/bus/vdev/rte_bus_vdev.h @@ -15,12 +15,11 @@ extern "C" { #endif -#include #include #include struct rte_vdev_device { - TAILQ_ENTRY(rte_vdev_device) next; /**< Next attached vdev */ + RTE_TAILQ_ENTRY(rte_vdev_device) next; /**< Next attached vdev */ struct rte_device device; /**< Inherit core device */ }; @@ -53,7 +52,7 @@ rte_vdev_device_args(const struct rte_vdev_device *dev) } /** Double linked list of virtual device drivers. */ -TAILQ_HEAD(vdev_driver_list, rte_vdev_driver); +RTE_TAILQ_HEAD(vdev_driver_list, rte_vdev_driver); /** * Probe function called for each virtual device driver once. @@ -107,7 +106,7 @@ typedef int (rte_vdev_dma_unmap_t)(struct rte_vdev_device *dev, void *addr, * A virtual device driver abstraction. */ struct rte_vdev_driver { - TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */ + RTE_TAILQ_ENTRY(rte_vdev_driver) next; /**< Next in list. */ struct rte_driver driver; /**< Inherited general driver. */ rte_vdev_probe_t *probe; /**< Virtual device probe function. */ rte_vdev_remove_t *remove; /**< Virtual device remove function. */ diff --git a/drivers/bus/vmbus/rte_bus_vmbus.h b/drivers/bus/vmbus/rte_bus_vmbus.h index 4cf73ce815..6bcff66468 100644 --- a/drivers/bus/vmbus/rte_bus_vmbus.h +++ b/drivers/bus/vmbus/rte_bus_vmbus.h @@ -20,7 +20,6 @@ extern "C" { #include #include #include -#include #include #include @@ -38,15 +37,15 @@ struct rte_vmbus_bus; struct vmbus_channel; struct vmbus_mon_page; -TAILQ_HEAD(rte_vmbus_device_list, rte_vmbus_device); -TAILQ_HEAD(rte_vmbus_driver_list, rte_vmbus_driver); +RTE_TAILQ_HEAD(rte_vmbus_device_list, rte_vmbus_device); +RTE_TAILQ_HEAD(rte_vmbus_driver_list, rte_vmbus_driver); /* VMBus iterators */ #define FOREACH_DEVICE_ON_VMBUS(p) \ - TAILQ_FOREACH(p, &(rte_vmbus_bus.device_list), next) + RTE_TAILQ_FOREACH(p, &(rte_vmbus_bus.device_list), next) #define FOREACH_DRIVER_ON_VMBUS(p) \ - TAILQ_FOREACH(p, &(rte_vmbus_bus.driver_list), next) + RTE_TAILQ_FOREACH(p, &(rte_vmbus_bus.driver_list), next) /** Maximum number of VMBUS resources. */ enum hv_uio_map { @@ -62,7 +61,7 @@ enum hv_uio_map { * A structure describing a VMBUS device. */ struct rte_vmbus_device { - TAILQ_ENTRY(rte_vmbus_device) next; /**< Next probed VMBUS device */ + RTE_TAILQ_ENTRY(rte_vmbus_device) next; /**< Next probed VMBUS device */ const struct rte_vmbus_driver *driver; /**< Associated driver */ struct rte_device device; /**< Inherit core device */ rte_uuid_t device_id; /**< VMBUS device id */ @@ -93,7 +92,7 @@ typedef int (vmbus_remove_t)(struct rte_vmbus_device *); * A structure describing a VMBUS driver. */ struct rte_vmbus_driver { - TAILQ_ENTRY(rte_vmbus_driver) next; /**< Next in list. */ + RTE_TAILQ_ENTRY(rte_vmbus_driver) next; /**< Next in list. */ struct rte_driver driver; struct rte_vmbus_bus *bus; /**< VM bus reference. */ vmbus_probe_t *probe; /**< Device Probe function. */ diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h index cd6deabd60..374b73e4a7 100644 --- a/drivers/net/i40e/i40e_ethdev.h +++ b/drivers/net/i40e/i40e_ethdev.h @@ -6,6 +6,7 @@ #define _I40E_ETHDEV_H_ #include +#include #include #include diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c index cab7c4da87..629e88980d 100644 --- a/drivers/net/ice/ice_dcf_ethdev.c +++ b/drivers/net/ice/ice_dcf_ethdev.c @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/lib/bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h index 7017124414..3ebf62e697 100644 --- a/lib/bbdev/rte_bbdev.h +++ b/lib/bbdev/rte_bbdev.h @@ -434,7 +434,7 @@ struct rte_bbdev_callback; struct rte_intr_handle; /** Structure to keep track of registered callbacks */ -TAILQ_HEAD(rte_bbdev_cb_list, rte_bbdev_callback); +RTE_TAILQ_HEAD(rte_bbdev_cb_list, rte_bbdev_callback); /** * @internal The data structure associated with a device. Drivers can access diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h index 11f4e6fdbf..f86bf2260b 100644 --- a/lib/cryptodev/rte_cryptodev.h +++ b/lib/cryptodev/rte_cryptodev.h @@ -879,7 +879,7 @@ typedef uint16_t (*enqueue_pkt_burst_t)(void *qp, struct rte_cryptodev_callback; /** Structure to keep track of registered callbacks */ -TAILQ_HEAD(rte_cryptodev_cb_list, rte_cryptodev_callback); +RTE_TAILQ_HEAD(rte_cryptodev_cb_list, rte_cryptodev_callback); /** * Structure used to hold information about the callbacks to be called for a diff --git a/lib/cryptodev/rte_cryptodev_pmd.h b/lib/cryptodev/rte_cryptodev_pmd.h index 1274436870..9542cbf263 100644 --- a/lib/cryptodev/rte_cryptodev_pmd.h +++ b/lib/cryptodev/rte_cryptodev_pmd.h @@ -66,7 +66,7 @@ struct rte_cryptodev_global { /* Cryptodev driver, containing the driver ID */ struct cryptodev_driver { - TAILQ_ENTRY(cryptodev_driver) next; /**< Next in list. */ + RTE_TAILQ_ENTRY(cryptodev_driver) next; /**< Next in list. */ const struct rte_driver *driver; uint8_t id; }; diff --git a/lib/eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c index 23aaf8b7e4..ac9746aec8 100644 --- a/lib/eal/common/eal_common_devargs.c +++ b/lib/eal/common/eal_common_devargs.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -18,6 +19,7 @@ #include #include #include +#include #include #include "eal_private.h" diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c index 3a28a53247..75168ca552 100644 --- a/lib/eal/common/eal_common_fbarray.c +++ b/lib/eal/common/eal_common_fbarray.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c index ec8fe23a7f..1be35f5397 100644 --- a/lib/eal/common/eal_common_log.c +++ b/lib/eal/common/eal_common_log.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/lib/eal/common/eal_common_memalloc.c b/lib/eal/common/eal_common_memalloc.c index e872c6533b..aefdf8de3f 100644 --- a/lib/eal/common/eal_common_memalloc.c +++ b/lib/eal/common/eal_common_memalloc.c @@ -3,6 +3,7 @@ */ #include +#include #include #include diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index ff5861b5f3..92987088a1 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -6,6 +6,7 @@ #include #include #include +#include #ifndef RTE_EXEC_ENV_WINDOWS #include #endif diff --git a/lib/eal/common/eal_trace.h b/lib/eal/common/eal_trace.h index 06751eb23a..76fbcd86b0 100644 --- a/lib/eal/common/eal_trace.h +++ b/lib/eal/common/eal_trace.h @@ -5,6 +5,8 @@ #ifndef __EAL_TRACE_H #define __EAL_TRACE_H +#include + #include #include #include diff --git a/lib/eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h index 627f0483ab..dc889e5826 100644 --- a/lib/eal/freebsd/include/rte_os.h +++ b/lib/eal/freebsd/include/rte_os.h @@ -11,6 +11,39 @@ */ #include +#include + +/* These macros are compatible with system's sys/queue.h. */ +#define RTE_TAILQ_INIT(head) TAILQ_INIT(head) +#define RTE_TAILQ_HEAD(name, type) TAILQ_HEAD(name, type) +#define RTE_TAILQ_LAST(head, headname) TAILQ_LAST(head, headname) +#define RTE_TAILQ_ENTRY(type) TAILQ_ENTRY(type) +#define RTE_TAILQ_FIRST(head) TAILQ_FIRST(head) +#define RTE_TAILQ_EMPTY(head) TAILQ_EMPTY(head) +#define RTE_TAILQ_NEXT(elem, field) TAILQ_NEXT(elem, field) +#define RTE_TAILQ_HEAD_INITIALIZER(head) TAILQ_HEAD_INITIALIZER(head) +#define RTE_TAILQ_FOREACH(var, head, field) TAILQ_FOREACH(var, head, field) +#define RTE_TAILQ_INSERT_TAIL(head, elm, field) \ + TAILQ_INSERT_TAIL(head, elm, field) +#define RTE_TAILQ_REMOVE(head, elm, field) TAILQ_REMOVE(head, elm, field) +#define RTE_TAILQ_INSERT_BEFORE(listelm, elm, field) \ + TAILQ_INSERT_BEFORE(listelm, elm, field) +#define RTE_TAILQ_INSERT_AFTER(head, listelm, elm, field) \ + TAILQ_INSERT_AFTER(head, listelm, elm, field) +#define RTE_TAILQ_INSERT_HEAD(head, elm, field) \ + TAILQ_INSERT_HEAD(head, elm, field) + +#define RTE_STAILQ_HEAD(name, type) STAILQ_HEAD(name, type) +#define RTE_STAILQ_HEAD_INITIALIZER(head) STAILQ_HEAD_INITIALIZER(head) +#define RTE_STAILQ_ENTRY(type) STAILQ_ENTRY(type) + +/* This is not defined in sys/queue.h */ +#ifndef TAILQ_FOREACH_SAFE +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = RTE_TAILQ_FIRST((head)); \ + (var) && ((tvar) = RTE_TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif typedef cpuset_t rte_cpuset_t; #define RTE_HAS_CPUSET diff --git a/lib/eal/include/rte_bus.h b/lib/eal/include/rte_bus.h index 80b154fb98..84d364df3f 100644 --- a/lib/eal/include/rte_bus.h +++ b/lib/eal/include/rte_bus.h @@ -19,13 +19,12 @@ extern "C" { #endif #include -#include #include #include /** Double linked list of buses */ -TAILQ_HEAD(rte_bus_list, rte_bus); +RTE_TAILQ_HEAD(rte_bus_list, rte_bus); /** @@ -250,7 +249,7 @@ typedef enum rte_iova_mode (*rte_bus_get_iommu_class_t)(void); * A structure describing a generic bus. */ struct rte_bus { - TAILQ_ENTRY(rte_bus) next; /**< Next bus object in linked list */ + RTE_TAILQ_ENTRY(rte_bus) next; /**< Next bus object in linked list */ const char *name; /**< Name of the bus */ rte_bus_scan_t scan; /**< Scan for devices attached to bus */ rte_bus_probe_t probe; /**< Probe devices on bus */ diff --git a/lib/eal/include/rte_class.h b/lib/eal/include/rte_class.h index 856d09b22d..d560339652 100644 --- a/lib/eal/include/rte_class.h +++ b/lib/eal/include/rte_class.h @@ -22,18 +22,16 @@ extern "C" { #endif -#include - #include /** Double linked list of classes */ -TAILQ_HEAD(rte_class_list, rte_class); +RTE_TAILQ_HEAD(rte_class_list, rte_class); /** * A structure describing a generic device class. */ struct rte_class { - TAILQ_ENTRY(rte_class) next; /**< Next device class in linked list */ + RTE_TAILQ_ENTRY(rte_class) next; /**< Next device class in linked list */ const char *name; /**< Name of the class */ rte_dev_iterate_t dev_iterate; /**< Device iterator. */ }; diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h index 6dd72c11a1..f6efe0c94e 100644 --- a/lib/eal/include/rte_dev.h +++ b/lib/eal/include/rte_dev.h @@ -18,7 +18,6 @@ extern "C" { #endif #include -#include #include #include @@ -75,7 +74,7 @@ struct rte_mem_resource { * A structure describing a device driver. */ struct rte_driver { - TAILQ_ENTRY(rte_driver) next; /**< Next in list. */ + RTE_TAILQ_ENTRY(rte_driver) next; /**< Next in list. */ const char *name; /**< Driver name. */ const char *alias; /**< Driver alias. */ }; @@ -90,7 +89,7 @@ struct rte_driver { * A structure describing a generic device. */ struct rte_device { - TAILQ_ENTRY(rte_device) next; /**< Next device */ + RTE_TAILQ_ENTRY(rte_device) next; /**< Next device */ const char *name; /**< Device name */ const struct rte_driver *driver; /**< Driver assigned after probing */ const struct rte_bus *bus; /**< Bus handle assigned on scan */ diff --git a/lib/eal/include/rte_devargs.h b/lib/eal/include/rte_devargs.h index cd90944fe8..957477b398 100644 --- a/lib/eal/include/rte_devargs.h +++ b/lib/eal/include/rte_devargs.h @@ -21,7 +21,6 @@ extern "C" { #endif #include -#include #include #include @@ -76,7 +75,7 @@ enum rte_devtype { */ struct rte_devargs { /** Next in list. */ - TAILQ_ENTRY(rte_devargs) next; + RTE_TAILQ_ENTRY(rte_devargs) next; /** Type of device. */ enum rte_devtype type; /** Device policy. */ diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h index b706bb8710..bb3523467b 100644 --- a/lib/eal/include/rte_log.h +++ b/lib/eal/include/rte_log.h @@ -21,7 +21,6 @@ extern "C" { #include #include #include -#include #include #include diff --git a/lib/eal/include/rte_service.h b/lib/eal/include/rte_service.h index c7d037d862..1c9275c32a 100644 --- a/lib/eal/include/rte_service.h +++ b/lib/eal/include/rte_service.h @@ -29,7 +29,6 @@ extern "C" { #include #include -#include #include #include diff --git a/lib/eal/include/rte_tailq.h b/lib/eal/include/rte_tailq.h index b6fe4e5f78..28cd54ef3e 100644 --- a/lib/eal/include/rte_tailq.h +++ b/lib/eal/include/rte_tailq.h @@ -15,17 +15,16 @@ extern "C" { #endif -#include #include #include /** dummy structure type used by the rte_tailq APIs */ struct rte_tailq_entry { - TAILQ_ENTRY(rte_tailq_entry) next; /**< Pointer entries for a tailq list */ + RTE_TAILQ_ENTRY(rte_tailq_entry) next; /**< Pointer entries for a tailq list */ void *data; /**< Pointer to the data referenced by this tailq entry */ }; /** dummy */ -TAILQ_HEAD(rte_tailq_entry_head, rte_tailq_entry); +RTE_TAILQ_HEAD(rte_tailq_entry_head, rte_tailq_entry); #define RTE_TAILQ_NAMESIZE 32 @@ -48,7 +47,7 @@ struct rte_tailq_elem { * rte_eal_tailqs_init() */ struct rte_tailq_head *head; - TAILQ_ENTRY(rte_tailq_elem) next; + RTE_TAILQ_ENTRY(rte_tailq_elem) next; const char name[RTE_TAILQ_NAMESIZE]; }; @@ -126,10 +125,10 @@ RTE_INIT(tailqinitfn_ ##t) \ } /* This macro permits both remove and free var within the loop safely.*/ -#ifndef TAILQ_FOREACH_SAFE -#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = TAILQ_FIRST((head)); \ - (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ +#ifndef RTE_TAILQ_FOREACH_SAFE +#define RTE_TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = RTE_TAILQ_FIRST((head)); \ + (var) && ((tvar) = RTE_TAILQ_NEXT((var), field), 1); \ (var) = (tvar)) #endif diff --git a/lib/eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h index 1618b4df22..bc8e9cd5d8 100644 --- a/lib/eal/linux/include/rte_os.h +++ b/lib/eal/linux/include/rte_os.h @@ -11,6 +11,39 @@ */ #include +#include + +/* These macros are compatible with system's sys/queue.h. */ +#define RTE_TAILQ_INIT(head) TAILQ_INIT(head) +#define RTE_TAILQ_HEAD(name, type) TAILQ_HEAD(name, type) +#define RTE_TAILQ_LAST(head, headname) TAILQ_LAST(head, headname) +#define RTE_TAILQ_ENTRY(type) TAILQ_ENTRY(type) +#define RTE_TAILQ_FIRST(head) TAILQ_FIRST(head) +#define RTE_TAILQ_EMPTY(head) TAILQ_EMPTY(head) +#define RTE_TAILQ_NEXT(elem, field) TAILQ_NEXT(elem, field) +#define RTE_TAILQ_HEAD_INITIALIZER(head) TAILQ_HEAD_INITIALIZER(head) +#define RTE_TAILQ_FOREACH(var, head, field) TAILQ_FOREACH(var, head, field) +#define RTE_TAILQ_INSERT_TAIL(head, elm, field) \ + TAILQ_INSERT_TAIL(head, elm, field) +#define RTE_TAILQ_REMOVE(head, elm, field) TAILQ_REMOVE(head, elm, field) +#define RTE_TAILQ_INSERT_BEFORE(listelm, elm, field) \ + TAILQ_INSERT_BEFORE(listelm, elm, field) +#define RTE_TAILQ_INSERT_AFTER(head, listelm, elm, field) \ + TAILQ_INSERT_AFTER(head, listelm, elm, field) +#define RTE_TAILQ_INSERT_HEAD(head, elm, field) \ + TAILQ_INSERT_HEAD(head, elm, field) + +#define RTE_STAILQ_HEAD(name, type) STAILQ_HEAD(name, type) +#define RTE_STAILQ_HEAD_INITIALIZER(head) STAILQ_HEAD_INITIALIZER(head) +#define RTE_STAILQ_ENTRY(type) STAILQ_ENTRY(type) + +/* This is not defined in sys/queue.h */ +#ifndef TAILQ_FOREACH_SAFE +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = RTE_TAILQ_FIRST((head)); \ + (var) && ((tvar) = RTE_TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif #ifdef CPU_SETSIZE /* may require _GNU_SOURCE */ typedef cpu_set_t rte_cpuset_t; diff --git a/lib/eal/windows/eal_alarm.c b/lib/eal/windows/eal_alarm.c index e5dc54efb8..103c1f909d 100644 --- a/lib/eal/windows/eal_alarm.c +++ b/lib/eal/windows/eal_alarm.c @@ -4,6 +4,7 @@ #include #include +#include #include #include diff --git a/lib/eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h index 66c711d458..d0935c5003 100644 --- a/lib/eal/windows/include/rte_os.h +++ b/lib/eal/windows/include/rte_os.h @@ -18,6 +18,144 @@ extern "C" { #endif +#ifdef QUEUE_MACRO_DEBUG_TRACE +/* Store the last 2 places the queue element or head was altered */ +struct qm_trace { + unsigned long lastline; + unsigned long prevline; + const char *lastfile; + const char *prevfile; +}; + +/** + * These macros are compatible with the sys/queue.h provided + * at DPDK source code. + */ +#define TRACEBUF struct qm_trace trace; +#define TRACEBUF_INITIALIZER { __LINE__, 0, __FILE__, NULL } , + +#define QMD_TRACE_HEAD(head) do { \ + (head)->trace.prevline = (head)->trace.lastline; \ + (head)->trace.prevfile = (head)->trace.lastfile; \ + (head)->trace.lastline = __LINE__; \ + (head)->trace.lastfile = __FILE__; \ +} while (0) + +#define QMD_TRACE_ELEM(elem) do { \ + (elem)->trace.prevline = (elem)->trace.lastline; \ + (elem)->trace.prevfile = (elem)->trace.lastfile; \ + (elem)->trace.lastline = __LINE__; \ + (elem)->trace.lastfile = __FILE__; \ +} while (0) + +#else /* !QUEUE_MACRO_DEBUG_TRACE */ +#define QMD_TRACE_ELEM(elem) +#define QMD_TRACE_HEAD(head) +#define TRACEBUF +#define TRACEBUF_INITIALIZER +#endif /* QUEUE_MACRO_DEBUG_TRACE */ + +#ifdef QUEUE_MACRO_DEBUG_TRASH +#define QMD_SAVELINK(name, link) void **name = (void *)&(link) +#define TRASHIT(x) do {(x) = (void *)-1;} while (0) +#define QMD_IS_TRASHED(x) ((x) == (void *)(intptr_t)-1) +#else /* !QUEUE_MACRO_DEBUG_TRASH */ +#define QMD_SAVELINK(name, link) +#define TRASHIT(x) +#define QMD_IS_TRASHED(x) 0 +#endif /* QUEUE_MACRO_DEBUG_TRASH */ + +#define QMD_TAILQ_CHECK_HEAD(head, field) +#define QMD_TAILQ_CHECK_TAIL(head, headname) +#define QMD_TAILQ_CHECK_NEXT(elm, field) +#define QMD_TAILQ_CHECK_PREV(elm, field) + + +#define RTE_TAILQ_EMPTY(head) ((head)->tqh_first == NULL) + +#define RTE_TAILQ_FIRST(head) ((head)->tqh_first) + +#define RTE_TAILQ_INIT(head) do { \ + RTE_TAILQ_FIRST((head)) = NULL; \ + (head)->tqh_last = &RTE_TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ +} while (0) + +#define RTE_TAILQ_HEAD(name, type) \ +struct name { \ + struct type *tqh_first; /* first element */ \ + struct type **tqh_last; /* addr of last next element */ \ + TRACEBUF \ +} +#define RTE_TAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).tqh_first, TRACEBUF_INITIALIZER } + +#define RTE_TAILQ_ENTRY(type) \ +struct { \ + struct type *tqe_next; /* next element */ \ + struct type **tqe_prev; /* address of previous next element */ \ + TRACEBUF \ +} + +#define RTE_TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) +#define RTE_TAILQ_LAST(head, headname) \ + (*(((struct headname *)((head)->tqh_last))->tqh_last)) + +#define RTE_TAILQ_FOREACH(var, head, field) \ + for ((var) = RTE_TAILQ_FIRST((head)); \ + (var); \ + (var) = RTE_TAILQ_NEXT((var), field)) + +#define RTE_TAILQ_INSERT_TAIL(head, elm, field) do { \ + QMD_TAILQ_CHECK_TAIL(head, field); \ + RTE_TAILQ_NEXT((elm), field) = NULL; \ + (elm)->field.tqe_prev = (head)->tqh_last; \ + *(head)->tqh_last = (elm); \ + (head)->tqh_last = &RTE_TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define RTE_TAILQ_REMOVE(head, elm, field) do { \ + QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \ + QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \ + QMD_TAILQ_CHECK_NEXT(elm, field); \ + QMD_TAILQ_CHECK_PREV(elm, field); \ + if ((RTE_TAILQ_NEXT((elm), field)) != NULL) \ + RTE_TAILQ_NEXT((elm), field)->field.tqe_prev = \ + (elm)->field.tqe_prev; \ + else { \ + (head)->tqh_last = (elm)->field.tqe_prev; \ + QMD_TRACE_HEAD(head); \ + } \ + *(elm)->field.tqe_prev = RTE_TAILQ_NEXT((elm), field); \ + TRASHIT(*oldnext); \ + TRASHIT(*oldprev); \ + QMD_TRACE_ELEM(&(elm)->field); \ +} while (0) + +#define RTE_TAILQ_INSERT_BEFORE(listelm, elm, field) \ + TAILQ_INSERT_BEFORE(listelm, elm, field) +#define RTE_TAILQ_INSERT_AFTER(head, listelm, elm, field) \ + TAILQ_INSERT_AFTER(head, listelm, elm, field) +#define RTE_TAILQ_INSERT_HEAD(head, elm, field) \ + TAILQ_INSERT_HEAD(head, elm, field) + + +#define RTE_STAILQ_HEAD(name, type) \ +struct name { \ + struct type *stqh_first;/* first element */ \ + struct type **stqh_last;/* addr of last next element */ \ +} +#define RTE_STAILQ_HEAD_INITIALIZER(head) \ + { NULL, &(head).stqh_first } + +#define RTE_STAILQ_ENTRY(type) \ +struct { \ + struct type *stqe_next; /* next element */ \ +} + + /* cpu_set macros implementation */ #define RTE_CPU_AND(dst, src1, src2) CPU_AND(dst, src1, src2) #define RTE_CPU_OR(dst, src1, src2) CPU_OR(dst, src1, src2) diff --git a/lib/ethdev/rte_ethdev_core.h b/lib/ethdev/rte_ethdev_core.h index edf96de2dc..d2c9ec42c7 100644 --- a/lib/ethdev/rte_ethdev_core.h +++ b/lib/ethdev/rte_ethdev_core.h @@ -21,7 +21,7 @@ struct rte_eth_dev_callback; /** @internal Structure to keep track of registered callbacks */ -TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); +RTE_TAILQ_HEAD(rte_eth_dev_cb_list, rte_eth_dev_callback); struct rte_eth_dev; diff --git a/lib/hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h index c4d6976d2b..9c3a61c1d6 100644 --- a/lib/hash/rte_fbk_hash.h +++ b/lib/hash/rte_fbk_hash.h @@ -17,7 +17,6 @@ #include #include -#include #ifdef __cplusplus extern "C" { diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c index d5a95a6e00..696a1121e2 100644 --- a/lib/hash/rte_thash.c +++ b/lib/hash/rte_thash.c @@ -2,6 +2,8 @@ * Copyright(c) 2021 Intel Corporation */ +#include + #include #include #include diff --git a/lib/ip_frag/rte_ip_frag.h b/lib/ip_frag/rte_ip_frag.h index 0bfe64b14e..80f931c32a 100644 --- a/lib/ip_frag/rte_ip_frag.h +++ b/lib/ip_frag/rte_ip_frag.h @@ -62,7 +62,7 @@ struct ip_frag_key { * First two entries in the frags[] array are for the last and first fragments. */ struct ip_frag_pkt { - TAILQ_ENTRY(ip_frag_pkt) lru; /**< LRU list */ + RTE_TAILQ_ENTRY(ip_frag_pkt) lru; /**< LRU list */ struct ip_frag_key key; /**< fragmentation key */ uint64_t start; /**< creation timestamp */ uint32_t total_size; /**< expected reassembled size */ @@ -83,7 +83,7 @@ struct rte_ip_frag_death_row { /**< mbufs to be freed */ }; -TAILQ_HEAD(ip_pkt_list, ip_frag_pkt); /**< @internal fragments tailq */ +RTE_TAILQ_HEAD(ip_pkt_list, ip_frag_pkt); /**< @internal fragments tailq */ /** fragmentation table statistics */ struct ip_frag_tbl_stat { diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index 4235d6f0bf..f57ecbd6fc 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -141,7 +140,7 @@ struct rte_mempool_objsz { * double-frees. */ struct rte_mempool_objhdr { - STAILQ_ENTRY(rte_mempool_objhdr) next; /**< Next in list. */ + RTE_STAILQ_ENTRY(rte_mempool_objhdr) next; /**< Next in list. */ struct rte_mempool *mp; /**< The mempool owning the object. */ rte_iova_t iova; /**< IO address of the object. */ #ifdef RTE_LIBRTE_MEMPOOL_DEBUG @@ -152,7 +151,7 @@ struct rte_mempool_objhdr { /** * A list of object headers type */ -STAILQ_HEAD(rte_mempool_objhdr_list, rte_mempool_objhdr); +RTE_STAILQ_HEAD(rte_mempool_objhdr_list, rte_mempool_objhdr); #ifdef RTE_LIBRTE_MEMPOOL_DEBUG @@ -171,7 +170,7 @@ struct rte_mempool_objtlr { /** * A list of memory where objects are stored */ -STAILQ_HEAD(rte_mempool_memhdr_list, rte_mempool_memhdr); +RTE_STAILQ_HEAD(rte_mempool_memhdr_list, rte_mempool_memhdr); /** * Callback used to free a memory chunk @@ -186,7 +185,7 @@ typedef void (rte_mempool_memchunk_free_cb_t)(struct rte_mempool_memhdr *memhdr, * and physically contiguous. */ struct rte_mempool_memhdr { - STAILQ_ENTRY(rte_mempool_memhdr) next; /**< Next in list. */ + RTE_STAILQ_ENTRY(rte_mempool_memhdr) next; /**< Next in list. */ struct rte_mempool *mp; /**< The mempool owning the chunk */ void *addr; /**< Virtual address of the chunk */ rte_iova_t iova; /**< IO address of the chunk */ diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h index 1f33d687f4..71cbd441c7 100644 --- a/lib/pci/rte_pci.h +++ b/lib/pci/rte_pci.h @@ -18,7 +18,6 @@ extern "C" { #include #include -#include #include #include diff --git a/lib/ring/rte_ring_core.h b/lib/ring/rte_ring_core.h index 16718ca7f1..43ce1a29d4 100644 --- a/lib/ring/rte_ring_core.h +++ b/lib/ring/rte_ring_core.h @@ -26,7 +26,6 @@ extern "C" { #include #include #include -#include #include #include #include diff --git a/lib/table/rte_swx_table.h b/lib/table/rte_swx_table.h index e23f2304c6..f93e5f3f95 100644 --- a/lib/table/rte_swx_table.h +++ b/lib/table/rte_swx_table.h @@ -16,7 +16,8 @@ extern "C" { */ #include -#include + +#include /** Match type. */ enum rte_swx_table_match_type { @@ -68,7 +69,7 @@ struct rte_swx_table_entry { /** Used to facilitate the membership of this table entry to a * linked list. */ - TAILQ_ENTRY(rte_swx_table_entry) node; + RTE_TAILQ_ENTRY(rte_swx_table_entry) node; /** Key value for the current entry. Array of *key_size* bytes or NULL * if the *key_size* for the current table is 0. @@ -111,7 +112,7 @@ struct rte_swx_table_entry { }; /** List of table entries. */ -TAILQ_HEAD(rte_swx_table_entry_list, rte_swx_table_entry); +RTE_TAILQ_HEAD(rte_swx_table_entry_list, rte_swx_table_entry); /** * Table memory footprint get diff --git a/lib/table/rte_swx_table_selector.h b/lib/table/rte_swx_table_selector.h index 71b6a74810..62988d2856 100644 --- a/lib/table/rte_swx_table_selector.h +++ b/lib/table/rte_swx_table_selector.h @@ -16,7 +16,6 @@ extern "C" { */ #include -#include #include @@ -56,7 +55,7 @@ struct rte_swx_table_selector_params { /** Group member parameters. */ struct rte_swx_table_selector_member { /** Linked list connectivity. */ - TAILQ_ENTRY(rte_swx_table_selector_member) node; + RTE_TAILQ_ENTRY(rte_swx_table_selector_member) node; /** Member ID. */ uint32_t member_id; @@ -66,7 +65,7 @@ struct rte_swx_table_selector_member { }; /** List of group members. */ -TAILQ_HEAD(rte_swx_table_selector_member_list, rte_swx_table_selector_member); +RTE_TAILQ_HEAD(rte_swx_table_selector_member_list, rte_swx_table_selector_member); /** Group parameters. */ struct rte_swx_table_selector_group { diff --git a/lib/vhost/rte_vdpa_dev.h b/lib/vhost/rte_vdpa_dev.h index bfada387b0..b0f494815f 100644 --- a/lib/vhost/rte_vdpa_dev.h +++ b/lib/vhost/rte_vdpa_dev.h @@ -71,7 +71,7 @@ struct rte_vdpa_dev_ops { * vdpa device structure includes device address and device operations. */ struct rte_vdpa_device { - TAILQ_ENTRY(rte_vdpa_device) next; + RTE_TAILQ_ENTRY(rte_vdpa_device) next; /** Generic device information */ struct rte_device *device; /** vdpa device operations */ -- 2.30.2