Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87942/?format=api
{ "id": 87942, "url": "http://patches.dpdk.org/api/patches/87942/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210216203540.29290-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": "<20210216203540.29290-4-aboyer@pensando.io>", "list_archive_url": "https://inbox.dpdk.org/dev/20210216203540.29290-4-aboyer@pensando.io", "date": "2021-02-16T20:35:28", "name": "[v2,03/15] net/ionic: consolidate adminq code", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "0120313f21aa96ffd84e74a6da1c8de422d9f407", "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/20210216203540.29290-4-aboyer@pensando.io/mbox/", "series": [ { "id": 15272, "url": "http://patches.dpdk.org/api/series/15272/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=15272", "date": "2021-02-16T20:35:25", "name": "net/ionic: struct optimizations, fixes", "version": 2, "mbox": "http://patches.dpdk.org/series/15272/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/87942/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/87942/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 44633A054D;\n\tTue, 16 Feb 2021 21:36:10 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B66EE1607B1;\n\tTue, 16 Feb 2021 21:35:57 +0100 (CET)", "from mail-pg1-f177.google.com (mail-pg1-f177.google.com\n [209.85.215.177])\n by mails.dpdk.org (Postfix) with ESMTP id BE5201607A8\n for <dev@dpdk.org>; Tue, 16 Feb 2021 21:35:54 +0100 (CET)", "by mail-pg1-f177.google.com with SMTP id t25so7010002pga.2\n for <dev@dpdk.org>; Tue, 16 Feb 2021 12:35:54 -0800 (PST)", "from driver-dev1.pensando.io ([12.226.153.42])\n by smtp.gmail.com with ESMTPSA id u17sm11371pgh.72.2021.02.16.12.35.52\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 16 Feb 2021 12:35:53 -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 :in-reply-to:references;\n bh=Pe+nbvsCf+CF43E4EPo9MEeeb6ONcSecpuDnF4bcYvw=;\n b=lSsEjt7SEIZuyKOvdsBxKkuqOThmRgWOTVAL4a/rqUCARn/6GR4tyuDvX3wCMQsFom\n lqi95G90m1tdJsbIYwE8KM+hBBReN7FobkrAxDA7u7/WFygZoW6/CvND3dQNawWMJq3x\n zIxZ5kyp0w1SV8mrDO7XlV4cuZSRiUKBYXvjU7bs+xLL+0NljoNbmgtsE3q4X3MLzVu3\n pSIvIA91MMiipO3M5Qlj47yXGirn3i/71Ykvwj33Quj2E9bTJ+xO/w4wW+ZChq8u5Lvr\n 1B25VCM/UYsWI1ogEGy9yWGnMwlu8CW0LbUtY6AqsXK5a7nggsDKV0y26cOVfcQC+9RG\n DSrw==", "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:in-reply-to:references;\n bh=Pe+nbvsCf+CF43E4EPo9MEeeb6ONcSecpuDnF4bcYvw=;\n b=B5ICNPONijPlDuIdBD4S7GI68SKFenm8E6+VuysaLc/WQ10BKgJVH1rnSKJdPAq01V\n 26yeCrzzz6ex95XV9pep68GWnsSvbn4E7tkNICb4DsZw1LuQ9eJl/IHlpsc9VteN5Z94\n 59XpDqrtLE3sXPaD9bBOWgN22f6HS/i41LvDzOGmODYsluKhfTGYCwoRizPTMGk67C/I\n 8wzkcvrX2vZrA5mTom0mWbfxRzmRimRT1Q4AMwuoDW90qEGZZVA4okZL1R0sffocDGHW\n bVec73Jw2FcCzili8iwxT9T6XwG4E5i9ursdOAafMmVO5qM4gD/itECfCHbHHZeBIEtY\n bKEQ==", "X-Gm-Message-State": "AOAM531YKcNyNI/fP1Gn6iMqUDbAochY1iJcUySXL03m4CM314Tb8Nlx\n DdhnMF/w/lExK4ceRImsbgcHXP+WVna15A==", "X-Google-Smtp-Source": "\n ABdhPJxMatxn4bEhWc/5RflkfMbKxF8alFuWJLXznf9crtpe39CgwESgWsrwl0o0V+ESCBx8zDKbNQ==", "X-Received": "by 2002:a62:7a0b:0:b029:1de:7e70:955d with SMTP id\n v11-20020a627a0b0000b02901de7e70955dmr21454834pfc.49.1613507753637;\n Tue, 16 Feb 2021 12:35:53 -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": "Tue, 16 Feb 2021 12:35:28 -0800", "Message-Id": "<20210216203540.29290-4-aboyer@pensando.io>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": [ "<20210216203540.29290-1-aboyer@pensando.io>", "<20210204195853.13411-1-aboyer@pensando.io>" ], "References": [ "<20210216203540.29290-1-aboyer@pensando.io>", "<20210204195853.13411-1-aboyer@pensando.io>" ], "Subject": "[dpdk-dev] [PATCH v2 03/15] net/ionic: consolidate adminq code", "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": "The adminq is the only caller of ionic_q_service(), so absorb it\ninto ionic_adminq_service().\nMove all of the adminq code together into ionic_main.c.\nStaticize a few things.\n\nSigned-off-by: Andrew Boyer <aboyer@pensando.io>\n---\n drivers/net/ionic/ionic.h | 13 ++++-\n drivers/net/ionic/ionic_dev.c | 85 ----------------------------\n drivers/net/ionic/ionic_dev.h | 15 -----\n drivers/net/ionic/ionic_lif.c | 16 ------\n drivers/net/ionic/ionic_lif.h | 2 -\n drivers/net/ionic/ionic_main.c | 87 ++++++++++++++++++++++++++---\n drivers/net/ionic/ionic_rx_filter.c | 1 +\n 7 files changed, 93 insertions(+), 126 deletions(-)", "diff": "diff --git a/drivers/net/ionic/ionic.h b/drivers/net/ionic/ionic.h\nindex 49d1fc003f..49b90d1b7c 100644\n--- a/drivers/net/ionic/ionic.h\n+++ b/drivers/net/ionic/ionic.h\n@@ -65,8 +65,19 @@ struct ionic_adapter {\n \tLIST_ENTRY(ionic_adapter) pci_adapters;\n };\n \n-int ionic_adminq_check_err(struct ionic_admin_ctx *ctx, bool timeout);\n+/** ionic_admin_ctx - Admin command context.\n+ * @pending_work: Flag that indicates a completion.\n+ * @cmd: Admin command (64B) to be copied to the queue.\n+ * @comp: Admin completion (16B) copied from the queue.\n+ */\n+struct ionic_admin_ctx {\n+\tbool pending_work;\n+\tunion ionic_adminq_cmd cmd;\n+\tunion ionic_adminq_comp comp;\n+};\n+\n int ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx);\n+\n int ionic_dev_cmd_wait_check(struct ionic_dev *idev, unsigned long max_wait);\n int ionic_setup(struct ionic_adapter *adapter);\n \ndiff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c\nindex f837817a0a..0eb9f6f21a 100644\n--- a/drivers/net/ionic/ionic_dev.c\n+++ b/drivers/net/ionic/ionic_dev.c\n@@ -465,88 +465,3 @@ ionic_q_post(struct ionic_queue *q, bool ring_doorbell, desc_cb cb,\n \tif (ring_doorbell)\n \t\tionic_q_flush(q);\n }\n-\n-void\n-ionic_q_service(struct ionic_queue *q, uint32_t cq_desc_index,\n-\t\tuint32_t stop_index, void *service_cb_arg)\n-{\n-\tstruct ionic_desc_info *desc_info;\n-\tuint32_t curr_q_tail_idx;\n-\n-\tdo {\n-\t\tdesc_info = &q->info[q->tail_idx];\n-\n-\t\tif (desc_info->cb)\n-\t\t\tdesc_info->cb(q, q->tail_idx, cq_desc_index,\n-\t\t\t\tdesc_info->cb_arg, service_cb_arg);\n-\n-\t\tdesc_info->cb = NULL;\n-\t\tdesc_info->cb_arg = NULL;\n-\n-\t\tcurr_q_tail_idx = q->tail_idx;\n-\t\tq->tail_idx = (q->tail_idx + 1) & (q->num_descs - 1);\n-\n-\t} while (curr_q_tail_idx != stop_index);\n-}\n-\n-static void\n-ionic_adminq_cb(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 __rte_unused)\n-{\n-\tstruct ionic_admin_ctx *ctx = cb_arg;\n-\tstruct ionic_admin_comp *cq_desc_base = q->bound_cq->base;\n-\tstruct ionic_admin_comp *cq_desc = &cq_desc_base[cq_desc_index];\n-\tuint16_t comp_index;\n-\n-\tif (!ctx)\n-\t\treturn;\n-\n-\tcomp_index = rte_le_to_cpu_16(cq_desc->comp_index);\n-\tif (unlikely(comp_index != q_desc_index)) {\n-\t\tIONIC_WARN_ON(comp_index != q_desc_index);\n-\t\treturn;\n-\t}\n-\n-\tmemcpy(&ctx->comp, cq_desc, sizeof(*cq_desc));\n-\n-\tctx->pending_work = false; /* done */\n-}\n-\n-/** ionic_adminq_post - Post an admin command.\n- * @lif:\t\tHandle to lif.\n- * @cmd_ctx:\t\tApi admin command context.\n- *\n- * Post the command to an admin queue in the ethernet driver. If this command\n- * succeeds, then the command has been posted, but that does not indicate a\n- * completion. If this command returns success, then the completion callback\n- * will eventually be called.\n- *\n- * Return: zero or negative error status.\n- */\n-int\n-ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)\n-{\n-\tstruct ionic_queue *adminq = &lif->adminqcq->q;\n-\tstruct ionic_admin_cmd *q_desc_base = adminq->base;\n-\tstruct ionic_admin_cmd *q_desc;\n-\tint err = 0;\n-\n-\trte_spinlock_lock(&lif->adminq_lock);\n-\n-\tif (ionic_q_space_avail(adminq) < 1) {\n-\t\terr = -ENOSPC;\n-\t\tgoto err_out;\n-\t}\n-\n-\tq_desc = &q_desc_base[adminq->head_idx];\n-\n-\tmemcpy(q_desc, &ctx->cmd, sizeof(ctx->cmd));\n-\n-\tionic_q_post(adminq, true, ionic_adminq_cb, ctx);\n-\n-err_out:\n-\trte_spinlock_unlock(&lif->adminq_lock);\n-\n-\treturn err;\n-}\ndiff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h\nindex e1b93b1b05..5b258a9e65 100644\n--- a/drivers/net/ionic/ionic_dev.h\n+++ b/drivers/net/ionic/ionic_dev.h\n@@ -184,17 +184,6 @@ struct ionic_cq {\n \trte_iova_t base_pa;\n };\n \n-/** ionic_admin_ctx - Admin command context.\n- * @pending_work:\tFlag that indicates a completion.\n- * @cmd:\t\tAdmin command (64B) to be copied to the queue.\n- * @comp:\t\tAdmin completion (16B) copied from the queue.\n- */\n-struct ionic_admin_ctx {\n-\tbool pending_work;\n-\tunion ionic_adminq_cmd cmd;\n-\tunion ionic_adminq_comp comp;\n-};\n-\n struct ionic_lif;\n struct ionic_adapter;\n struct ionic_qcq;\n@@ -255,8 +244,6 @@ 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_service(struct ionic_queue *q, uint32_t cq_desc_index,\n-\tuint32_t stop_index, void *service_cb_arg);\n \n static inline uint32_t\n ionic_q_space_avail(struct ionic_queue *q)\n@@ -279,6 +266,4 @@ ionic_q_flush(struct ionic_queue *q)\n \trte_write64(rte_cpu_to_le_64(val), q->db);\n }\n \n-int ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx);\n-\n #endif /* _IONIC_DEV_H_ */\ndiff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c\nindex a9fe34c0f2..52bc0b178d 100644\n--- a/drivers/net/ionic/ionic_lif.c\n+++ b/drivers/net/ionic/ionic_lif.c\n@@ -1163,22 +1163,6 @@ ionic_lif_notifyq_deinit(struct ionic_lif *lif)\n \tnqcq->flags &= ~IONIC_QCQ_F_INITED;\n }\n \n-bool\n-ionic_adminq_service(struct ionic_cq *cq, uint32_t cq_desc_index,\n-\t\tvoid *cb_arg __rte_unused)\n-{\n-\tstruct ionic_admin_comp *cq_desc_base = cq->base;\n-\tstruct ionic_admin_comp *cq_desc = &cq_desc_base[cq_desc_index];\n-\tstruct ionic_qcq *qcq = IONIC_CQ_TO_QCQ(cq);\n-\n-\tif (!color_match(cq_desc->color, cq->done_color))\n-\t\treturn false;\n-\n-\tionic_q_service(&qcq->q, cq_desc_index, cq_desc->comp_index, NULL);\n-\n-\treturn true;\n-}\n-\n /* This acts like ionic_napi */\n int\n ionic_qcq_service(struct ionic_qcq *qcq, int budget, ionic_cq_cb cb,\ndiff --git a/drivers/net/ionic/ionic_lif.h b/drivers/net/ionic/ionic_lif.h\nindex 1a898a0ef9..c4cb7514fb 100644\n--- a/drivers/net/ionic/ionic_lif.h\n+++ b/drivers/net/ionic/ionic_lif.h\n@@ -154,8 +154,6 @@ void ionic_lif_reset(struct ionic_lif *lif);\n int ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr);\n void ionic_intr_free(struct ionic_lif *lif, struct ionic_intr_info *intr);\n \n-bool ionic_adminq_service(struct ionic_cq *cq, uint32_t cq_desc_index,\n-\tvoid *cb_arg);\n int ionic_qcq_service(struct ionic_qcq *qcq, int budget, ionic_cq_cb cb,\n \tvoid *cb_arg);\n \ndiff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c\nindex 3f1a764888..012103921d 100644\n--- a/drivers/net/ionic/ionic_main.c\n+++ b/drivers/net/ionic/ionic_main.c\n@@ -122,7 +122,7 @@ ionic_opcode_to_str(enum ionic_cmd_opcode opcode)\n \t}\n }\n \n-int\n+static int\n ionic_adminq_check_err(struct ionic_admin_ctx *ctx, bool timeout)\n {\n \tconst char *name;\n@@ -145,8 +145,81 @@ ionic_adminq_check_err(struct ionic_admin_ctx *ctx, bool timeout)\n \treturn 0;\n }\n \n+static bool\n+ionic_adminq_service(struct ionic_cq *cq, uint32_t cq_desc_index,\n+\t\tvoid *cb_arg __rte_unused)\n+{\n+\tstruct ionic_admin_comp *cq_desc_base = cq->base;\n+\tstruct ionic_admin_comp *cq_desc = &cq_desc_base[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+\n+\tif (!color_match(cq_desc->color, cq->done_color))\n+\t\treturn false;\n+\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+\n+\t\tctx = desc_info->cb_arg;\n+\t\tif (ctx) {\n+\t\t\tmemcpy(&ctx->comp, cq_desc, sizeof(*cq_desc));\n+\n+\t\t\tctx->pending_work = false; /* done */\n+\t\t}\n+\n+\t\tcurr_q_tail_idx = q->tail_idx;\n+\t\tq->tail_idx = (q->tail_idx + 1) & (q->num_descs - 1);\n+\t} while (curr_q_tail_idx != stop_index);\n+\n+\treturn true;\n+}\n+\n+/** ionic_adminq_post - Post an admin command.\n+ * @lif: Handle to lif.\n+ * @cmd_ctx: Api admin command context.\n+ *\n+ * Post the command to an admin queue in the ethernet driver. If this command\n+ * succeeds, then the command has been posted, but that does not indicate a\n+ * completion. If this command returns success, then the completion callback\n+ * will eventually be called.\n+ *\n+ * Return: zero or negative error status.\n+ */\n+static int\n+ionic_adminq_post(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)\n+{\n+\tstruct ionic_queue *q = &lif->adminqcq->q;\n+\tstruct ionic_admin_cmd *q_desc_base = q->base;\n+\tstruct ionic_admin_cmd *q_desc;\n+\tint err = 0;\n+\n+\trte_spinlock_lock(&lif->adminq_lock);\n+\n+\tif (ionic_q_space_avail(q) < 1) {\n+\t\terr = -ENOSPC;\n+\t\tgoto err_out;\n+\t}\n+\n+\tq_desc = &q_desc_base[q->head_idx];\n+\n+\tmemcpy(q_desc, &ctx->cmd, sizeof(ctx->cmd));\n+\n+\tionic_q_post(q, true, NULL, ctx);\n+\n+err_out:\n+\trte_spinlock_unlock(&lif->adminq_lock);\n+\n+\treturn err;\n+}\n+\n static int\n-ionic_wait_ctx_for_completion(struct ionic_lif *lif, struct ionic_qcq *qcq,\n+ionic_adminq_wait_for_completion(struct ionic_lif *lif,\n \t\tstruct ionic_admin_ctx *ctx, unsigned long max_wait)\n {\n \tunsigned long step_usec = IONIC_DEVCMD_CHECK_PERIOD_US;\n@@ -156,12 +229,13 @@ ionic_wait_ctx_for_completion(struct ionic_lif *lif, struct ionic_qcq *qcq,\n \n \twhile (ctx->pending_work && elapsed_usec < max_wait_usec) {\n \t\t/*\n-\t\t * Locking here as adminq is served inline (this could be called\n-\t\t * from multiple places)\n+\t\t * Locking here as adminq is served inline and could be\n+\t\t * called from multiple places\n \t\t */\n \t\trte_spinlock_lock(&lif->adminq_service_lock);\n \n-\t\tionic_qcq_service(qcq, budget, ionic_adminq_service, NULL);\n+\t\tionic_qcq_service(lif->adminqcq, budget,\n+\t\t\t\tionic_adminq_service, NULL);\n \n \t\trte_spinlock_unlock(&lif->adminq_service_lock);\n \n@@ -175,7 +249,6 @@ ionic_wait_ctx_for_completion(struct ionic_lif *lif, struct ionic_qcq *qcq,\n int\n ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)\n {\n-\tstruct ionic_qcq *qcq = lif->adminqcq;\n \tbool done;\n \tint err;\n \n@@ -189,7 +262,7 @@ ionic_adminq_post_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx)\n \t\treturn err;\n \t}\n \n-\tdone = ionic_wait_ctx_for_completion(lif, qcq, ctx,\n+\tdone = ionic_adminq_wait_for_completion(lif, ctx,\n \t\tIONIC_DEVCMD_TIMEOUT);\n \n \treturn ionic_adminq_check_err(ctx, !done /* timed out */);\ndiff --git a/drivers/net/ionic/ionic_rx_filter.c b/drivers/net/ionic/ionic_rx_filter.c\nindex 4310c91b94..bf57a9fa52 100644\n--- a/drivers/net/ionic/ionic_rx_filter.c\n+++ b/drivers/net/ionic/ionic_rx_filter.c\n@@ -7,6 +7,7 @@\n \n #include <rte_malloc.h>\n \n+#include \"ionic.h\"\n #include \"ionic_lif.h\"\n #include \"ionic_rx_filter.h\"\n \n", "prefixes": [ "v2", "03/15" ] }