Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50187/?format=api
{ "id": 50187, "url": "http://patches.dpdk.org/api/patches/50187/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1549541873-17403-27-git-send-email-arybchenko@solarflare.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": "<1549541873-17403-27-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1549541873-17403-27-git-send-email-arybchenko@solarflare.com", "date": "2019-02-07T12:17:49", "name": "[26/30] net/sfc: move RSS config to adapter shared", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c949ce769db294cfe3d51d37ecaeacfcbecda97a", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.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/1549541873-17403-27-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 3407, "url": "http://patches.dpdk.org/api/series/3407/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=3407", "date": "2019-02-07T12:17:25", "name": "net/sfc: improve multi-process support", "version": 1, "mbox": "http://patches.dpdk.org/series/3407/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/50187/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/50187/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 DA7BC1B573;\n\tThu, 7 Feb 2019 13:18:45 +0100 (CET)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[148.163.129.52]) by dpdk.org (Postfix) with ESMTP id ACF551B4B6\n\tfor <dev@dpdk.org>; Thu, 7 Feb 2019 13:18:18 +0100 (CET)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id\n\t6E06A600057 for <dev@dpdk.org>; Thu, 7 Feb 2019 12:18:17 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Thu, 7 Feb 2019 04:18:11 -0800", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1395.4 via Frontend Transport; Thu, 7 Feb 2019 04:18:10 -0800", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx17CI96g013307 for <dev@dpdk.org>; Thu, 7 Feb 2019 12:18:09 GMT", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\t7395D1613E4\n\tfor <dev@dpdk.org>; Thu, 7 Feb 2019 12:18:09 +0000 (GMT)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Thu, 7 Feb 2019 12:17:49 +0000", "Message-ID": "<1549541873-17403-27-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1549541873-17403-1-git-send-email-arybchenko@solarflare.com>", "References": "<1549541873-17403-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-TM-AS-Result": "No-12.459900-4.000000-10", "X-TMASE-MatchedRID": "vytiu2saxpzS7nHQNTh6QWO43qcJKa+vSoCG4sefl8Qs/uUAk6xP7PlY\n\toV6p/cSxI1/Ds5nW8XA4qledhhZLFYvTpuEjuIpkyeVujmXuYYVdxx6WRf+5sMY/Qxi9/1JcJUs\n\tsq++k8WPm1ONecb78IMKwQxLmUdi8Blb13GpBGGvUWdZik3yrYbxy3Klthorp0WncJAzpLqC3Wj\n\tIVml7BR1t69dWv4qiEgX8lJSBYjTIb+BGg6rnrdleollpgzyxAy3fMd7pCml6gtbAbUC6MPlwOq\n\ti16hG2LvIVi2kAj6e+O9NvhBeIuxAe3cFgbc4mU0Xw0ILvo/uVuTe9VGO3qvF4KJoYT5MRLo8WM\n\tkQWv6iXBcIE78YqRWo6HM5rqDwqtlgH8/iMroMsk2ojq1XuBh/3iU9vHU+r1gMJCNsAm8Y7It3h\n\tfzZp+SA==", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--12.459900-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-MDID": "1549541898-mkPNAJPylaAH", "Subject": "[dpdk-dev] [PATCH 26/30] net/sfc: move RSS config to adapter shared", "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": "RSS get requests are supported in secondary process.\n\nPrepare to make sfc_adapter primary process private data.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/sfc.c | 2 +-\n drivers/net/sfc/sfc.h | 4 ++--\n drivers/net/sfc/sfc_ethdev.c | 15 +++++++++------\n drivers/net/sfc/sfc_flow.c | 6 ++++--\n drivers/net/sfc/sfc_rx.c | 26 +++++++++++++-------------\n drivers/net/sfc/sfc_rx.h | 3 +--\n 6 files changed, 30 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c\nindex 4e4c4e445..8526a84b5 100644\n--- a/drivers/net/sfc/sfc.c\n+++ b/drivers/net/sfc/sfc.c\n@@ -642,7 +642,7 @@ static const uint8_t default_rss_key[EFX_RSS_KEY_SIZE] = {\n static int\n sfc_rss_attach(struct sfc_adapter *sa)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tint rc;\n \n \trc = efx_intr_init(sa->nic, sa->intr.type, NULL);\ndiff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 2c6715027..72992d68b 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -182,6 +182,8 @@ struct sfc_adapter_shared {\n \tunsigned int\t\t\ttxq_count;\n \tstruct sfc_txq_info\t\t*txq_info;\n \n+\tstruct sfc_rss\t\t\trss;\n+\n \tstruct rte_pci_addr\t\tpci_addr;\n \tuint16_t\t\t\tport_id;\n \n@@ -283,8 +285,6 @@ struct sfc_adapter {\n \tboolean_t\t\t\ttso;\n \n \tuint32_t\t\t\trxd_wait_timeout_ns;\n-\n-\tstruct sfc_rss\t\t\trss;\n };\n \n static inline struct sfc_adapter_shared *\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 6572aa1a0..034229f37 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -85,8 +85,9 @@ static void\n sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n {\n \tconst struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev);\n+\tstruct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);\n \tstruct sfc_adapter *sa = dev->data->dev_private;\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sas->rss;\n \tuint64_t txq_offloads_def = 0;\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1419,8 +1420,9 @@ static int\n sfc_dev_rss_hash_conf_get(struct rte_eth_dev *dev,\n \t\t\t struct rte_eth_rss_conf *rss_conf)\n {\n+\tstruct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);\n \tstruct sfc_adapter *sa = dev->data->dev_private;\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sas->rss;\n \n \tif (rss->context_type != EFX_RX_SCALE_EXCLUSIVE)\n \t\treturn -ENOTSUP;\n@@ -1433,7 +1435,7 @@ sfc_dev_rss_hash_conf_get(struct rte_eth_dev *dev,\n \t * flags which corresponds to the active EFX configuration stored\n \t * locally in 'sfc_adapter' and kept up-to-date\n \t */\n-\trss_conf->rss_hf = sfc_rx_hf_efx_to_rte(sa, rss->hash_types);\n+\trss_conf->rss_hf = sfc_rx_hf_efx_to_rte(rss, rss->hash_types);\n \trss_conf->rss_key_len = EFX_RSS_KEY_SIZE;\n \tif (rss_conf->rss_key != NULL)\n \t\trte_memcpy(rss_conf->rss_key, rss->key, EFX_RSS_KEY_SIZE);\n@@ -1448,7 +1450,7 @@ sfc_dev_rss_hash_update(struct rte_eth_dev *dev,\n \t\t\tstruct rte_eth_rss_conf *rss_conf)\n {\n \tstruct sfc_adapter *sa = dev->data->dev_private;\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tstruct sfc_port *port = &sa->port;\n \tunsigned int efx_hash_types;\n \tint rc = 0;\n@@ -1524,8 +1526,9 @@ sfc_dev_rss_reta_query(struct rte_eth_dev *dev,\n \t\t struct rte_eth_rss_reta_entry64 *reta_conf,\n \t\t uint16_t reta_size)\n {\n+\tstruct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);\n \tstruct sfc_adapter *sa = dev->data->dev_private;\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sas->rss;\n \tstruct sfc_port *port = &sa->port;\n \tint entry;\n \n@@ -1559,7 +1562,7 @@ sfc_dev_rss_reta_update(struct rte_eth_dev *dev,\n \t\t\tuint16_t reta_size)\n {\n \tstruct sfc_adapter *sa = dev->data->dev_private;\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tstruct sfc_port *port = &sa->port;\n \tunsigned int *rss_tbl_new;\n \tuint16_t entry;\ndiff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c\nindex ab5f24f51..201c6cd06 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -1255,7 +1255,8 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,\n \t\t const struct rte_flow_action_rss *action_rss,\n \t\t struct rte_flow *flow)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tstruct sfc_rss *rss = &sas->rss;\n \tunsigned int rxq_sw_index;\n \tstruct sfc_rxq *rxq;\n \tunsigned int rxq_hw_index_min;\n@@ -1400,7 +1401,8 @@ static int\n sfc_flow_filter_insert(struct sfc_adapter *sa,\n \t\t struct rte_flow *flow)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n+\tstruct sfc_rss *rss = &sas->rss;\n \tstruct sfc_flow_rss *flow_rss = &flow->rss_conf;\n \tuint32_t efs_rss_context = EFX_RSS_CONTEXT_DEFAULT;\n \tunsigned int i;\ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 8af9d2148..3b4b65f6e 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -618,7 +618,7 @@ sfc_rx_qflush(struct sfc_adapter *sa, unsigned int sw_index)\n static int\n sfc_rx_default_rxq_set_filter(struct sfc_adapter *sa, struct sfc_rxq *rxq)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tboolean_t need_rss = (rss->channels > 0) ? B_TRUE : B_FALSE;\n \tstruct sfc_port *port = &sa->port;\n \tint rc;\n@@ -961,7 +961,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \t struct rte_mempool *mb_pool)\n {\n \tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tint rc;\n \tunsigned int rxq_entries;\n \tunsigned int evq_entries;\n@@ -1176,7 +1176,7 @@ sfc_rx_hash_types_mask_supp(efx_rx_hash_type_t hash_type,\n int\n sfc_rx_hash_init(struct sfc_adapter *sa)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);\n \tuint32_t alg_mask = encp->enc_rx_scale_hash_alg_mask;\n \tefx_rx_hash_alg_t alg;\n@@ -1232,7 +1232,7 @@ sfc_rx_hash_init(struct sfc_adapter *sa)\n void\n sfc_rx_hash_fini(struct sfc_adapter *sa)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \n \trte_free(rss->hf_map);\n }\n@@ -1241,7 +1241,7 @@ int\n sfc_rx_hf_rte_to_efx(struct sfc_adapter *sa, uint64_t rte,\n \t\t efx_rx_hash_type_t *efx)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tefx_rx_hash_type_t hash_types = 0;\n \tunsigned int i;\n \n@@ -1265,9 +1265,8 @@ sfc_rx_hf_rte_to_efx(struct sfc_adapter *sa, uint64_t rte,\n }\n \n uint64_t\n-sfc_rx_hf_efx_to_rte(struct sfc_adapter *sa, efx_rx_hash_type_t efx)\n+sfc_rx_hf_efx_to_rte(struct sfc_rss *rss, efx_rx_hash_type_t efx)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n \tuint64_t rte = 0;\n \tunsigned int i;\n \n@@ -1285,9 +1284,9 @@ static int\n sfc_rx_process_adv_conf_rss(struct sfc_adapter *sa,\n \t\t\t struct rte_eth_rss_conf *conf)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tefx_rx_hash_type_t efx_hash_types = rss->hash_types;\n-\tuint64_t rss_hf = sfc_rx_hf_efx_to_rte(sa, efx_hash_types);\n+\tuint64_t rss_hf = sfc_rx_hf_efx_to_rte(rss, efx_hash_types);\n \tint rc;\n \n \tif (rss->context_type != EFX_RX_SCALE_EXCLUSIVE) {\n@@ -1319,7 +1318,7 @@ sfc_rx_process_adv_conf_rss(struct sfc_adapter *sa,\n static int\n sfc_rx_rss_config(struct sfc_adapter *sa)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \tint rc = 0;\n \n \tif (rss->channels > 0) {\n@@ -1418,9 +1417,10 @@ sfc_rx_qinit_info(struct sfc_adapter *sa, unsigned int sw_index)\n static int\n sfc_rx_check_mode(struct sfc_adapter *sa, struct rte_eth_rxmode *rxmode)\n {\n+\tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n \tuint64_t offloads_supported = sfc_rx_get_dev_offload_caps(sa) |\n \t\t\t\t sfc_rx_get_queue_offload_caps(sa);\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sas->rss;\n \tint rc = 0;\n \n \tswitch (rxmode->mq_mode) {\n@@ -1492,7 +1492,7 @@ int\n sfc_rx_configure(struct sfc_adapter *sa)\n {\n \tstruct sfc_adapter_shared * const sas = sfc_sa2shared(sa);\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sas->rss;\n \tstruct rte_eth_conf *dev_conf = &sa->eth_dev->data->dev_conf;\n \tconst unsigned int nb_rx_queues = sa->eth_dev->data->nb_rx_queues;\n \tint rc;\n@@ -1603,7 +1603,7 @@ sfc_rx_configure(struct sfc_adapter *sa)\n void\n sfc_rx_close(struct sfc_adapter *sa)\n {\n-\tstruct sfc_rss *rss = &sa->rss;\n+\tstruct sfc_rss *rss = &sfc_sa2shared(sa)->rss;\n \n \tsfc_rx_fini_queues(sa, 0);\n \ndiff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h\nindex 73b70249c..ee1402022 100644\n--- a/drivers/net/sfc/sfc_rx.h\n+++ b/drivers/net/sfc/sfc_rx.h\n@@ -141,8 +141,7 @@ int sfc_rx_hash_init(struct sfc_adapter *sa);\n void sfc_rx_hash_fini(struct sfc_adapter *sa);\n int sfc_rx_hf_rte_to_efx(struct sfc_adapter *sa, uint64_t rte,\n \t\t\t efx_rx_hash_type_t *efx);\n-uint64_t sfc_rx_hf_efx_to_rte(struct sfc_adapter *sa,\n-\t\t\t efx_rx_hash_type_t efx);\n+uint64_t sfc_rx_hf_efx_to_rte(struct sfc_rss *rss, efx_rx_hash_type_t efx);\n \n #ifdef __cplusplus\n }\n", "prefixes": [ "26/30" ] }