net/failsafe: fix fd leak

[dpdk.git] / drivers / net / failsafe / failsafe_private.h

diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index 6e3f203..651578a 100644 (file)
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -3,8 +3,8 @@
  * Copyright 2017 Mellanox Technologies, Ltd
  */
 
-#ifndef _RTE_ETH_FAILSAFE_PRIVATE_H_
-#define _RTE_ETH_FAILSAFE_PRIVATE_H_
+#ifndef _ETH_FAILSAFE_PRIVATE_H_
+#define _ETH_FAILSAFE_PRIVATE_H_
 
 #include <stdint.h>
 #include <sys/queue.h>
@@ -58,6 +58,14 @@ struct rx_proxy {
        enum rxp_service_state sstate;
 };
 
+#define FS_RX_PROXY_INIT (struct rx_proxy){ \
+       .efd = -1, \
+       .evec = NULL, \
+       .sid = 0, \
+       .scid = 0, \
+       .sstate = SS_NO_SERVICE, \
+}
+
 struct rxq {
        struct fs_priv *priv;
        uint16_t qid;
@@ -100,13 +108,15 @@ struct fs_stats {
        uint64_t timestamp;
 };
 
+/*
+ * Allocated in shared memory.
+ */
 struct sub_device {
        /* Exhaustive DPDK device description */
        struct sub_device *next;
        struct rte_devargs devargs;
-       struct rte_bus *bus;
-       struct rte_device *dev;
-       struct rte_eth_dev *edev;
+       struct rte_bus *bus; /* for primary process only. */
+       struct rte_device *dev; /* for primary process only. */
        uint8_t sid;
        /* Device state machine */
        enum dev_state state;
@@ -117,7 +127,9 @@ struct sub_device {
        /* Others are retrieved through a file descriptor */
        char *fd_str;
        /* fail-safe device backreference */
-       struct rte_eth_dev *fs_dev;
+       uint16_t fs_port_id; /* shared between processes */
+       /* sub device port id*/
+       uint16_t sdev_port_id; /* shared between processes */
        /* flag calling for recollection */
        volatile unsigned int remove:1;
        /* flow isolation state */
@@ -139,7 +151,7 @@ struct fs_priv {
         * subs[0] is the preferred device
         * any other is just another slave
         */
-       struct sub_device *subs;
+       struct sub_device *subs;  /* shared between processes */
        uint8_t subs_head; /* if head == tail, no subs */
        uint8_t subs_tail; /* first invalid */
        uint8_t subs_tx; /* current emitting device */
@@ -148,12 +160,11 @@ struct fs_priv {
        TAILQ_HEAD(sub_flows, rte_flow) flow_list;
        /* current number of mac_addr slots allocated. */
        uint32_t nb_mac_addr;
-       struct ether_addr mac_addrs[FAILSAFE_MAX_ETHADDR];
+       struct rte_ether_addr mac_addrs[FAILSAFE_MAX_ETHADDR];
        uint32_t mac_addr_pool[FAILSAFE_MAX_ETHADDR];
        uint32_t nb_mcast_addr;
-       struct ether_addr *mcast_addrs;
+       struct rte_ether_addr *mcast_addrs;
        /* current capabilities */
-       struct rte_eth_dev_info infos;
        struct rte_eth_dev_owner my_owner; /* Unique owner. */
        struct rte_intr_handle intr_handle; /* Port interrupt handle. */
        /*
@@ -254,11 +265,12 @@ extern int failsafe_mac_from_arg;
 
 /* sdev: (struct sub_device *) */
 #define ETH(sdev) \
-       ((sdev)->edev)
+       ((sdev)->sdev_port_id == RTE_MAX_ETHPORTS ? \
+       NULL : &rte_eth_devices[(sdev)->sdev_port_id])
 
 /* sdev: (struct sub_device *) */
 #define PORT_ID(sdev) \
-       (ETH(sdev)->data->port_id)
+       ((sdev)->sdev_port_id)
 
 /* sdev: (struct sub_device *) */
 #define SUB_ID(sdev) \
@@ -324,16 +336,16 @@ extern int failsafe_mac_from_arg;
  */
 #define FS_ATOMIC_RX(s, i) \
        rte_atomic64_read( \
-        &((struct rxq *)((s)->fs_dev->data->rx_queues[i]))->refcnt[(s)->sid] \
-       )
+        &((struct rxq *) \
+        (fs_dev(s)->data->rx_queues[i]))->refcnt[(s)->sid])
 /**
  * s: (struct sub_device *)
  * i: uint16_t qid
  */
 #define FS_ATOMIC_TX(s, i) \
        rte_atomic64_read( \
-        &((struct txq *)((s)->fs_dev->data->tx_queues[i]))->refcnt[(s)->sid] \
-       )
+        &((struct txq *) \
+        (fs_dev(s)->data->tx_queues[i]))->refcnt[(s)->sid])
 
 #ifdef RTE_EXEC_ENV_FREEBSD
 #define FS_THREADID_TYPE void*
@@ -379,6 +391,11 @@ fs_find_next(struct rte_eth_dev *dev,
        return &subs[sid];
 }
 
+static inline struct rte_eth_dev *
+fs_dev(struct sub_device *sdev) {
+       return &rte_eth_devices[sdev->fs_port_id];
+}
+
 /*
  * Lock hot-plug mutex.
  * is_alarm means that the caller is, for sure, the hot-plug alarm mechanism.
@@ -484,4 +501,4 @@ fs_err(struct sub_device *sdev, int err)
                return rte_errno = 0;
        return err;
 }
-#endif /* _RTE_ETH_FAILSAFE_PRIVATE_H_ */
+#endif /* _ETH_FAILSAFE_PRIVATE_H_ */