Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2760149rdb; Mon, 4 Dec 2023 06:57:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IF9AQzEedmuHOWWIbIWZvmABln5VxKWOO0uqn2278rl00tuSMQ42VSr8eXuymhfJrnyDekn X-Received: by 2002:a17:902:e804:b0:1d0:9e59:35e2 with SMTP id u4-20020a170902e80400b001d09e5935e2mr2356624plg.123.1701701825289; Mon, 04 Dec 2023 06:57:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701701825; cv=none; d=google.com; s=arc-20160816; b=KAX+nSNVR++pc0g76TckuZD0lLAAYZidlJG2CFMeOWqo1i1hl3Vru7Yvmy5YpL+yts fqvPaOOe+DMo+UgnOMcCrvQiBaEnLaPSxPyFexoxw8wV2RjZYfchhV+TrdDiubyyAj58 GItiLKxpP7gN6yALSr5fPO33GyjZt6Cgvsq4PNaMbLIgQM48XpIJJy6eszbqxJxhTvn8 03ELPSy+Ytnn0W8TrUojNadTnIRBWnfA3ZSWhPAq3rxkEQhtJvo3B7d2Ft1rRUigVbAo A3qamLyv4FB01dd5GpFublA0wiAc0uyAI1E5Swm4bSwdSnrwcZUUWmA0g17KBjwuxwbi ofCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:user-agent:references:in-reply-to :message-id:date:cc:to:from:subject:dkim-signature; bh=hXSHO1UFoV2mebL0kP9nk0bPQ5saD+6/+I6kZhjKqt4=; fh=WfGVbliYpqgzl5GprTVUBQR8rnRPHqjfX8LKlqDYYGk=; b=GvbCVLR/JgU8cbDBUdIGw3cVYaGNVqO2rIZGIOzSSzs11yk+7aL/BpdnD1NNjjemcW gGPlBH5dDiGZIXZX5hu2hFqEqfgnTGkPQsxZc2BkDpb31KOVbUjk0Zve46vH6BzZfvis fdcpvDFsxcDtDcHM/KzUZAQJntkwVa7WSxkBJ5FRh7H/sCYzBfeqzClczbCUKKipWXeu p0WAPL9vCUYVQeYMseV+b+R5t2Ms6JHxW7JqPOWrBfxY3T8eXaWjiIyjYv1xMECHK1dw jChNI88LTaqNM/olziyB729VUx8lYEqghh8qZ3RS4hpqXIPNebxFMHCp18ltp5FI0+Tf vIyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fD5ZkKs2; spf=pass (google.com: domain of linux-nfs+bounces-281-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-nfs+bounces-281-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id x17-20020a1709027c1100b001d0b0447a6bsi1245182pll.324.2023.12.04.06.57.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 06:57:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs+bounces-281-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fD5ZkKs2; spf=pass (google.com: domain of linux-nfs+bounces-281-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-nfs+bounces-281-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 27221B209AB for ; Mon, 4 Dec 2023 14:57:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D64E228DD8; Mon, 4 Dec 2023 14:56:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fD5ZkKs2" X-Original-To: linux-nfs@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B696628DB6; Mon, 4 Dec 2023 14:56:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0A7EC433C8; Mon, 4 Dec 2023 14:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701701818; bh=fHIjcO5K+bWRNVdkbSUDNozsj/t7D5bxIXHwZHgZTic=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=fD5ZkKs2ZNB8A6YBl7XQ8lJcL1oNFYsG7DWCVfjHF74NEFIxfGrMnFAobkjfumFTW +HNnphtHGByquyESlPPyTlwgv1Ba6yg9RD45oo6Mgw5HliZ+MDM0iJQZyqrR4WYbNK ++YwKCl1iRH1lw10PG0mr7FjjLEO4T8XL9dDZ/KdtVkIep/dS36dhTvp79h8VQVnIx 3oM+9y+HEgq5ULbUMgvF9k91u5nqUhOBpBRyWld4hHFs3lP1UzuYIl016iFX5ucVqb ceetesvXs7rQThGZr2+UVX+mFDsP9vcLT63kW0CrXkP/+uk5kISDnPCt5tCaR7yqrn 1ZH5zSFO5v0WA== Subject: [PATCH v1 06/21] svcrdma: Pass a pointer to the transport to svc_rdma_cc_release() From: Chuck Lever To: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org Cc: tom@talpey.com Date: Mon, 04 Dec 2023 09:56:57 -0500 Message-ID: <170170181700.54779.12821389893583498120.stgit@bazille.1015granger.net> In-Reply-To: <170170144201.54779.9877683240030806819.stgit@bazille.1015granger.net> References: <170170144201.54779.9877683240030806819.stgit@bazille.1015granger.net> User-Agent: StGit/1.5 Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit From: Chuck Lever Enable the eventual removal of the svc_rdma_chunk_ctxt::cc_rdma field. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_rw.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_rw.c b/net/sunrpc/xprtrdma/svc_rdma_rw.c index c0b64a79197e..7676b9df024b 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_rw.c +++ b/net/sunrpc/xprtrdma/svc_rdma_rw.c @@ -187,10 +187,10 @@ static void svc_rdma_cc_init(struct svcxprt_rdma *rdma, * that only one atomic llist operation is needed to put them all * back on the free list. */ -static void svc_rdma_cc_release(struct svc_rdma_chunk_ctxt *cc, +static void svc_rdma_cc_release(struct svcxprt_rdma *rdma, + struct svc_rdma_chunk_ctxt *cc, enum dma_data_direction dir) { - struct svcxprt_rdma *rdma = cc->cc_rdma; struct llist_node *first, *last; struct svc_rdma_rw_ctxt *ctxt; LLIST_HEAD(free); @@ -262,7 +262,7 @@ static void svc_rdma_write_info_free_async(struct work_struct *work) struct svc_rdma_write_info *info; info = container_of(work, struct svc_rdma_write_info, wi_work); - svc_rdma_cc_release(&info->wi_cc, DMA_TO_DEVICE); + svc_rdma_cc_release(info->wi_rdma, &info->wi_cc, DMA_TO_DEVICE); kfree(info); } @@ -334,9 +334,10 @@ svc_rdma_read_info_alloc(struct svcxprt_rdma *rdma) return info; } -static void svc_rdma_read_info_free(struct svc_rdma_read_info *info) +static void svc_rdma_read_info_free(struct svcxprt_rdma *rdma, + struct svc_rdma_read_info *info) { - svc_rdma_cc_release(&info->ri_cc, DMA_FROM_DEVICE); + svc_rdma_cc_release(rdma, &info->ri_cc, DMA_FROM_DEVICE); kfree(info); } @@ -1197,6 +1198,6 @@ int svc_rdma_process_read_list(struct svcxprt_rdma *rdma, head->rc_page_count = 0; out_err: - svc_rdma_read_info_free(info); + svc_rdma_read_info_free(rdma, info); return ret; }