Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87758/?format=api
{ "id": 87758, "url": "http://patches.dpdk.org/api/patches/87758/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210204195853.13411-4-aboyer@pensando.io/", "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": "<20210204195853.13411-4-aboyer@pensando.io>", "list_archive_url": "https://inbox.dpdk.org/dev/20210204195853.13411-4-aboyer@pensando.io", "date": "2021-02-04T19:58:42", "name": "[03/14] net/ionic: convert info array to generic pointers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "167582540335604d016dce929231e97a16b2c67c", "submitter": { "id": 2036, "url": "http://patches.dpdk.org/api/people/2036/?format=api", "name": "Andrew Boyer", "email": "aboyer@pensando.io" }, "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/20210204195853.13411-4-aboyer@pensando.io/mbox/", "series": [ { "id": 15176, "url": "http://patches.dpdk.org/api/series/15176/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=15176", "date": "2021-02-04T19:58:39", "name": "net/ionic: struct optimizations, fixes", "version": 1, "mbox": "http://patches.dpdk.org/series/15176/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/87758/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/87758/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id B333AA0524;\n\tThu, 4 Feb 2021 20:59:35 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0A3B22407F2;\n\tThu, 4 Feb 2021 20:59:26 +0100 (CET)", "from mail-pl1-f179.google.com (mail-pl1-f179.google.com\n [209.85.214.179])\n by mails.dpdk.org (Postfix) with ESMTP id BD02A2407E6\n for <dev@dpdk.org>; Thu, 4 Feb 2021 20:59:24 +0100 (CET)", "by mail-pl1-f179.google.com with SMTP id b8so2318344plh.12\n for <dev@dpdk.org>; Thu, 04 Feb 2021 11:59:24 -0800 (PST)", "from driver-dev1.pensando.io ([12.226.153.42])\n by smtp.gmail.com with ESMTPSA id r14sm7757915pgi.27.2021.02.04.11.59.22\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 04 Feb 2021 11:59:23 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google;\n h=from:to:cc:subject:date:message-id:in-reply-to:references;\n bh=KfhvG+RcLowgaTLDSwebE3+lJM81TFTc8KpnBTGKaZM=;\n b=vsXbSdWOTabTZOvM/hAkQbTmPhzLpEdIoPR/K5HOAa1DIMlN97LPIfH0wNFM3+z+Ft\n lKhiREgDzW5qIMU9c4TnDvq0VbDrOsoAd3MlycXCX9qm5BpDYs9lOHTQwuxNtzmRtUS3\n 1+RK4JTk7zU3qEQjjec/4oXgQbhvV334BywfermZapQOOX5Za6Gm2E+8VpdeW7peutFR\n qt2KSY4CUGBXowXS1aEReyFxWzLsqqm2fXpPaM2wuqizyjWPJlQnGs0D50YCdDoEBIc4\n T8Q4/OLPUnJZZWVwjhb3QAPWr5h2Oc11AdHUDp2m5u+eZRd1GYcgNDAYkn1kNUg3Kthb\n ZzwA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references;\n bh=KfhvG+RcLowgaTLDSwebE3+lJM81TFTc8KpnBTGKaZM=;\n b=rf9tQNDEcdTeYCz9YkPDki6vq+NvegEv6BnAXQLeNeF/jQi7nkQ54ykScgFa6VLhhl\n 0TJsnpVdZPXcODG4IxcbiS3qOKDLoECW4a5Syh+mHZOODR/izn2mcdv8j2EdGANnXi+H\n rPFJ2htxfQGW2L+PGSp9w8E5L2FVaXnRVIT93ieIAhNp92cq6AuQ0FU9U7UAVDf1G3+8\n Y/FVR2uFl5gNfKaayqkxSD6xy5rBvY23z/SnT1MuBjuFNc7lgistuqTnQOoGn+tXl1p0\n 0piwkT2raicYab6wMxGOk2kQorvzsB0ymybjSXj1nxY5zoc/IBigLUG9wyjpiKKtzCNi\n hzDQ==", "X-Gm-Message-State": "AOAM531sMxlIn+00OtP60zxGXqrmeNRleLuuLbh9lbXdoBN5SErQSpZV\n Tpyi+7UXR0NsEZVxZ2fOvdrC9jY3dKGNPw==", "X-Google-Smtp-Source": "\n ABdhPJwghTzZvMjuwH4/nj6HNKFL/RBOO3sSwUBOW9WdnzxzeOxmMPmXdZozSJQIfnDtbgTPf9UO7g==", "X-Received": "by 2002:a17:90b:1c0d:: with SMTP id\n oc13mr614130pjb.156.1612468763667;\n Thu, 04 Feb 2021 11:59:23 -0800 (PST)", "From": "Andrew Boyer <aboyer@pensando.io>", "To": "dev@dpdk.org", "Cc": "Alfredo Cardigliano <cardigliano@ntop.org>,\n Andrew Boyer <aboyer@pensando.io>", "Date": "Thu, 4 Feb 2021 11:58:42 -0800", "Message-Id": "<20210204195853.13411-4-aboyer@pensando.io>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20210204195853.13411-1-aboyer@pensando.io>", "References": "<20210204195853.13411-1-aboyer@pensando.io>", "Subject": "[dpdk-dev] [PATCH 03/14] net/ionic: convert info array to generic\n pointers", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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": "Drop the callback part of the object and store only the pointers.\nThis saves a bit of space and simplifies the code.\n\nSigned-off-by: Andrew Boyer <aboyer@pensando.io>\n---\n drivers/net/ionic/ionic_dev.c | 8 ++------\n drivers/net/ionic/ionic_dev.h | 21 +++++--------------\n drivers/net/ionic/ionic_main.c | 8 ++++----\n drivers/net/ionic/ionic_rxtx.c | 37 ++++++++++++++++++----------------\n 4 files changed, 31 insertions(+), 43 deletions(-)", "diff": "diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c\nindex 0eb9f6f21a..74ac2e67a5 100644\n--- a/drivers/net/ionic/ionic_dev.c\n+++ b/drivers/net/ionic/ionic_dev.c\n@@ -452,13 +452,9 @@ ionic_q_sg_map(struct ionic_queue *q, void *base, rte_iova_t base_pa)\n }\n \n void\n-ionic_q_post(struct ionic_queue *q, bool ring_doorbell, desc_cb cb,\n-\t void *cb_arg)\n+ionic_q_post(struct ionic_queue *q, bool ring_doorbell, void *cb_arg)\n {\n-\tstruct ionic_desc_info *head = &q->info[q->head_idx];\n-\n-\thead->cb = cb;\n-\thead->cb_arg = cb_arg;\n+\tq->info[q->head_idx] = cb_arg;\n \n \tq->head_idx = (q->head_idx + 1) & (q->num_descs - 1);\n \ndiff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h\nindex 70d95af6bb..1a43ccc61f 100644\n--- a/drivers/net/ionic/ionic_dev.h\n+++ b/drivers/net/ionic/ionic_dev.h\n@@ -129,22 +129,12 @@ struct ionic_dev {\n \tuint32_t port_info_sz;\n };\n \n-struct ionic_queue;\n-struct ionic_desc_info;\n-\n-typedef void (*desc_cb)(struct ionic_queue *q,\n-\tuint32_t q_desc_index,\n-\tuint32_t cq_desc_index,\n-\tvoid *cb_arg, void *service_cb_arg);\n-\n-struct ionic_desc_info {\n-\tdesc_cb cb;\n-\tvoid *cb_arg;\n-};\n-\n #define Q_NEXT_TO_POST(_q, _n)\t(((_q)->head_idx + (_n)) & ((_q)->size_mask))\n #define Q_NEXT_TO_SRVC(_q, _n)\t(((_q)->tail_idx + (_n)) & ((_q)->size_mask))\n \n+#define IONIC_INFO_IDX(_q, _i)\t(_i)\n+#define IONIC_INFO_PTR(_q, _i)\t(&(_q)->info[IONIC_INFO_IDX((_q), _i)])\n+\n struct ionic_queue {\n \tstruct ionic_dev *idev;\n \tstruct ionic_lif *lif;\n@@ -155,9 +145,9 @@ struct ionic_queue {\n \tuint32_t hw_type;\n \tvoid *base;\n \tvoid *sg_base;\n+\tvoid **info;\n \trte_iova_t base_pa;\n \trte_iova_t sg_base_pa;\n-\tstruct ionic_desc_info *info;\n \tuint32_t tail_idx;\n \tuint32_t head_idx;\n \tuint32_t num_descs;\n@@ -243,8 +233,7 @@ int ionic_q_init(struct ionic_lif *lif, struct ionic_dev *idev,\n \tsize_t desc_size, size_t sg_desc_size);\n void ionic_q_map(struct ionic_queue *q, void *base, rte_iova_t base_pa);\n void ionic_q_sg_map(struct ionic_queue *q, void *base, rte_iova_t base_pa);\n-void ionic_q_post(struct ionic_queue *q, bool ring_doorbell, desc_cb cb,\n-\tvoid *cb_arg);\n+void ionic_q_post(struct ionic_queue *q, bool ring_doorbell, void *cb_arg);\n \n static inline uint32_t\n ionic_q_space_avail(struct ionic_queue *q)\ndiff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c\nindex acc8b87b64..c9c0123d6a 100644\n--- a/drivers/net/ionic/ionic_main.c\n+++ b/drivers/net/ionic/ionic_main.c\n@@ -154,9 +154,9 @@ ionic_adminq_service(struct ionic_cq *cq, uint32_t cq_desc_index,\n \tstruct ionic_qcq *qcq = IONIC_CQ_TO_QCQ(cq);\n \tstruct ionic_queue *q = &qcq->q;\n \tstruct ionic_admin_ctx *ctx;\n-\tstruct ionic_desc_info *desc_info;\n \tuint16_t curr_q_tail_idx;\n \tuint16_t stop_index;\n+\tvoid **info;\n \n \tif (!color_match(cq_desc->color, cq->done_color))\n \t\treturn false;\n@@ -164,9 +164,9 @@ ionic_adminq_service(struct ionic_cq *cq, uint32_t cq_desc_index,\n \tstop_index = rte_le_to_cpu_16(cq_desc->comp_index);\n \n \tdo {\n-\t\tdesc_info = &q->info[q->tail_idx];\n+\t\tinfo = IONIC_INFO_PTR(q, q->tail_idx);\n \n-\t\tctx = desc_info->cb_arg;\n+\t\tctx = info[0];\n \t\tif (ctx) {\n \t\t\tmemcpy(&ctx->comp, cq_desc, sizeof(*cq_desc));\n \n@@ -210,7 +210,7 @@ ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)\n \n \tmemcpy(q_desc, &ctx->cmd, sizeof(ctx->cmd));\n \n-\tionic_q_post(q, true, NULL, ctx);\n+\tionic_q_post(q, true, ctx);\n \n err_out:\n \trte_spinlock_unlock(&lif->adminq_lock);\ndiff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c\nindex 1ad95d8e39..81c9ff8ba8 100644\n--- a/drivers/net/ionic/ionic_rxtx.c\n+++ b/drivers/net/ionic/ionic_rxtx.c\n@@ -72,10 +72,10 @@ ionic_tx_flush(struct ionic_qcq *txq)\n {\n \tstruct ionic_cq *cq = &txq->cq;\n \tstruct ionic_queue *q = &txq->q;\n-\tstruct ionic_desc_info *q_desc_info;\n \tstruct rte_mbuf *txm, *next;\n \tstruct ionic_txq_comp *cq_desc_base = cq->base;\n \tstruct ionic_txq_comp *cq_desc;\n+\tvoid **info;\n \tu_int32_t comp_index = (u_int32_t)-1;\n \n \tcq_desc = &cq_desc_base[cq->tail_idx];\n@@ -96,7 +96,7 @@ ionic_tx_flush(struct ionic_qcq *txq)\n \n \tif (comp_index != (u_int32_t)-1) {\n \t\twhile (q->tail_idx != comp_index) {\n-\t\t\tq_desc_info = &q->info[q->tail_idx];\n+\t\t\tinfo = IONIC_INFO_PTR(q, q->tail_idx);\n \n \t\t\tq->tail_idx = (q->tail_idx + 1) & (q->num_descs - 1);\n \n@@ -109,7 +109,7 @@ ionic_tx_flush(struct ionic_qcq *txq)\n \t\t\t * Note: you can just use rte_pktmbuf_free,\n \t\t\t * but this loop is faster\n \t\t\t */\n-\t\t\ttxm = q_desc_info->cb_arg;\n+\t\t\ttxm = info[0];\n \t\t\twhile (txm != NULL) {\n \t\t\t\tnext = txm->next;\n \t\t\t\trte_pktmbuf_free_seg(txm);\n@@ -311,7 +311,7 @@ ionic_tx_tso_post(struct ionic_queue *q, struct ionic_txq_desc *desc,\n \tdesc->hdr_len = hdrlen;\n \tdesc->mss = mss;\n \n-\tionic_q_post(q, done, NULL, done ? txm : NULL);\n+\tionic_q_post(q, done, done ? txm : NULL);\n }\n \n static struct ionic_txq_desc *\n@@ -511,7 +511,7 @@ ionic_tx(struct ionic_qcq *txq, struct rte_mbuf *txm,\n \t\ttxm_seg = txm_seg->next;\n \t}\n \n-\tionic_q_post(q, not_xmit_more, NULL, txm);\n+\tionic_q_post(q, not_xmit_more, txm);\n \n \treturn 0;\n }\n@@ -639,12 +639,12 @@ static void __rte_cold\n ionic_rx_empty(struct ionic_queue *q)\n {\n \tstruct ionic_qcq *rxq = IONIC_Q_TO_QCQ(q);\n-\tstruct ionic_desc_info *cur;\n \tstruct rte_mbuf *mbuf;\n+\tvoid **info;\n \n \twhile (q->tail_idx != q->head_idx) {\n-\t\tcur = &q->info[q->tail_idx];\n-\t\tmbuf = cur->cb_arg;\n+\t\tinfo = IONIC_INFO_PTR(q, q->tail_idx);\n+\t\tmbuf = info[0];\n \t\trte_mempool_put(rxq->mb_pool, mbuf);\n \n \t\tq->tail_idx = (q->tail_idx + 1) & (q->num_descs - 1);\n@@ -743,12 +743,11 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,\n static __rte_always_inline void\n ionic_rx_clean(struct ionic_queue *q,\n \t\tuint32_t q_desc_index, uint32_t cq_desc_index,\n-\t\tvoid *cb_arg, void *service_cb_arg)\n+\t\tvoid *service_cb_arg)\n {\n \tstruct ionic_rxq_comp *cq_desc_base = q->bound_cq->base;\n \tstruct ionic_rxq_comp *cq_desc = &cq_desc_base[cq_desc_index];\n-\tstruct rte_mbuf *rxm = cb_arg;\n-\tstruct rte_mbuf *rxm_seg;\n+\tstruct rte_mbuf *rxm, *rxm_seg;\n \tstruct ionic_qcq *rxq = IONIC_Q_TO_QCQ(q);\n \tuint32_t max_frame_size =\n \t\trxq->lif->eth_dev->data->dev_conf.rxmode.max_rx_pkt_len;\n@@ -761,6 +760,13 @@ ionic_rx_clean(struct ionic_queue *q,\n \t\t(rte_pktmbuf_data_room_size(rxq->mb_pool) -\n \t\tRTE_PKTMBUF_HEADROOM);\n \tuint32_t left;\n+\tvoid **info;\n+\n+\tassert(q_desc_index == cq_desc->comp_index);\n+\n+\tinfo = IONIC_INFO_PTR(q, cq_desc->comp_index);\n+\n+\trxm = info[0];\n \n \tif (!recv_args) {\n \t\tstats->no_cb_arg++;\n@@ -898,7 +904,7 @@ ionic_rx_recycle(struct ionic_queue *q, uint32_t q_desc_index,\n \tnew->addr = old->addr;\n \tnew->len = old->len;\n \n-\tionic_q_post(q, true, ionic_rx_clean, mbuf);\n+\tionic_q_post(q, true, mbuf);\n }\n \n static __rte_always_inline int\n@@ -969,7 +975,7 @@ ionic_rx_fill(struct ionic_qcq *rxq, uint32_t len)\n \t\tring_doorbell = ((q->head_idx + 1) &\n \t\t\tIONIC_RX_RING_DOORBELL_STRIDE) == 0;\n \n-\t\tionic_q_post(q, ring_doorbell, ionic_rx_clean, rxm);\n+\t\tionic_q_post(q, ring_doorbell, rxm);\n \t}\n \n \treturn 0;\n@@ -1023,7 +1029,6 @@ ionic_rxq_service(struct ionic_qcq *rxq, uint32_t work_to_do,\n {\n \tstruct ionic_cq *cq = &rxq->cq;\n \tstruct ionic_queue *q = &rxq->q;\n-\tstruct ionic_desc_info *q_desc_info;\n \tstruct ionic_rxq_comp *cq_desc_base = cq->base;\n \tstruct ionic_rxq_comp *cq_desc;\n \tbool more;\n@@ -1048,8 +1053,6 @@ ionic_rxq_service(struct ionic_qcq *rxq, uint32_t work_to_do,\n \t\tdo {\n \t\t\tmore = (q->tail_idx != cq_desc->comp_index);\n \n-\t\t\tq_desc_info = &q->info[q->tail_idx];\n-\n \t\t\tcurr_q_tail_idx = q->tail_idx;\n \t\t\tq->tail_idx = (q->tail_idx + 1) & (q->num_descs - 1);\n \n@@ -1059,7 +1062,7 @@ ionic_rxq_service(struct ionic_qcq *rxq, uint32_t work_to_do,\n \t\t\t\trte_prefetch0(&q->info[q->tail_idx]);\n \n \t\t\tionic_rx_clean(q, curr_q_tail_idx, curr_cq_tail_idx,\n-\t\t\t\tq_desc_info->cb_arg, service_cb_arg);\n+\t\t\t\tservice_cb_arg);\n \n \t\t} while (more);\n \n", "prefixes": [ "03/14" ] }