From cf5643661161056c0ad0c073dd37ff674c2c9dc6 Mon Sep 17 00:00:00 2001 From: Pascal Mazon Date: Thu, 23 Mar 2017 09:33:54 +0100 Subject: [PATCH] net/tap: move private elements to external header In the next patch, access to struct pmd_internals will be necessary in tap_flow.c to store the flows. Signed-off-by: Pascal Mazon Acked-by: Olga Shern Acked-by: Keith Wiles --- drivers/net/tap/Makefile | 1 + drivers/net/tap/rte_eth_tap.c | 36 +---------------- drivers/net/tap/rte_eth_tap.h | 75 +++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 34 deletions(-) create mode 100644 drivers/net/tap/rte_eth_tap.h diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile index ddf87232d3..fa4658bd1e 100644 --- a/drivers/net/tap/Makefile +++ b/drivers/net/tap/Makefile @@ -40,6 +40,7 @@ EXPORT_MAP := rte_pmd_tap_version.map LIBABIVER := 1 CFLAGS += -O3 +CFLAGS += -I$(SRCDIR) CFLAGS += $(WERROR_FLAGS) # diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index f8d9cc7dc3..6bb63e5ec8 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -55,6 +55,8 @@ #include #include +#include + /* Linux based path to the TUN device */ #define TUN_TAP_DEV_PATH "/dev/net/tun" #define DEFAULT_TAP_NAME "dtap" @@ -87,40 +89,6 @@ static struct rte_eth_link pmd_link = { .link_autoneg = ETH_LINK_SPEED_AUTONEG }; -struct pkt_stats { - uint64_t opackets; /* Number of output packets */ - uint64_t ipackets; /* Number of input packets */ - uint64_t obytes; /* Number of bytes on output */ - uint64_t ibytes; /* Number of bytes on input */ - uint64_t errs; /* Number of error packets */ -}; - -struct rx_queue { - struct rte_mempool *mp; /* Mempool for RX packets */ - uint32_t trigger_seen; /* Last seen Rx trigger value */ - uint16_t in_port; /* Port ID */ - int fd; - - struct pkt_stats stats; /* Stats for this RX queue */ -}; - -struct tx_queue { - int fd; - struct pkt_stats stats; /* Stats for this TX queue */ -}; - -struct pmd_internals { - char name[RTE_ETH_NAME_MAX_LEN]; /* Internal Tap device name */ - uint16_t nb_queues; /* Number of queues supported */ - struct ether_addr eth_addr; /* Mac address of the device port */ - - int if_index; /* IF_INDEX for the port */ - int ioctl_sock; /* socket for ioctl calls */ - - struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */ - struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */ -}; - static void tap_trigger_cb(int sig __rte_unused) { diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h new file mode 100644 index 0000000000..aafdef1faa --- /dev/null +++ b/drivers/net/tap/rte_eth_tap.h @@ -0,0 +1,75 @@ +/*- + * BSD LICENSE + * + * Copyright 2017 6WIND S.A. + * Copyright 2017 Mellanox. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of 6WIND S.A. nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _RTE_ETH_TAP_H_ +#define _RTE_ETH_TAP_H_ + +#include + +#include +#include + +#define RTE_PMD_TAP_MAX_QUEUES 16 + +struct pkt_stats { + uint64_t opackets; /* Number of output packets */ + uint64_t ipackets; /* Number of input packets */ + uint64_t obytes; /* Number of bytes on output */ + uint64_t ibytes; /* Number of bytes on input */ + uint64_t errs; /* Number of TX error packets */ +}; + +struct rx_queue { + struct rte_mempool *mp; /* Mempool for RX packets */ + uint32_t trigger_seen; /* Last seen Rx trigger value */ + uint16_t in_port; /* Port ID */ + int fd; + struct pkt_stats stats; /* Stats for this RX queue */ +}; + +struct tx_queue { + int fd; + struct pkt_stats stats; /* Stats for this TX queue */ +}; + +struct pmd_internals { + char name[RTE_ETH_NAME_MAX_LEN]; /* Internal Tap device name */ + uint16_t nb_queues; /* Number of queues supported */ + struct ether_addr eth_addr; /* Mac address of the device port */ + int if_index; /* IF_INDEX for the port */ + int ioctl_sock; /* socket for ioctl calls */ + struct rx_queue rxq[RTE_PMD_TAP_MAX_QUEUES]; /* List of RX queues */ + struct tx_queue txq[RTE_PMD_TAP_MAX_QUEUES]; /* List of TX queues */ +}; + +#endif /* _RTE_ETH_TAP_H_ */ -- 2.20.1