Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50184/?format=api
{ "id": 50184, "url": "http://patches.dpdk.org/api/patches/50184/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1549541873-17403-20-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-20-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1549541873-17403-20-git-send-email-arybchenko@solarflare.com", "date": "2019-02-07T12:17:42", "name": "[19/30] net/sfc: remove RxQ control from shared RxQ info", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4ffc794dd998b35ade7a92a1880cf22607c9027f", "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-20-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/50184/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/50184/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 273E61B55A;\n\tThu, 7 Feb 2019 13:18:43 +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 289981B4C7\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\tE107860005C for <dev@dpdk.org>; Thu, 7 Feb 2019 12:18:16 +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:10 -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\tx17CI9Z2013275 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\t15E0D1613EB\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:42 +0000", "Message-ID": "<1549541873-17403-20-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-2.380400-4.000000-10", "X-TMASE-MatchedRID": "nUPEeKf28usX/ky8TX34Oh+WEMjoO9WWTJDl9FKHbrnuaWurQfPpTfXE\n\tAIDW+JUPreNj5HHxl211Wshy4GROjd+rqUqQYDChsK+WWVTsOXXt/okBLaEo+G3D6f6IpbLI0EE\n\t528uys4VJY8AYrJ6k6NcmFD18waF5v94QsDvR6Nx2hM5Lw8u+sBNtTUpgahCnCgNjqBgJU5PSjo\n\tJfgzSjg5+A2XixGIT0bX/IR8wWTaiR9GF2J2xqMxRFJJyf5BJe3QfwsVk0UbsIoUKaF27lxYE97\n\tkeJJuFzRK5SdGVqESNnKoStUC3zJMXaFiL66EzD9bGrhXv6MUdC6+63YyX4NIMdvQ+VPga4UOdk\n\tT47j5bABOKNjaZ7b3ADlJLZdGMoUz5pk4iF6iVS+9SjSFk+GXMz/jdQvUwlH+rL5VW+ofZc=", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10-2.380400-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-MDID": "1549541897-3m02Uq8ULGXQ", "Subject": "[dpdk-dev] [PATCH 19/30] net/sfc: remove RxQ control from shared\n\tRxQ 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": "libefx is not multi-process aware and all related structures\nshould be moved to primary process only.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/sfc.h | 3 ++\n drivers/net/sfc/sfc_ethdev.c | 2 +-\n drivers/net/sfc/sfc_flow.c | 8 ++--\n drivers/net/sfc/sfc_rx.c | 77 ++++++++++++++++++++++--------------\n drivers/net/sfc/sfc_rx.h | 4 +-\n 5 files changed, 57 insertions(+), 37 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex f04127bbc..f19a9dafb 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -110,6 +110,8 @@ struct sfc_intr {\n \tboolean_t\t\t\tlsc_intr;\n };\n \n+struct sfc_rxq;\n+\n struct sfc_rxq_info;\n struct sfc_txq_info;\n struct sfc_dp_rx;\n@@ -256,6 +258,7 @@ struct sfc_adapter {\n \n \tunsigned int\t\t\trxq_count;\n \tstruct sfc_rxq_info\t\t*rxq_info;\n+\tstruct sfc_rxq\t\t\t*rxq_ctrl;\n \n \tunsigned int\t\t\ttxq_count;\n \tstruct sfc_txq_info\t\t*txq_info;\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex a00ea9ce4..3d38bf661 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -1196,7 +1196,7 @@ sfc_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n \tif (sa->state != SFC_ADAPTER_STARTED)\n \t\tgoto fail_not_started;\n \n-\tif (sa->rxq_info[rx_queue_id].rxq == NULL)\n+\tif (sa->rxq_info[rx_queue_id].state != SFC_RXQ_INITIALIZED)\n \t\tgoto fail_not_setup;\n \n \trc = sfc_rx_qstart(sa, rx_queue_id);\ndiff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c\nindex 41d388735..e20c2e612 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -1244,7 +1244,7 @@ sfc_flow_parse_queue(struct sfc_adapter *sa,\n \tif (queue->index >= sa->rxq_count)\n \t\treturn -EINVAL;\n \n-\trxq = sa->rxq_info[queue->index].rxq;\n+\trxq = &sa->rxq_ctrl[queue->index];\n \tflow->spec.template.efs_dmaq_id = (uint16_t)rxq->hw_index;\n \n \treturn 0;\n@@ -1269,7 +1269,7 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,\n \t\treturn -EINVAL;\n \n \trxq_sw_index = sa->rxq_count - 1;\n-\trxq = sa->rxq_info[rxq_sw_index].rxq;\n+\trxq = &sa->rxq_ctrl[rxq_sw_index];\n \trxq_hw_index_min = rxq->hw_index;\n \trxq_hw_index_max = 0;\n \n@@ -1279,7 +1279,7 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,\n \t\tif (rxq_sw_index >= sa->rxq_count)\n \t\t\treturn -EINVAL;\n \n-\t\trxq = sa->rxq_info[rxq_sw_index].rxq;\n+\t\trxq = &sa->rxq_ctrl[rxq_sw_index];\n \n \t\tif (rxq->hw_index < rxq_hw_index_min)\n \t\t\trxq_hw_index_min = rxq->hw_index;\n@@ -1344,7 +1344,7 @@ sfc_flow_parse_rss(struct sfc_adapter *sa,\n \tfor (i = 0; i < RTE_DIM(sfc_rss_conf->rss_tbl); ++i) {\n \t\tunsigned int nb_queues = action_rss->queue_num;\n \t\tunsigned int rxq_sw_index = action_rss->queue[i % nb_queues];\n-\t\tstruct sfc_rxq *rxq = sa->rxq_info[rxq_sw_index].rxq;\n+\t\tstruct sfc_rxq *rxq = &sa->rxq_ctrl[rxq_sw_index];\n \n \t\tsfc_rss_conf->rss_tbl[i] = rxq->hw_index - rxq_hw_index_min;\n \t}\ndiff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c\nindex 3c1e77974..eb4875fec 100644\n--- a/drivers/net/sfc/sfc_rx.c\n+++ b/drivers/net/sfc/sfc_rx.c\n@@ -395,12 +395,17 @@ sfc_rxq_info_by_dp_rxq(const struct sfc_dp_rxq *dp_rxq)\n struct sfc_rxq *\n sfc_rxq_by_dp_rxq(const struct sfc_dp_rxq *dp_rxq)\n {\n-\tstruct sfc_rxq_info *rxq_info;\n+\tconst struct sfc_dp_queue *dpq = &dp_rxq->dpq;\n+\tstruct rte_eth_dev *eth_dev;\n+\tstruct sfc_adapter *sa;\n \n-\trxq_info = sfc_rxq_info_by_dp_rxq(dp_rxq);\n+\tSFC_ASSERT(rte_eth_dev_is_valid_port(dpq->port_id));\n+\teth_dev = &rte_eth_devices[dpq->port_id];\n+\n+\tsa = eth_dev->data->dev_private;\n \n-\tSFC_ASSERT(rxq_info->rxq != NULL);\n-\treturn rxq_info->rxq;\n+\tSFC_ASSERT(dpq->queue_id < sa->rxq_count);\n+\treturn &sa->rxq_ctrl[dpq->queue_id];\n }\n \n static sfc_dp_rx_qsize_up_rings_t sfc_efx_rx_qsize_up_rings;\n@@ -563,9 +568,10 @@ sfc_rx_qflush(struct sfc_adapter *sa, unsigned int sw_index)\n \tint rc;\n \n \trxq_info = &sa->rxq_info[sw_index];\n-\trxq = rxq_info->rxq;\n \tSFC_ASSERT(rxq_info->state & SFC_RXQ_STARTED);\n \n+\trxq = &sa->rxq_ctrl[sw_index];\n+\n \t/*\n \t * Retry Rx queue flushing in the case of flush failed or\n \t * timeout. In the worst case it can delay for 6 seconds.\n@@ -674,10 +680,9 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n \tSFC_ASSERT(sw_index < sa->rxq_count);\n \n \trxq_info = &sa->rxq_info[sw_index];\n-\trxq = rxq_info->rxq;\n-\tSFC_ASSERT(rxq != NULL);\n \tSFC_ASSERT(rxq_info->state == SFC_RXQ_INITIALIZED);\n \n+\trxq = &sa->rxq_ctrl[sw_index];\n \tevq = rxq->evq;\n \n \trc = sfc_ev_qstart(evq, sfc_evq_index_by_rxq_sw_index(sa, sw_index));\n@@ -764,9 +769,8 @@ sfc_rx_qstop(struct sfc_adapter *sa, unsigned int sw_index)\n \tSFC_ASSERT(sw_index < sa->rxq_count);\n \n \trxq_info = &sa->rxq_info[sw_index];\n-\trxq = rxq_info->rxq;\n \n-\tif (rxq == NULL || rxq_info->state == SFC_RXQ_INITIALIZED)\n+\tif (rxq_info->state == SFC_RXQ_INITIALIZED)\n \t\treturn;\n \tSFC_ASSERT(rxq_info->state & SFC_RXQ_STARTED);\n \n@@ -774,6 +778,7 @@ sfc_rx_qstop(struct sfc_adapter *sa, unsigned int sw_index)\n \tsa->eth_dev->data->rx_queue_state[sw_index] =\n \t\tRTE_ETH_QUEUE_STATE_STOPPED;\n \n+\trxq = &sa->rxq_ctrl[sw_index];\n \tsa->priv.dp_rx->qstop(rxq_info->dp, &rxq->evq->read_ptr);\n \n \tif (sw_index == 0)\n@@ -1026,14 +1031,7 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \tif (rc != 0)\n \t\tgoto fail_ev_qinit;\n \n-\trc = ENOMEM;\n-\trxq = rte_zmalloc_socket(\"sfc-rxq\", sizeof(*rxq), RTE_CACHE_LINE_SIZE,\n-\t\t\t\t socket_id);\n-\tif (rxq == NULL)\n-\t\tgoto fail_rxq_alloc;\n-\n-\trxq_info->rxq = rxq;\n-\n+\trxq = &sa->rxq_ctrl[sw_index];\n \trxq->evq = evq;\n \trxq->hw_index = sw_index;\n \trxq_info->refill_threshold =\n@@ -1083,10 +1081,6 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \tsfc_dma_free(sa, &rxq->mem);\n \n fail_dma_alloc:\n-\trxq_info->rxq = NULL;\n-\trte_free(rxq);\n-\n-fail_rxq_alloc:\n \tsfc_ev_qfini(evq);\n \n fail_ev_qinit:\n@@ -1109,21 +1103,20 @@ sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index)\n \n \trxq_info = &sa->rxq_info[sw_index];\n \n-\trxq = rxq_info->rxq;\n \tSFC_ASSERT(rxq_info->state == SFC_RXQ_INITIALIZED);\n \n \tsa->priv.dp_rx->qdestroy(rxq_info->dp);\n \trxq_info->dp = NULL;\n \n-\trxq_info->rxq = NULL;\n+\trxq_info->state &= ~SFC_RXQ_INITIALIZED;\n \trxq_info->entries = 0;\n \n+\trxq = &sa->rxq_ctrl[sw_index];\n+\n \tsfc_dma_free(sa, &rxq->mem);\n \n \tsfc_ev_qfini(rxq->evq);\n \trxq->evq = NULL;\n-\n-\trte_free(rxq);\n }\n \n /*\n@@ -1366,7 +1359,7 @@ sfc_rx_start(struct sfc_adapter *sa)\n \t\tgoto fail_rss_config;\n \n \tfor (sw_index = 0; sw_index < sa->rxq_count; ++sw_index) {\n-\t\tif (sa->rxq_info[sw_index].rxq != NULL &&\n+\t\tif (sa->rxq_info[sw_index].state == SFC_RXQ_INITIALIZED &&\n \t\t (!sa->rxq_info[sw_index].deferred_start ||\n \t\t sa->rxq_info[sw_index].deferred_started)) {\n \t\t\trc = sfc_rx_qstart(sa, sw_index);\n@@ -1398,7 +1391,7 @@ sfc_rx_stop(struct sfc_adapter *sa)\n \n \tsw_index = sa->rxq_count;\n \twhile (sw_index-- > 0) {\n-\t\tif (sa->rxq_info[sw_index].rxq != NULL)\n+\t\tif (sa->rxq_info[sw_index].state & SFC_RXQ_STARTED)\n \t\t\tsfc_rx_qstop(sa, sw_index);\n \t}\n \n@@ -1476,7 +1469,7 @@ sfc_rx_fini_queues(struct sfc_adapter *sa, unsigned int nb_rx_queues)\n \n \tsw_index = sa->rxq_count;\n \twhile (--sw_index >= (int)nb_rx_queues) {\n-\t\tif (sa->rxq_info[sw_index].rxq != NULL)\n+\t\tif (sa->rxq_info[sw_index].state & SFC_RXQ_INITIALIZED)\n \t\t\tsfc_rx_qfini(sa, sw_index);\n \t}\n \n@@ -1516,8 +1509,18 @@ sfc_rx_configure(struct sfc_adapter *sa)\n \t\t\t\t\t\t sa->socket_id);\n \t\tif (sa->rxq_info == NULL)\n \t\t\tgoto fail_rxqs_alloc;\n+\n+\t\t/*\n+\t\t * Allocate primary process only RxQ control from heap\n+\t\t * since it should not be shared.\n+\t\t */\n+\t\trc = ENOMEM;\n+\t\tsa->rxq_ctrl = calloc(nb_rx_queues, sizeof(sa->rxq_ctrl[0]));\n+\t\tif (sa->rxq_ctrl == NULL)\n+\t\t\tgoto fail_rxqs_ctrl_alloc;\n \t} else {\n \t\tstruct sfc_rxq_info *new_rxq_info;\n+\t\tstruct sfc_rxq *new_rxq_ctrl;\n \n \t\tif (nb_rx_queues < sa->rxq_count)\n \t\t\tsfc_rx_fini_queues(sa, nb_rx_queues);\n@@ -1529,11 +1532,22 @@ sfc_rx_configure(struct sfc_adapter *sa)\n \t\tif (new_rxq_info == NULL && nb_rx_queues > 0)\n \t\t\tgoto fail_rxqs_realloc;\n \n+\t\trc = ENOMEM;\n+\t\tnew_rxq_ctrl = realloc(sa->rxq_ctrl,\n+\t\t\t\t nb_rx_queues * sizeof(sa->rxq_ctrl[0]));\n+\t\tif (new_rxq_ctrl == NULL && nb_rx_queues > 0)\n+\t\t\tgoto fail_rxqs_ctrl_realloc;\n+\n \t\tsa->rxq_info = new_rxq_info;\n-\t\tif (nb_rx_queues > sa->rxq_count)\n+\t\tsa->rxq_ctrl = new_rxq_ctrl;\n+\t\tif (nb_rx_queues > sa->rxq_count) {\n \t\t\tmemset(&sa->rxq_info[sa->rxq_count], 0,\n \t\t\t (nb_rx_queues - sa->rxq_count) *\n \t\t\t sizeof(sa->rxq_info[0]));\n+\t\t\tmemset(&sa->rxq_ctrl[sa->rxq_count], 0,\n+\t\t\t (nb_rx_queues - sa->rxq_count) *\n+\t\t\t sizeof(sa->rxq_ctrl[0]));\n+\t\t}\n \t}\n \n \twhile (sa->rxq_count < nb_rx_queues) {\n@@ -1565,7 +1579,9 @@ sfc_rx_configure(struct sfc_adapter *sa)\n \n fail_rx_process_adv_conf_rss:\n fail_rx_qinit_info:\n+fail_rxqs_ctrl_realloc:\n fail_rxqs_realloc:\n+fail_rxqs_ctrl_alloc:\n fail_rxqs_alloc:\n \tsfc_rx_close(sa);\n \n@@ -1588,6 +1604,9 @@ sfc_rx_close(struct sfc_adapter *sa)\n \n \trss->channels = 0;\n \n+\tfree(sa->rxq_ctrl);\n+\tsa->rxq_ctrl = NULL;\n+\n \trte_free(sa->rxq_info);\n \tsa->rxq_info = NULL;\n }\ndiff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h\nindex 963d487c0..73b70249c 100644\n--- a/drivers/net/sfc/sfc_rx.h\n+++ b/drivers/net/sfc/sfc_rx.h\n@@ -50,8 +50,7 @@ enum sfc_rxq_state_bit {\n };\n \n /**\n- * Receive queue control information.\n- * Allocated on the socket specified on the queue setup.\n+ * Receive queue control primary process-only information.\n */\n struct sfc_rxq {\n \tstruct sfc_evq\t\t*evq;\n@@ -110,7 +109,6 @@ struct sfc_rxq_info {\n \tunsigned int\t\tentries;\n \tefx_rxq_type_t\t\ttype;\n \tunsigned int\t\ttype_flags;\n-\tstruct sfc_rxq\t\t*rxq;\n \tstruct sfc_dp_rxq\t*dp;\n \tboolean_t\t\tdeferred_start;\n \tboolean_t\t\tdeferred_started;\n", "prefixes": [ "19/30" ] }