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 4ABF1468E4 for ; Thu, 12 Jun 2025 23:11:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40EB542E0C; Thu, 12 Jun 2025 23:11:20 +0200 (CEST) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 7D5CF42E4F for ; Thu, 12 Jun 2025 23:11:19 +0200 (CEST) Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3a5257748e1so1167344f8f.2 for ; Thu, 12 Jun 2025 14:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762679; x=1750367479; 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=LJr1qsRxX+iF8LBjv5KFRt5O+lZzgQOtz62A506w8nw=; b=a59ELOue6Sffqzi1v38LxwvuUyJZUYLTgmD5psdShksdN+ftWeTXWhGut6RBXFnbiu 2ZUgQ0D0YiFBNbCUbGvi0lA7MRvLcKRvAMhv4mpxSGDKrKpjv35pLDTb6LVxfXNt/ADg vGLljUtMmERDV8FD1Tuq8Zw6pTHuqgosLmjWUlG3s0R+H5teCxaQ2yfpMrLTzenu0Flr f1kFDx2WHQYCGRiJhNoLBk4pS7223eYzJAkaNxvVvvASSC3+zrarlZhQUxvwhoju9ia9 erc9kPC/+aUVSDAAAWCWkhybA8IE16xP8WVyROGMmP3vZMKE1hmvR4dBkIXcPMiO1QsU v/5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762679; x=1750367479; 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=LJr1qsRxX+iF8LBjv5KFRt5O+lZzgQOtz62A506w8nw=; b=fnKBJOXKhMs/iDqWAiw9hgCl8LdpuFGBZGY2h1USxN3D2xiMJl/LxdbWJSNGPFFVDC TkS+ANGD6hVQZ5J6IV8A39VW0PZcRNkGqYoAeRTKD2p5V/pU0BYSdbvd3z4HEPycdqCx tt0EMhaXaAkax909qhLGxQnYXHX8UFWWwMz57Gazt1vdxon7xRtUqPM+RPANZKB/WmuT E2vdLNH1GB/kqGjrZ7wj2kpDkrLLrhGrdZG9p/JhBeiiJkm7Lva9W/27oumrPB6N7rJC +KBHTbsFAMiSPjm4qa1uRNvR8tAT9oJhX2+gbdmqYtaUShG07fzbcNvEvzMgtmaRrV/K Ix1g== X-Forwarded-Encrypted: i=1; AJvYcCUvPEawEIxHtv3nn46M74ZvKx2dHAj6R6GTAla6XzEOObYT3o4fCKld030tXJbCaehH9CbJvRE=@dpdk.org X-Gm-Message-State: AOJu0YwDU6IF9aGwadqnzbE0XIVH4pityRiAvEI2g/OuHXjWNdwbwd7Z w5zHjqGb6HcGGZqo8M61t46X+v5OB7ar/C/BXg51PEsxWGie/j8ah7y+kfkijs0GJcU= X-Gm-Gg: ASbGncsc7NNj6hJbY+ZV/AZr5gsb8mGL9JecQkKRCGrb25qHcvEY2VWrsHAWStndlST Dd/IZoWJuZE00oYq97GVHAOvzU6FONOO4klJITLnEWjwZTEYm6OhOVpwL4qdeGKAjdVDpN5ivuu IFwntTojwn8qDHpQqgv6hWuMaaudmpe24vn4sliQlADVgYaeyqcBMFsnHLcKJx+XlFA2Wzm+vnM R+IjXQFih2n/bTiMyKz2nY9EALE+JYWyiT78H1+1sEn2OUuCtc2lqsgxnKl5HSbkySsu+24Ph22 lTa4zBPvT/aBNgRr9qVZzxiyrKsI1KpZjv6JVFhkF6pTY83SxOjB+8TJguQ2SSEtUz1M X-Google-Smtp-Source: AGHT+IEiMWV1aYbxcOqYnxSuHIQOF3kHhMsaWjypulotUS5r+5JuUaUWNexzGdFf9i24GTAusrY7qA== X-Received: by 2002:a05:6000:4285:b0:3a4:ddd6:427f with SMTP id ffacd0b85a97d-3a56875d7e3mr602169f8f.35.1749762679013; Thu, 12 Jun 2025 14:11:19 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b7431esm368122f8f.97.2025.06.12.14.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:11:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Kevin Laatz , dpdk stable Subject: patch 'power/intel_uncore: fix crash closing uninitialized driver' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:07:23 +0100 Message-ID: <20250612210733.2506558-66-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/c93af8c2daead715e99bc0b846aa2214e05f0112 Thanks. Luca Boccassi --- >From c93af8c2daead715e99bc0b846aa2214e05f0112 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 15 May 2025 17:58:53 +0100 Subject: [PATCH] power/intel_uncore: fix crash closing uninitialized driver [ upstream commit 74c4b081825123350578f18dc838ec0bf69ba03b ] When the power_intel_uncore_autotest unit test is run as an unprivileged user which cannot init the power library, it crashes the unit test binary due to calling "rte_power_uncore_exit" after the first test case (initialization) fails. This crash is due to trying to write to NULL file handles. Fix the crash by checking each file handle is non-null before writing to it and closing it. Fixes: 60b8a661a957 ("power: add Intel uncore frequency control") Signed-off-by: Bruce Richardson Acked-by: Kevin Laatz --- lib/power/rte_power_intel_uncore.c | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/power/rte_power_intel_uncore.c b/lib/power/rte_power_intel_uncore.c index 7193b86516..8780bc38a2 100644 --- a/lib/power/rte_power_intel_uncore.c +++ b/lib/power/rte_power_intel_uncore.c @@ -308,27 +308,28 @@ rte_power_uncore_exit(unsigned int pkg, unsigned int die) ui = &uncore_info[pkg][die]; - if (fprintf(ui->f_cur_min, "%u", ui->org_min_freq) < 0) { - RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for " - "pkg %02u die %02u\n", ui->pkg, ui->die); - return -1; + if (ui->f_cur_min != NULL) { + if (fprintf(ui->f_cur_min, "%u", ui->org_min_freq) < 0) { + RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for pkg %02u die %02u", + ui->pkg, ui->die); + return -1; + } + fflush(ui->f_cur_min); + fclose(ui->f_cur_min); + ui->f_cur_min = NULL; } - if (fprintf(ui->f_cur_max, "%u", ui->org_max_freq) < 0) { - RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for " - "pkg %02u die %02u\n", ui->pkg, ui->die); - return -1; + if (ui->f_cur_max != NULL) { + if (fprintf(ui->f_cur_max, "%u", ui->org_max_freq) < 0) { + RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for pkg %02u die %02u", + ui->pkg, ui->die); + return -1; + } + fflush(ui->f_cur_max); + fclose(ui->f_cur_max); + ui->f_cur_max = NULL; } - fflush(ui->f_cur_min); - fflush(ui->f_cur_max); - - /* Close FD of setting freq */ - fclose(ui->f_cur_min); - fclose(ui->f_cur_max); - ui->f_cur_min = NULL; - ui->f_cur_max = NULL; - return 0; } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:26.254333367 +0100 +++ 0066-power-intel_uncore-fix-crash-closing-uninitialized-d.patch 2025-06-12 22:06:23.894045145 +0100 @@ -1 +1 @@ -From 74c4b081825123350578f18dc838ec0bf69ba03b Mon Sep 17 00:00:00 2001 +From c93af8c2daead715e99bc0b846aa2214e05f0112 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 74c4b081825123350578f18dc838ec0bf69ba03b ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ - drivers/power/intel_uncore/intel_uncore.c | 35 ++++++++++++----------- + lib/power/rte_power_intel_uncore.c | 35 +++++++++++++++--------------- @@ -24,5 +25,5 @@ -diff --git a/drivers/power/intel_uncore/intel_uncore.c b/drivers/power/intel_uncore/intel_uncore.c -index 804ad5d755..6759ea1445 100644 ---- a/drivers/power/intel_uncore/intel_uncore.c -+++ b/drivers/power/intel_uncore/intel_uncore.c -@@ -307,27 +307,28 @@ power_intel_uncore_exit(unsigned int pkg, unsigned int die) +diff --git a/lib/power/rte_power_intel_uncore.c b/lib/power/rte_power_intel_uncore.c +index 7193b86516..8780bc38a2 100644 +--- a/lib/power/rte_power_intel_uncore.c ++++ b/lib/power/rte_power_intel_uncore.c +@@ -308,27 +308,28 @@ rte_power_uncore_exit(unsigned int pkg, unsigned int die) @@ -33,2 +34,2 @@ -- POWER_LOG(ERR, "Fail to write original uncore frequency for " -- "pkg %02u die %02u", ui->pkg, ui->die); +- RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for " +- "pkg %02u die %02u\n", ui->pkg, ui->die); @@ -38 +39 @@ -+ POWER_LOG(ERR, "Fail to write original uncore frequency for pkg %02u die %02u", ++ RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for pkg %02u die %02u", @@ -48,2 +49,2 @@ -- POWER_LOG(ERR, "Fail to write original uncore frequency for " -- "pkg %02u die %02u", ui->pkg, ui->die); +- RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for " +- "pkg %02u die %02u\n", ui->pkg, ui->die); @@ -53 +54 @@ -+ POWER_LOG(ERR, "Fail to write original uncore frequency for pkg %02u die %02u", ++ RTE_LOG(ERR, POWER, "Fail to write original uncore frequency for pkg %02u die %02u",