X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fnull%2Frte_eth_null.c;h=025b73acb366fec51e44bf761959ad22043da1fd;hb=c886f4263a34ea083511c3a0a0206f5ba8a34934;hp=74dde9521b7b0cb862a7cf6070c296efb28411af;hpb=caccf8b318cafcdafe39faa3c5ce3eef67007621;p=dpdk.git diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 74dde9521b..025b73acb3 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright (C) IGEL Co.,Ltd. - * All rights reserved. - * - * 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 IGEL Co.,Ltd. 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. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (C) IGEL Co.,Ltd. + * All rights reserved. */ #include @@ -62,7 +34,6 @@ struct null_queue { rte_atomic64_t rx_pkts; rte_atomic64_t tx_pkts; - rte_atomic64_t err_pkts; }; struct pmd_internals { @@ -73,7 +44,7 @@ struct pmd_internals { struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT]; struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT]; - struct ether_addr eth_addr; + struct rte_ether_addr eth_addr; /** Bit mask of RSS offloads, the bit offset also means flow type */ uint64_t flow_type_rss_offloads; @@ -89,9 +60,15 @@ static struct rte_eth_link pmd_link = { .link_speed = ETH_SPEED_NUM_10G, .link_duplex = ETH_LINK_FULL_DUPLEX, .link_status = ETH_LINK_DOWN, - .link_autoneg = ETH_LINK_AUTONEG, + .link_autoneg = ETH_LINK_FIXED, }; +static int eth_null_logtype; + +#define PMD_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, eth_null_logtype, \ + "%s(): " fmt "\n", __func__, ##args) + static uint16_t eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { @@ -282,14 +259,14 @@ eth_mtu_set(struct rte_eth_dev *dev __rte_unused, uint16_t mtu __rte_unused) return 0; } -static void +static int eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) { struct pmd_internals *internals; if ((dev == NULL) || (dev_info == NULL)) - return; + return -EINVAL; internals = dev->data->dev_private; dev_info->max_mac_addrs = 1; @@ -299,13 +276,15 @@ eth_dev_info(struct rte_eth_dev *dev, dev_info->min_rx_bufsize = 0; dev_info->reta_size = internals->reta_size; dev_info->flow_type_rss_offloads = internals->flow_type_rss_offloads; + + return 0; } static int eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats) { unsigned i, num_stats; - unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0; + unsigned long rx_total = 0, tx_total = 0; const struct pmd_internals *internal; if ((dev == NULL) || (igb_stats == NULL)) @@ -327,35 +306,31 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats) for (i = 0; i < num_stats; i++) { igb_stats->q_opackets[i] = internal->tx_null_queues[i].tx_pkts.cnt; - igb_stats->q_errors[i] = - internal->tx_null_queues[i].err_pkts.cnt; tx_total += igb_stats->q_opackets[i]; - tx_err_total += igb_stats->q_errors[i]; } igb_stats->ipackets = rx_total; igb_stats->opackets = tx_total; - igb_stats->oerrors = tx_err_total; return 0; } -static void +static int eth_stats_reset(struct rte_eth_dev *dev) { unsigned i; struct pmd_internals *internal; if (dev == NULL) - return; + return -EINVAL; internal = dev->data->dev_private; for (i = 0; i < RTE_DIM(internal->rx_null_queues); i++) internal->rx_null_queues[i].rx_pkts.cnt = 0; - for (i = 0; i < RTE_DIM(internal->tx_null_queues); i++) { + for (i = 0; i < RTE_DIM(internal->tx_null_queues); i++) internal->tx_null_queues[i].tx_pkts.cnt = 0; - internal->tx_null_queues[i].err_pkts.cnt = 0; - } + + return 0; } static void @@ -461,7 +436,7 @@ eth_rss_hash_conf_get(struct rte_eth_dev *dev, static int eth_mac_address_set(__rte_unused struct rte_eth_dev *dev, - __rte_unused struct ether_addr *addr) + __rte_unused struct rte_ether_addr *addr) { return 0; } @@ -486,8 +461,6 @@ static const struct eth_dev_ops ops = { .rss_hash_conf_get = eth_rss_hash_conf_get }; -static struct rte_vdev_driver pmd_null_drv; - static int eth_dev_null_create(struct rte_vdev_device *dev, unsigned packet_size, @@ -495,7 +468,7 @@ eth_dev_null_create(struct rte_vdev_device *dev, { const unsigned nb_rx_queues = 1; const unsigned nb_tx_queues = 1; - struct rte_eth_dev_data *data = NULL; + struct rte_eth_dev_data *data; struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; @@ -509,22 +482,13 @@ eth_dev_null_create(struct rte_vdev_device *dev, if (dev->device.numa_node == SOCKET_ID_ANY) dev->device.numa_node = rte_socket_id(); - RTE_LOG(INFO, PMD, "Creating null ethdev on numa socket %u\n", + PMD_LOG(INFO, "Creating null ethdev on numa socket %u", dev->device.numa_node); - /* now do all data allocation - for eth_dev structure, dummy pci driver - * and internal (private) data - */ - data = rte_zmalloc_socket(rte_vdev_device_name(dev), sizeof(*data), 0, - dev->device.numa_node); - if (!data) - return -ENOMEM; - eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals)); - if (!eth_dev) { - rte_free(data); + if (!eth_dev) return -ENOMEM; - } + /* now put it all together * - store queue data in internals, * - store numa_node info in ethdev data @@ -538,20 +502,21 @@ eth_dev_null_create(struct rte_vdev_device *dev, internals->packet_size = packet_size; internals->packet_copy = packet_copy; internals->port_id = eth_dev->data->port_id; - eth_random_addr(internals->eth_addr.addr_bytes); + rte_eth_random_addr(internals->eth_addr.addr_bytes); internals->flow_type_rss_offloads = ETH_RSS_PROTO_MASK; internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_RETA_GROUP_SIZE; rte_memcpy(internals->rss_key, default_rss_key, 40); - rte_memcpy(data, eth_dev->data, sizeof(*data)); + data = eth_dev->data; data->nb_rx_queues = (uint16_t)nb_rx_queues; data->nb_tx_queues = (uint16_t)nb_tx_queues; data->dev_link = pmd_link; data->mac_addrs = &internals->eth_addr; + data->promiscuous = 1; + data->all_multicast = 1; - eth_dev->data = data; eth_dev->dev_ops = &ops; /* finally assign rx and tx ops */ @@ -563,6 +528,7 @@ eth_dev_null_create(struct rte_vdev_device *dev, eth_dev->tx_pkt_burst = eth_null_tx; } + rte_eth_dev_probing_finish(eth_dev); return 0; } @@ -607,6 +573,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) unsigned packet_size = default_packet_size; unsigned packet_copy = default_packet_copy; struct rte_kvargs *kvlist = NULL; + struct rte_eth_dev *eth_dev; int ret; if (!dev) @@ -614,7 +581,27 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) name = rte_vdev_device_name(dev); params = rte_vdev_device_args(dev); - RTE_LOG(INFO, PMD, "Initializing pmd_null for %s\n", name); + PMD_LOG(INFO, "Initializing pmd_null for %s", name); + + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + eth_dev = rte_eth_dev_attach_secondary(name); + if (!eth_dev) { + PMD_LOG(ERR, "Failed to probe %s", name); + return -1; + } + /* TODO: request info from primary to set up Rx and Tx */ + eth_dev->dev_ops = &ops; + eth_dev->device = &dev->device; + if (packet_copy) { + eth_dev->rx_pkt_burst = eth_null_copy_rx; + eth_dev->tx_pkt_burst = eth_null_copy_tx; + } else { + eth_dev->rx_pkt_burst = eth_null_rx; + eth_dev->tx_pkt_burst = eth_null_tx; + } + rte_eth_dev_probing_finish(eth_dev); + return 0; + } if (params != NULL) { kvlist = rte_kvargs_parse(params, valid_arguments); @@ -640,8 +627,8 @@ rte_pmd_null_probe(struct rte_vdev_device *dev) } } - RTE_LOG(INFO, PMD, "Configure pmd_null: packet size is %d, " - "packet copy is %s\n", packet_size, + PMD_LOG(INFO, "Configure pmd_null: packet size is %d, " + "packet copy is %s", packet_size, packet_copy ? "enabled" : "disabled"); ret = eth_dev_null_create(dev, packet_size, packet_copy); @@ -660,7 +647,7 @@ rte_pmd_null_remove(struct rte_vdev_device *dev) if (!dev) return -EINVAL; - RTE_LOG(INFO, PMD, "Closing null ethdev on numa socket %u\n", + PMD_LOG(INFO, "Closing null ethdev on numa socket %u", rte_socket_id()); /* find the ethdev entry */ @@ -668,8 +655,9 @@ rte_pmd_null_remove(struct rte_vdev_device *dev) if (eth_dev == NULL) return -1; - rte_free(eth_dev->data->dev_private); - rte_free(eth_dev->data); + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + /* mac_addrs must not be freed alone because part of dev_private */ + eth_dev->data->mac_addrs = NULL; rte_eth_dev_release_port(eth_dev); @@ -686,3 +674,10 @@ RTE_PMD_REGISTER_ALIAS(net_null, eth_null); RTE_PMD_REGISTER_PARAM_STRING(net_null, "size= " "copy="); + +RTE_INIT(eth_null_init_log) +{ + eth_null_logtype = rte_log_register("pmd.net.null"); + if (eth_null_logtype >= 0) + rte_log_set_level(eth_null_logtype, RTE_LOG_NOTICE); +}