From: Patrick Farrell <paf@cray.com>
To: NeilBrown <neilb@suse.com>, Oleg Drokin <oleg.drokin@intel.com>,
        "Andreas Dilger" <andreas.dilger@intel.com>,
        James Simmons <jsimmons@infradead.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: lkml <linux-kernel@vger.kernel.org>,
        lustre <lustre-devel@lists.lustre.org>
Subject: Re: [lustre-devel] [PATCH 15/16] staging: lustre: use explicit poll
 loop in ptlrpc_unregister_reply
Thread-Topic: [lustre-devel] [PATCH 15/16] staging: lustre: use explicit poll
 loop in ptlrpc_unregister_reply
Thread-Index: AQHTd9C1kIjSYWPwjE+6grVlyaxz8aNJNLMA
Date: Mon, 18 Dec 2017 21:09:18 +0000
Message-ID: <D65D8A40.C5E44%paf@cray.com>
References: <151358127190.5099.12792810096274074963.stgit@noble>
 <151358148034.5099.17386685003288433122.stgit@noble>
In-Reply-To: <151358148034.5099.17386685003288433122.stgit@noble>
Accept-Language: en-US
Content-Language: en-US
user-agent: Microsoft-MacOutlook/14.7.2.170228
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-ID: <03B4D6494D6D2A4BAA660AB3A088531D@namprd11.prod.outlook.com>
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 0093acec-7745-4d30-afc8-08d5465b9a2f
X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Dec 2017 21:09:18.3702
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: e7b8488a-c0cd-4614-aae1-996bfabec247
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2141
X-OriginatorOrg: cray.com
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from quoted-printable to 8bit by nfs id vBIL9Tru026407
Content-Length: 2032
Lines: 61

This should not contribute to load, since it?s called out of the ptlrpcd
daemons.

On 12/18/17, 1:18 AM, "lustre-devel on behalf of NeilBrown"
<lustre-devel-bounces@lists.lustre.org on behalf of neilb@suse.com> wrote:

>replace l_wait_event() with wait_event_timeout() and explicit
>loop.  This approach is easier to understand.
>
>Signed-off-by: NeilBrown <neilb@suse.com>
>---
> drivers/staging/lustre/lustre/ptlrpc/client.c |   14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c
>b/drivers/staging/lustre/lustre/ptlrpc/client.c
>index 3e6d22beb9f5..bb8c9ab68f5f 100644
>--- a/drivers/staging/lustre/lustre/ptlrpc/client.c
>+++ b/drivers/staging/lustre/lustre/ptlrpc/client.c
>@@ -2500,7 +2500,6 @@ static int ptlrpc_unregister_reply(struct
>ptlrpc_request *request, int async)
> {
> 	int rc;
> 	wait_queue_head_t *wq;
>-	struct l_wait_info lwi;
> 
> 	/* Might sleep. */
> 	LASSERT(!in_interrupt());
>@@ -2543,16 +2542,17 @@ static int ptlrpc_unregister_reply(struct
>ptlrpc_request *request, int async)
> 		 * Network access will complete in finite time but the HUGE
> 		 * timeout lets us CWARN for visibility of sluggish NALs
> 		 */
>-		lwi = LWI_TIMEOUT_INTERVAL(LONG_UNLINK * HZ,
>-					   HZ, NULL, NULL);
>-		rc = l_wait_event(*wq, !ptlrpc_client_recv_or_unlink(request),
>-				  &lwi);
>-		if (rc == 0) {
>+		int cnt = 0;
>+		while (cnt < LONG_UNLINK &&
>+		       (rc = wait_event_timeout(*wq,
>+						!ptlrpc_client_recv_or_unlink(request),
>+						HZ)) == 0)
>+			cnt += 1;
>+		if (rc > 0) {
> 			ptlrpc_rqphase_move(request, request->rq_next_phase);
> 			return 1;
> 		}
> 
>-		LASSERT(rc == -ETIMEDOUT);
> 		DEBUG_REQ(D_WARNING, request,
> 			  "Unexpectedly long timeout receiving_reply=%d req_ulinked=%d
>reply_unlinked=%d",
> 			  request->rq_receiving_reply,
>
>
>_______________________________________________
>lustre-devel mailing list
>lustre-devel@lists.lustre.org
>http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org