Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/7450/?format=api
{ "id": 7450, "url": "https://patches.dpdk.org/api/patches/7450/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1444067692-29645-11-git-send-email-adrien.mazarguil@6wind.com/", "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": "<1444067692-29645-11-git-send-email-adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1444067692-29645-11-git-send-email-adrien.mazarguil@6wind.com", "date": "2015-10-05T17:54:45", "name": "[dpdk-dev,10/17] mlx5: use one RSS hash key per flow type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6783e872d9e5353b72e60b4c350abf991c140498", "submitter": { "id": 165, "url": "https://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1444067692-29645-11-git-send-email-adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/7450/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/7450/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 185F393EA;\n\tMon, 5 Oct 2015 19:55:37 +0200 (CEST)", "from mail-wi0-f179.google.com (mail-wi0-f179.google.com\n\t[209.85.212.179]) by dpdk.org (Postfix) with ESMTP id 695689251\n\tfor <dev@dpdk.org>; Mon, 5 Oct 2015 19:55:35 +0200 (CEST)", "by wiclk2 with SMTP id lk2so132479525wic.0\n\tfor <dev@dpdk.org>; Mon, 05 Oct 2015 10:55:35 -0700 (PDT)", "from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by smtp.gmail.com with ESMTPSA id\n\tjd7sm6261804wjb.19.2015.10.05.10.55.34\n\t(version=TLSv1.2 cipher=RC4-SHA bits=128/128);\n\tMon, 05 Oct 2015 10:55:34 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=DiBO12hOzDekyFvRpUZWREUUTAgcZyMrejrMdlFFMK0=;\n\tb=fTkaRsawcWKhnR+XnN/2F9OscdGmvFRWeZ20U454uoQ7vcqjfNcnKN84iLyqtmNojN\n\t+KMp1/qhUO99+iQnLopsadHx5pacru+/2pP69APkBsiwJpkc8X32yyyDCVyXp3vgWEIK\n\tVruU8CUGxryOuyUj5zKiRUic5Wf8zZM+DD0SadO7h0gLd4mnBvyWOzsQLDqx4VYQW12a\n\tG41vzrtLioq6qxVl3qJdE5yOIGXzuAArO3mESQWsnuBPB+7+5NrD2OzRMTwe0Ddxl+w3\n\t9pduglpu1k5zDTTR7rs5VFspmew0FucalMW9dUjJ8GqG4Cx2akRk8l4rn11um7rZB4Qw\n\tPy8g==", "X-Gm-Message-State": "ALoCoQmL7HUA+IEeWsZwJrdDACpNFp72Fmu+KKyVlFaLXQHmBlWs/PNOtXciqK1U4L7Pkar1pyaf", "X-Received": "by 10.180.102.226 with SMTP id fr2mr14078476wib.3.1444067735264; \n\tMon, 05 Oct 2015 10:55:35 -0700 (PDT)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Date": "Mon, 5 Oct 2015 19:54:45 +0200", "Message-Id": "<1444067692-29645-11-git-send-email-adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1444067692-29645-1-git-send-email-adrien.mazarguil@6wind.com>", "References": "<1444067692-29645-1-git-send-email-adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH 10/17] mlx5: use one RSS hash key per flow type", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n\nDPDK expects to have an RSS hash key per flow type (IPv4, IPv6, UDPv4,\netc.), to handle this the PMD must keep a table of hash keys to be able\nto reconfigure the queues at each start/stop call.\n\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n drivers/net/mlx5/mlx5.c | 17 +++++++--\n drivers/net/mlx5/mlx5.h | 6 ++--\n drivers/net/mlx5/mlx5_rss.c | 85 +++++++++++++++++++++++++++++++++-----------\n drivers/net/mlx5/mlx5_rxq.c | 24 +++++++++----\n drivers/net/mlx5/mlx5_rxtx.h | 4 +++\n 5 files changed, 105 insertions(+), 31 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex bc2a19b..fb9d594 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -129,7 +129,11 @@ mlx5_dev_close(struct rte_eth_dev *dev)\n \t\tclaim_zero(ibv_close_device(priv->ctx));\n \t} else\n \t\tassert(priv->ctx == NULL);\n-\trte_free(priv->rss_conf);\n+\tif (priv->rss_conf != NULL) {\n+\t\tfor (i = 0; (i != hash_rxq_init_n); ++i)\n+\t\t\trte_free((*priv->rss_conf)[i]);\n+\t\trte_free(priv->rss_conf);\n+\t}\n \tpriv_unlock(priv);\n \tmemset(priv, 0, sizeof(*priv));\n }\n@@ -379,10 +383,17 @@ mlx5_pci_devinit(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)\n #endif /* HAVE_EXP_QUERY_DEVICE */\n \n \t\tpriv->vf = vf;\n-\t\t/* Register default RSS hash key. */\n+\t\t/* Allocate and register default RSS hash keys. */\n+\t\tpriv->rss_conf = rte_calloc(__func__, hash_rxq_init_n,\n+\t\t\t\t\t sizeof((*priv->rss_conf)[0]), 0);\n+\t\tif (priv->rss_conf == NULL) {\n+\t\t\terr = ENOMEM;\n+\t\t\tgoto port_error;\n+\t\t}\n \t\terr = rss_hash_rss_conf_new_key(priv,\n \t\t\t\t\t\trss_hash_default_key,\n-\t\t\t\t\t\trss_hash_default_key_len);\n+\t\t\t\t\t\trss_hash_default_key_len,\n+\t\t\t\t\t\tETH_RSS_PROTO_MASK);\n \t\tif (err)\n \t\t\tgoto port_error;\n \t\t/* Configure the first MAC address by default. */\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex fc042e8..de72f94 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -118,7 +118,8 @@ struct priv {\n \t/* Hash RX QPs feeding the indirection table. */\n \tstruct hash_rxq (*hash_rxqs)[];\n \tunsigned int hash_rxqs_n; /* Hash RX QPs array size. */\n-\tstruct rte_eth_rss_conf *rss_conf; /* RSS configuration. */\n+\t/* RSS configuration array indexed by hash RX queue type. */\n+\tstruct rte_eth_rss_conf *(*rss_conf)[];\n \trte_spinlock_t lock; /* Lock for control functions. */\n };\n \n@@ -177,7 +178,8 @@ void mlx5_mac_addr_add(struct rte_eth_dev *, struct ether_addr *, uint32_t,\n \n /* mlx5_rss.c */\n \n-int rss_hash_rss_conf_new_key(struct priv *, const uint8_t *, unsigned int);\n+int rss_hash_rss_conf_new_key(struct priv *, const uint8_t *, unsigned int,\n+\t\t\t uint64_t);\n int mlx5_rss_hash_update(struct rte_eth_dev *, struct rte_eth_rss_conf *);\n int mlx5_rss_hash_conf_get(struct rte_eth_dev *, struct rte_eth_rss_conf *);\n \ndiff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c\nindex 2dc58e5..bf19aca 100644\n--- a/drivers/net/mlx5/mlx5_rss.c\n+++ b/drivers/net/mlx5/mlx5_rss.c\n@@ -61,6 +61,33 @@\n #include \"mlx5_rxtx.h\"\n \n /**\n+ * Get a RSS configuration hash key.\n+ *\n+ * @param priv\n+ * Pointer to private structure.\n+ * @param rss_hf\n+ * RSS hash functions configuration must be retrieved for.\n+ *\n+ * @return\n+ * Pointer to a RSS configuration structure or NULL if rss_hf cannot\n+ * be matched.\n+ */\n+static struct rte_eth_rss_conf *\n+rss_hash_get(struct priv *priv, uint64_t rss_hf)\n+{\n+\tunsigned int i;\n+\n+\tfor (i = 0; (i != hash_rxq_init_n); ++i) {\n+\t\tuint64_t dpdk_rss_hf = hash_rxq_init[i].dpdk_rss_hf;\n+\n+\t\tif (!(dpdk_rss_hf & rss_hf))\n+\t\t\tcontinue;\n+\t\treturn (*priv->rss_conf)[i];\n+\t}\n+\treturn NULL;\n+}\n+\n+/**\n * Register a RSS key.\n *\n * @param priv\n@@ -69,25 +96,35 @@\n * Hash key to register.\n * @param key_len\n * Hash key length in bytes.\n+ * @param rss_hf\n+ * RSS hash functions the provided key applies to.\n *\n * @return\n * 0 on success, errno value on failure.\n */\n int\n rss_hash_rss_conf_new_key(struct priv *priv, const uint8_t *key,\n-\t\t\t unsigned int key_len)\n+\t\t\t unsigned int key_len, uint64_t rss_hf)\n {\n-\tstruct rte_eth_rss_conf *rss_conf;\n-\n-\trss_conf = rte_realloc(priv->rss_conf,\n-\t\t\t (sizeof(*rss_conf) + key_len),\n-\t\t\t 0);\n-\tif (!rss_conf)\n-\t\treturn ENOMEM;\n-\trss_conf->rss_key = (void *)(rss_conf + 1);\n-\trss_conf->rss_key_len = key_len;\n-\tmemcpy(rss_conf->rss_key, key, key_len);\n-\tpriv->rss_conf = rss_conf;\n+\tunsigned int i;\n+\n+\tfor (i = 0; (i != hash_rxq_init_n); ++i) {\n+\t\tstruct rte_eth_rss_conf *rss_conf;\n+\t\tuint64_t dpdk_rss_hf = hash_rxq_init[i].dpdk_rss_hf;\n+\n+\t\tif (!(dpdk_rss_hf & rss_hf))\n+\t\t\tcontinue;\n+\t\trss_conf = rte_realloc((*priv->rss_conf)[i],\n+\t\t\t\t (sizeof(*rss_conf) + key_len),\n+\t\t\t\t 0);\n+\t\tif (!rss_conf)\n+\t\t\treturn ENOMEM;\n+\t\trss_conf->rss_key = (void *)(rss_conf + 1);\n+\t\trss_conf->rss_key_len = key_len;\n+\t\trss_conf->rss_hf = dpdk_rss_hf;\n+\t\tmemcpy(rss_conf->rss_key, key, key_len);\n+\t\t(*priv->rss_conf)[i] = rss_conf;\n+\t}\n \treturn 0;\n }\n \n@@ -117,11 +154,13 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev,\n \tif (rss_conf->rss_key)\n \t\terr = rss_hash_rss_conf_new_key(priv,\n \t\t\t\t\t\trss_conf->rss_key,\n-\t\t\t\t\t\trss_conf->rss_key_len);\n+\t\t\t\t\t\trss_conf->rss_key_len,\n+\t\t\t\t\t\trss_conf->rss_hf);\n \telse\n \t\terr = rss_hash_rss_conf_new_key(priv,\n \t\t\t\t\t\trss_hash_default_key,\n-\t\t\t\t\t\trss_hash_default_key_len);\n+\t\t\t\t\t\trss_hash_default_key_len,\n+\t\t\t\t\t\tETH_RSS_PROTO_MASK);\n \n \t/* Store the configuration set into port configure.\n \t * This will enable/disable hash RX queues associated to the protocols\n@@ -149,19 +188,25 @@ mlx5_rss_hash_conf_get(struct rte_eth_dev *dev,\n \t\t struct rte_eth_rss_conf *rss_conf)\n {\n \tstruct priv *priv = dev->data->dev_private;\n+\tstruct rte_eth_rss_conf *priv_rss_conf;\n \n \tpriv_lock(priv);\n \n \tassert(priv->rss_conf != NULL);\n \n+\tpriv_rss_conf = rss_hash_get(priv, rss_conf->rss_hf);\n+\tif (!priv_rss_conf) {\n+\t\trss_conf->rss_hf = 0;\n+\t\tpriv_unlock(priv);\n+\t\treturn -EINVAL;\n+\t}\n \tif (rss_conf->rss_key &&\n-\t rss_conf->rss_key_len >= priv->rss_conf->rss_key_len)\n+\t rss_conf->rss_key_len >= priv_rss_conf->rss_key_len)\n \t\tmemcpy(rss_conf->rss_key,\n-\t\t priv->rss_conf->rss_key,\n-\t\t priv->rss_conf->rss_key_len);\n-\trss_conf->rss_key_len = priv->rss_conf->rss_key_len;\n-\t/* FIXME: rss_hf should be more specific. */\n-\trss_conf->rss_hf = ETH_RSS_PROTO_MASK;\n+\t\t priv_rss_conf->rss_key,\n+\t\t priv_rss_conf->rss_key_len);\n+\trss_conf->rss_key_len = priv_rss_conf->rss_key_len;\n+\trss_conf->rss_hf = priv_rss_conf->rss_hf;\n \n \tpriv_unlock(priv);\n \treturn 0;\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 2bd1277..283e56b 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -65,12 +65,13 @@\n #include \"mlx5_defs.h\"\n \n /* Initialization data for hash RX queues. */\n-static const struct hash_rxq_init hash_rxq_init[] = {\n+const struct hash_rxq_init hash_rxq_init[] = {\n \t[HASH_RXQ_TCPv4] = {\n \t\t.hash_fields = (IBV_EXP_RX_HASH_SRC_IPV4 |\n \t\t\t\tIBV_EXP_RX_HASH_DST_IPV4 |\n \t\t\t\tIBV_EXP_RX_HASH_SRC_PORT_TCP |\n \t\t\t\tIBV_EXP_RX_HASH_DST_PORT_TCP),\n+\t\t.dpdk_rss_hf = ETH_RSS_NONFRAG_IPV4_TCP,\n \t\t.flow_priority = 0,\n \t\t.flow_spec.tcp_udp = {\n \t\t\t.type = IBV_FLOW_SPEC_TCP,\n@@ -83,6 +84,7 @@ static const struct hash_rxq_init hash_rxq_init[] = {\n \t\t\t\tIBV_EXP_RX_HASH_DST_IPV4 |\n \t\t\t\tIBV_EXP_RX_HASH_SRC_PORT_UDP |\n \t\t\t\tIBV_EXP_RX_HASH_DST_PORT_UDP),\n+\t\t.dpdk_rss_hf = ETH_RSS_NONFRAG_IPV4_UDP,\n \t\t.flow_priority = 0,\n \t\t.flow_spec.tcp_udp = {\n \t\t\t.type = IBV_FLOW_SPEC_UDP,\n@@ -93,6 +95,8 @@ static const struct hash_rxq_init hash_rxq_init[] = {\n \t[HASH_RXQ_IPv4] = {\n \t\t.hash_fields = (IBV_EXP_RX_HASH_SRC_IPV4 |\n \t\t\t\tIBV_EXP_RX_HASH_DST_IPV4),\n+\t\t.dpdk_rss_hf = (ETH_RSS_IPV4 |\n+\t\t\t\tETH_RSS_FRAG_IPV4),\n \t\t.flow_priority = 1,\n \t\t.flow_spec.ipv4 = {\n \t\t\t.type = IBV_FLOW_SPEC_IPV4,\n@@ -102,6 +106,7 @@ static const struct hash_rxq_init hash_rxq_init[] = {\n \t},\n \t[HASH_RXQ_ETH] = {\n \t\t.hash_fields = 0,\n+\t\t.dpdk_rss_hf = 0,\n \t\t.flow_priority = 2,\n \t\t.flow_spec.eth = {\n \t\t\t.type = IBV_FLOW_SPEC_ETH,\n@@ -112,7 +117,7 @@ static const struct hash_rxq_init hash_rxq_init[] = {\n };\n \n /* Number of entries in hash_rxq_init[]. */\n-static const unsigned int hash_rxq_init_n = RTE_DIM(hash_rxq_init);\n+const unsigned int hash_rxq_init_n = RTE_DIM(hash_rxq_init);\n \n /* Initialization data for hash RX queue indirection tables. */\n static const struct ind_table_init ind_table_init[] = {\n@@ -260,16 +265,18 @@ static unsigned int\n priv_make_ind_table_init(struct priv *priv,\n \t\t\t struct ind_table_init (*table)[IND_TABLE_INIT_N])\n {\n+\tuint64_t rss_hf;\n \tunsigned int i;\n \tunsigned int j;\n \tunsigned int table_n = 0;\n \t/* Mandatory to receive frames not handled by normal hash RX queues. */\n \tunsigned int hash_types_sup = 1 << HASH_RXQ_ETH;\n \n+\trss_hf = priv->dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf;\n \t/* Process other protocols only if more than one queue. */\n \tif (priv->rxqs_n > 1)\n \t\tfor (i = 0; (i != hash_rxq_init_n); ++i)\n-\t\t\tif (hash_rxq_init[i].hash_fields)\n+\t\t\tif (rss_hf & hash_rxq_init[i].dpdk_rss_hf)\n \t\t\t\thash_types_sup |= (1 << i);\n \n \t/* Filter out entries whose protocols are not in the set. */\n@@ -330,7 +337,6 @@ priv_create_hash_rxqs(struct priv *priv)\n \tassert(priv->hash_rxqs_n == 0);\n \tassert(priv->pd != NULL);\n \tassert(priv->ctx != NULL);\n-\tassert(priv->rss_conf != NULL);\n \tif (priv->rxqs_n == 0)\n \t\treturn EINVAL;\n \tassert(priv->rxqs != NULL);\n@@ -413,10 +419,16 @@ priv_create_hash_rxqs(struct priv *priv)\n \t\tstruct hash_rxq *hash_rxq = &(*hash_rxqs)[i];\n \t\tenum hash_rxq_type type =\n \t\t\thash_rxq_type_from_n(&ind_table_init[j], k);\n+\t\tstruct rte_eth_rss_conf *priv_rss_conf =\n+\t\t\t(*priv->rss_conf)[type];\n \t\tstruct ibv_exp_rx_hash_conf hash_conf = {\n \t\t\t.rx_hash_function = IBV_EXP_RX_HASH_FUNC_TOEPLITZ,\n-\t\t\t.rx_hash_key_len = priv->rss_conf->rss_key_len,\n-\t\t\t.rx_hash_key = priv->rss_conf->rss_key,\n+\t\t\t.rx_hash_key_len = (priv_rss_conf ?\n+\t\t\t\t\t priv_rss_conf->rss_key_len :\n+\t\t\t\t\t rss_hash_default_key_len),\n+\t\t\t.rx_hash_key = (priv_rss_conf ?\n+\t\t\t\t\tpriv_rss_conf->rss_key :\n+\t\t\t\t\trss_hash_default_key),\n \t\t\t.rx_hash_fields_mask = hash_rxq_init[type].hash_fields,\n \t\t\t.rwq_ind_tbl = (*ind_tables)[j],\n \t\t};\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 94e5f04..0db4393 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -148,6 +148,7 @@ struct flow_attr_spec_eth {\n /* Initialization data for hash RX queue. */\n struct hash_rxq_init {\n \tuint64_t hash_fields; /* Fields that participate in the hash. */\n+\tuint64_t dpdk_rss_hf; /* Matching DPDK RSS hash fields. */\n \tunsigned int flow_priority; /* Flow priority to use. */\n \tstruct ibv_flow_spec flow_spec; /* Flow specification template. */\n \tconst struct hash_rxq_init *underlayer; /* Pointer to underlayer. */\n@@ -216,6 +217,9 @@ struct txq {\n \n /* mlx5_rxq.c */\n \n+extern const struct hash_rxq_init hash_rxq_init[];\n+extern const unsigned int hash_rxq_init_n;\n+\n extern uint8_t rss_hash_default_key[];\n extern const size_t rss_hash_default_key_len;\n \n", "prefixes": [ "dpdk-dev", "10/17" ] }