From patchwork Thu Feb 27 21:12:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11410181 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93F60138D for ; Thu, 27 Feb 2020 21:32:10 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7C57024677 for ; Thu, 27 Feb 2020 21:32:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C57024677 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id A7DA0349A08; Thu, 27 Feb 2020 13:27:16 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp3.ccs.ornl.gov (smtp3.ccs.ornl.gov [160.91.203.39]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 8889621FE77 for ; Thu, 27 Feb 2020 13:19:45 -0800 (PST) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp3.ccs.ornl.gov (Postfix) with ESMTP id A91F18A30; Thu, 27 Feb 2020 16:18:16 -0500 (EST) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id A761E46F; Thu, 27 Feb 2020 16:18:16 -0500 (EST) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Thu, 27 Feb 2020 16:12:32 -0500 Message-Id: <1582838290-17243-285-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> References: <1582838290-17243-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 284/622] lnet: libcfs: poll fail_loc in cfs_fail_timeout_set() X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: Alex Zhuravlev Some internal test usually take 800-900s which is almost half of the whole sanityn test suite run time. 99.(9)% of the time the tests just wait to ensure specific order the operations execute in. the patch changes cfs_fail_timeout_set() so that it can interrupt waiting if fail_loc is set to 0 - polling with 1/10s frequency is used. the tests itself are modified to reset fail_loc. to be able to do so both operations (referenced as OP1 and OP2 in the tests) are run in background. once started and then ensured with pdo_sched() helper that MDS threads got to the blocking points, we can interrupt OP1 and do usual checks. ONLY=40-47 sh sanityn.sh take: 1017s before and 78s after. WC-bug-id: https://jira.whamcloud.com/browse/LU-2233 Lustre-commit: 743b85a32e24 ("LU-2233 tests: improve tests sanityn/40-47") Signed-off-by: Alex Zhuravlev Reviewed-on: https://review.whamcloud.com/4392 Reviewed-by: Andreas Dilger Reviewed-by: Mike Pershin Signed-off-by: James Simmons --- net/lnet/libcfs/fail.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/net/lnet/libcfs/fail.c b/net/lnet/libcfs/fail.c index 6ee4de2..40e93b00 100644 --- a/net/lnet/libcfs/fail.c +++ b/net/lnet/libcfs/fail.c @@ -131,14 +131,21 @@ int __cfs_fail_check_set(u32 id, u32 value, int set) int __cfs_fail_timeout_set(u32 id, u32 value, int ms, int set) { + ktime_t till = ktime_add_ms(ktime_get(), ms); int ret; ret = __cfs_fail_check_set(id, value, set); if (ret && likely(ms > 0)) { - CERROR("cfs_fail_timeout id %x sleeping for %dms\n", - id, ms); - schedule_timeout_uninterruptible(ms * HZ / 1000); - CERROR("cfs_fail_timeout id %x awake\n", id); + CERROR("cfs_fail_timeout id %x sleeping for %dms\n", id, ms); + while (ktime_before(ktime_get(), till)) { + schedule_timeout_uninterruptible(HZ / 10); + if (!cfs_fail_loc) { + CERROR("cfs_fail_timeout interrupted\n"); + break; + } + } + if (cfs_fail_loc) + CERROR("cfs_fail_timeout id %x awake\n", id); } return ret; }