net/mlx5: add C++ include guard to public header

[dpdk.git] / drivers / net / tap / rte_eth_tap.c

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index a9a7658..111037d 100644 (file)
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -67,6 +67,7 @@
 
 /* IPC key for queue fds sync */
 #define TAP_MP_KEY "tap_mp_sync_queues"
+#define TAP_MP_REQ_START_RXTX "tap_mp_req_start_rxtx"
 
 #define TAP_IOV_DEFAULT_MAX 1024
 
@@ -525,7 +526,7 @@ tap_tx_l4_cksum(uint16_t *l4_cksum, uint16_t l4_phdr_cksum,
        }
 }
 
-/* Accumaulate L4 raw checksums */
+/* Accumulate L4 raw checksums */
 static void
 tap_tx_l4_add_rcksum(char *l4_data, unsigned int l4_len, uint16_t *l4_cksum,
                        uint32_t *l4_raw_cksum)
@@ -880,11 +881,49 @@ tap_link_set_up(struct rte_eth_dev *dev)
        return tap_ioctl(pmd, SIOCSIFFLAGS, &ifr, 1, LOCAL_AND_REMOTE);
 }
 
+static int
+tap_mp_req_on_rxtx(struct rte_eth_dev *dev)
+{
+       struct rte_mp_msg msg;
+       struct ipc_queues *request_param = (struct ipc_queues *)msg.param;
+       int err;
+       int fd_iterator = 0;
+       struct pmd_process_private *process_private = dev->process_private;
+       int i;
+
+       memset(&msg, 0, sizeof(msg));
+       strlcpy(msg.name, TAP_MP_REQ_START_RXTX, sizeof(msg.name));
+       strlcpy(request_param->port_name, dev->data->name, sizeof(request_param->port_name));
+       msg.len_param = sizeof(*request_param);
+       for (i = 0; i < dev->data->nb_tx_queues; i++) {
+               msg.fds[fd_iterator++] = process_private->txq_fds[i];
+               msg.num_fds++;
+               request_param->txq_count++;
+       }
+       for (i = 0; i < dev->data->nb_rx_queues; i++) {
+               msg.fds[fd_iterator++] = process_private->rxq_fds[i];
+               msg.num_fds++;
+               request_param->rxq_count++;
+       }
+
+       err = rte_mp_sendmsg(&msg);
+       if (err < 0) {
+               TAP_LOG(ERR, "Failed to send start req to secondary %d",
+                       rte_errno);
+               return -1;
+       }
+
+       return 0;
+}
+
 static int
 tap_dev_start(struct rte_eth_dev *dev)
 {
        int err, i;
 
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               tap_mp_req_on_rxtx(dev);
+
        err = tap_intr_handle_set(dev, 1);
        if (err)
                return err;
@@ -901,6 +940,34 @@ tap_dev_start(struct rte_eth_dev *dev)
        return err;
 }
 
+static int
+tap_mp_req_start_rxtx(const struct rte_mp_msg *request, __rte_unused const void *peer)
+{
+       struct rte_eth_dev *dev;
+       const struct ipc_queues *request_param =
+               (const struct ipc_queues *)request->param;
+       int fd_iterator;
+       int queue;
+       struct pmd_process_private *process_private;
+
+       dev = rte_eth_dev_get_by_name(request_param->port_name);
+       if (!dev) {
+               TAP_LOG(ERR, "Failed to get dev for %s",
+                       request_param->port_name);
+               return -1;
+       }
+       process_private = dev->process_private;
+       fd_iterator = 0;
+       TAP_LOG(DEBUG, "tap_attach rx_q:%d tx_q:%d\n", request_param->rxq_count,
+               request_param->txq_count);
+       for (queue = 0; queue < request_param->txq_count; queue++)
+               process_private->txq_fds[queue] = request->fds[fd_iterator++];
+       for (queue = 0; queue < request_param->rxq_count; queue++)
+               process_private->rxq_fds[queue] = request->fds[fd_iterator++];
+
+       return 0;
+}
+
 /* This function gets called when the current port gets stopped.
  */
 static int
@@ -940,6 +1007,14 @@ tap_dev_configure(struct rte_eth_dev *dev)
                        RTE_PMD_TAP_MAX_QUEUES);
                return -1;
        }
+       if (dev->data->nb_rx_queues != dev->data->nb_tx_queues) {
+               TAP_LOG(ERR,
+                       "%s: number of rx queues %d must be equal to number of tx queues %d",
+                       dev->device->name,
+                       dev->data->nb_rx_queues,
+                       dev->data->nb_tx_queues);
+               return -1;
+       }
 
        TAP_LOG(INFO, "%s: %s: TX configured queues number: %u",
                dev->device->name, pmd->name, dev->data->nb_tx_queues);
@@ -1006,6 +1081,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
         * functions together and not in partial combinations
         */
        dev_info->flow_type_rss_offloads = ~TAP_RSS_HF_MASK;
+       dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP;
 
        return 0;
 }
@@ -1083,6 +1159,9 @@ tap_dev_close(struct rte_eth_dev *dev)
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                rte_free(dev->process_private);
+               if (tap_devices_count == 1)
+                       rte_mp_action_unregister(TAP_MP_REQ_START_RXTX);
+               tap_devices_count--;
                return 0;
        }
 
@@ -1663,8 +1742,9 @@ tap_dev_intr_handler(void *cb_arg)
        struct rte_eth_dev *dev = cb_arg;
        struct pmd_internals *pmd = dev->data->dev_private;
 
-       tap_nl_recv(rte_intr_fd_get(pmd->intr_handle),
-                   tap_nl_msg_handler, dev);
+       if (rte_intr_fd_get(pmd->intr_handle) >= 0)
+               tap_nl_recv(rte_intr_fd_get(pmd->intr_handle),
+                           tap_nl_msg_handler, dev);
 }
 
 static int
@@ -1703,8 +1783,10 @@ clean:
                }
        } while (true);
 
-       tap_nl_final(rte_intr_fd_get(pmd->intr_handle));
-       rte_intr_fd_set(pmd->intr_handle, -1);
+       if (rte_intr_fd_get(pmd->intr_handle) >= 0) {
+               tap_nl_final(rte_intr_fd_get(pmd->intr_handle));
+               rte_intr_fd_set(pmd->intr_handle, -1);
+       }
 
        return 0;
 }
@@ -2441,6 +2523,16 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)
                ret = tap_mp_attach_queues(name, eth_dev);
                if (ret != 0)
                        return -1;
+
+               if (!tap_devices_count) {
+                       ret = rte_mp_action_register(TAP_MP_REQ_START_RXTX, tap_mp_req_start_rxtx);
+                       if (ret < 0 && rte_errno != ENOTSUP) {
+                               TAP_LOG(ERR, "tap: Failed to register IPC callback: %s",
+                                       strerror(rte_errno));
+                               return -1;
+                       }
+               }
+               tap_devices_count++;
                rte_eth_dev_probing_finish(eth_dev);
                return 0;
        }