Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/92508/?format=api
{ "id": 92508, "url": "http://patches.dpdk.org/api/patches/92508/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210430125725.28796-20-mk@semihalf.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210430125725.28796-20-mk@semihalf.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210430125725.28796-20-mk@semihalf.com", "date": "2021-04-30T12:57:22", "name": "[19/22] net/ena: make ethdev references smp safe", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c659d3643613bd11bfa1bbfbd7c4bf8b2e8ce687", "submitter": { "id": 786, "url": "http://patches.dpdk.org/api/people/786/?format=api", "name": "Michal Krawczyk", "email": "mk@semihalf.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210430125725.28796-20-mk@semihalf.com/mbox/", "series": [ { "id": 16774, "url": "http://patches.dpdk.org/api/series/16774/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=16774", "date": "2021-04-30T12:57:03", "name": "net/ena: update ENA PMD to v2.3.0", "version": 1, "mbox": "http://patches.dpdk.org/series/16774/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/92508/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/92508/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 4A3C6A0546;\n\tFri, 30 Apr 2021 14:59:37 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C337E41340;\n\tFri, 30 Apr 2021 14:58:09 +0200 (CEST)", "from mail-wm1-f41.google.com (mail-wm1-f41.google.com\n [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 9BAA5412DE\n for <dev@dpdk.org>; Fri, 30 Apr 2021 14:58:02 +0200 (CEST)", "by mail-wm1-f41.google.com with SMTP id\n k4-20020a7bc4040000b02901331d89fb83so1629035wmi.5\n for <dev@dpdk.org>; Fri, 30 Apr 2021 05:58:02 -0700 (PDT)", "from DESKTOP-U5LNN3J.localdomain (89-79-189-199.dynamic.chello.pl.\n [89.79.189.199])\n by smtp.gmail.com with ESMTPSA id l13sm13476245wmj.3.2021.04.30.05.58.00\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 30 Apr 2021 05:58:01 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=semihalf-com.20150623.gappssmtp.com; s=20150623;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=xQ5KzMcvNm7MJFLzLa3duwUXJFZs4nyU4dVGhI0xeS4=;\n b=OSYzPGZ5MzNkiOOA/FjvKc2Bj+Bxx8UpwBVQ9KKqRtF9/bvVq3KkTzMWMtySj8Rk7M\n EJjvEoQty+3WWVFfZvDv4PYGHO9teVO33BfG+AGVHXT/HSSAGPHeXy2ks1sKEG05RJeo\n Vy4yVX184ULU4dfl2Q1myQcAnlY5JZMhesKvZAv8A+sUOMfMGrF7ownBPH6VfnbndYee\n h2bSGP8zh/jd6w1PMwq7q8CFsEE9v0IczjWfKMjSB7e4uDibtJanF4OBtG/dQLTz7Vtp\n JsBRB3tfbXseqLFtHOytyvOWu1AMbfJWPuDjRbNccmC8SNieqRwAS024hNL9ISBLXx89\n nxiA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=xQ5KzMcvNm7MJFLzLa3duwUXJFZs4nyU4dVGhI0xeS4=;\n b=nUgCqXhvSUbmoSTh5WoARusNZHwwiTeZxCaWLuA2yb5hkMRO4zIMvlRtJPnut/XUKK\n YQ6nsadlRWqzcQCQp0NXqJHotBtFr9rFRuc7DBPx6eB+Qw7PRP4YLrlpO9IXTEAb0pYL\n JH3i3VkSxJX/N14/P7fcj6O+tQoiojtyGi0VDHtwh2fsZ4YgAi6pluaiLnjMXU4gU2EK\n 7czYMabvqC9xtDtO1udahbg5nkD0hg//SNl2mwuqWpAryRIVkC8d/EqsS9vw/Na7Ef4W\n 542AOfC92tQ6907yr4uYEdLjF+/gg2+mNBAleNTM1thS8Kx99LJyeKrf0jzdnd2k0wWt\n vGog==", "X-Gm-Message-State": "AOAM532HZQ5m+PLfGY/aXc47TUUpy5teIgV08ppx8KmKi++54DjfRRHb\n UuwaZLCSadKA/w1UvuIZI912NNeBaftcZzQT", "X-Google-Smtp-Source": "\n ABdhPJwW1GYDAow9Y0Pib/ZSWDIJ9nqPQBGDdO+/IdZ0DWAwcgbnQoVIWc2MgyE3+EFxXK9q1lH8hw==", "X-Received": "by 2002:a05:600c:35d1:: with SMTP id\n r17mr5934247wmq.71.1619787482040;\n Fri, 30 Apr 2021 05:58:02 -0700 (PDT)", "From": "Michal Krawczyk <mk@semihalf.com>", "To": "dev@dpdk.org", "Cc": "ndagan@amazom.com, gtzalik@amazon.com, igorch@amazon.com, mw@semihalf.com,\n Stanislaw Kardach <kda@semihalf.com>, Michal Krawczyk <mk@semihalf.com>,\n Shay Agroskin <shayagr@amazon.com>", "Date": "Fri, 30 Apr 2021 14:57:22 +0200", "Message-Id": "<20210430125725.28796-20-mk@semihalf.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210430125725.28796-1-mk@semihalf.com>", "References": "<20210430125725.28796-1-mk@semihalf.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 19/22] net/ena: make ethdev references smp safe", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Stanislaw Kardach <kda@semihalf.com>\n\nrte_pci_device and rte_eth_dev are process-local structures. Therefore\nena_adapter::pdev and ena_adapter::rte_dev cannot be used universally.\nSwitch this to extracting those structures via rte_eth_devices indexing\nand remove pdev since it's not used outside of init.\n\nSigned-off-by: Stanislaw Kardach <kda@semihalf.com>\nReviewed-by: Michal Krawczyk <mk@semihalf.com>\nReviewed-by: Igor Chauskin <igorch@amazon.com>\nReviewed-by: Shay Agroskin <shayagr@amazon.com>\n---\n drivers/net/ena/ena_ethdev.c | 47 ++++++++++++++++++------------------\n drivers/net/ena/ena_ethdev.h | 5 ++--\n 2 files changed, 25 insertions(+), 27 deletions(-)", "diff": "diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 5c365e1ab5..90ea40513a 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -168,6 +168,7 @@ static const struct rte_pci_id pci_id_ena_map[] = {\n static struct ena_aenq_handlers aenq_handlers;\n \n static int ena_device_init(struct ena_com_dev *ena_dev,\n+\t\t\t struct rte_pci_device *pdev,\n \t\t\t struct ena_com_dev_get_features_ctx *get_feat_ctx,\n \t\t\t bool *wd_state);\n static int ena_dev_configure(struct rte_eth_dev *dev);\n@@ -451,11 +452,11 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev)\n }\n \n /* This function calculates the number of xstats based on the current config */\n-static unsigned int ena_xstats_calc_num(struct rte_eth_dev *dev)\n+static unsigned int ena_xstats_calc_num(struct rte_eth_dev_data *data)\n {\n \treturn ENA_STATS_ARRAY_GLOBAL + ENA_STATS_ARRAY_ENI +\n-\t\t(dev->data->nb_tx_queues * ENA_STATS_ARRAY_TX) +\n-\t\t(dev->data->nb_rx_queues * ENA_STATS_ARRAY_RX);\n+\t\t(data->nb_tx_queues * ENA_STATS_ARRAY_TX) +\n+\t\t(data->nb_rx_queues * ENA_STATS_ARRAY_RX);\n }\n \n static void ena_config_debug_area(struct ena_adapter *adapter)\n@@ -463,7 +464,7 @@ static void ena_config_debug_area(struct ena_adapter *adapter)\n \tu32 debug_area_size;\n \tint rc, ss_count;\n \n-\tss_count = ena_xstats_calc_num(adapter->rte_dev);\n+\tss_count = ena_xstats_calc_num(adapter->edev_data);\n \n \t/* allocate 32 bytes for each string and 64bit for the value */\n \tdebug_area_size = ss_count * ETH_GSTRING_LEN + sizeof(u64) * ss_count;\n@@ -587,7 +588,7 @@ static int ena_rss_reta_update(struct rte_eth_dev *dev,\n \t}\n \n \tPMD_DRV_LOG(DEBUG, \"%s(): RSS configured %d entries for port %d\\n\",\n-\t\t__func__, reta_size, adapter->rte_dev->data->port_id);\n+\t\t__func__, reta_size, dev->data->port_id);\n \n \treturn 0;\n }\n@@ -631,7 +632,7 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev,\n static int ena_rss_init_default(struct ena_adapter *adapter)\n {\n \tstruct ena_com_dev *ena_dev = &adapter->ena_dev;\n-\tuint16_t nb_rx_queues = adapter->rte_dev->data->nb_rx_queues;\n+\tuint16_t nb_rx_queues = adapter->edev_data->nb_rx_queues;\n \tint rc, i;\n \tu32 val;\n \n@@ -669,8 +670,7 @@ static int ena_rss_init_default(struct ena_adapter *adapter)\n \t\tPMD_DRV_LOG(ERR, \"Cannot flush the indirect table\\n\");\n \t\tgoto err_fill_indir;\n \t}\n-\tPMD_DRV_LOG(DEBUG, \"RSS configured for port %d\\n\",\n-\t\tadapter->rte_dev->data->port_id);\n+\tPMD_DRV_LOG(DEBUG, \"RSS configured for port %d\\n\", adapter->port_id);\n \n \treturn 0;\n \n@@ -841,10 +841,10 @@ static uint32_t ena_get_mtu_conf(struct ena_adapter *adapter)\n {\n \tuint32_t max_frame_len = adapter->max_mtu;\n \n-\tif (adapter->rte_eth_dev_data->dev_conf.rxmode.offloads &\n+\tif (adapter->edev_data->dev_conf.rxmode.offloads &\n \t DEV_RX_OFFLOAD_JUMBO_FRAME)\n \t\tmax_frame_len =\n-\t\t\tadapter->rte_eth_dev_data->dev_conf.rxmode.max_rx_pkt_len;\n+\t\t\tadapter->edev_data->dev_conf.rxmode.max_rx_pkt_len;\n \n \treturn max_frame_len;\n }\n@@ -1064,8 +1064,8 @@ static int ena_start(struct rte_eth_dev *dev)\n \tif (rc)\n \t\tgoto err_start_tx;\n \n-\tif (adapter->rte_dev->data->dev_conf.rxmode.mq_mode &\n-\t ETH_MQ_RX_RSS_FLAG && adapter->rte_dev->data->nb_rx_queues > 0) {\n+\tif (adapter->edev_data->dev_conf.rxmode.mq_mode &\n+\t ETH_MQ_RX_RSS_FLAG && adapter->edev_data->nb_rx_queues > 0) {\n \t\trc = ena_rss_init_default(adapter);\n \t\tif (rc)\n \t\t\tgoto err_rss_init;\n@@ -1505,6 +1505,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n }\n \n static int ena_device_init(struct ena_com_dev *ena_dev,\n+\t\t\t struct rte_pci_device *pdev,\n \t\t\t struct ena_com_dev_get_features_ctx *get_feat_ctx,\n \t\t\t bool *wd_state)\n {\n@@ -1522,9 +1523,7 @@ static int ena_device_init(struct ena_com_dev *ena_dev,\n \t/* The PCIe configuration space revision id indicate if mmio reg\n \t * read is disabled.\n \t */\n-\treadless_supported =\n-\t\t!(((struct rte_pci_device *)ena_dev->dmadev)->id.class_id\n-\t\t\t & ENA_MMIO_DISABLE_REG_READ);\n+\treadless_supported = !(pdev->id.class_id & ENA_MMIO_DISABLE_REG_READ);\n \tena_com_set_mmio_read_mode(ena_dev, readless_supported);\n \n \t/* reset device */\n@@ -1634,7 +1633,7 @@ static void ena_timer_wd_callback(__rte_unused struct rte_timer *timer,\n \t\t\t\t void *arg)\n {\n \tstruct ena_adapter *adapter = arg;\n-\tstruct rte_eth_dev *dev = adapter->rte_dev;\n+\tstruct rte_eth_dev *dev = &rte_eth_devices[adapter->port_id];\n \n \tcheck_for_missing_keep_alive(adapter);\n \tcheck_for_admin_com_state(adapter);\n@@ -1819,11 +1818,10 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \tmemset(adapter, 0, sizeof(struct ena_adapter));\n \tena_dev = &adapter->ena_dev;\n \n-\tadapter->rte_eth_dev_data = eth_dev->data;\n-\tadapter->rte_dev = eth_dev;\n+\tadapter->edev_data = eth_dev->data;\n+\tadapter->port_id = eth_dev->data->port_id;\n \n \tpci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n-\tadapter->pdev = pci_dev;\n \n \tPMD_INIT_LOG(INFO, \"Initializing %x:%x:%x.%d\",\n \t\t pci_dev->addr.domain,\n@@ -1843,7 +1841,8 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \t}\n \n \tena_dev->reg_bar = adapter->regs;\n-\tena_dev->dmadev = adapter->pdev;\n+\t/* This is a dummy pointer for ena_com functions. */\n+\tena_dev->dmadev = adapter;\n \n \tadapter->id_number = adapters_found;\n \n@@ -1857,7 +1856,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \t}\n \n \t/* device specific initialization routine */\n-\trc = ena_device_init(ena_dev, &get_feat_ctx, &wd_state);\n+\trc = ena_device_init(ena_dev, pci_dev, &get_feat_ctx, &wd_state);\n \tif (rc) {\n \t\tPMD_INIT_LOG(CRIT, \"Failed to init ENA device\");\n \t\tgoto err;\n@@ -2716,7 +2715,7 @@ static int ena_xstats_get_names(struct rte_eth_dev *dev,\n \t\t\t\tstruct rte_eth_xstat_name *xstats_names,\n \t\t\t\tunsigned int n)\n {\n-\tunsigned int xstats_count = ena_xstats_calc_num(dev);\n+\tunsigned int xstats_count = ena_xstats_calc_num(dev->data);\n \tunsigned int stat, i, count = 0;\n \n \tif (n < xstats_count || !xstats_names)\n@@ -2765,7 +2764,7 @@ static int ena_xstats_get(struct rte_eth_dev *dev,\n \t\t\t unsigned int n)\n {\n \tstruct ena_adapter *adapter = dev->data->dev_private;\n-\tunsigned int xstats_count = ena_xstats_calc_num(dev);\n+\tunsigned int xstats_count = ena_xstats_calc_num(dev->data);\n \tunsigned int stat, i, count = 0;\n \tint stat_offset;\n \tvoid *stats_begin;\n@@ -2997,7 +2996,7 @@ static void ena_update_on_link_change(void *adapter_data,\n \n \tadapter = adapter_data;\n \taenq_link_desc = (struct ena_admin_aenq_link_change_desc *)aenq_e;\n-\teth_dev = adapter->rte_dev;\n+\teth_dev = &rte_eth_devices[adapter->port_id];\n \n \tstatus = get_ena_admin_aenq_link_change_desc_link_status(aenq_link_desc);\n \tadapter->link_status = status;\ndiff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h\nindex 1f7383dce0..32e92e1d6b 100644\n--- a/drivers/net/ena/ena_ethdev.h\n+++ b/drivers/net/ena/ena_ethdev.h\n@@ -219,9 +219,8 @@ struct ena_shared_data {\n /* board specific private data structure */\n struct ena_adapter {\n \t/* OS defined structs */\n-\tstruct rte_pci_device *pdev;\n-\tstruct rte_eth_dev_data *rte_eth_dev_data;\n-\tstruct rte_eth_dev *rte_dev;\n+\tstruct rte_eth_dev_data *edev_data;\n+\tint port_id;\n \n \tstruct ena_com_dev ena_dev __rte_cache_aligned;\n \n", "prefixes": [ "19/22" ] }