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 139D9468E4 for ; Thu, 12 Jun 2025 23:11:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F39342E4F; Thu, 12 Jun 2025 23:11:10 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id CD6FE42E0C for ; Thu, 12 Jun 2025 23:11:06 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-442fda876a6so12396575e9.0 for ; Thu, 12 Jun 2025 14:11:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762666; x=1750367466; 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=ayAp6fQgV1plC8Q5LrG1b/IhZJbmR0UtDXWv50Ffqv4=; b=gRkou8LFJoDJ2h8XRjMMqtJo5izL8cYv6NIqElYPwySEgBPhDgYA4bHB9kjmYiVAfW pCh6R1PilqPPttPtXcVlEw5eH/aJldx/8kSuvsYFZXxzy93VAF95J76OzX2eiOtwU2Z2 euSO/piWZYCz6hbwrfjACTwkStDBoni7FAXzI+qGW7WQkq8DcxQhOghno10n3ysee0XP +2DuVhpfezUuj1AmwdlEGXbREHpZcDyP7zjVVvgzd1n3PE1gY6UJhyHLVxrMUIkf/wcG K7vexRlX58TQJ5RUIeQOVVTfNITan5fny67kq5H2He7/B3xn2Eizq8LVaVO3HKc83oyl D6vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762666; x=1750367466; 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=ayAp6fQgV1plC8Q5LrG1b/IhZJbmR0UtDXWv50Ffqv4=; b=JwmVq0JSHgE3S4Qc2K4RFZIHyLGYZ2KRhhTHpbBYrW2QksYv3CAroutWHRcVybMrPp RW1HskvPOCzawArci09IqA7HSspvKqEDjjygAB8N02Y+cHe6BegdngPwgGaKGwZojqaS y4/ToWhggVvGPRPoz69E/rqNrqTaFbX1IgfKqB9RgvOKxXvAKBfvuABn2zqJsGVyktnX GZy/JmoBFf1Icb05069pI5Dq9r+WiYCZmswoUCrtJaOqom86S0uwfwFYEn1BoTcNlrWk w8eSMtQZSc3XiEMI7rv2j26+Ej1meEapNORfmjg8rtxUUmZCMruifA7qDg1uDNA/+AaN YXPQ== X-Forwarded-Encrypted: i=1; AJvYcCUBCmZVVTJoVCfHLf2ZOVmarOz36p/Dn85bse5qGrSmZmXwC6fFl8LGHscALSeVwbS0KbsfaLk=@dpdk.org X-Gm-Message-State: AOJu0Yw3jd3u6ZPOcY8gupJj0WcTFPMJk5gJxqz4x1WHWGEQrF65VRxT UVqoQlIsKuDdUjgVXSYP6JsfGQYcmAxXjOPs+ldiGzLnANHLJvXrDxeR X-Gm-Gg: ASbGnctAgPARxcGTlhP5ksgTWzeRc2zxcEVRxXBBJ/rIsf3so1E4Ln+CpkbfMiXWVkI TiBKSUjVxSL/YqIHhn7WsN8QCdLDinZH4miW7E8xDeChhhrW5gVcv2KUMLitjHwAx20FaByMczA SUllIqoDy3Pck+yss8GREDW+VXF44tvG709x/aXJ2C0gwxxJGzN8opd5N0RzdixtJ1cj/2fA3ud o6Z7xBUT70ufIgDmOG23FVAmrA4SFfIaBVOZyoylvYn+JzEdwcm8o3GvIQgfv574fdz9hPNyGH9 GFsftZOTTxyLKH5E2F4Q8IYBp34DkRkyvpLFQpWGRqzzQU7DQMZKcFM+zREc1xeLn1nd X-Google-Smtp-Source: AGHT+IGRys/PrYBjorS56FSi4zje3hRGk984O9Bo6+e0EmK/WsYzLo9YMKE26uzo5ls4Qet7z51Bvg== X-Received: by 2002:a05:600c:a301:b0:442:f12f:bd9f with SMTP id 5b1f17b1804b1-45334b2aaadmr3536085e9.27.1749762666211; Thu, 12 Jun 2025 14:11:06 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568a54af6sm400878f8f.6.2025.06.12.14.11.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:11:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Rui Ferreira Cc: Bruce Richardson , Thomas Monjalon , dpdk stable Subject: patch 'eal/freebsd: unregister alarm callback before free' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:21 +0100 Message-ID: <20250612210733.2506558-64-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/8254c4d5c935e94ecc8f574d545319653d623d49 Thanks. Luca Boccassi --- >From 8254c4d5c935e94ecc8f574d545319653d623d49 Mon Sep 17 00:00:00 2001 From: Rui Ferreira Date: Fri, 30 May 2025 09:18:44 +0100 Subject: [PATCH] eal/freebsd: unregister alarm callback before free [ upstream commit cf1937a96dcf63f6e00e3181654a845edb1fd682 ] Unregister callback on cleanup to avoid use after free from the interrupt thread (eal_intr_thread_main). To be more defensive, set ptr to NULL 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: Bruce Richardson Signed-off-by: Thomas Monjalon --- lib/eal/freebsd/eal.c | 2 +- lib/eal/freebsd/eal_alarm.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index 122daf6c1f..008a6c68e4 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -904,9 +904,9 @@ rte_eal_cleanup(void) rte_service_finalize(); rte_mp_channel_cleanup(); eal_bus_cleanup(); + rte_eal_alarm_cleanup(); rte_trace_save(); eal_trace_fini(); - rte_eal_alarm_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); eal_cleanup_config(internal_conf); diff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c index 1a3e6c0aad..d598f6aaf5 100644 --- a/lib/eal/freebsd/eal_alarm.c +++ b/lib/eal/freebsd/eal_alarm.c @@ -48,7 +48,13 @@ 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; + } } int -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:26.189443151 +0100 +++ 0064-eal-freebsd-unregister-alarm-callback-before-free.patch 2025-06-12 22:06:23.894045145 +0100 @@ -1 +1 @@ -From cf1937a96dcf63f6e00e3181654a845edb1fd682 Mon Sep 17 00:00:00 2001 +From 8254c4d5c935e94ecc8f574d545319653d623d49 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cf1937a96dcf63f6e00e3181654a845edb1fd682 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index d6fffa2170..45adfad668 100644 +index 122daf6c1f..008a6c68e4 100644 @@ -31 +32 @@ -@@ -906,9 +906,9 @@ rte_eal_cleanup(void) +@@ -904,9 +904,9 @@ rte_eal_cleanup(void) @@ -43 +44 @@ -index 28f285fdef..c03e281e67 100644 +index 1a3e6c0aad..d598f6aaf5 100644 @@ -46 +47 @@ -@@ -50,7 +50,13 @@ static void eal_alarm_callback(void *arg); +@@ -48,7 +48,13 @@ static void eal_alarm_callback(void *arg);