From patchwork Tue Mar 7 22:49:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 13164910 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C4A6C6FD1E for ; Tue, 7 Mar 2023 22:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678229387; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=z4OisbwfPJJu2HjFb2W4C9naFkQuBEDzT1gdhAONRdw=; b=McWYMTlYwSD3TT9IDB3JdteKPhek36Dxu88LsZHOO3g8c+2qZ/5VbJUA6cVSodsMBqvDdh BhLvz98qYJQRZ49zV4sSI53xaoGdqAKndlFUf4zRJ83XTb3Oed6INsps/omW+6dQHrebF5 WceVMzBNohmjLTzvALvFv45yB4FOeMM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-fPDc1oxgPTy2ESHOchaJ4Q-1; Tue, 07 Mar 2023 17:49:44 -0500 X-MC-Unique: fPDc1oxgPTy2ESHOchaJ4Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 514EC384D030; Tue, 7 Mar 2023 22:49:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F1A12166B2A; Tue, 7 Mar 2023 22:49:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1B1C619465A4; Tue, 7 Mar 2023 22:49:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 232611946594 for ; Tue, 7 Mar 2023 22:49:41 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0858E35454; Tue, 7 Mar 2023 22:49:41 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E24E618EC6; Tue, 7 Mar 2023 22:49:40 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 327MndN4018838; Tue, 7 Mar 2023 16:49:39 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 327MncaF018837; Tue, 7 Mar 2023 16:49:38 -0600 From: Benjamin Marzinski To: Christophe Varoqui Date: Tue, 7 Mar 2023 16:49:34 -0600 Message-Id: <1678229374-18788-4-git-send-email-bmarzins@redhat.com> In-Reply-To: <1678229374-18788-1-git-send-email-bmarzins@redhat.com> References: <1678229374-18788-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Subject: [dm-devel] [PATCH 3/3] libmultipath: reset nr_timeouts if we freed the context X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: device-mapper development , Brian Bunker , Martin Wilck MIME-Version: 1.0 Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com If a the tur checker creates a new context because an old thread is still running, but the old thread finishes before the checker drops the old context, the checker should reset nr_timeouts to 0, since the old thread did complete in time. Signed-off-by: Benjamin Marzinski --- libmultipath/checkers/tur.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c index a19becf5..fe6a2f14 100644 --- a/libmultipath/checkers/tur.c +++ b/libmultipath/checkers/tur.c @@ -406,9 +406,11 @@ int libcheck_check(struct checker * c) } ((struct tur_checker_context *)c->context)->nr_timeouts = ct->nr_timeouts; - if (!uatomic_sub_return(&ct->holders, 1)) + if (!uatomic_sub_return(&ct->holders, 1)) { /* It did terminate, eventually */ cleanup_context(ct); + ((struct tur_checker_context *)c->context)->nr_timeouts = 0; + } ct = c->context; } else