From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29A81C43603 for ; Wed, 11 Dec 2019 15:08:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F2BF122527 for ; Wed, 11 Dec 2019 15:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576076891; bh=73y6llFQMMIZCQOShezk0KW2VUlhcWIdRCpboFMbUQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fMLFbs2uPzOcABz6qslta32Gnlr7LxyTGiYFtK4K8Mdy5RVwjcTCYdOOZV2s28vJB ocZxFaqZW/WmCwKEp0tD2b8tJ5bP98C1PQHNdAPUqSaxou5mNWyhvG3z5/J9wQ9GWX GSuSXgsM0uol2q7iHaFyHewd6YOR4ouY477nfF9Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730273AbfLKPIJ (ORCPT ); Wed, 11 Dec 2019 10:08:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:55528 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729513AbfLKPII (ORCPT ); Wed, 11 Dec 2019 10:08:08 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 11E1B2173E; Wed, 11 Dec 2019 15:08:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576076887; bh=73y6llFQMMIZCQOShezk0KW2VUlhcWIdRCpboFMbUQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JDucN8fTgDGKyZo5O296+54PlJr5RMqYdgDUVTbIqg7xGdFm8cYDfO7R5QggWDru0 73J4beN+oC9abOjxhaCXiuMfo7t5IkkuAj52O9BRMtbEyv1LsVo24H4IHGosk4yVEO j/YxzWhPKkvvQ4+6e1aKfooFujiFB5VmZm7qhvys= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jon Hunter , Trond Myklebust Subject: [PATCH 5.4 28/92] SUNRPC: Avoid RPC delays when exiting suspend Date: Wed, 11 Dec 2019 16:05:19 +0100 Message-Id: <20191211150232.779719650@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.977775294@linuxfoundation.org> References: <20191211150221.977775294@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trond Myklebust commit 66eb3add452aa1be65ad536da99fac4b8f620b74 upstream. Jon Hunter: "I have been tracking down another suspend/NFS related issue where again I am seeing random delays exiting suspend. The delays can be up to a couple minutes in the worst case and this is causing a suspend test we have to fail." Change the use of a deferrable work to a standard delayed one. Reported-by: Jon Hunter Tested-by: Jon Hunter Fixes: 7e0a0e38fcfea ("SUNRPC: Replace the queue timer with a delayed work function") Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c @@ -260,7 +260,7 @@ static void __rpc_init_priority_wait_que rpc_reset_waitqueue_priority(queue); queue->qlen = 0; queue->timer_list.expires = 0; - INIT_DEFERRABLE_WORK(&queue->timer_list.dwork, __rpc_queue_timer_fn); + INIT_DELAYED_WORK(&queue->timer_list.dwork, __rpc_queue_timer_fn); INIT_LIST_HEAD(&queue->timer_list.list); rpc_assign_waitqueue_name(queue, qname); }