From patchwork Mon Mar 6 10:00:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Blunck X-Patchwork-Id: 21437 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 4DE1DF94A; Mon, 6 Mar 2017 11:01:42 +0100 (CET) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id CD65B567C for ; Mon, 6 Mar 2017 11:00:55 +0100 (CET) Received: by mail-wm0-f67.google.com with SMTP id v190so12805829wme.3 for ; Mon, 06 Mar 2017 02:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=U0ADes7W43yDw1AgF3pux0YQdLTa9j4tiBLbPxMiYDs=; b=p7Q9hERoVgWinH23KugjjHPUctZJMf6l9y7s1SQGDuXHFwh5kMCfmNEbO701MUi4DV CZl/5ls8hwCqW2O+hIvU7iZEUxYZrTdXyu8qlwD+mkWG8ziHzsCMoynyCFPI9bCsIfU+ 3+fESO3yHzJcpYXuJqebv1G2f3XgWeLp5ASXrCW1XI5Lg5/wH7Cckn+tN0OXUgvxS1Mv yjhqdZs/HuxRBFmFRfz/bAyRd0t+19kApQKjdkqBxNwjJxcvatNiJ6jUgFMg91YLj6Ly GUWqjCFIeahf7QFJeqtCI92CzY2cFafRNMkYF4oSQ748Mv/JWwIesOcmm0KcKEhN1V0P tUGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=U0ADes7W43yDw1AgF3pux0YQdLTa9j4tiBLbPxMiYDs=; b=U5gndI4H0VhjnFu99Vg5leJal3NvVB4zVC/BLmNNi7erLRu2yAyEJKIpWhDaJ7H02J jGt5SYK0qhQRmW7pCxKAFx6JBcxv6ZvHfNig9waRk5Il3rhdm9PM5f9bzvnE7ng9E4x2 K6ILn51b5Cy0FpywNc3WnM5yR23vHhhQz4lsbxasMc50hn6CqqaVSXv8uAmlE41VB3pd KT7lSRcy8tJIIux0ZYmU3ajaiuCBxGe6TjgOR4NbUcH91nwb0ICrERCy+Cz6NwR7Hijr XIrUcVnBwIIIB+qDwCSoX7MRRW1xvDsey0q1cYivXaKeD+F4gw6mbgQ5XhcyE8w6CeQv Jrmw== X-Gm-Message-State: AMke39l6nRPMbEtBT58RARvEO2qJZWDBLnPp6FfVHDcgPsUK/MojZoWXKY4WKkrexyVRag== X-Received: by 10.28.166.208 with SMTP id p199mr12728404wme.25.1488794455198; Mon, 06 Mar 2017 02:00:55 -0800 (PST) Received: from weierstrass.local.net ([91.200.109.169]) by smtp.gmail.com with ESMTPSA id u145sm3829237wmu.1.2017.03.06.02.00.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 02:00:54 -0800 (PST) From: Jan Blunck To: dev@dpdk.org Date: Mon, 6 Mar 2017 11:00:01 +0100 Message-Id: <1488794430-25179-10-git-send-email-jblunck@infradead.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488794430-25179-1-git-send-email-jblunck@infradead.org> References: <1488794430-25179-1-git-send-email-jblunck@infradead.org> Subject: [dpdk-dev] [PATCH 09/38] net/af_packet: use ethdev allocation helper for virtual devices X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Signed-off-by: Jan Blunck --- drivers/net/af_packet/rte_eth_af_packet.c | 42 ++++++++++++++----------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c index 77536e8..6f6ba0c 100644 --- a/drivers/net/af_packet/rte_eth_af_packet.c +++ b/drivers/net/af_packet/rte_eth_af_packet.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -539,18 +540,19 @@ open_packet_iface(const char *key __rte_unused, static struct rte_vdev_driver pmd_af_packet_drv; static int -rte_pmd_init_internals(const char *name, +rte_pmd_init_internals(struct rte_vdev_device *dev, const int sockfd, const unsigned nb_queues, unsigned int blocksize, unsigned int blockcnt, unsigned int framesize, unsigned int framecnt, - const unsigned numa_node, struct pmd_internals **internals, struct rte_eth_dev **eth_dev, struct rte_kvargs *kvlist) { + const char *name = rte_vdev_device_name(dev); + const unsigned int numa_node = dev->device.numa_node; struct rte_eth_dev_data *data = NULL; struct rte_kvargs_pair *pair = NULL; struct ifreq ifr; @@ -768,7 +770,7 @@ rte_pmd_init_internals(const char *name, } /* reserve an ethdev entry */ - *eth_dev = rte_eth_dev_allocate(name); + *eth_dev = rte_eth_vdev_allocate(dev, 0); if (*eth_dev == NULL) goto error; @@ -782,22 +784,16 @@ rte_pmd_init_internals(const char *name, (*internals)->nb_queues = nb_queues; + rte_memcpy(data, (*eth_dev)->data, sizeof(*data)); data->dev_private = *internals; - data->port_id = (*eth_dev)->data->port_id; data->nb_rx_queues = (uint16_t)nb_queues; data->nb_tx_queues = (uint16_t)nb_queues; data->dev_link = pmd_link; data->mac_addrs = &(*internals)->eth_addr; - strncpy(data->name, - (*eth_dev)->data->name, strlen((*eth_dev)->data->name)); (*eth_dev)->data = data; (*eth_dev)->dev_ops = &ops; - (*eth_dev)->driver = NULL; (*eth_dev)->data->dev_flags = RTE_ETH_DEV_DETACHABLE; - (*eth_dev)->data->drv_name = pmd_af_packet_drv.driver.name; - (*eth_dev)->data->kdrv = RTE_KDRV_NONE; - (*eth_dev)->data->numa_node = numa_node; return 0; @@ -822,11 +818,11 @@ rte_pmd_init_internals(const char *name, } static int -rte_eth_from_packet(const char *name, +rte_eth_from_packet(struct rte_vdev_device *dev, int const *sockfd, - const unsigned numa_node, struct rte_kvargs *kvlist) { + const char *name = rte_vdev_device_name(dev); struct pmd_internals *internals = NULL; struct rte_eth_dev *eth_dev = NULL; struct rte_kvargs_pair *pair = NULL; @@ -909,11 +905,11 @@ rte_eth_from_packet(const char *name, RTE_LOG(INFO, PMD, "%s:\tframe size %d\n", name, framesize); RTE_LOG(INFO, PMD, "%s:\tframe count %d\n", name, framecount); - if (rte_pmd_init_internals(name, *sockfd, qpairs, - blocksize, blockcount, - framesize, framecount, - numa_node, &internals, ð_dev, - kvlist) < 0) + if (rte_pmd_init_internals(dev, *sockfd, qpairs, + blocksize, blockcount, + framesize, framecount, + &internals, ð_dev, + kvlist) < 0) return -1; eth_dev->rx_pkt_burst = eth_af_packet_rx; @@ -925,15 +921,12 @@ rte_eth_from_packet(const char *name, static int rte_pmd_af_packet_probe(struct rte_vdev_device *dev) { - const char *name = rte_vdev_device_name(dev); - unsigned numa_node; int ret = 0; struct rte_kvargs *kvlist; int sockfd = -1; - RTE_LOG(INFO, PMD, "Initializing pmd_af_packet for %s\n", name); - - numa_node = rte_socket_id(); + RTE_LOG(INFO, PMD, "Initializing pmd_af_packet for %s\n", + rte_vdev_device_name(dev)); kvlist = rte_kvargs_parse(rte_vdev_device_args(dev), valid_arguments); if (kvlist == NULL) { @@ -953,7 +946,10 @@ rte_pmd_af_packet_probe(struct rte_vdev_device *dev) goto exit; } - ret = rte_eth_from_packet(name, &sockfd, numa_node, kvlist); + if (dev->device.numa_node == SOCKET_ID_ANY) + dev->device.numa_node = rte_socket_id(); + + ret = rte_eth_from_packet(dev, &sockfd, kvlist); close(sockfd); /* no longer needed */ exit: