Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 50183,
    "url": "http://patches.dpdk.org/api/patches/50183/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1549541873-17403-21-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-21-git-send-email-arybchenko@solarflare.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1549541873-17403-21-git-send-email-arybchenko@solarflare.com",
    "date": "2019-02-07T12:17:43",
    "name": "[20/30] net/sfc: remove TxQ control from shared TxQ info",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "68984586ebfa73639282287a4a54d25fe15715be",
    "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-21-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/50183/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/50183/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 594131B555;\n\tThu,  7 Feb 2019 13:18:42 +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 E6C0F1B4B6\n\tfor <dev@dpdk.org>; Thu,  7 Feb 2019 13:18:17 +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\tA29D5600067 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\tx17CI9M5013280 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\t244C61613E4\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:43 +0000",
        "Message-ID": "<1549541873-17403-21-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.889200-4.000000-10",
        "X-TMASE-MatchedRID": "15UE9zINTirW5rPMDq6HbwPZZctd3P4BlSphlGf1p5ES+jFO7d+PWyxV\n\tTnd/2+hkO9d867AEK2j+qrXTNqMyZjd/MTfApr+s5O5PclyYqqrt/okBLaEo+HPBWZjlMys2ixP\n\t77M1esQwrVPAnGHaZeJ6uWrWgXC9Fsk3Xm9yiC75pR7+L0B6mE30tCKdnhB589yM15V5aWpj6C0\n\tePs7A07QkL5VmLaBARtxJbZoBvHP/6fTliHLjX1gh/V/SaZNkXdeSoST5RxXKoIpMziCqFxj7gC\n\t+SVb7ZITseBaeP9VOyH2wUPSfLYyj+terldlHrIAAPQWqVl2ibRvisn3a2a0X93tr1Wx/MwKa3j\n\t8X0o5Xs=",
        "X-TM-AS-User-Approved-Sender": "No",
        "X-TM-AS-User-Blocked-Sender": "No",
        "X-TMASE-Result": "10--2.889200-4.000000",
        "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24412.006",
        "X-MDID": "1549541897-frLjBHmD_EcN",
        "Subject": "[dpdk-dev] [PATCH 20/30] net/sfc: remove TxQ control from shared\n\tTxQ 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.c        |  2 +-\n drivers/net/sfc/sfc.h        |  2 +\n drivers/net/sfc/sfc_ethdev.c |  2 +-\n drivers/net/sfc/sfc_tx.c     | 75 +++++++++++++++++++++---------------\n drivers/net/sfc/sfc_tx.h     |  5 +--\n 5 files changed, 51 insertions(+), 35 deletions(-)",
    "diff": "diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c\nindex 63bc0a568..dd662df0d 100644\n--- a/drivers/net/sfc/sfc.c\n+++ b/drivers/net/sfc/sfc.c\n@@ -280,7 +280,7 @@ sfc_set_fw_subvariant(struct sfc_adapter *sa)\n \tfor (txq_index = 0; txq_index < sa->txq_count; ++txq_index) {\n \t\tstruct sfc_txq_info *txq_info = &sa->txq_info[txq_index];\n \n-\t\tif (txq_info->txq != NULL)\n+\t\tif (txq_info->state & SFC_TXQ_INITIALIZED)\n \t\t\ttx_offloads |= txq_info->offloads;\n \t}\n \ndiff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex f19a9dafb..7e95170bc 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -111,6 +111,7 @@ struct sfc_intr {\n };\n \n struct sfc_rxq;\n+struct sfc_txq;\n \n struct sfc_rxq_info;\n struct sfc_txq_info;\n@@ -262,6 +263,7 @@ struct sfc_adapter {\n \n \tunsigned int\t\t\ttxq_count;\n \tstruct sfc_txq_info\t\t*txq_info;\n+\tstruct sfc_txq\t\t\t*txq_ctrl;\n \n \tboolean_t\t\t\ttso;\n \ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 3d38bf661..aa857ec74 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -1248,7 +1248,7 @@ sfc_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)\n \tif (sa->state != SFC_ADAPTER_STARTED)\n \t\tgoto fail_not_started;\n \n-\tif (sa->txq_info[tx_queue_id].txq == NULL)\n+\tif (sa->txq_info[tx_queue_id].state != SFC_TXQ_INITIALIZED)\n \t\tgoto fail_not_setup;\n \n \trc = sfc_tx_qstart(sa, tx_queue_id);\ndiff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c\nindex 4357dbfd8..94baf4530 100644\n--- a/drivers/net/sfc/sfc_tx.c\n+++ b/drivers/net/sfc/sfc_tx.c\n@@ -159,13 +159,7 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \tif (rc != 0)\n \t\tgoto fail_ev_qinit;\n \n-\trc = ENOMEM;\n-\ttxq = rte_zmalloc_socket(\"sfc-txq\", sizeof(*txq), 0, socket_id);\n-\tif (txq == NULL)\n-\t\tgoto fail_txq_alloc;\n-\n-\ttxq_info->txq = txq;\n-\n+\ttxq = &sa->txq_ctrl[sw_index];\n \ttxq->hw_index = sw_index;\n \ttxq->evq = evq;\n \ttxq_info->free_thresh =\n@@ -211,10 +205,6 @@ sfc_tx_qinit(struct sfc_adapter *sa, unsigned int sw_index,\n \tsfc_dma_free(sa, &txq->mem);\n \n fail_dma_alloc:\n-\ttxq_info->txq = NULL;\n-\trte_free(txq);\n-\n-fail_txq_alloc:\n \tsfc_ev_qfini(evq);\n \n fail_ev_qinit:\n@@ -239,22 +229,20 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)\n \n \ttxq_info = &sa->txq_info[sw_index];\n \n-\ttxq = txq_info->txq;\n-\tSFC_ASSERT(txq != NULL);\n \tSFC_ASSERT(txq_info->state == SFC_TXQ_INITIALIZED);\n \n \tsa->priv.dp_tx->qdestroy(txq_info->dp);\n \ttxq_info->dp = NULL;\n \n-\ttxq_info->txq = NULL;\n+\ttxq_info->state &= ~SFC_TXQ_INITIALIZED;\n \ttxq_info->entries = 0;\n \n+\ttxq = &sa->txq_ctrl[sw_index];\n+\n \tsfc_dma_free(sa, &txq->mem);\n \n \tsfc_ev_qfini(txq->evq);\n \ttxq->evq = NULL;\n-\n-\trte_free(txq);\n }\n \n static int\n@@ -314,7 +302,7 @@ sfc_tx_fini_queues(struct sfc_adapter *sa, unsigned int nb_tx_queues)\n \n \tsw_index = sa->txq_count;\n \twhile (--sw_index >= (int)nb_tx_queues) {\n-\t\tif (sa->txq_info[sw_index].txq != NULL)\n+\t\tif (sa->txq_info[sw_index].state & SFC_TXQ_INITIALIZED)\n \t\t\tsfc_tx_qfini(sa, sw_index);\n \t}\n \n@@ -355,8 +343,18 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \t\t\t\t\t\t sa->socket_id);\n \t\tif (sa->txq_info == NULL)\n \t\t\tgoto fail_txqs_alloc;\n+\n+\t\t/*\n+\t\t * Allocate primary process only TxQ control from heap\n+\t\t * since it should not be shared.\n+\t\t */\n+\t\trc = ENOMEM;\n+\t\tsa->txq_ctrl = calloc(nb_tx_queues, sizeof(sa->txq_ctrl[0]));\n+\t\tif (sa->txq_ctrl == NULL)\n+\t\t\tgoto fail_txqs_ctrl_alloc;\n \t} else {\n \t\tstruct sfc_txq_info *new_txq_info;\n+\t\tstruct sfc_txq *new_txq_ctrl;\n \n \t\tif (nb_tx_queues < sa->txq_count)\n \t\t\tsfc_tx_fini_queues(sa, nb_tx_queues);\n@@ -367,11 +365,21 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \t\tif (new_txq_info == NULL && nb_tx_queues > 0)\n \t\t\tgoto fail_txqs_realloc;\n \n+\t\tnew_txq_ctrl = realloc(sa->txq_ctrl,\n+\t\t\t\t       nb_tx_queues * sizeof(sa->txq_ctrl[0]));\n+\t\tif (new_txq_ctrl == NULL && nb_tx_queues > 0)\n+\t\t\tgoto fail_txqs_ctrl_realloc;\n+\n \t\tsa->txq_info = new_txq_info;\n-\t\tif (nb_tx_queues > sa->txq_count)\n+\t\tsa->txq_ctrl = new_txq_ctrl;\n+\t\tif (nb_tx_queues > sa->txq_count) {\n \t\t\tmemset(&sa->txq_info[sa->txq_count], 0,\n \t\t\t       (nb_tx_queues - sa->txq_count) *\n \t\t\t       sizeof(sa->txq_info[0]));\n+\t\t\tmemset(&sa->txq_ctrl[sa->txq_count], 0,\n+\t\t\t       (nb_tx_queues - sa->txq_count) *\n+\t\t\t       sizeof(sa->txq_ctrl[0]));\n+\t\t}\n \t}\n \n \twhile (sa->txq_count < nb_tx_queues) {\n@@ -386,7 +394,9 @@ sfc_tx_configure(struct sfc_adapter *sa)\n \treturn 0;\n \n fail_tx_qinit_info:\n+fail_txqs_ctrl_realloc:\n fail_txqs_realloc:\n+fail_txqs_ctrl_alloc:\n fail_txqs_alloc:\n \tsfc_tx_close(sa);\n \n@@ -401,6 +411,9 @@ sfc_tx_close(struct sfc_adapter *sa)\n {\n \tsfc_tx_fini_queues(sa, 0);\n \n+\tfree(sa->txq_ctrl);\n+\tsa->txq_ctrl = NULL;\n+\n \trte_free(sa->txq_info);\n \tsa->txq_info = NULL;\n }\n@@ -423,11 +436,9 @@ sfc_tx_qstart(struct sfc_adapter *sa, unsigned int sw_index)\n \tSFC_ASSERT(sw_index < sa->txq_count);\n \ttxq_info = &sa->txq_info[sw_index];\n \n-\ttxq = txq_info->txq;\n-\n-\tSFC_ASSERT(txq != NULL);\n \tSFC_ASSERT(txq_info->state == SFC_TXQ_INITIALIZED);\n \n+\ttxq = &sa->txq_ctrl[sw_index];\n \tevq = txq->evq;\n \n \trc = sfc_ev_qstart(evq, sfc_evq_index_by_txq_sw_index(sa, sw_index));\n@@ -504,13 +515,12 @@ sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index)\n \tSFC_ASSERT(sw_index < sa->txq_count);\n \ttxq_info = &sa->txq_info[sw_index];\n \n-\ttxq = txq_info->txq;\n-\n-\tif (txq == NULL || txq_info->state == SFC_TXQ_INITIALIZED)\n+\tif (txq_info->state == SFC_TXQ_INITIALIZED)\n \t\treturn;\n \n \tSFC_ASSERT(txq_info->state & SFC_TXQ_STARTED);\n \n+\ttxq = &sa->txq_ctrl[sw_index];\n \tsa->priv.dp_tx->qstop(txq_info->dp, &txq->evq->read_ptr);\n \n \t/*\n@@ -583,7 +593,7 @@ sfc_tx_start(struct sfc_adapter *sa)\n \t\tgoto fail_efx_tx_init;\n \n \tfor (sw_index = 0; sw_index < sa->txq_count; ++sw_index) {\n-\t\tif (sa->txq_info[sw_index].txq != NULL &&\n+\t\tif (sa->txq_info[sw_index].state == SFC_TXQ_INITIALIZED &&\n \t\t    (!(sa->txq_info[sw_index].deferred_start) ||\n \t\t     sa->txq_info[sw_index].deferred_started)) {\n \t\t\trc = sfc_tx_qstart(sa, sw_index);\n@@ -614,7 +624,7 @@ sfc_tx_stop(struct sfc_adapter *sa)\n \n \tsw_index = sa->txq_count;\n \twhile (sw_index-- > 0) {\n-\t\tif (sa->txq_info[sw_index].txq != NULL)\n+\t\tif (sa->txq_info[sw_index].state & SFC_TXQ_STARTED)\n \t\t\tsfc_tx_qstop(sa, sw_index);\n \t}\n \n@@ -888,12 +898,17 @@ sfc_txq_info_by_dp_txq(const struct sfc_dp_txq *dp_txq)\n struct sfc_txq *\n sfc_txq_by_dp_txq(const struct sfc_dp_txq *dp_txq)\n {\n-\tstruct sfc_txq_info *txq_info;\n+\tconst struct sfc_dp_queue *dpq = &dp_txq->dpq;\n+\tstruct rte_eth_dev *eth_dev;\n+\tstruct sfc_adapter *sa;\n \n-\ttxq_info = sfc_txq_info_by_dp_txq(dp_txq);\n+\tSFC_ASSERT(rte_eth_dev_is_valid_port(dpq->port_id));\n+\teth_dev = &rte_eth_devices[dpq->port_id];\n \n-\tSFC_ASSERT(txq_info->txq != NULL);\n-\treturn txq_info->txq;\n+\tsa = eth_dev->data->dev_private;\n+\n+\tSFC_ASSERT(dpq->queue_id < sa->txq_count);\n+\treturn &sa->txq_ctrl[dpq->queue_id];\n }\n \n static sfc_dp_tx_qsize_up_rings_t sfc_efx_tx_qsize_up_rings;\ndiff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h\nindex 2d21e6e83..d0e751a26 100644\n--- a/drivers/net/sfc/sfc_tx.h\n+++ b/drivers/net/sfc/sfc_tx.h\n@@ -47,8 +47,8 @@ enum sfc_txq_state_bit {\n };\n \n /**\n- * Transmit queue control information. Not used on datapath.\n- * Allocated on the socket specified on the queue setup.\n+ * Transmit queue control primary process-only information.\n+ * Not used on datapath.\n  */\n struct sfc_txq {\n \tunsigned int\t\t\thw_index;\n@@ -95,7 +95,6 @@ sfc_efx_txq_by_dp_txq(struct sfc_dp_txq *dp_txq)\n struct sfc_txq_info {\n \tunsigned int\t\tstate;\n \tunsigned int\t\tentries;\n-\tstruct sfc_txq\t\t*txq;\n \tstruct sfc_dp_txq\t*dp;\n \tboolean_t\t\tdeferred_start;\n \tboolean_t\t\tdeferred_started;\n",
    "prefixes": [
        "20/30"
    ]
}