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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 54112C433ED for ; Thu, 29 Apr 2021 18:49:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F647613B3 for ; Thu, 29 Apr 2021 18:49:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241128AbhD2SuC (ORCPT ); Thu, 29 Apr 2021 14:50:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241146AbhD2SuC (ORCPT ); Thu, 29 Apr 2021 14:50:02 -0400 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7007CC06138C for ; Thu, 29 Apr 2021 11:49:15 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id 35-20020a9d05260000b029029c82502d7bso30852295otw.2 for ; Thu, 29 Apr 2021 11:49:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hsqY5ElojN7QyWG9J/VNC2zRxRSymbF4BnhNplKOyUE=; b=apyfECOWl3zM+aFHksFf6KThLy79T9a3NOeVmEXnRCc9KG2uxL0WYeuCX0a7W+WLnF 7Iz6CMpjX9w3sPT5fAiexDderl8pUIa82x9Z+LHLYg309B07PHdp8SKFCiVDEnamtrrb CXKUN3iBkbN7RDItYPs2bdQyN60uMulT6gdANq2EZ/4Eb2JYEqrpufZVJ+naJVoy1I+s pUaFC2ChMreZVGJeujLgooRKzlV0yZWbFL+GnoWnjjwkEvm061fwa4j8CpurdRilel6M d0M7wzdruGPB6rPX0HtSr3Ql6399iF46d6cldYavz/JqpqWzDDsQH+Seyuegv4JAN6LF UH7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hsqY5ElojN7QyWG9J/VNC2zRxRSymbF4BnhNplKOyUE=; b=cQ0K8TtnWUdg/I3BIgHpDslWijajUHlgWE7cLVa3gsnHZpnb0ihAbpUH/l8GKR0UHA 5eC2YVbVBTeHjmuuczakyGpgUcWkjWI//eFaK1Mv0PWsMEwGvYxhalscOZyMLQCy1djf t4VU33NdQOcyEarkXTcvFnBx9+bwhgJsLHws4jtDyxVuOeJBjI75kBvXGHYEtZAiLa9z hRVF4GO74HsgRMzDhYRQediz4cvR+6wR5mapbPq+0eb+1Seyv+1S8SafnnBYlcz6pJ4v IZHTfyUrj1ifOXDVgYkodhmoyGzUzRA4h/3AySB6nd2gKpxEl5VpSKgfd2z/XqbXNL8p ADrA== X-Gm-Message-State: AOAM530rZMPXmVc1Z0Vr4jbweL10gb/MXqHd9DoBNUm8PwF2fbTTh2bd XEN2s/NXutlGq0oBJfOUVqQ= X-Google-Smtp-Source: ABdhPJyn+m73YB8e8SVeAMBpEu/Ck+xXqkzobH8UC8USTMlnroWukLbI5s5EE8C8cXmq17UhA1m01Q== X-Received: by 2002:a9d:4e05:: with SMTP id p5mr645989otf.264.1619722154913; Thu, 29 Apr 2021 11:49:14 -0700 (PDT) Received: from localhost (2603-8081-140c-1a00-a63d-9643-fc29-df2a.res6.spectrum.com. [2603:8081:140c:1a00:a63d:9643:fc29:df2a]) by smtp.gmail.com with ESMTPSA id r189sm196060oif.8.2021.04.29.11.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Apr 2021 11:49:14 -0700 (PDT) From: Bob Pearson X-Google-Original-From: Bob Pearson To: jgg@nvidia.com, zyjzyj2000@gmail.com, linux-rdma@vger.kernel.org Cc: Bob Pearson Subject: [PATCH for-next v6 06/10] RDMA/rxe: Move local ops to subroutine Date: Thu, 29 Apr 2021 13:48:51 -0500 Message-Id: <20210429184855.54939-7-rpearson@hpe.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210429184855.54939-1-rpearson@hpe.com> References: <20210429184855.54939-1-rpearson@hpe.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Simplify rxe_requester() by moving the local operations to a subroutine. Add an error return for illegal send WR opcode. Moved next_index ahead of rxe_run_task which fixed a small bug where work completions were delayed until after the next wqe which was not the intended behavior. Signed-off-by: Bob Pearson --- drivers/infiniband/sw/rxe/rxe_req.c | 89 +++++++++++++++++------------ 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c index 0d4dcd514c55..9163aac41848 100644 --- a/drivers/infiniband/sw/rxe/rxe_req.c +++ b/drivers/infiniband/sw/rxe/rxe_req.c @@ -555,6 +555,56 @@ static void update_state(struct rxe_qp *qp, struct rxe_send_wqe *wqe, jiffies + qp->qp_timeout_jiffies); } +static int rxe_do_local_ops(struct rxe_qp *qp, struct rxe_send_wqe *wqe) +{ + u8 opcode = wqe->wr.opcode; + struct rxe_dev *rxe; + struct rxe_mr *mr; + u32 rkey; + + switch (opcode) { + case IB_WR_LOCAL_INV: + rxe = to_rdev(qp->ibqp.device); + rkey = wqe->wr.ex.invalidate_rkey; + mr = rxe_pool_get_index(&rxe->mr_pool, rkey >> 8); + if (!mr) { + pr_err("No MR for rkey %#x\n", rkey); + wqe->state = wqe_state_error; + wqe->status = IB_WC_LOC_QP_OP_ERR; + return -EINVAL; + } + mr->state = RXE_MR_STATE_FREE; + rxe_drop_ref(mr); + break; + case IB_WR_REG_MR: + mr = to_rmr(wqe->wr.wr.reg.mr); + + rxe_add_ref(mr); + mr->state = RXE_MR_STATE_VALID; + mr->access = wqe->wr.wr.reg.access; + mr->ibmr.lkey = wqe->wr.wr.reg.key; + mr->ibmr.rkey = wqe->wr.wr.reg.key; + mr->iova = wqe->wr.wr.reg.mr->iova; + rxe_drop_ref(mr); + break; + default: + pr_err("Unexpected send wqe opcode %d\n", opcode); + wqe->state = wqe_state_error; + wqe->status = IB_WC_LOC_QP_OP_ERR; + return -EINVAL; + } + + wqe->state = wqe_state_done; + wqe->status = IB_WC_SUCCESS; + qp->req.wqe_index = next_index(qp->sq.queue, qp->req.wqe_index); + + if ((wqe->wr.send_flags & IB_SEND_SIGNALED) || + qp->sq_sig_type == IB_SIGNAL_ALL_WR) + rxe_run_task(&qp->comp.task, 1); + + return 0; +} + int rxe_requester(void *arg) { struct rxe_qp *qp = (struct rxe_qp *)arg; @@ -594,42 +644,11 @@ int rxe_requester(void *arg) goto exit; if (wqe->mask & WR_LOCAL_OP_MASK) { - if (wqe->wr.opcode == IB_WR_LOCAL_INV) { - struct rxe_dev *rxe = to_rdev(qp->ibqp.device); - struct rxe_mr *rmr; - - rmr = rxe_pool_get_index(&rxe->mr_pool, - wqe->wr.ex.invalidate_rkey >> 8); - if (!rmr) { - pr_err("No mr for key %#x\n", - wqe->wr.ex.invalidate_rkey); - wqe->state = wqe_state_error; - wqe->status = IB_WC_MW_BIND_ERR; - goto exit; - } - rmr->state = RXE_MR_STATE_FREE; - rxe_drop_ref(rmr); - wqe->state = wqe_state_done; - wqe->status = IB_WC_SUCCESS; - } else if (wqe->wr.opcode == IB_WR_REG_MR) { - struct rxe_mr *rmr = to_rmr(wqe->wr.wr.reg.mr); - - rmr->state = RXE_MR_STATE_VALID; - rmr->access = wqe->wr.wr.reg.access; - rmr->ibmr.lkey = wqe->wr.wr.reg.key; - rmr->ibmr.rkey = wqe->wr.wr.reg.key; - rmr->iova = wqe->wr.wr.reg.mr->iova; - wqe->state = wqe_state_done; - wqe->status = IB_WC_SUCCESS; - } else { + ret = rxe_do_local_ops(qp, wqe); + if (unlikely(ret)) goto exit; - } - if ((wqe->wr.send_flags & IB_SEND_SIGNALED) || - qp->sq_sig_type == IB_SIGNAL_ALL_WR) - rxe_run_task(&qp->comp.task, 1); - qp->req.wqe_index = next_index(qp->sq.queue, - qp->req.wqe_index); - goto next_wqe; + else + goto next_wqe; } if (unlikely(qp_type(qp) == IB_QPT_RC && -- 2.27.0