From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E84DB43169 for ; Thu, 9 Jan 2025 07:51:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736409083; cv=none; b=lGNlGwQpZT27MU5YQ3SKdooGtLrZnZvo90sK/MGMX4M0G3BnJZOHGomgscHcRyrNtB14Wx3C31+EXlguiqnDNz/yco9GODvKsAADE+YfHiw4u/cw4YYD2MvJXufrUu7klBDOYI7Ugq5yUPV5v3fg5JnRy+bfkwuR8jVIeoUknM4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736409083; c=relaxed/simple; bh=l3rsftF8R/Lbyc2l8yy+s7iBe/R5ucGrbpLeFvVhTAs=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=SulDAGktHterGFOPyvZC61E5AscIRiNGQcIxVPH2h30cgVC5Zs5uTW/XjoRHq8W9loaRFdHJ319xq5AoDm5T5GOjXICBBExcAF8eAPNw+RVzQdefbV5BahHMdNfIRxUNbKAiXL8pEKC0jE850AI0acjW7xsV3SpTP9JU0ZZczWw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=iQe7xpUw; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="iQe7xpUw" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e02fff66a83so1230160276.0 for ; Wed, 08 Jan 2025 23:51:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736409081; x=1737013881; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=BR5b0II9MP8kbiarazKtxJYt5Ueqv9IehOmdPFNXrQI=; b=iQe7xpUwzABl8UOGPHFY5lIKIovakAdgjGsUimb3UMcJprT8+RywvlbWE5naqviDrs NrzV7wXMAPVE9xDgIu5EVdtkVG5mnizPGJSR2vtXqmB2+XFvozOp8qPLpWhsmEk2s2St i8EktFY8LaTc+GcvKE6dpq0rgsHYw3L4c8WQihUQXXrtfs0Wu69tudPnSPeRFQb3zida /oj+ao5X3KqtSoAfMhQC8VYM4B7uUNlM5kDiLiXQ/EeRCGovFkjoh/BE9B8AksihlViC VVzhHHc6dYDtf4t/rFnZCsk4Eo3zxfeCaM0rNx3uCxWUj4GC3lg9Wf9HA4ylH/4RCPvm uOAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736409081; x=1737013881; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BR5b0II9MP8kbiarazKtxJYt5Ueqv9IehOmdPFNXrQI=; b=wBeYkuoe6B26ChYkar+9W2k4xCVY7FEjblBYKLPF48dBhCsOQ8rKrlbf8xJPGCfxo2 krzgJeNYqApshN1eklGD1lkiU5HOfAfqVjgdq8C+Dngm8YhnCx+jwvhx4ksHnmhreUl0 I6/O9Kr3ghrfty7kN8FnDuRU1pYW1iGbIW6WItQo34P1EM2bAxLt9jSBL4pgApZVxm97 P3e71T6YX3OsoMXI4/Q9N18gzDO9VFEhH8QJ3wvwiGhE4TMx0ejojUzJ4s4QjCtuj38S cdTvIJvaSLe3b6I6X7Ttt1uoDWt2FZFfX7zwTbMDgvDEiLtHL4uEVzZOFVxXVjz5xBPR hvmg== X-Forwarded-Encrypted: i=1; AJvYcCUF7fzK0dz/dipQdvKJC0nLAzWDHe1NirnT+5S/tq+mRBT3gYW5XxJS05IHLTZNtXQwOLjxiXGoFpJNDLo=@vger.kernel.org X-Gm-Message-State: AOJu0YyAEKhgi9S6+iHGvwQ2Few6zr53LwLXpXbmT9sa1i+NyDQ14FNO hqK3EHnruUf/ioE45diEXw5oKYI2YEGI2gE+HCHYGj0IwrNxYnoyXKY1S83q3n97fFG0VPl8nV8 ns52oQg== X-Google-Smtp-Source: AGHT+IFaLpuzEz62THI4YJQg5UCkmxrc6rOT4j4MT0fvtNntW9tGS36QfwR2+cn28xMqnY1sGhdl7efGDtAM X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:f801:f788:c7e5:c181]) (user=irogers job=sendgmr) by 2002:a25:ab65:0:b0:e53:d953:90a8 with SMTP id 3f1490d57ef6-e54ee1388famr13080276.4.1736409080861; Wed, 08 Jan 2025 23:51:20 -0800 (PST) Date: Wed, 8 Jan 2025 23:50:59 -0800 In-Reply-To: <20250109075108.7651-1-irogers@google.com> Message-Id: <20250109075108.7651-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250109075108.7651-1-irogers@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Subject: [PATCH v1 02/11] perf evlist: Add success path to evlist__create_syswide_maps From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Yicong Yang , James Clark , Howard Chu , "Dr. David Alan Gilbert" , Levi Yun , Ze Gao , Weilin Wang , Xu Yang , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Over various refactorings evlist__create_syswide_maps has been made to only ever return with -ENOMEM. Fix this so that when perf_evlist__set_maps is successfully called, 0 is returned. Signed-off-by: Ian Rogers --- tools/perf/util/evlist.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index f0dd174e2deb..633df7d9204c 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1373,19 +1373,18 @@ static int evlist__create_syswide_maps(struct evlist *evlist) */ cpus = perf_cpu_map__new_online_cpus(); if (!cpus) - goto out; + return -ENOMEM; threads = perf_thread_map__new_dummy(); - if (!threads) - goto out_put; + if (!threads) { + perf_cpu_map__put(cpus); + return -ENOMEM; + } perf_evlist__set_maps(&evlist->core, cpus, threads); - perf_thread_map__put(threads); -out_put: perf_cpu_map__put(cpus); -out: - return -ENOMEM; + return 0; } int evlist__open(struct evlist *evlist) -- 2.47.1.613.gc27f4b7a9f-goog