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 EF222468E4 for ; Thu, 12 Jun 2025 23:11:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EAFFC42E5C; Thu, 12 Jun 2025 23:11:06 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id AC03442E5C for ; Thu, 12 Jun 2025 23:11:05 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-451d6ade159so12645195e9.1 for ; Thu, 12 Jun 2025 14:11:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762665; x=1750367465; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1S0lqyvzbkoHestZxhu1/Bi0JSEgBjNt7IpzAT1mApQ=; b=UbqdXu4RHFTKx05YDajdRQRuNxemvuHAwOsb/FZL02YglRz3lw/eNYfhwAMmZDUvuC VC9SVqfpiZzVbFmULIoB4MFhfJB6TzqM4hleNULZzOKK67pYisQ5T4MHwZ+MpuT8/UxF DcoVyUZxu8X0T9IthtLwYvROnlxGBtU90eI8N4//aY8Qm/4POA3ciPfm8pPKp9kY/3XG SQrbxWBdW0rxR+u/4fCQURabWemBgnMPD+O7dNx0jeExM2f4+2cbDCBpoJN6T8QP81/u wYcnxlQfJENGIhr8/Hvwwp2ee5uyWvsi5lMOCRSJkfW5n3SZT2008yhIW7/Q4bhiNFEt CkRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762665; x=1750367465; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1S0lqyvzbkoHestZxhu1/Bi0JSEgBjNt7IpzAT1mApQ=; b=tCRGY/DcMe4lLS8F5Ef+ldC3SB9IdjM9hJA5PeM+qupdxlY6sDHVWZUgq8GQgIREM1 pAWFhyG7TI/Mmf77jZ427mDGcMYuXgHJ/HVf25QdNKy6vNq94cYQpdKwHXx6OjYXK04O cnh6EPu8xAuSrrjCZI7J5SQwCm2CHQ6DarkEh/CaA7Oj1I0wY8Hif+/oC2Xv9R8MtPvv OTFj2cK+VeKzSQMzubjZvfDiWq7a0/xNeT4jl33Qnwh0ao6dt1SthYTSYv46wX652I4w Tdq851/wgjwbtGce1jZyPZ0fRntHZo8WA8hGiqcVBFaKTfMW7xWZ4e6Jqx3t4WfBHIP+ rHig== X-Forwarded-Encrypted: i=1; AJvYcCXZ/d4u1beAWZJZNbkufZUU6Cdv6bXxUZ4UPFMMNWF/qNe5h33IrDCdO1uNTL+qVZm0iVU7/ys=@dpdk.org X-Gm-Message-State: AOJu0Yy0M0hlB8ty3+TkCdM48XSRbpLlZQ0dGP5lXwgkYRA2eQq+Egz1 eEp6MUbgl/aLtKWjYaUQZq41xxbaVK3vS0Hgqt8wTF2YDN967gSwwuwn X-Gm-Gg: ASbGncsY8a+H07TiC7duafk8pN2fvxwVBHKnIHfwuo4iruX5jZCWNNcaClT52GrkeZz oUE7swnt79L+lf/NLT3SB1NEwetjkU3IYoSSB5a6WJHHBhhxgmgr+i9vjVFrlHaTSOpTeP7B6g2 buPFaLqyPSKthYrVIER+ZPNMuK7GYJz46pa/3syKK4Kswe05p8nZfiJJOau3fA6hTfpSgGA6+oh 0d/ZSj1eYowNQYGbjKAHMdQiyQnJswFCkEKRm5Q+LOOUn/r48VWXkEgGZopv7a1pSaCDb2xg9IK 3/rq2j1cedZI4qiWWk3iWAIeTYQlr0zS3X28NliOkdAk63DulSp1+q0nORi+WfuraXCf X-Google-Smtp-Source: AGHT+IEBWBcQ9R8LA3Dg2H+PM/hHA3HJ3fklrcssf9l+fktAUtmNuq/RjPcGjoYeuPpuZ/T//PGpHg== X-Received: by 2002:a05:600c:3f96:b0:453:66f:b96e with SMTP id 5b1f17b1804b1-45334a83b38mr5164415e9.11.1749762665097; Thu, 12 Jun 2025 14:11:05 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b71c15sm361241f8f.95.2025.06.12.14.11.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:11:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Rui Ferreira Cc: Konstantin Ananyev , Thomas Monjalon , dpdk stable Subject: patch 'eal/linux: unregister alarm callback before free' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:20 +0100 Message-ID: <20250612210733.2506558-63-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/25. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cbb840f586dfe10ea619dd94a97336fd09d621e7 Thanks. Luca Boccassi --- >From cbb840f586dfe10ea619dd94a97336fd09d621e7 Mon Sep 17 00:00:00 2001 From: Rui Ferreira Date: Fri, 30 May 2025 09:18:43 +0100 Subject: [PATCH] eal/linux: unregister alarm callback before free [ upstream commit d84bf0d9aeb474d89a412b6af8e947b16bfcb895 ] This was flagged by Address sanitizer as a use after free. The intr_handle ptr is shared between the main thread and the interrupt thread. The interrupt thread can dereference the ptr after free (from the alarm callback). free is called when the main thread cleans up. The interrupt thread never terminates (eal_intr_thread_main) so use rte_intr_callback_unregister_sync during cleanup to ensure the callback is removed before freeing the ptr. To be more defensive clear out the pointer and registration variable if we can unregister. rte_intr_callback_unregister_sync may (optionally) use traces so the alarm cleanup must happen before eal_trace_fini to avoid accessing freed memory. Bugzilla ID: 1683 Fixes: 90b13ab8d4f7 ("alarm: remove direct access to interrupt handle") Signed-off-by: Rui Ferreira Acked-by: Konstantin Ananyev Signed-off-by: Thomas Monjalon --- .mailmap | 1 + lib/eal/linux/eal.c | 2 +- lib/eal/linux/eal_alarm.c | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 8cd91eff62..c29ac7d334 100644 --- a/.mailmap +++ b/.mailmap @@ -1206,6 +1206,7 @@ Rosen Xu Roy Franz Roy Pledge Roy Shterman +Rui Ferreira Ruifeng Wang Rushil Gupta Ryan E Hall diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 336698379f..f6ac970ed9 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -1380,10 +1380,10 @@ rte_eal_cleanup(void) #endif rte_mp_channel_cleanup(); eal_bus_cleanup(); + rte_eal_alarm_cleanup(); rte_trace_save(); eal_trace_fini(); eal_mp_dev_hotplug_cleanup(); - rte_eal_alarm_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); rte_eal_malloc_heap_cleanup(); diff --git a/lib/eal/linux/eal_alarm.c b/lib/eal/linux/eal_alarm.c index 9a68e4ce68..a1103a7f7c 100644 --- a/lib/eal/linux/eal_alarm.c +++ b/lib/eal/linux/eal_alarm.c @@ -55,7 +55,14 @@ static void eal_alarm_callback(void *arg); void rte_eal_alarm_cleanup(void) { - rte_intr_instance_free(intr_handle); + /* unregister callback using intr_handle in interrupt thread */ + int ret = rte_intr_callback_unregister_sync(intr_handle, + eal_alarm_callback, (void *)-1); + if (ret >= 0) { + rte_intr_instance_free(intr_handle); + intr_handle = NULL; + handler_registered = 0; + } } int -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:26.155286300 +0100 +++ 0063-eal-linux-unregister-alarm-callback-before-free.patch 2025-06-12 22:06:23.890045060 +0100 @@ -1 +1 @@ -From d84bf0d9aeb474d89a412b6af8e947b16bfcb895 Mon Sep 17 00:00:00 2001 +From cbb840f586dfe10ea619dd94a97336fd09d621e7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d84bf0d9aeb474d89a412b6af8e947b16bfcb895 ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -36 +37 @@ -index fb90483bee..9135f06efc 100644 +index 8cd91eff62..c29ac7d334 100644 @@ -39 +40 @@ -@@ -1339,6 +1339,7 @@ Rosen Xu +@@ -1206,6 +1206,7 @@ Rosen Xu @@ -45 +45,0 @@ - Rupesh Chiluka @@ -46,0 +47 @@ + Ryan E Hall @@ -48 +49 @@ -index 20f777b8b0..de90ab3b86 100644 +index 336698379f..f6ac970ed9 100644 @@ -51 +52 @@ -@@ -1328,10 +1328,10 @@ rte_eal_cleanup(void) +@@ -1380,10 +1380,10 @@ rte_eal_cleanup(void) @@ -64 +65 @@ -index b216a007a3..eb6a21d4f0 100644 +index 9a68e4ce68..a1103a7f7c 100644 @@ -67 +68 @@ -@@ -57,7 +57,14 @@ static void eal_alarm_callback(void *arg); +@@ -55,7 +55,14 @@ static void eal_alarm_callback(void *arg);