From patchwork Mon Jan 22 23:23:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Taranov X-Patchwork-Id: 190445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp13366dyi; Mon, 22 Jan 2024 15:23:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IH3Tq1ZV3JR9DlhItLLTSJMwKEFDQJYpaEbgXG0h8psUq1DhaL/CFP0zYgclELTHbeZ+bmM X-Received: by 2002:aa7:d756:0:b0:55a:5b68:aa3b with SMTP id a22-20020aa7d756000000b0055a5b68aa3bmr342010eds.14.1705965834168; Mon, 22 Jan 2024 15:23:54 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705965834; cv=pass; d=google.com; s=arc-20160816; b=dF1iAu3dNmjd/DtFzSMno7CE6abQyLBalbZtkaI6qgm6NQGIElSIH/7kXRrh7ClJvt zG1xpyTeUJHPcX+vUGMoYB1h+rS78gxOrFCPsrEnqtNLlUYn75P1q8wygnBKdHlRC09A 7V7dhfu2tREdLYLEC0K1wue1HoElmT2uAGkpdVb03qZDSy9wMQiWavIMk+DKIaWVJdtM X/S6x/ig2d5RerKG1wOuK9Wfc/lBOVFqHRP8PiNno2lRV4Ix8ohfEwyuYLcwfVQeZItT 5gPS6Ja9Dxyb0beu+zhcUH061LfmJb3ULlK6csV+kXAdLi6JCpZ9xjaRt+BezUipXapF G7kQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :dkim-filter; bh=ydnT8gvdi2bZa/bNOPVGXK22E60tOprDMH+lbzR3qq4=; fh=ujksmUrBEjpGhQjWbrjZMx9PDXUXbYR/j4y8MAq1x1o=; b=c0PbLavEzSQgdcc9ggT9e1LGweIabLvRHGenryrRactgGm0tzvbSkIxRvT7cN2sp6b JhU1dn+z+tkMlp+teQ6RtFUUk2ca5Uqt4L9TONOG1GTRYjjNvs9Gd2UtVw8zRsuyu9n7 VM5kDr6/99MtJKkTzIoOPEa7zAu1U/twqZPRPLLHqL4M6lK/Bgk7W5wihoOmpk1HYGkM 7r+QvhmihRyJgXn15PsikY1oXse9H2unfdUnwEdQwwzXv131s+yv9zM4sp5qU9FLz5UC sDUJHS4DBvK7qBPf4tHEAXNLwPvr3nKDnL/o1dvlertTd/3pHrGGqU9XHTos9r3DV6iR JQpA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=kxWpsLhs; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-34291-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34291-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id fg12-20020a056402548c00b0055c53a15ac9si993899edb.688.2024.01.22.15.23.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 15:23:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-34291-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=kxWpsLhs; arc=pass (i=1 spf=pass spfdomain=linux.microsoft.com dkim=pass dkdomain=linux.microsoft.com dmarc=pass fromdomain=linux.microsoft.com); spf=pass (google.com: domain of linux-kernel+bounces-34291-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-34291-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 947911F25653 for ; Mon, 22 Jan 2024 23:23:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 40A684E1CC; Mon, 22 Jan 2024 23:23:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="kxWpsLhs" Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2AAF04CE10; Mon, 22 Jan 2024 23:23:11 +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=1705965792; cv=none; b=f4JKg9ag0QaIKjXje3XJdoTSKZ6AdQSch2r7JOMN2h/5R5LofGJBSyonV2sI1eQ+5zZ//BhqmtoEAps4FtdA0o3bAaqJNH2UXBWViIx233zy/dHZ857DLUNwcNFalXI3eUIbzEgnmHFAGY2B0ob/iEAEepFlZf6C8GNaCdVYAGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705965792; c=relaxed/simple; bh=L88DAoiSBHD76fYpHeFcca7Y2t8+GzrNgBX+SAW6wuo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=eIEzFsOkGftRlgJDqlfpSJn6pwrWunElmigQkQ6UhvORYUXzeTqml7eqHeUQqwWTNj7yHoCjt0QHfRWf+lD9fm9xcreXp+L0yOOL4wMet7clnGCza/PmF1JfQBvQ5I4WExhA4/ulm1VoIQqUj1zs8s4vyt1e316NgGtFIwdZDvg= 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=kxWpsLhs; 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 Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id BBBF520E2C32; Mon, 22 Jan 2024 15:23:10 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BBBF520E2C32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1705965790; bh=ydnT8gvdi2bZa/bNOPVGXK22E60tOprDMH+lbzR3qq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kxWpsLhsUJjqXLIoISQt0Clo/JrVGKqLeYJqwOKpEgq4GTjt+7F7IsIrRZzkb0hy4 OIa+LVNXoD5vaNl8FG67WoWvzGHOFMpxJnnhmhGEk/9jPeJ+X2Gaa9655Xdj7+afbT h8PIIIdnU6xQmcOi2J7RHhh4qM4T8LUXrlpNxWoo= From: Konstantin Taranov To: kotaranov@microsoft.com, sharmaajay@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 v1 3/3] RDMA/mana_ib: introduce mana_ib_install_cq_cb helper function Date: Mon, 22 Jan 2024 15:23:01 -0800 Message-Id: <1705965781-3235-4-git-send-email-kotaranov@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1705965781-3235-1-git-send-email-kotaranov@linux.microsoft.com> References: <1705965781-3235-1-git-send-email-kotaranov@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788834830239493972 X-GMAIL-MSGID: 1788834830239493972 From: Konstantin Taranov Use a helper function to install callbacks to CQs. This patch removes code repetition. Signed-off-by: Konstantin Taranov --- drivers/infiniband/hw/mana/cq.c | 21 ++++++++++++++++++++- drivers/infiniband/hw/mana/mana_ib.h | 4 ++-- drivers/infiniband/hw/mana/qp.c | 28 +++++----------------------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c index 3369e7b665f9..83d20c3f048d 100644 --- a/drivers/infiniband/hw/mana/cq.c +++ b/drivers/infiniband/hw/mana/cq.c @@ -100,10 +100,29 @@ int mana_ib_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata) return 0; } -void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq) +static void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq) { struct mana_ib_cq *cq = ctx; if (cq->ibcq.comp_handler) cq->ibcq.comp_handler(&cq->ibcq, cq->ibcq.cq_context); } + +int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq) +{ + struct gdma_context *gc = mdev_to_gc(mdev); + struct gdma_queue *gdma_cq; + + /* Create CQ table entry */ + WARN_ON(gc->cq_table[cq->id]); + gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL); + if (!gdma_cq) + return -ENOMEM; + + gdma_cq->cq.context = cq; + gdma_cq->type = GDMA_CQ; + gdma_cq->cq.callback = mana_ib_cq_handler; + gdma_cq->id = cq->id; + gc->cq_table[cq->id] = gdma_cq; + return 0; +} diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h index d373639e25d4..6a03ae645c01 100644 --- a/drivers/infiniband/hw/mana/mana_ib.h +++ b/drivers/infiniband/hw/mana/mana_ib.h @@ -158,6 +158,8 @@ static inline struct net_device *mana_ib_get_netdev(struct ib_device *ibdev, u32 return mc->ports[port - 1]; } +int mana_ib_install_cq_cb(struct mana_ib_dev *mdev, struct mana_ib_cq *cq); + int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, mana_handle_t *gdma_region); @@ -226,6 +228,4 @@ int mana_ib_query_gid(struct ib_device *ibdev, u32 port, int index, void mana_ib_disassociate_ucontext(struct ib_ucontext *ibcontext); int mana_ib_gd_query_adapter_caps(struct mana_ib_dev *mdev); - -void mana_ib_cq_handler(void *ctx, struct gdma_queue *gdma_cq); #endif diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c index f5427599e033..5d4c05dcd003 100644 --- a/drivers/infiniband/hw/mana/qp.c +++ b/drivers/infiniband/hw/mana/qp.c @@ -104,7 +104,6 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd, struct gdma_queue **gdma_cq_allocated; mana_handle_t *mana_ind_table; struct mana_port_context *mpc; - struct gdma_queue *gdma_cq; unsigned int ind_tbl_size; struct net_device *ndev; struct mana_ib_cq *cq; @@ -229,19 +228,11 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd, mana_ind_table[i] = wq->rx_object; /* Create CQ table entry */ - WARN_ON(gc->cq_table[cq->id]); - gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL); - if (!gdma_cq) { - ret = -ENOMEM; + ret = mana_ib_install_cq_cb(mdev, cq); + if (ret) goto fail; - } - gdma_cq_allocated[i] = gdma_cq; - gdma_cq->cq.context = cq; - gdma_cq->type = GDMA_CQ; - gdma_cq->cq.callback = mana_ib_cq_handler; - gdma_cq->id = cq->id; - gc->cq_table[cq->id] = gdma_cq; + gdma_cq_allocated[i] = gc->cq_table[cq->id]; } resp.num_entries = i; @@ -407,18 +398,9 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd, send_cq->id = cq_spec.queue_index; /* Create CQ table entry */ - WARN_ON(gc->cq_table[send_cq->id]); - gdma_cq = kzalloc(sizeof(*gdma_cq), GFP_KERNEL); - if (!gdma_cq) { - err = -ENOMEM; + err = mana_ib_install_cq_cb(mdev, send_cq); + if (err) goto err_destroy_wq_obj; - } - - gdma_cq->cq.context = send_cq; - gdma_cq->type = GDMA_CQ; - gdma_cq->cq.callback = mana_ib_cq_handler; - gdma_cq->id = send_cq->id; - gc->cq_table[send_cq->id] = gdma_cq; ibdev_dbg(&mdev->ib_dev, "ret %d qp->tx_object 0x%llx sq id %llu cq id %llu\n", err,