From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B882FC47087 for ; Fri, 28 May 2021 12:58:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8CE516139A for ; Fri, 28 May 2021 12:58:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234752AbhE1M7e (ORCPT ); Fri, 28 May 2021 08:59:34 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:33538 "EHLO smtp-out1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233583AbhE1M7d (ORCPT ); Fri, 28 May 2021 08:59:33 -0400 Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3AEBB218B3; Fri, 28 May 2021 12:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1622206678; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qWIpG8aVBYSRYisysyLBlhblP07vx5IzKFfoNpMhAvo=; b=Uhs5yr9clcUYbOvlg0nY4u2WYGMBYfgKuYRBovkRSKnGRyF84IRuLiTREq2FcSYXZwP/ri EWFGq8tOWisL4ibIFEpoS0kZSqpbp/7JHMjqZuOa+8kSmilNmIHi8/474w26o4l9z7MLbv sS/HfWOPxBQO6ELn0MdK12droB+ruQk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1622206678; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qWIpG8aVBYSRYisysyLBlhblP07vx5IzKFfoNpMhAvo=; b=IH3Nckgc0jUzKK8kCRZcprVuNjhaIKHwc7Z2nSFxreUhcJ2W0O1pnn8+g+6eurEh5FmoYc o5i34OZ72aOOwuAQ== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id EBDD111A98; Fri, 28 May 2021 12:57:57 +0000 (UTC) Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id iERnONXosGBPOAAALh3uQQ (envelope-from ); Fri, 28 May 2021 12:57:57 +0000 To: Shai Malin , netdev@vger.kernel.org, linux-nvme@lists.infradead.org, davem@davemloft.net, kuba@kernel.org, sagi@grimberg.me, hch@lst.de, axboe@fb.com, kbusch@kernel.org Cc: aelior@marvell.com, mkalderon@marvell.com, okulkarni@marvell.com, pkushwaha@marvell.com, malin1024@gmail.com References: <20210527235902.2185-1-smalin@marvell.com> <20210527235902.2185-23-smalin@marvell.com> From: Hannes Reinecke Organization: SUSE Linux GmbH Subject: Re: [RFC PATCH v6 22/27] qedn: Add IO level qedn_send_req and fw_cq workqueue Message-ID: <189ee11c-96fb-0fe0-9c55-e722af611f27@suse.de> Date: Fri, 28 May 2021 14:57:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210527235902.2185-23-smalin@marvell.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 5/28/21 1:58 AM, Shai Malin wrote: > This patch will present the IO level skeleton flows: > > - qedn_send_req(): process new requests, similar to nvme_tcp_queue_rq(). > > - qedn_fw_cq_fp_wq(): process new FW completions, the flow starts from > the IRQ handler and for a single interrupt it will > process all the pending NVMeoF Completions under > polling mode. > > Acked-by: Igor Russkikh > Signed-off-by: Prabhakar Kushwaha > Signed-off-by: Omkar Kulkarni > Signed-off-by: Michal Kalderon > Signed-off-by: Ariel Elior > Signed-off-by: Shai Malin > --- > drivers/nvme/hw/qedn/Makefile | 2 +- > drivers/nvme/hw/qedn/qedn.h | 15 +++++ > drivers/nvme/hw/qedn/qedn_conn.c | 2 + > drivers/nvme/hw/qedn/qedn_main.c | 107 +++++++++++++++++++++++++++++-- > drivers/nvme/hw/qedn/qedn_task.c | 90 ++++++++++++++++++++++++++ > 5 files changed, 208 insertions(+), 8 deletions(-) > create mode 100644 drivers/nvme/hw/qedn/qedn_task.c > > diff --git a/drivers/nvme/hw/qedn/Makefile b/drivers/nvme/hw/qedn/Makefile > index ece84772d317..888d466fa5ed 100644 > --- a/drivers/nvme/hw/qedn/Makefile > +++ b/drivers/nvme/hw/qedn/Makefile > @@ -1,4 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0 > > obj-$(CONFIG_NVME_QEDN) += qedn.o > -qedn-y := qedn_main.o qedn_conn.o > +qedn-y := qedn_main.o qedn_conn.o qedn_task.o > \ No newline at end of file > diff --git a/drivers/nvme/hw/qedn/qedn.h b/drivers/nvme/hw/qedn/qedn.h > index 6908409eb5b5..d56184f58840 100644 > --- a/drivers/nvme/hw/qedn/qedn.h > +++ b/drivers/nvme/hw/qedn/qedn.h > @@ -38,6 +38,8 @@ > #define QEDN_NON_ABORTIVE_TERMINATION 0 > #define QEDN_ABORTIVE_TERMINATION 1 > > +#define QEDN_FW_CQ_FP_WQ_WORKQUEUE "qedn_fw_cq_fp_wq" > + > /* > * TCP offload stack default configurations and defines. > * Future enhancements will allow controlling the configurable > @@ -90,6 +92,7 @@ struct qedn_fp_queue { > struct qedn_ctx *qedn; > struct qed_sb_info *sb_info; > unsigned int cpu; > + struct work_struct fw_cq_fp_wq_entry; > u16 sb_id; > char irqname[QEDN_IRQ_NAME_LEN]; > }; > @@ -118,6 +121,7 @@ struct qedn_ctx { > struct qedn_fp_queue *fp_q_arr; > struct nvmetcp_glbl_queue_entry *fw_cq_array_virt; > dma_addr_t fw_cq_array_phy; /* Physical address of fw_cq_array_virt */ > + struct workqueue_struct *fw_cq_fp_wq; > }; > > struct qedn_endpoint { > @@ -204,6 +208,13 @@ struct qedn_ctrl { > > /* Connection level struct */ > struct qedn_conn_ctx { > + /* IO path */ > + struct qedn_fp_queue *fp_q; > + /* mutex for queueing request */ > + struct mutex send_mutex; > + unsigned int cpu; > + int qid; > + > struct qedn_ctx *qedn; > struct nvme_tcp_ofld_queue *queue; > struct nvme_tcp_ofld_ctrl *ctrl; > @@ -263,5 +274,9 @@ int qedn_set_con_state(struct qedn_conn_ctx *conn_ctx, enum qedn_conn_state new_ > void qedn_terminate_connection(struct qedn_conn_ctx *conn_ctx); > void qedn_cleanp_fw(struct qedn_conn_ctx *conn_ctx); > __be16 qedn_get_in_port(struct sockaddr_storage *sa); > +inline int qedn_validate_cccid_in_range(struct qedn_conn_ctx *conn_ctx, u16 cccid); > +int qedn_queue_request(struct qedn_conn_ctx *qedn_conn, struct nvme_tcp_ofld_req *req); > +void qedn_nvme_req_fp_wq_handler(struct work_struct *work); > +void qedn_io_work_cq(struct qedn_ctx *qedn, struct nvmetcp_fw_cqe *cqe); > > #endif /* _QEDN_H_ */ > diff --git a/drivers/nvme/hw/qedn/qedn_conn.c b/drivers/nvme/hw/qedn/qedn_conn.c > index 150ee53b6095..049db20b69e8 100644 > --- a/drivers/nvme/hw/qedn/qedn_conn.c > +++ b/drivers/nvme/hw/qedn/qedn_conn.c > @@ -179,6 +179,7 @@ static void qedn_release_conn_ctx(struct qedn_conn_ctx *conn_ctx) > pr_err("Conn resources state isn't 0 as expected 0x%lx\n", > conn_ctx->resrc_state); > > + mutex_destroy(&conn_ctx->send_mutex); > atomic_inc(&conn_ctx->destroy_conn_indicator); > qedn_set_con_state(conn_ctx, CONN_STATE_DESTROY_COMPLETE); > wake_up_interruptible(&conn_ctx->conn_waitq); > @@ -407,6 +408,7 @@ static int qedn_prep_and_offload_queue(struct qedn_conn_ctx *conn_ctx) > } > > set_bit(QEDN_CONN_RESRC_FW_SQ, &conn_ctx->resrc_state); > + > rc = qed_ops->acquire_conn(qedn->cdev, > &conn_ctx->conn_handle, > &conn_ctx->fw_cid, > diff --git a/drivers/nvme/hw/qedn/qedn_main.c b/drivers/nvme/hw/qedn/qedn_main.c > index a2d0ae0c2c65..db8c27dd8876 100644 > --- a/drivers/nvme/hw/qedn/qedn_main.c > +++ b/drivers/nvme/hw/qedn/qedn_main.c > @@ -261,6 +261,18 @@ static int qedn_release_ctrl(struct nvme_tcp_ofld_ctrl *ctrl) > return 0; > } > > +static void qedn_set_ctrl_io_cpus(struct qedn_conn_ctx *conn_ctx, int qid) > +{ > + struct qedn_ctx *qedn = conn_ctx->qedn; > + struct qedn_fp_queue *fp_q = NULL; > + int index; > + > + index = qid ? (qid - 1) % qedn->num_fw_cqs : 0; > + fp_q = &qedn->fp_q_arr[index]; > + > + conn_ctx->cpu = fp_q->cpu; > +} > + why do you need this? Isn't the 'qid' here the block-layer hardware queue index? And if so, shouldn't you let interrupt affinity decide on which cpu the completion will be handled? > static int qedn_create_queue(struct nvme_tcp_ofld_queue *queue, int qid, > size_t queue_size) > { > @@ -288,6 +300,8 @@ static int qedn_create_queue(struct nvme_tcp_ofld_queue *queue, int qid, > conn_ctx->queue = queue; > conn_ctx->ctrl = ctrl; > conn_ctx->sq_depth = queue_size; > + mutex_init(&conn_ctx->send_mutex); > + qedn_set_ctrl_io_cpus(conn_ctx, qid); > > init_waitqueue_head(&conn_ctx->conn_waitq); > atomic_set(&conn_ctx->est_conn_indicator, 0); > @@ -295,6 +309,8 @@ static int qedn_create_queue(struct nvme_tcp_ofld_queue *queue, int qid, > > spin_lock_init(&conn_ctx->conn_state_lock); > > + conn_ctx->qid = qid; > + > qedn_initialize_endpoint(&conn_ctx->ep, qedn->local_mac_addr, ctrl); > > atomic_inc(&qctrl->host_num_active_conns); > @@ -384,11 +400,30 @@ static int qedn_poll_queue(struct nvme_tcp_ofld_queue *queue) > return 0; > } > > +int qedn_process_request(struct qedn_conn_ctx *qedn_conn, > + struct nvme_tcp_ofld_req *req) > +{ > + int rc = 0; > + > + mutex_lock(&qedn_conn->send_mutex); > + rc = qedn_queue_request(qedn_conn, req); > + mutex_unlock(&qedn_conn->send_mutex); > + > + return rc; > +} > + > static int qedn_send_req(struct nvme_tcp_ofld_req *req) > { > - /* Placeholder - qedn_send_req */ > + struct qedn_conn_ctx *qedn_conn = (struct qedn_conn_ctx *)req->queue->private_data; > + struct request *rq; > > - return 0; > + rq = blk_mq_rq_from_pdu(req); > + > + /* Under the assumption that the cccid/tag will be in the range of 0 to sq_depth-1. */ > + if (!req->async && qedn_validate_cccid_in_range(qedn_conn, rq->tag)) > + return BLK_STS_NOTSUPP; > + > + return qedn_process_request(qedn_conn, req); > } > Why? The tag number will never exceed the queue depth ... > static struct nvme_tcp_ofld_ops qedn_ofld_ops = { > @@ -428,9 +463,59 @@ struct qedn_conn_ctx *qedn_get_conn_hash(struct qedn_ctx *qedn, u16 icid) > } > > /* Fastpath IRQ handler */ > +void qedn_fw_cq_fp_handler(struct qedn_fp_queue *fp_q) > +{ > + u16 sb_id, cq_prod_idx, cq_cons_idx; > + struct qedn_ctx *qedn = fp_q->qedn; > + struct nvmetcp_fw_cqe *cqe = NULL; > + > + sb_id = fp_q->sb_id; > + qed_sb_update_sb_idx(fp_q->sb_info); > + > + /* rmb - to prevent missing new cqes */ > + rmb(); > + > + /* Read the latest cq_prod from the SB */ > + cq_prod_idx = *fp_q->cq_prod; > + cq_cons_idx = qed_chain_get_cons_idx(&fp_q->cq_chain); > + > + while (cq_cons_idx != cq_prod_idx) { > + cqe = qed_chain_consume(&fp_q->cq_chain); > + if (likely(cqe)) > + qedn_io_work_cq(qedn, cqe); > + else > + pr_err("Failed consuming cqe\n"); > + > + cq_cons_idx = qed_chain_get_cons_idx(&fp_q->cq_chain); > + > + /* Check if new completions were posted */ > + if (unlikely(cq_prod_idx == cq_cons_idx)) { > + /* rmb - to prevent missing new cqes */ > + rmb(); > + > + /* Update the latest cq_prod from the SB */ > + cq_prod_idx = *fp_q->cq_prod; > + } > + } > +} > + > +static void qedn_fw_cq_fq_wq_handler(struct work_struct *work) > +{ > + struct qedn_fp_queue *fp_q = container_of(work, struct qedn_fp_queue, fw_cq_fp_wq_entry); > + > + qedn_fw_cq_fp_handler(fp_q); > + qed_sb_ack(fp_q->sb_info, IGU_INT_ENABLE, 1); > +} > + > static irqreturn_t qedn_irq_handler(int irq, void *dev_id) > { > - /* Placeholder */ > + struct qedn_fp_queue *fp_q = dev_id; > + struct qedn_ctx *qedn = fp_q->qedn; > + > + fp_q->cpu = smp_processor_id(); > + > + qed_sb_ack(fp_q->sb_info, IGU_INT_DISABLE, 0); > + queue_work_on(fp_q->cpu, qedn->fw_cq_fp_wq, &fp_q->fw_cq_fp_wq_entry); > > return IRQ_HANDLED; > } > @@ -564,6 +649,8 @@ static void qedn_free_function_queues(struct qedn_ctx *qedn) > int i; > > /* Free workqueues */ > + destroy_workqueue(qedn->fw_cq_fp_wq); > + qedn->fw_cq_fp_wq = NULL; > > /* Free the fast path queues*/ > for (i = 0; i < qedn->num_fw_cqs; i++) { > @@ -631,7 +718,14 @@ static int qedn_alloc_function_queues(struct qedn_ctx *qedn) > u64 cq_phy_addr; > int i; > > - /* Place holder - IO-path workqueues */ > + qedn->fw_cq_fp_wq = alloc_workqueue(QEDN_FW_CQ_FP_WQ_WORKQUEUE, > + WQ_HIGHPRI | WQ_MEM_RECLAIM, 0); > + if (!qedn->fw_cq_fp_wq) { > + rc = -ENODEV; > + pr_err("Unable to create fastpath FW CQ workqueue!\n"); > + > + return rc; > + } > > qedn->fp_q_arr = kcalloc(qedn->num_fw_cqs, > sizeof(struct qedn_fp_queue), GFP_KERNEL); > @@ -659,7 +753,7 @@ static int qedn_alloc_function_queues(struct qedn_ctx *qedn) > chain_params.mode = QED_CHAIN_MODE_PBL, > chain_params.cnt_type = QED_CHAIN_CNT_TYPE_U16, > chain_params.num_elems = QEDN_FW_CQ_SIZE; > - chain_params.elem_size = 64; /*Placeholder - sizeof(struct nvmetcp_fw_cqe)*/ > + chain_params.elem_size = sizeof(struct nvmetcp_fw_cqe); > > rc = qed_ops->common->chain_alloc(qedn->cdev, > &fp_q->cq_chain, > @@ -688,8 +782,7 @@ static int qedn_alloc_function_queues(struct qedn_ctx *qedn) > sb = fp_q->sb_info->sb_virt; > fp_q->cq_prod = (u16 *)&sb->pi_array[QEDN_PROTO_CQ_PROD_IDX]; > fp_q->qedn = qedn; > - > - /* Placeholder - Init IO-path workqueue */ > + INIT_WORK(&fp_q->fw_cq_fp_wq_entry, qedn_fw_cq_fq_wq_handler); > > /* Placeholder - Init IO-path resources */ > } > diff --git a/drivers/nvme/hw/qedn/qedn_task.c b/drivers/nvme/hw/qedn/qedn_task.c > new file mode 100644 > index 000000000000..ea6745b94817 > --- /dev/null > +++ b/drivers/nvme/hw/qedn/qedn_task.c > @@ -0,0 +1,90 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright 2021 Marvell. All rights reserved. > + */ > + > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > + > + /* Kernel includes */ > +#include > + > +/* Driver includes */ > +#include "qedn.h" > + > +inline int qedn_validate_cccid_in_range(struct qedn_conn_ctx *conn_ctx, u16 cccid) > +{ > + int rc = 0; > + > + if (unlikely(cccid >= conn_ctx->sq_depth)) { > + pr_err("cccid 0x%x out of range ( > sq depth)\n", cccid); > + rc = -EINVAL; > + } > + > + return rc; > +} > + > +int qedn_queue_request(struct qedn_conn_ctx *qedn_conn, struct nvme_tcp_ofld_req *req) > +{ > + /* Process the request */ > + > + return 0; > +} > + > +struct qedn_task_ctx *qedn_cqe_get_active_task(struct nvmetcp_fw_cqe *cqe) > +{ > + struct regpair *p = &cqe->task_opaque; > + > + return (struct qedn_task_ctx *)((((u64)(le32_to_cpu(p->hi)) << 32) > + + le32_to_cpu(p->lo))); > +} > + > +void qedn_io_work_cq(struct qedn_ctx *qedn, struct nvmetcp_fw_cqe *cqe) > +{ > + struct qedn_task_ctx *qedn_task = NULL; > + struct qedn_conn_ctx *conn_ctx = NULL; > + u16 itid; > + u32 cid; > + > + conn_ctx = qedn_get_conn_hash(qedn, le16_to_cpu(cqe->conn_id)); > + if (unlikely(!conn_ctx)) { > + pr_err("CID 0x%x: Failed to fetch conn_ctx from hash\n", > + le16_to_cpu(cqe->conn_id)); > + > + return; > + } > + > + cid = conn_ctx->fw_cid; > + itid = le16_to_cpu(cqe->itid); > + qedn_task = qedn_cqe_get_active_task(cqe); > + if (unlikely(!qedn_task)) > + return; > + > + if (likely(cqe->cqe_type == NVMETCP_FW_CQE_TYPE_NORMAL)) { > + /* Placeholder - verify the connection was established */ > + > + switch (cqe->task_type) { > + case NVMETCP_TASK_TYPE_HOST_WRITE: > + case NVMETCP_TASK_TYPE_HOST_READ: > + > + /* Placeholder - IO flow */ > + > + break; > + > + case NVMETCP_TASK_TYPE_HOST_READ_NO_CQE: > + > + /* Placeholder - IO flow */ > + > + break; > + > + case NVMETCP_TASK_TYPE_INIT_CONN_REQUEST: > + > + /* Placeholder - ICReq flow */ > + > + break; > + default: > + pr_info("Could not identify task type\n"); > + } > + } else { > + /* Placeholder - Recovery flows */ > + } > +} > Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions Germany GmbH, 90409 Nürnberg GF: F. Imendörffer, HRB 36809 (AG Nürnberg)