Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63691/?format=api
{ "id": 63691, "url": "http://patches.dpdk.org/api/patches/63691/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191209214656.27347-15-cardigliano@ntop.org/", "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": "<20191209214656.27347-15-cardigliano@ntop.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20191209214656.27347-15-cardigliano@ntop.org", "date": "2019-12-09T21:46:53", "name": "[v3,14/17] net/ionic: add RSS support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c16c801ac2629f1abee657fe3fe818cbb046dc4a", "submitter": { "id": 1465, "url": "http://patches.dpdk.org/api/people/1465/?format=api", "name": "Alfredo Cardigliano", "email": "cardigliano@ntop.org" }, "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/20191209214656.27347-15-cardigliano@ntop.org/mbox/", "series": [ { "id": 7760, "url": "http://patches.dpdk.org/api/series/7760/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7760", "date": "2019-12-09T21:46:39", "name": "Introduces net/ionic PMD", "version": 3, "mbox": "http://patches.dpdk.org/series/7760/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/63691/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/63691/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D2F88A04B3;\n\tMon, 9 Dec 2019 22:51:09 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 66E921BFC2;\n\tMon, 9 Dec 2019 22:49:01 +0100 (CET)", "from mail.ntop.org (mail-digitalocean.ntop.org [167.99.215.164])\n by dpdk.org (Postfix) with ESMTP id 25B7D1BE80\n for <dev@dpdk.org>; Mon, 9 Dec 2019 22:48:35 +0100 (CET)", "from devele.ntop.org (net-93-145-196-230.cust.vodafonedsl.it\n [93.145.196.230])\n by mail.ntop.org (Postfix) with ESMTPSA id C7FE341BAA;\n Mon, 9 Dec 2019 22:48:34 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ntop.org; s=mail;\n t=1575928115; bh=XygCaVpiZ25ampMevEw4SOOqSOA3BOpX7qyW5qIk7TM=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=iUykVYsL0tU1BPbxb8e+V18SnPoolW3krOL+mGMdDr8cfe8RI8ipGSkQAAoXC6g1L\n RuH+B5/8wblsoe1YnY3JM69Qq0q9AAXXHidtuYZVkbM4lNdV1KIX4+AzqV5hLBzJNf\n Rtx0Oe4pfDgWMYIx0MzmCvzbTPAx9O1lKL2aLrUw=", "From": "Alfredo Cardigliano <cardigliano@ntop.org>", "To": "Alfredo Cardigliano <cardigliano@ntop.org>,\n John McNamara <john.mcnamara@intel.com>,\n Marko Kovacevic <marko.kovacevic@intel.com>", "Cc": "dev@dpdk.org", "Date": "Mon, 9 Dec 2019 22:46:53 +0100", "Message-Id": "<20191209214656.27347-15-cardigliano@ntop.org>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20191209214656.27347-1-cardigliano@ntop.org>", "References": "<20191209214656.27347-1-cardigliano@ntop.org>", "Subject": "[dpdk-dev] [PATCH v3 14/17] net/ionic: add RSS support", "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 <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": "Add code to manipulate the RSS configuration\nused by the adapter.\n\nSigned-off-by: Alfredo Cardigliano <cardigliano@ntop.org>\nReviewed-by: Shannon Nelson <snelson@pensando.io>\n---\n doc/guides/nics/features/ionic.ini | 3 +\n drivers/net/ionic/ionic_ethdev.c | 175 +++++++++++++++++++++++++++++\n drivers/net/ionic/ionic_ethdev.h | 8 ++\n drivers/net/ionic/ionic_lif.c | 120 +++++++++++++++++++-\n drivers/net/ionic/ionic_lif.h | 16 +++\n drivers/net/ionic/ionic_rxtx.c | 4 +\n 6 files changed, 324 insertions(+), 2 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/ionic.ini b/doc/guides/nics/features/ionic.ini\nindex 1308bf321..83e0b5054 100644\n--- a/doc/guides/nics/features/ionic.ini\n+++ b/doc/guides/nics/features/ionic.ini\n@@ -16,6 +16,9 @@ TSO = Y\n Promiscuous mode = Y\n Allmulticast mode = Y\n Unicast MAC filter = Y\n+RSS hash = Y\n+RSS key update = Y\n+RSS reta update = Y\n VLAN filter = Y\n VLAN offload = Y\n Flow control = Y\ndiff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c\nindex 00c33f35b..352890ef1 100644\n--- a/drivers/net/ionic/ionic_ethdev.c\n+++ b/drivers/net/ionic/ionic_ethdev.c\n@@ -35,6 +35,14 @@ static int ionic_flow_ctrl_get(struct rte_eth_dev *eth_dev,\n static int ionic_flow_ctrl_set(struct rte_eth_dev *eth_dev,\n \tstruct rte_eth_fc_conf *fc_conf);\n static int ionic_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask);\n+static int ionic_dev_rss_reta_update(struct rte_eth_dev *eth_dev,\n+\tstruct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size);\n+static int ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev,\n+\tstruct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size);\n+static int ionic_dev_rss_hash_conf_get(struct rte_eth_dev *eth_dev,\n+\tstruct rte_eth_rss_conf *rss_conf);\n+static int ionic_dev_rss_hash_update(struct rte_eth_dev *eth_dev,\n+\tstruct rte_eth_rss_conf *rss_conf);\n \n int ionic_logtype_driver;\n \n@@ -90,6 +98,10 @@ static const struct eth_dev_ops ionic_eth_dev_ops = {\n \t.tx_queue_start\t = ionic_dev_tx_queue_start,\n \t.tx_queue_stop = ionic_dev_tx_queue_stop,\n \t.vlan_offload_set = ionic_vlan_offload_set,\n+\t.reta_update = ionic_dev_rss_reta_update,\n+\t.reta_query = ionic_dev_rss_reta_query,\n+\t.rss_hash_conf_get = ionic_dev_rss_hash_conf_get,\n+\t.rss_hash_update = ionic_dev_rss_hash_update,\n };\n \n /*\n@@ -269,6 +281,10 @@ ionic_dev_info_get(struct rte_eth_dev *eth_dev,\n \tdev_info->min_mtu = IONIC_MIN_MTU;\n \tdev_info->max_mtu = IONIC_MAX_MTU;\n \n+\tdev_info->hash_key_size = IONIC_RSS_HASH_KEY_SIZE;\n+\tdev_info->reta_size = ident->lif.eth.rss_ind_tbl_sz;\n+\tdev_info->flow_type_rss_offloads = IONIC_ETH_RSS_OFFLOAD_ALL;\n+\n \tdev_info->speed_capa =\n \t\tETH_LINK_SPEED_10G |\n \t\tETH_LINK_SPEED_25G |\n@@ -411,6 +427,165 @@ ionic_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)\n \treturn 0;\n }\n \n+static int\n+ionic_dev_rss_reta_update(struct rte_eth_dev *eth_dev,\n+\t\tstruct rte_eth_rss_reta_entry64 *reta_conf,\n+\t\tuint16_t reta_size)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tstruct ionic_adapter *adapter = lif->adapter;\n+\tstruct ionic_identity *ident = &adapter->ident;\n+\tuint32_t i, j, index, num;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tif (!lif->rss_ind_tbl) {\n+\t\tIONIC_PRINT(ERR, \"RSS RETA not initialized, \"\n+\t\t\t\"can't update the table\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (reta_size != ident->lif.eth.rss_ind_tbl_sz) {\n+\t\tIONIC_PRINT(ERR, \"The size of hash lookup table configured \"\n+\t\t\t\"(%d) doesn't match the number hardware can supported \"\n+\t\t\t\"(%d)\",\n+\t\t\treta_size, ident->lif.eth.rss_ind_tbl_sz);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tnum = lif->adapter->ident.lif.eth.rss_ind_tbl_sz / RTE_RETA_GROUP_SIZE;\n+\n+\tfor (i = 0; i < num; i++) {\n+\t\tfor (j = 0; j < RTE_RETA_GROUP_SIZE; j++) {\n+\t\t\tif (reta_conf[i].mask & ((uint64_t)1 << j)) {\n+\t\t\t\tindex = (i * RTE_RETA_GROUP_SIZE) + j;\n+\t\t\t\tlif->rss_ind_tbl[index] = reta_conf[i].reta[j];\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\treturn ionic_lif_rss_config(lif, lif->rss_types, NULL, NULL);\n+}\n+\n+static int\n+ionic_dev_rss_reta_query(struct rte_eth_dev *eth_dev,\n+\t\tstruct rte_eth_rss_reta_entry64 *reta_conf,\n+\t\tuint16_t reta_size)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tstruct ionic_adapter *adapter = lif->adapter;\n+\tstruct ionic_identity *ident = &adapter->ident;\n+\tint i, num;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tif (reta_size != ident->lif.eth.rss_ind_tbl_sz) {\n+\t\tIONIC_PRINT(ERR, \"The size of hash lookup table configured \"\n+\t\t\t\"(%d) doesn't match the number hardware can supported \"\n+\t\t\t\"(%d)\",\n+\t\t\treta_size, ident->lif.eth.rss_ind_tbl_sz);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (!lif->rss_ind_tbl) {\n+\t\tIONIC_PRINT(ERR, \"RSS RETA has not been built yet\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tnum = reta_size / RTE_RETA_GROUP_SIZE;\n+\n+\tfor (i = 0; i < num; i++) {\n+\t\tmemcpy(reta_conf->reta,\n+\t\t\t&lif->rss_ind_tbl[i * RTE_RETA_GROUP_SIZE],\n+\t\t\tRTE_RETA_GROUP_SIZE);\n+\t\treta_conf++;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+ionic_dev_rss_hash_conf_get(struct rte_eth_dev *eth_dev,\n+\t\tstruct rte_eth_rss_conf *rss_conf)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tuint64_t rss_hf = 0;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tif (!lif->rss_ind_tbl) {\n+\t\tIONIC_PRINT(NOTICE, \"RSS not enabled\");\n+\t\treturn 0;\n+\t}\n+\n+\t/* Get key value (if not null, rss_key is 40-byte) */\n+\tif (rss_conf->rss_key != NULL &&\n+\t\t\trss_conf->rss_key_len >= IONIC_RSS_HASH_KEY_SIZE)\n+\t\tmemcpy(rss_conf->rss_key, lif->rss_hash_key,\n+\t\t\tIONIC_RSS_HASH_KEY_SIZE);\n+\n+\tif (lif->rss_types & IONIC_RSS_TYPE_IPV4)\n+\t\trss_hf |= ETH_RSS_IPV4;\n+\tif (lif->rss_types & IONIC_RSS_TYPE_IPV4_TCP)\n+\t\trss_hf |= ETH_RSS_NONFRAG_IPV4_TCP;\n+\tif (lif->rss_types & IONIC_RSS_TYPE_IPV4_UDP)\n+\t\trss_hf |= ETH_RSS_NONFRAG_IPV4_UDP;\n+\tif (lif->rss_types & IONIC_RSS_TYPE_IPV6)\n+\t\trss_hf |= ETH_RSS_IPV6;\n+\tif (lif->rss_types & IONIC_RSS_TYPE_IPV6_TCP)\n+\t\trss_hf |= ETH_RSS_NONFRAG_IPV6_TCP;\n+\tif (lif->rss_types & IONIC_RSS_TYPE_IPV6_UDP)\n+\t\trss_hf |= ETH_RSS_NONFRAG_IPV6_UDP;\n+\n+\trss_conf->rss_hf = rss_hf;\n+\n+\treturn 0;\n+}\n+\n+static int\n+ionic_dev_rss_hash_update(struct rte_eth_dev *eth_dev,\n+\t\tstruct rte_eth_rss_conf *rss_conf)\n+{\n+\tstruct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);\n+\tuint32_t rss_types = 0;\n+\tuint8_t *key = NULL;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tif (rss_conf->rss_key)\n+\t\tkey = rss_conf->rss_key;\n+\n+\tif ((rss_conf->rss_hf & IONIC_ETH_RSS_OFFLOAD_ALL) == 0) {\n+\t\t/*\n+\t\t * Can't disable rss through hash flags,\n+\t\t * if it is enabled by default during init\n+\t\t */\n+\t\tif (lif->rss_ind_tbl)\n+\t\t\treturn -EINVAL;\n+\t} else {\n+\t\t/* Can't enable rss if disabled by default during init */\n+\t\tif (!lif->rss_ind_tbl)\n+\t\t\treturn -EINVAL;\n+\n+\t\tif (rss_conf->rss_hf & ETH_RSS_IPV4)\n+\t\t\trss_types |= IONIC_RSS_TYPE_IPV4;\n+\t\tif (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_TCP)\n+\t\t\trss_types |= IONIC_RSS_TYPE_IPV4_TCP;\n+\t\tif (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV4_UDP)\n+\t\t\trss_types |= IONIC_RSS_TYPE_IPV4_UDP;\n+\t\tif (rss_conf->rss_hf & ETH_RSS_IPV6)\n+\t\t\trss_types |= IONIC_RSS_TYPE_IPV6;\n+\t\tif (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_TCP)\n+\t\t\trss_types |= IONIC_RSS_TYPE_IPV6_TCP;\n+\t\tif (rss_conf->rss_hf & ETH_RSS_NONFRAG_IPV6_UDP)\n+\t\t\trss_types |= IONIC_RSS_TYPE_IPV6_UDP;\n+\n+\t\tionic_lif_rss_config(lif, rss_types, key, NULL);\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int\n ionic_dev_configure(struct rte_eth_dev *eth_dev)\n {\ndiff --git a/drivers/net/ionic/ionic_ethdev.h b/drivers/net/ionic/ionic_ethdev.h\nindex 7228d8969..578e2301f 100644\n--- a/drivers/net/ionic/ionic_ethdev.h\n+++ b/drivers/net/ionic/ionic_ethdev.h\n@@ -5,6 +5,14 @@\n #ifndef _IONIC_ETHDEV_H_\n #define _IONIC_ETHDEV_H_\n \n+#define IONIC_ETH_RSS_OFFLOAD_ALL ( \\\n+\tETH_RSS_IPV4 | \\\n+\tETH_RSS_NONFRAG_IPV4_TCP | \\\n+\tETH_RSS_NONFRAG_IPV4_UDP | \\\n+\tETH_RSS_IPV6 | \\\n+\tETH_RSS_NONFRAG_IPV6_TCP | \\\n+\tETH_RSS_NONFRAG_IPV6_UDP)\n+\n #define IONIC_ETH_DEV_TO_LIF(eth_dev) ((struct ionic_lif *) \\\n \t(eth_dev)->data->dev_private)\n #define IONIC_ETH_DEV_TO_ADAPTER(eth_dev) \\\ndiff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c\nindex 88da803dc..9631fdb6c 100644\n--- a/drivers/net/ionic/ionic_lif.c\n+++ b/drivers/net/ionic/ionic_lif.c\n@@ -793,6 +793,97 @@ ionic_lif_free(struct ionic_lif *lif)\n \t}\n }\n \n+int\n+ionic_lif_rss_config(struct ionic_lif *lif,\n+\t\tconst uint16_t types, const uint8_t *key, const uint32_t *indir)\n+{\n+\tstruct ionic_admin_ctx ctx = {\n+\t\t.pending_work = true,\n+\t\t.cmd.lif_setattr = {\n+\t\t\t.opcode = IONIC_CMD_LIF_SETATTR,\n+\t\t\t.attr = IONIC_LIF_ATTR_RSS,\n+\t\t\t.rss.types = types,\n+\t\t\t.rss.addr = lif->rss_ind_tbl_pa,\n+\t\t},\n+\t};\n+\tunsigned int i;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tlif->rss_types = types;\n+\n+\tif (key)\n+\t\tmemcpy(lif->rss_hash_key, key, IONIC_RSS_HASH_KEY_SIZE);\n+\n+\tif (indir)\n+\t\tfor (i = 0; i < lif->adapter->ident.lif.eth.rss_ind_tbl_sz; i++)\n+\t\t\tlif->rss_ind_tbl[i] = indir[i];\n+\n+\tmemcpy(ctx.cmd.lif_setattr.rss.key, lif->rss_hash_key,\n+\t IONIC_RSS_HASH_KEY_SIZE);\n+\n+\treturn ionic_adminq_post_wait(lif, &ctx);\n+}\n+\n+static int\n+ionic_lif_rss_setup(struct ionic_lif *lif)\n+{\n+\tsize_t tbl_size = sizeof(*lif->rss_ind_tbl) *\n+\t\tlif->adapter->ident.lif.eth.rss_ind_tbl_sz;\n+\tstatic const uint8_t toeplitz_symmetric_key[] = {\n+\t\t0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A,\n+\t\t0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A,\n+\t\t0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A,\n+\t\t0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A,\n+\t\t0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A, 0x6D, 0x5A,\n+\t};\n+\tuint32_t socket_id = rte_socket_id();\n+\tuint32_t i;\n+\tint err;\n+\n+\tIONIC_PRINT_CALL();\n+\n+\tlif->rss_ind_tbl_z = rte_eth_dma_zone_reserve(lif->eth_dev,\n+\t\t\"rss_ind_tbl\",\n+\t\t0 /* queue_idx*/, tbl_size, IONIC_ALIGN, socket_id);\n+\n+\tif (!lif->rss_ind_tbl_z) {\n+\t\tIONIC_PRINT(ERR, \"OOM\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tlif->rss_ind_tbl = lif->rss_ind_tbl_z->addr;\n+\tlif->rss_ind_tbl_pa = lif->rss_ind_tbl_z->iova;\n+\n+\t/* Fill indirection table with 'default' values */\n+\tfor (i = 0; i < lif->adapter->ident.lif.eth.rss_ind_tbl_sz; i++)\n+\t\tlif->rss_ind_tbl[i] = i % lif->nrxqcqs;\n+\n+\terr = ionic_lif_rss_config(lif, IONIC_RSS_OFFLOAD_ALL,\n+\t\ttoeplitz_symmetric_key, NULL);\n+\tif (err)\n+\t\treturn err;\n+\n+\treturn 0;\n+}\n+\n+static void\n+ionic_lif_rss_teardown(struct ionic_lif *lif)\n+{\n+\tif (!lif->rss_ind_tbl)\n+\t\treturn;\n+\n+\tif (lif->rss_ind_tbl_z) {\n+\t\t/* Disable RSS on the NIC */\n+\t\tionic_lif_rss_config(lif, 0x0, NULL, NULL);\n+\n+\t\tlif->rss_ind_tbl = NULL;\n+\t\tlif->rss_ind_tbl_pa = 0;\n+\t\trte_memzone_free(lif->rss_ind_tbl_z);\n+\t\tlif->rss_ind_tbl_z = NULL;\n+\t}\n+}\n+\n static void\n ionic_lif_qcq_deinit(struct ionic_lif *lif, struct ionic_qcq *qcq)\n {\n@@ -1317,6 +1408,7 @@ ionic_lif_deinit(struct ionic_lif *lif)\n \t\treturn;\n \n \tionic_rx_filters_deinit(lif);\n+\tionic_lif_rss_teardown(lif);\n \tionic_lif_qcq_deinit(lif, lif->notifyqcq);\n \tionic_lif_qcq_deinit(lif, lif->adminqcq);\n \n@@ -1326,10 +1418,27 @@ ionic_lif_deinit(struct ionic_lif *lif)\n int\n ionic_lif_configure(struct ionic_lif *lif)\n {\n+\tstruct ionic_identity *ident = &lif->adapter->ident;\n+\tuint32_t ntxqs_per_lif =\n+\t\tident->lif.eth.config.queue_count[IONIC_QTYPE_TXQ];\n+\tuint32_t nrxqs_per_lif =\n+\t\tident->lif.eth.config.queue_count[IONIC_QTYPE_RXQ];\n+\tuint32_t nrxqs = lif->eth_dev->data->nb_rx_queues;\n+\tuint32_t ntxqs = lif->eth_dev->data->nb_tx_queues;\n+\n \tlif->port_id = lif->eth_dev->data->port_id;\n \n-\tlif->nrxqcqs = 1;\n-\tlif->ntxqcqs = 1;\n+\tIONIC_PRINT(DEBUG, \"Configuring LIF on port %u\",\n+\t\tlif->port_id);\n+\n+\tif (nrxqs > 0)\n+\t\tnrxqs_per_lif = RTE_MIN(nrxqs_per_lif, nrxqs);\n+\n+\tif (ntxqs > 0)\n+\t\tntxqs_per_lif = RTE_MIN(ntxqs_per_lif, ntxqs);\n+\n+\tlif->nrxqcqs = nrxqs_per_lif;\n+\tlif->ntxqcqs = ntxqs_per_lif;\n \n \treturn 0;\n }\n@@ -1341,6 +1450,13 @@ ionic_lif_start(struct ionic_lif *lif)\n \tuint32_t i;\n \tint err;\n \n+\tIONIC_PRINT(DEBUG, \"Setting RSS configuration on port %u\",\n+\t\tlif->port_id);\n+\n+\terr = ionic_lif_rss_setup(lif);\n+\tif (err)\n+\t\treturn err;\n+\n \tIONIC_PRINT(DEBUG, \"Setting RX mode on port %u\",\n \t\tlif->port_id);\n \ndiff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h\nindex 5e7d9ae0c..a6f579d1c 100644\n--- a/drivers/net/ionic/ionic_lif.h\n+++ b/drivers/net/ionic/ionic_lif.h\n@@ -17,6 +17,14 @@\n #define IONIC_ADMINQ_LENGTH\t16\t/* must be a power of two */\n #define IONIC_NOTIFYQ_LENGTH\t64\t/* must be a power of two */\n \n+#define IONIC_RSS_OFFLOAD_ALL ( \\\n+\tIONIC_RSS_TYPE_IPV4 | \\\n+\tIONIC_RSS_TYPE_IPV4_TCP | \\\n+\tIONIC_RSS_TYPE_IPV4_UDP | \\\n+\tIONIC_RSS_TYPE_IPV6 | \\\n+\tIONIC_RSS_TYPE_IPV6_TCP | \\\n+\tIONIC_RSS_TYPE_IPV6_UDP)\n+\n #define IONIC_GET_SG_CNTR_IDX(num_sg_elems)\t(num_sg_elems)\n \n struct ionic_tx_stats {\n@@ -96,6 +104,11 @@ struct ionic_lif {\n \tuint32_t rx_mode;\n \tchar name[IONIC_LIF_NAME_MAX_SZ];\n \tuint8_t mac_addr[RTE_ETHER_ADDR_LEN];\n+\tuint16_t rss_types;\n+\tuint8_t rss_hash_key[IONIC_RSS_HASH_KEY_SIZE];\n+\tuint8_t *rss_ind_tbl;\n+\trte_iova_t rss_ind_tbl_pa;\n+\tconst struct rte_memzone *rss_ind_tbl_z;\n \tuint32_t info_sz;\n \tstruct ionic_lif_info *info;\n \trte_iova_t info_pa;\n@@ -156,6 +169,9 @@ void ionic_lif_rxq_deinit(struct ionic_qcq *qcq);\n int ionic_lif_txq_init(struct ionic_qcq *qcq);\n void ionic_lif_txq_deinit(struct ionic_qcq *qcq);\n \n+int ionic_lif_rss_config(struct ionic_lif *lif, const uint16_t types,\n+\tconst uint8_t *key, const uint32_t *indir);\n+\n int ionic_lif_set_features(struct ionic_lif *lif);\n \n int ionic_notifyq_handler(struct ionic_lif *lif, int budget);\ndiff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c\nindex 44cc6278c..c780f5727 100644\n--- a/drivers/net/ionic/ionic_rxtx.c\n+++ b/drivers/net/ionic/ionic_rxtx.c\n@@ -704,6 +704,10 @@ ionic_rx_clean(struct ionic_queue *q,\n \t\trxm->nb_segs++;\n \t}\n \n+\t/* RSS */\n+\tpkt_flags |= PKT_RX_RSS_HASH;\n+\trxm->hash.rss = cq_desc->rss_hash;\n+\n \t/* Vlan Strip */\n \tif (cq_desc->csum_flags & IONIC_RXQ_COMP_CSUM_F_VLAN) {\n \t\tpkt_flags |= PKT_RX_VLAN_STRIPPED;\n", "prefixes": [ "v3", "14/17" ] }