From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794585916; b=Kyheb2qNb7czFToeuAbiAAiI6/4tLV9MD3byPoXbB+1anKltuOwkbCx+UODmfgmYfXSH 2/a9MLYAnM04AIDnOglWO2fpYXpMvwNDulxci/5hIYn7eI6diUleBs1ZuHFsYTDzY0xH1 zi4SdS2TY+iVeQPP1fsX1+pMt6VolsCc3t8/nu8SURg28yF+Ow0YUG26iWLEjvk8+DDYs 9hcJnS41yMgFzVc86SVhUMPwLK10a4bOzhkoksbw6geMdo4CobeXUZi/0k2Xh61UDyCYW XoOdr4CnzoBfk2XTyT2tP0M/5Kk7Rie4Qgf3M/Db0Y+5qpPuy9C4GmU0TJRxPA8IyNA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794585916; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=7vQAZfhhwm3DQricutNUcHMV4Sj5NM5Hw54FwBqQcCw=; b=kSoy7OOipmfp+6ZZq1Gin0ZU3JpEH3y5ayAZY8cWOBkeNZODsX/+q1Beac28eFkbtMgn x9oXGNkTiYRiUqZ8Nqj4G9MfCr1P5GDCuc9kVc6zsWUa4lSRjmxgZCZQNl9TnAPAMb+JR jCiV3S4ITMURXr3rBYvz92OEmi4Lb2iHdA8lEIlIlVI74rn/7ZXZvSu+giGkb1pWykOud DzsmPRM9d831ATe+2jfZWMNsAh2b+7Eh1UEIjgbxNn6se5IzFysnKV8GdLaynoUiI+HUX Cz/vVu8vys8E7pCOj31whNx+yQrhLj06agATQaUwT3Ou0P5of5W9qm/nHZsN2+BQBAg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=VQS6Sl9h; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20177607021A; Fri, 13 Nov 2026 16:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=VQS6Sl9h Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF9831F000C4; Fri, 13 Nov 2026 16:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794585916; bh=7vQAZfhhwm3DQricutNUcHMV4Sj5NM5Hw54FwBqQcCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VQS6Sl9hB0WbWWXr4vDMKyifQjZhI0/FBPr5aZP9YOH28PrUGhNC7u5NDrtH78DaL Xymq+mWe3tkYW43megOP1QWiCI+eUjntq4quYHvdQ3AjUwu3s1fxUywTaPR8JHDUa3 GBc4irJvlTcv39DXxPgLjPceVvUAywbNExojv5Vo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Ian Rogers , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 7.3 478/507] perf evsel: Close the fds opened so far when disabling missing features Date: Fri, 13 Nov 2026 10:53:02 -0500 Message-ID: <20261113153813.188908860@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153753.358973689@linuxfoundation.org> References: <20261113153753.358973689@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit 16d1234793d42a5a594db99522845996ab8e0d29 ] evsel__open_cpu() opens the events one by one and, when an open fails with EINVAL and evsel__detect_missing_features() has a feature to leave out, goes back to fallback_missing_features to open them all again from start_cpu_map_idx, without closing what the abandoned attempt opened: the fd of every CPU or thread that was opened before the failing one is overwritten in the FD() array, leaking it. Close them first, the same way out_close does when returning an error, leaving the entries at -1 for the retry. Fixes: af954f76eea5 ("perf tools: Check fallback error and order") Reported-by: Sashiko Closes: https://lore.kernel.org/r/sashiko-outbox-173532@kernel.org Reviewed-by: Ian Rogers Tested-by: Ian Rogers Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/evsel.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index eb429087ebfee..5db43520f25e7 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2974,6 +2974,19 @@ static bool evsel__detect_missing_features(struct evsel *evsel, struct perf_cpu return false; } +static void evsel__close_fds(struct evsel *evsel, int start_cpu_map_idx, + int cpu_map_idx, int thread, int nthreads) +{ + do { + while (--thread >= 0) { + if (FD(evsel, cpu_map_idx, thread) >= 0) + close(FD(evsel, cpu_map_idx, thread)); + FD(evsel, cpu_map_idx, thread) = -1; + } + thread = nthreads; + } while (--cpu_map_idx >= start_cpu_map_idx); +} + static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, struct perf_thread_map *threads, int start_cpu_map_idx, int end_cpu_map_idx) @@ -3109,8 +3122,14 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, if (err == -EMFILE && rlimit__increase_nofile(&set_rlimit)) goto retry_open; - if (err == -EINVAL && evsel__detect_missing_features(evsel, cpu)) + if (err == -EINVAL && evsel__detect_missing_features(evsel, cpu)) { + /* + * The restart opens the events again, so close what this + * attempt opened before its entries are overwritten. + */ + evsel__close_fds(evsel, start_cpu_map_idx, idx, thread, nthreads); goto fallback_missing_features; + } if (evsel__precise_ip_fallback(evsel)) goto retry_open; @@ -3120,14 +3139,7 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, threads->err_thread = thread; old_errno = errno; - do { - while (--thread >= 0) { - if (FD(evsel, idx, thread) >= 0) - close(FD(evsel, idx, thread)); - FD(evsel, idx, thread) = -1; - } - thread = nthreads; - } while (--idx >= start_cpu_map_idx); + evsel__close_fds(evsel, start_cpu_map_idx, idx, thread, nthreads); errno = old_errno; out: if (err) -- 2.53.0