From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BA55E41D52 for ; Thu, 23 Feb 2023 16:08:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B65B24324B; Thu, 23 Feb 2023 16:08:41 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E94BF43262 for ; Thu, 23 Feb 2023 16:08:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164919; h=from:from: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; bh=zJtpRQJmbnAeN8x9lpwUuBKwrvA1/gv+CFC2uVeYhVg=; b=DeT0NMuRrCOud9+DioFxKpmVpgJigr9umVSXvL7bR4mLIJ1l5HMT2x2W4ZSyc0jPBHjRJn BEtxdvK8QwyvAU/+gNduSXhBIVjzcm791WSk24hQVwcs2j2IuFStOGD/ToKxOEXv8DPxGj dxWWyyN9qs8teissdxJU6pfUj0ywMwU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-643-3zWmLCWnPQOxuMJ8HeCLRg-1; Thu, 23 Feb 2023 10:08:38 -0500 X-MC-Unique: 3zWmLCWnPQOxuMJ8HeCLRg-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 05A3485A588; Thu, 23 Feb 2023 15:08:38 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 555D52166B2B; Thu, 23 Feb 2023 15:08:37 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Bruce Richardson , dpdk stable Subject: patch 'eal/freebsd: fix lock in alarm callback' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:06:21 +0000 Message-Id: <20230223150631.723699-90-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/118edbb63464c5cf13f76106fb1b8adf32552763 Thanks. Kevin --- >From 118edbb63464c5cf13f76106fb1b8adf32552763 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 13 Feb 2023 12:44:52 +0000 Subject: [PATCH] eal/freebsd: fix lock in alarm callback [ upstream commit fc6bdd5248e843ba1300c8d46d43b263b4a69438 ] The spinlock should unlock when clock_gettime() failed. This patch fixes it by invoking clock_gettime() before lock. Fixes: 26021a715067 ("eal/bsd: support alarm API") Signed-off-by: Chengwen Feng Acked-by: Bruce Richardson --- lib/eal/freebsd/eal_alarm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c index 1023c32937..1a3e6c0aad 100644 --- a/lib/eal/freebsd/eal_alarm.c +++ b/lib/eal/freebsd/eal_alarm.c @@ -172,10 +172,10 @@ eal_alarm_callback(void *arg __rte_unused) struct alarm_entry *ap; - rte_spinlock_lock(&alarm_list_lk); - ap = LIST_FIRST(&alarm_list); - if (clock_gettime(CLOCK_TYPE_ID, &now) < 0) return; + rte_spinlock_lock(&alarm_list_lk); + ap = LIST_FIRST(&alarm_list); + while (ap != NULL && timespec_cmp(&now, &ap->time) >= 0) { ap->executing = 1; -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:25.976987694 +0000 +++ 0090-eal-freebsd-fix-lock-in-alarm-callback.patch 2023-02-23 14:46:23.883236360 +0000 @@ -1 +1 @@ -From fc6bdd5248e843ba1300c8d46d43b263b4a69438 Mon Sep 17 00:00:00 2001 +From 118edbb63464c5cf13f76106fb1b8adf32552763 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fc6bdd5248e843ba1300c8d46d43b263b4a69438 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org