Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp4043876rdb; Mon, 11 Dec 2023 07:24:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBcBZe5ppbz6LcLKq1cdFeXYS7k6DfEI9lFJYgoM1IXN7IxLZi4yUmw+MzSJJafcYR/d7r X-Received: by 2002:a9d:62d6:0:b0:6d9:d732:620d with SMTP id z22-20020a9d62d6000000b006d9d732620dmr4340529otk.14.1702308283633; Mon, 11 Dec 2023 07:24:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702308283; cv=none; d=google.com; s=arc-20160816; b=fvl09EVTjhY4p5h6hTuzwgutJnOl04yVKY0nT+99wz0JZDu521bG1iV5CLOlmMzoxx PErsfOMzqprnYr1rfljXoKCzsAnky6rVslru2n/eXjTM7WgGgaWaoM8gCs5Ohu6/PhR5 wdkuQczqk0OePlk0PIPsZ79HHXOf7b/5DlxSXUYRn4UJ2BYPjqfVKG7P8GEqBQffjO8u FSmvMfN2uNwO1kq2nm/jwhFPVC8aHy3xuVYTMlGwMmM3eY0RgntMOxS+uy2vtYto89ST nSXJhDkE0lSG2A5a10XySsooBSOIDZ4BqtOz7vuQzYoZYn1kwot03JZxWpFsfAN/S/gC tN+A== 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=7XYeHmWlPWmqi8lIBCmr3ZesblKXysNnOuQCq+uIZxw=; fh=WfGVbliYpqgzl5GprTVUBQR8rnRPHqjfX8LKlqDYYGk=; b=w/fYppL1b81YRCetzyVhIuX7STWKFAWj5W4fhW/YIuPmf4MQn8Gi4nhWl/cLf6W6wv vnWcDKvl1DGKgiFiwubTbM3Hrg8dgvZQ8ap+W5rpjfep9+IUY2xckI+TQGhjrMM6kMDz 2MxIKYuTYINXUGEf2jDw8MBqPTuX1H8P4LGyictfkMn1b+z6gukjZmKHHsCy5jwM7aL5 eeqSmEcSdyBIkeHXdMVaz0SLMW27tYCfbvzT5i3SWgLw6ko1skUBIawGOd8jz4UCKWaf QL9DZzDGDcubBeGkYVxexc6jaC5mDkUUUJopYyYH68+1Le5BWjGpiijvoQL6kYA/G9IV TR/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RnmXoHCq; spf=pass (google.com: domain of linux-nfs+bounces-488-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-nfs+bounces-488-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id t10-20020a67bc0a000000b00465f66d7a51si1324212vsn.494.2023.12.11.07.24.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:24:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs+bounces-488-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RnmXoHCq; spf=pass (google.com: domain of linux-nfs+bounces-488-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-nfs+bounces-488-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 5C7B51C21288 for ; Mon, 11 Dec 2023 15:24:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 700D94AF86; Mon, 11 Dec 2023 15:24:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RnmXoHCq" 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 4E98C4AF83; Mon, 11 Dec 2023 15:24:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8C22C433C8; Mon, 11 Dec 2023 15:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702308282; bh=hbCI41fDxHFogMcLFo0YztlPsPbDh4I1ONF2ZseeT1s=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=RnmXoHCqP8e5mWqqw2J5OqLsDnOoKgRbBdjthe5Hn/ujOkulyfE2lM65OdN5EA/vv bPEBFy6zFDR48AEuPrVQCPGJ5zT8YeMp4XM9ptQSEji8+0lbOoGXgp25ipRkcVRgtK e31hqLAOvC3kPoE8vX+cL+paUDXjEKCdO7Qoh22nyDEiYvZGS83aIQ1UbpfgQOum5Q 217XBdtTCWIua0Jtqq6JqS7KjRvsmC1L3XKiDWFECRTj0aoZY9B8hjPw2UQt5SWsyF RCNGw0NaWqlf6LT7KP20Mwz95HGmhT9tBcT/0vfh+wZSy0zFeCje49bHRUhBj4hR7+ 31WrZS3z5QUPg== Subject: [PATCH v1 6/8] svcrdma: Reserve an extra WQE for ib_drain_rq() From: Chuck Lever To: linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org Cc: tom@talpey.com Date: Mon, 11 Dec 2023 10:24:40 -0500 Message-ID: <170230828089.90242.3890762157877508465.stgit@bazille.1015granger.net> In-Reply-To: <170230788373.90242.9421368360904462120.stgit@bazille.1015granger.net> References: <170230788373.90242.9421368360904462120.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 Do as other ULPs already do: ensure there is an extra Receive WQE reserved for the tear-down drain WR. I haven't heard reports of problems but it can't hurt. Note that rq_depth is used to compute the Send Queue depth as well, so this fix should affect both the SQ and RQ. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 8127c711fa3b..0541aa54674c 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -414,7 +414,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) if (newxprt->sc_max_send_sges > dev->attrs.max_send_sge) newxprt->sc_max_send_sges = dev->attrs.max_send_sge; rq_depth = newxprt->sc_max_requests + newxprt->sc_max_bc_requests + - newxprt->sc_recv_batch; + newxprt->sc_recv_batch + 1 /* drain */; if (rq_depth > dev->attrs.max_qp_wr) { rq_depth = dev->attrs.max_qp_wr; newxprt->sc_recv_batch = 1;