From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B021041834D; Sat, 10 Oct 2026 06:54:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791615288; cv=none; b=o5QDp6pU4grdP0+QrL62ZngPDpNH0WavHI2tA7CCVnp5gVE1UZMoZ+O9Y9FmjD1ZJNHmqBiegmqvallCymIBWHKFJshyo5f9FphnD6g1RmC+/qwRvbha+8oK6G02GeGpz+WcGPa/76CiTgjIEgeZd97AchVRIo0cAS7T//4soMM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791615288; c=relaxed/simple; bh=8eAKSR8uoa2qvNQKY6PXNHVSk6jBrzGtU1C0QgG5huw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pJ5s1gnNI22u5/ifP1YX6Srp0GnqR/Ba24cLfputo/NrH9posxedqQAIfPasvqQRIL5yA+mRoVBEPSUwkcAIFzjhoz+pwJ7W7jg9aVLvGcoNDPI5FqOpauF38/adQdzIC+bcZm68E8DQu8H7UB5bNMCIdeY+/3XQV0RmNn/7eeE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=R7wpAUQT; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="R7wpAUQT" Received: by linux.microsoft.com (Postfix, from userid 1186) id 2E01E20B7171; Fri, 9 Oct 2026 23:54:43 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2E01E20B7171 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1791615284; bh=zQJckXSx2B/R1Mj4Oqq4h8fv4ke2Yyk9rGNZLkVhO0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R7wpAUQTdCzhy6FGXsNgeANcFBashhFmFka2TtqQyP9xBetwQkfILj2OBRV1o8F0h vt/e6WP3/7Qp+mUIJPp+dSOLHX1Duy8n++bNWQN+miRDeEpBX7shoTf2sPO0lPF4yH kR8lHIs4ICtd4nYNdicPlzZVjmxKytDcK6u13/sw= From: Konstantin Taranov To: kotaranov@microsoft.com, snsanghvi@microsoft.com, longli@microsoft.com, jgg@ziepe.ca, leon@kernel.org Cc: linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH rdma-next v4 10/10] RDMA/mana_ib: Drain kernel receive and send queues Date: Fri, 9 Oct 2026 23:54:43 -0700 Message-ID: <20261010065443.3554193-11-kotaranov@linux.microsoft.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20261010065443.3554193-1-kotaranov@linux.microsoft.com> References: <20261010065443.3554193-1-kotaranov@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Konstantin Taranov Implement the core drain callbacks by moving the QP to ERR, posting a completion-bearing marker, and waiting until that marker is flushed. Signed-off-by: Konstantin Taranov --- v2: - Limit the drain callbacks to RC QPs. - Skip completion callbacks for IB_POLL_DIRECT and retain direct polling. drivers/infiniband/hw/mana/device.c | 2 + drivers/infiniband/hw/mana/mana_ib.h | 2 + drivers/infiniband/hw/mana/qp.c | 103 +++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/drivers/infiniband/hw/mana/device.c b/drivers/infiniband/hw/mana/device.c index cdaada7f6e8a..07c7fe678ff7 100644 --- a/drivers/infiniband/hw/mana/device.c +++ b/drivers/infiniband/hw/mana/device.c @@ -38,6 +38,8 @@ static const struct ib_device_ops mana_ib_dev_ops = { .destroy_rwq_ind_table = mana_ib_destroy_rwq_ind_table, .destroy_wq = mana_ib_destroy_wq, .disassociate_ucontext = mana_ib_disassociate_ucontext, + .drain_rq = mana_ib_drain_rq, + .drain_sq = mana_ib_drain_sq, .get_dma_mr = mana_ib_get_dma_mr, .get_link_layer = mana_ib_get_link_layer, .get_port_immutable = mana_ib_get_port_immutable, diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h index 2fbb1c662d93..97cd5193fcb5 100644 --- a/drivers/infiniband/hw/mana/mana_ib.h +++ b/drivers/infiniband/hw/mana/mana_ib.h @@ -1061,6 +1061,8 @@ int mana_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr, int mana_ib_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr, const struct ib_send_wr **bad_wr); +void mana_ib_drain_sq(struct ib_qp *ibqp); +void mana_ib_drain_rq(struct ib_qp *ibqp); void mana_drain_gsi_sqs(struct mana_ib_dev *mdev); int mana_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc); int mana_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags); diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c index 3158d41db709..23ae87212ad8 100644 --- a/drivers/infiniband/hw/mana/qp.c +++ b/drivers/infiniband/hw/mana/qp.c @@ -1338,3 +1338,106 @@ int mana_ib_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) return -ENOENT; } + +struct mana_ib_drain_cqe { + struct ib_cqe cqe; + struct completion done; +}; + +static void mana_ib_drain_qp_done(struct ib_cq *cq, struct ib_wc *wc) +{ + struct mana_ib_drain_cqe *cqe = container_of(wc->wr_cqe, + struct mana_ib_drain_cqe, + cqe); + complete(&cqe->done); +} + +void mana_ib_drain_sq(struct ib_qp *ibqp) +{ + struct ib_qp_attr attr = { .qp_state = IB_QPS_ERR }; + struct mana_ib_drain_cqe sdrain; + struct ib_rdma_wr swr = { + .wr = { + .next = NULL, + .wr_cqe = &sdrain.cqe, + .opcode = IB_WR_SEND, + }, + }; + const struct ib_send_wr *bad_swr; + struct ib_cq *cq = ibqp->send_cq; + int ret; + + if (ibqp->qp_type != IB_QPT_RC) { + ibdev_err(ibqp->device, "SQ drain is only supported for RC QPs (type %u)\n", + ibqp->qp_type); + return; + } + + ret = ib_modify_qp(ibqp, &attr, IB_QP_STATE); + if (ret) { + ibdev_err(ibqp->device, "Failed to drain SQ: modify QP returned %d\n", ret); + return; + } + + sdrain.cqe.done = mana_ib_drain_qp_done; + init_completion(&sdrain.done); + + ret = ib_post_send(ibqp, &swr.wr, &bad_swr); + if (ret) { + ibdev_err(ibqp->device, "Failed to post SQ drain WR: %d\n", ret); + return; + } + + if (cq->poll_ctx != IB_POLL_DIRECT && cq->comp_handler) + cq->comp_handler(cq, cq->cq_context); + + if (cq->poll_ctx == IB_POLL_DIRECT) { + while (!wait_for_completion_timeout(&sdrain.done, HZ / 10)) + ib_process_cq_direct(cq, -1); + } else { + wait_for_completion(&sdrain.done); + } +} + +void mana_ib_drain_rq(struct ib_qp *ibqp) +{ + struct ib_qp_attr attr = { .qp_state = IB_QPS_ERR }; + struct mana_ib_drain_cqe rdrain; + struct ib_recv_wr rwr = { + .next = NULL, + .wr_cqe = &rdrain.cqe, + }; + struct ib_cq *cq = ibqp->recv_cq; + int ret; + + if (ibqp->qp_type != IB_QPT_RC) { + ibdev_err(ibqp->device, "RQ drain is only supported for RC QPs (type %u)\n", + ibqp->qp_type); + return; + } + + ret = ib_modify_qp(ibqp, &attr, IB_QP_STATE); + if (ret) { + ibdev_err(ibqp->device, "Failed to drain RQ: modify QP returned %d\n", ret); + return; + } + + rdrain.cqe.done = mana_ib_drain_qp_done; + init_completion(&rdrain.done); + + ret = ib_post_recv(ibqp, &rwr, NULL); + if (ret) { + ibdev_err(ibqp->device, "Failed to post RQ drain WR: %d\n", ret); + return; + } + + if (cq->poll_ctx != IB_POLL_DIRECT && cq->comp_handler) + cq->comp_handler(cq, cq->cq_context); + + if (cq->poll_ctx == IB_POLL_DIRECT) { + while (!wait_for_completion_timeout(&rdrain.done, HZ / 10)) + ib_process_cq_direct(cq, -1); + } else { + wait_for_completion(&rdrain.done); + } +} -- 2.43.0