Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53457/?format=api
{ "id": 53457, "url": "https://patches.dpdk.org/api/patches/53457/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190516035310.31145-1-stephen@networkplumber.org/", "project": { "id": 1, "url": "https://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": "<20190516035310.31145-1-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190516035310.31145-1-stephen@networkplumber.org", "date": "2019-05-16T03:53:10", "name": "net/failsafe: fix reported device info", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "732597968d2174659be44a7a2f2287a893291790", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190516035310.31145-1-stephen@networkplumber.org/mbox/", "series": [ { "id": 4684, "url": "https://patches.dpdk.org/api/series/4684/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=4684", "date": "2019-05-16T03:53:10", "name": "net/failsafe: fix reported device info", "version": 1, "mbox": "https://patches.dpdk.org/series/4684/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/53457/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/53457/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9FFAF2C17;\n\tThu, 16 May 2019 05:53:22 +0200 (CEST)", "from mail-pl1-f194.google.com (mail-pl1-f194.google.com\n\t[209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 6E3012BAF\n\tfor <dev@dpdk.org>; Thu, 16 May 2019 05:53:20 +0200 (CEST)", "by mail-pl1-f194.google.com with SMTP id n8so883760plp.10\n\tfor <dev@dpdk.org>; Wed, 15 May 2019 20:53:20 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\tq193sm6314755pfc.52.2019.05.15.20.53.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 15 May 2019 20:53:18 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=/BJJv3wfR83t3FdWkHUuQY2gHuldRdMBdjTM+GcOr2E=;\n\tb=CKpM2X7cf1om5Y7QK0oOrcxZjWXVVARrIEikQLedAI87VknKTbxcj7mp8iApU00nIY\n\tB5KhE3qaze/wmnZM9Q6TDHNBAJokgqM7mKaSI6RNJWSQNi01YKCFuvEzb0e/pD9S93CN\n\t2bC3Hq8x/W5B9p8qDac92nUzTUh6RaMssIywQ4kd3IwQmVPP9MdfMO/iudzPiBoagAvM\n\t8BPiVbZoP2Syc/3hTYGbVx9lT9iGnzFvgIPIJIaWqbnk3ZM/arssXxnlIo0pzxOwR5Y1\n\tLe5xRIrjM6yxCgF2I/3bF+bGOfAl+wvhiDEKk5ZFktwfFen8D5+q/FcUKRIKl6/+QWFs\n\tLEPQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=/BJJv3wfR83t3FdWkHUuQY2gHuldRdMBdjTM+GcOr2E=;\n\tb=P7ki8DCeymaATZhsdJzileiCN1DS30LSBV8p/vXLfGNzRZcDPmu8T6cC8IghsGKF8e\n\t5bOHYgB6R8LLe7aDm+6chJC7zWjPn+0delaoSBfiC6o/Jt6/3K2OR9Rg0fLFiBZQefNA\n\tWOZEAbM9N9QiI561V3k56tkTXqhTv68e5aFRm5asAzj99f5pxKaEQ2s8ltHQ3AgltqE5\n\tAuADFVE7ABqgsH93z3mv69sDcWTftzlUmee1vs4LvHoRMw+ZyASvglt8uRhPArMlaHzk\n\tUdhu79aFWB52v91iaQwjz/v4A/DLMqKCIqBwJA4k6RIot8WGS6tDVu7WDPrKZ8pxS0cv\n\tkLlQ==", "X-Gm-Message-State": "APjAAAUTluPrBmF4OipxTh+9kiVc1Tc0aRp25xZt1Ig5sLMkP6vPT5kR\n\tAI/jZ+6Nbeg5z1feieRX8UDF9g==", "X-Google-Smtp-Source": "APXvYqw46OwyvCoim3kjqI8ZCPL35VwBaufh+gkITDax/Ku5DussLK5pM7IJdNAcZgd7bUqQ2iimzg==", "X-Received": "by 2002:a17:902:b094:: with SMTP id\n\tp20mr25537727plr.164.1557978799129; \n\tWed, 15 May 2019 20:53:19 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "gaetan.rivet@6wind.com", "Cc": "dev@dpdk.org, Stephen Hemminger <stephen@networkplumber.org>,\n\tStephen Hemminger <sthemmin@microsoft.com>", "Date": "Wed, 15 May 2019 20:53:10 -0700", "Message-Id": "<20190516035310.31145-1-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH] net/failsafe: fix reported device info", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The failsafe driver device info had several issues in the\ninfo it reported in dev_info_get:\n - it cleared dev_info->device set in rte_eth_dev_info_get\n - many fields (for example max_rx_queue) should be the minimum\n of all sub devices\n - it reported tx capa for the active transmit device, but\n the device may change.\n\nThere was enough messed up that ended up reworking the info_get\nhandler. There is no need to save current values or have a\ntemplate for defaults.\n\nFixes: 4e31ee26ed51 (\"net/failsafe: report actual device capabilities\")\nSigned-off-by: Stephen Hemminger <sthemmin@microsoft.com>\n---\n drivers/net/failsafe/failsafe_ops.c | 220 ++++++++++++------------\n drivers/net/failsafe/failsafe_private.h | 1 -\n 2 files changed, 109 insertions(+), 112 deletions(-)", "diff": "diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c\nindex 43d6a828ffa5..5d311492cece 100644\n--- a/drivers/net/failsafe/failsafe_ops.c\n+++ b/drivers/net/failsafe/failsafe_ops.c\n@@ -17,81 +17,6 @@\n \n #include \"failsafe_private.h\"\n \n-static struct rte_eth_dev_info default_infos = {\n-\t/* Max possible number of elements */\n-\t.max_rx_pktlen = UINT32_MAX,\n-\t.max_rx_queues = RTE_MAX_QUEUES_PER_PORT,\n-\t.max_tx_queues = RTE_MAX_QUEUES_PER_PORT,\n-\t.max_mac_addrs = FAILSAFE_MAX_ETHADDR,\n-\t.max_hash_mac_addrs = UINT32_MAX,\n-\t.max_vfs = UINT16_MAX,\n-\t.max_vmdq_pools = UINT16_MAX,\n-\t.rx_desc_lim = {\n-\t\t.nb_max = UINT16_MAX,\n-\t\t.nb_min = 0,\n-\t\t.nb_align = 1,\n-\t\t.nb_seg_max = UINT16_MAX,\n-\t\t.nb_mtu_seg_max = UINT16_MAX,\n-\t},\n-\t.tx_desc_lim = {\n-\t\t.nb_max = UINT16_MAX,\n-\t\t.nb_min = 0,\n-\t\t.nb_align = 1,\n-\t\t.nb_seg_max = UINT16_MAX,\n-\t\t.nb_mtu_seg_max = UINT16_MAX,\n-\t},\n-\t/*\n-\t * Set of capabilities that can be verified upon\n-\t * configuring a sub-device.\n-\t */\n-\t.rx_offload_capa =\n-\t\tDEV_RX_OFFLOAD_VLAN_STRIP |\n-\t\tDEV_RX_OFFLOAD_IPV4_CKSUM |\n-\t\tDEV_RX_OFFLOAD_UDP_CKSUM |\n-\t\tDEV_RX_OFFLOAD_TCP_CKSUM |\n-\t\tDEV_RX_OFFLOAD_TCP_LRO |\n-\t\tDEV_RX_OFFLOAD_QINQ_STRIP |\n-\t\tDEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |\n-\t\tDEV_RX_OFFLOAD_MACSEC_STRIP |\n-\t\tDEV_RX_OFFLOAD_HEADER_SPLIT |\n-\t\tDEV_RX_OFFLOAD_VLAN_FILTER |\n-\t\tDEV_RX_OFFLOAD_VLAN_EXTEND |\n-\t\tDEV_RX_OFFLOAD_JUMBO_FRAME |\n-\t\tDEV_RX_OFFLOAD_SCATTER |\n-\t\tDEV_RX_OFFLOAD_TIMESTAMP |\n-\t\tDEV_RX_OFFLOAD_SECURITY,\n-\t.rx_queue_offload_capa =\n-\t\tDEV_RX_OFFLOAD_VLAN_STRIP |\n-\t\tDEV_RX_OFFLOAD_IPV4_CKSUM |\n-\t\tDEV_RX_OFFLOAD_UDP_CKSUM |\n-\t\tDEV_RX_OFFLOAD_TCP_CKSUM |\n-\t\tDEV_RX_OFFLOAD_TCP_LRO |\n-\t\tDEV_RX_OFFLOAD_QINQ_STRIP |\n-\t\tDEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |\n-\t\tDEV_RX_OFFLOAD_MACSEC_STRIP |\n-\t\tDEV_RX_OFFLOAD_HEADER_SPLIT |\n-\t\tDEV_RX_OFFLOAD_VLAN_FILTER |\n-\t\tDEV_RX_OFFLOAD_VLAN_EXTEND |\n-\t\tDEV_RX_OFFLOAD_JUMBO_FRAME |\n-\t\tDEV_RX_OFFLOAD_SCATTER |\n-\t\tDEV_RX_OFFLOAD_TIMESTAMP |\n-\t\tDEV_RX_OFFLOAD_SECURITY,\n-\t.tx_offload_capa =\n-\t\tDEV_TX_OFFLOAD_MULTI_SEGS |\n-\t\tDEV_TX_OFFLOAD_MBUF_FAST_FREE |\n-\t\tDEV_TX_OFFLOAD_IPV4_CKSUM |\n-\t\tDEV_TX_OFFLOAD_UDP_CKSUM |\n-\t\tDEV_TX_OFFLOAD_TCP_CKSUM |\n-\t\tDEV_TX_OFFLOAD_TCP_TSO,\n-\t.flow_type_rss_offloads =\n-\t\t\tETH_RSS_IP |\n-\t\t\tETH_RSS_UDP |\n-\t\t\tETH_RSS_TCP,\n-\t.dev_capa =\n-\t\tRTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |\n-\t\tRTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP,\n-};\n-\n static int\n fs_dev_configure(struct rte_eth_dev *dev)\n {\n@@ -864,6 +789,46 @@ fs_stats_reset(struct rte_eth_dev *dev)\n \tfs_unlock(dev, 0);\n }\n \n+static void\n+fs_dev_merge_desc_lim(struct rte_eth_desc_lim *to,\n+\t\t const struct rte_eth_desc_lim *from)\n+{\n+\tto->nb_max = RTE_MIN(to->nb_max, from->nb_max);\n+\tto->nb_min = RTE_MAX(to->nb_min, from->nb_min);\n+\tto->nb_align = RTE_MAX(to->nb_align, from->nb_align);\n+\n+\tto->nb_seg_max = RTE_MIN(to->nb_seg_max, from->nb_seg_max);\n+\tto->nb_mtu_seg_max = RTE_MIN(to->nb_mtu_seg_max, from->nb_mtu_seg_max);\n+}\n+\n+/*\n+ * Merge the information from sub-devices.\n+ *\n+ * The reported values must be the common subset of all sub devices\n+ */\n+static void\n+fs_dev_merge_info(struct rte_eth_dev_info *info,\n+\t\t const struct rte_eth_dev_info *sinfo)\n+{\n+\tinfo->max_rx_pktlen = RTE_MIN(info->max_rx_pktlen, sinfo->max_rx_pktlen);\n+\tinfo->max_rx_queues = RTE_MIN(info->max_rx_queues, sinfo->max_rx_queues);\n+\tinfo->max_tx_queues = RTE_MIN(info->max_tx_queues, sinfo->max_tx_queues);\n+\tinfo->max_mac_addrs = RTE_MIN(info->max_mac_addrs, sinfo->max_mac_addrs);\n+\tinfo->max_hash_mac_addrs = RTE_MIN(info->max_hash_mac_addrs,\n+\t\t\t\t\tsinfo->max_hash_mac_addrs);\n+\tinfo->max_vmdq_pools = RTE_MIN(info->max_vmdq_pools, sinfo->max_vmdq_pools);\n+\tinfo->max_vfs = RTE_MIN(info->max_vfs, sinfo->max_vfs);\n+\n+\tfs_dev_merge_desc_lim(&info->rx_desc_lim, &sinfo->rx_desc_lim);\n+\tfs_dev_merge_desc_lim(&info->tx_desc_lim, &sinfo->tx_desc_lim);\n+\n+\tinfo->rx_offload_capa &= sinfo->rx_offload_capa;\n+\tinfo->tx_offload_capa &= sinfo->tx_offload_capa;\n+\tinfo->rx_queue_offload_capa &= sinfo->rx_queue_offload_capa;\n+\tinfo->tx_queue_offload_capa &= sinfo->tx_queue_offload_capa;\n+\tinfo->flow_type_rss_offloads &= sinfo->flow_type_rss_offloads;\n+}\n+\n /**\n * Fail-safe dev_infos_get rules:\n *\n@@ -902,43 +867,76 @@ fs_dev_infos_get(struct rte_eth_dev *dev,\n \tstruct sub_device *sdev;\n \tuint8_t i;\n \n-\tsdev = TX_SUBDEV(dev);\n-\tif (sdev == NULL) {\n-\t\tDEBUG(\"No probed device, using default infos\");\n-\t\trte_memcpy(&PRIV(dev)->infos, &default_infos,\n-\t\t\t sizeof(default_infos));\n-\t} else {\n-\t\tuint64_t rx_offload_capa;\n-\t\tuint64_t rxq_offload_capa;\n-\t\tuint64_t rss_hf_offload_capa;\n-\t\tuint64_t dev_capa;\n-\n-\t\trx_offload_capa = default_infos.rx_offload_capa;\n-\t\trxq_offload_capa = default_infos.rx_queue_offload_capa;\n-\t\trss_hf_offload_capa = default_infos.flow_type_rss_offloads;\n-\t\tdev_capa = default_infos.dev_capa;\n-\t\tFOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {\n-\t\t\trte_eth_dev_info_get(PORT_ID(sdev),\n-\t\t\t\t\t&PRIV(dev)->infos);\n-\t\t\trx_offload_capa &= PRIV(dev)->infos.rx_offload_capa;\n-\t\t\trxq_offload_capa &=\n-\t\t\t\t\tPRIV(dev)->infos.rx_queue_offload_capa;\n-\t\t\trss_hf_offload_capa &=\n-\t\t\t\t\tPRIV(dev)->infos.flow_type_rss_offloads;\n-\t\t\tdev_capa &= PRIV(dev)->infos.dev_capa;\n-\t\t}\n-\t\tsdev = TX_SUBDEV(dev);\n-\t\trte_eth_dev_info_get(PORT_ID(sdev), &PRIV(dev)->infos);\n-\t\tPRIV(dev)->infos.rx_offload_capa = rx_offload_capa;\n-\t\tPRIV(dev)->infos.rx_queue_offload_capa = rxq_offload_capa;\n-\t\tPRIV(dev)->infos.flow_type_rss_offloads = rss_hf_offload_capa;\n-\t\tPRIV(dev)->infos.dev_capa = dev_capa;\n-\t\tPRIV(dev)->infos.tx_offload_capa &=\n-\t\t\t\t\tdefault_infos.tx_offload_capa;\n-\t\tPRIV(dev)->infos.tx_queue_offload_capa &=\n-\t\t\t\t\tdefault_infos.tx_queue_offload_capa;\n+\t/* Use maximum upper bounds by default */\n+\tinfos->max_rx_pktlen = UINT32_MAX;\n+\tinfos->max_rx_queues = RTE_MAX_QUEUES_PER_PORT;\n+\tinfos->max_tx_queues = RTE_MAX_QUEUES_PER_PORT;\n+\tinfos->max_mac_addrs = FAILSAFE_MAX_ETHADDR;\n+\tinfos->max_hash_mac_addrs = UINT32_MAX;\n+\tinfos->max_vfs = UINT16_MAX;\n+\tinfos->max_vmdq_pools = UINT16_MAX;\n+\n+\t/*\n+\t * Set of capabilities that can be verified upon\n+\t * configuring a sub-device.\n+\t */\n+\tinfos->rx_offload_capa =\n+\t\tDEV_RX_OFFLOAD_VLAN_STRIP |\n+\t\tDEV_RX_OFFLOAD_IPV4_CKSUM |\n+\t\tDEV_RX_OFFLOAD_UDP_CKSUM |\n+\t\tDEV_RX_OFFLOAD_TCP_CKSUM |\n+\t\tDEV_RX_OFFLOAD_TCP_LRO |\n+\t\tDEV_RX_OFFLOAD_QINQ_STRIP |\n+\t\tDEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |\n+\t\tDEV_RX_OFFLOAD_MACSEC_STRIP |\n+\t\tDEV_RX_OFFLOAD_HEADER_SPLIT |\n+\t\tDEV_RX_OFFLOAD_VLAN_FILTER |\n+\t\tDEV_RX_OFFLOAD_VLAN_EXTEND |\n+\t\tDEV_RX_OFFLOAD_JUMBO_FRAME |\n+\t\tDEV_RX_OFFLOAD_SCATTER |\n+\t\tDEV_RX_OFFLOAD_TIMESTAMP |\n+\t\tDEV_RX_OFFLOAD_SECURITY;\n+\n+\tinfos->rx_queue_offload_capa =\n+\t\tDEV_RX_OFFLOAD_VLAN_STRIP |\n+\t\tDEV_RX_OFFLOAD_IPV4_CKSUM |\n+\t\tDEV_RX_OFFLOAD_UDP_CKSUM |\n+\t\tDEV_RX_OFFLOAD_TCP_CKSUM |\n+\t\tDEV_RX_OFFLOAD_TCP_LRO |\n+\t\tDEV_RX_OFFLOAD_QINQ_STRIP |\n+\t\tDEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |\n+\t\tDEV_RX_OFFLOAD_MACSEC_STRIP |\n+\t\tDEV_RX_OFFLOAD_HEADER_SPLIT |\n+\t\tDEV_RX_OFFLOAD_VLAN_FILTER |\n+\t\tDEV_RX_OFFLOAD_VLAN_EXTEND |\n+\t\tDEV_RX_OFFLOAD_JUMBO_FRAME |\n+\t\tDEV_RX_OFFLOAD_SCATTER |\n+\t\tDEV_RX_OFFLOAD_TIMESTAMP |\n+\t\tDEV_RX_OFFLOAD_SECURITY;\n+\n+\tinfos->tx_offload_capa =\n+\t\tDEV_TX_OFFLOAD_MULTI_SEGS |\n+\t\tDEV_TX_OFFLOAD_MBUF_FAST_FREE |\n+\t\tDEV_TX_OFFLOAD_IPV4_CKSUM |\n+\t\tDEV_TX_OFFLOAD_UDP_CKSUM |\n+\t\tDEV_TX_OFFLOAD_TCP_CKSUM |\n+\t\tDEV_TX_OFFLOAD_TCP_TSO;\n+\n+\tinfos->flow_type_rss_offloads =\n+\t\tETH_RSS_IP |\n+\t\tETH_RSS_UDP |\n+\t\tETH_RSS_TCP;\n+\tinfos->dev_capa =\n+\t\tRTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |\n+\t\tRTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;\n+\n+\tFOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {\n+\t\tstruct rte_eth_dev_info sub_info;\n+\n+\t\trte_eth_dev_info_get(PORT_ID(sdev), &sub_info);\n+\n+\t\tfs_dev_merge_info(infos, &sub_info);\n \t}\n-\trte_memcpy(infos, &PRIV(dev)->infos, sizeof(*infos));\n }\n \n static const uint32_t *\ndiff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h\nindex 4f58a5c918b8..d9fd3d3265e3 100644\n--- a/drivers/net/failsafe/failsafe_private.h\n+++ b/drivers/net/failsafe/failsafe_private.h\n@@ -157,7 +157,6 @@ struct fs_priv {\n \tuint32_t nb_mcast_addr;\n \tstruct ether_addr *mcast_addrs;\n \t/* current capabilities */\n-\tstruct rte_eth_dev_info infos;\n \tstruct rte_eth_dev_owner my_owner; /* Unique owner. */\n \tstruct rte_intr_handle intr_handle; /* Port interrupt handle. */\n \t/*\n", "prefixes": [] }