From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 857D2253B73 for ; Fri, 25 Jul 2025 18:52:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753469534; cv=none; b=MfOvsajd5ardoqHGZbqOT2JJNhk9Z176YN6LzFHFMtxY/WCGe/hKaMinXKPb2sd/haVVPiEgm1LapbzUN6VVw4o+ZLYRQAW+TaVyf8NxOAttAUOl/j/62Q5m9Zf0qprPRb7spgPRb2nAUcucNEsFS385/vgYDy+5PL8QmBqgfyk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753469534; c=relaxed/simple; bh=x1oDUvRWtnxx2zf7jV9K/bE1vHUJygLj2ln3EI9Q0Jk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rdRYt3M0OPjo188cFRNSFDx/g0EPCCrEvxfYnmIx/kTS7gLABCtWfAcBAH8X3beh7pDEyk+td5m63EL/2u+uvJFBfGRvHwDDVg8YuYulrtTkGkvtTwBZOHKsn75+ncWuaZIjcEmGu5mthYLP4bbiSiLofslzZvMyl0K/q1CPRao= 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=nVL9MYlq; arc=none smtp.client-ip=209.85.214.202 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="nVL9MYlq" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-234906c5e29so29888375ad.0 for ; Fri, 25 Jul 2025 11:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753469533; x=1754074333; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=vKrQy9jWlpHmx2H86IY6nleA9kDjYzDczHYTDNV4vRQ=; b=nVL9MYlqJi6xorZInpp/tVYZkEHHvIC76bgnoDOPbtliEGHUsvYONkGsSDPZRrkz0f KqaknYEku+9pTBlLYffzBmnLhwVdOICpWIUQ03wtDz02m4b0ywwaRHOzwHnkXLV7FlLI 7CP1rOcH3qBkIko9NkR4kvVC31XZI9JP6eW19LhRI+Rcq3z6Ddz0wDHzEh3tw1LuUXrg jF0mRQdpFR7htzlpYMqWsUWEiUwYLPQjOr+i7dK1BLnTqfQIIp8YjN0T+VpT8h9HMq9X H4fxNytp0mRq8rTS+t406fAsxrsiNhm6SA6eaNntxq+mQEQj/WZBjW1/Zm4npQ9Nqo8G zWiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753469533; x=1754074333; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vKrQy9jWlpHmx2H86IY6nleA9kDjYzDczHYTDNV4vRQ=; b=J0zWtO4JWpvocsrKx3IrY+iCemz5VBvrvRCL+j6v6KUb9yPtFVgz/KbabSh4pKTUTV zYkJb4v6kW/Q6Xfu7a/sGxb7gGY7ZCaVnvCX4pdfdKCm6o9372sZqpWysUDCyCroOZLW uiZixTuNALXa5hLervWacbfcOZSMnIV97gCrRxsRi5gHoCU/yn3Qz71OMIA838Ia4zf/ KHqDl+NBWTpNJ/Ut6We9FZ8pIYkKfnCsEWGvG6nX9djpnUEO1Zqb3PekGYXCTwX5G7gG otCqqzea+T6nCLnOkXW0btYPYHSNtGtXFFjvMbg+rFuo3r/VHyH8kWqrG6rKBwBzZTLW 3WbQ== X-Forwarded-Encrypted: i=1; AJvYcCXrmMqxBekNE3tdL03E8ywQwn1toA0J8GzMXBECyUO8Hg1PnQ3B7yrpGUZyirxMgqHjHE1EAN5+Uzs48UUr/qHf@vger.kernel.org X-Gm-Message-State: AOJu0YwioqlyCYG/xduHicn55VgDI0nuaYUI0etLekVE8p6pra/rWOyJ vPqhriGVw0w1EzLDRYPGugbVbW4JYiNMFgy4OGLYNeqxlmUIDpzwjUejdeQcPnGnQeqSj4Ld5T+ PQKowLSqg/g== X-Google-Smtp-Source: AGHT+IGQ0CPUNqlhaiW8IDbXCE7+NjYhca9/C2ns6zlxUx4mQY8Djx0wiDfuNEGDwS2LlHAe8uJR+5CuVj6w X-Received: from pjbsl3.prod.google.com ([2002:a17:90b:2e03:b0:312:1e70:e233]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:292:b0:234:f182:a754 with SMTP id d9443c01a7336-23fb3118d1dmr47509925ad.47.1753469532754; Fri, 25 Jul 2025 11:52:12 -0700 (PDT) Date: Fri, 25 Jul 2025 11:51:47 -0700 In-Reply-To: <20250725185202.68671-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250725185202.68671-1-irogers@google.com> X-Mailer: git-send-email 2.50.1.552.g942d659e1b-goog Message-ID: <20250725185202.68671-2-irogers@google.com> Subject: [PATCH v9 01/16] perf python: Add more exceptions on error paths 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 , James Clark , Xu Yang , "Masami Hiramatsu (Google)" , Collin Funk , Howard Chu , Weilin Wang , Andi Kleen , "Dr. David Alan Gilbert" , Thomas Richter , Tiezhu Yang , Gautam Menghani , Thomas Falcon , Chun-Tse Shao , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Arnaldo Carvalho de Melo Content-Type: text/plain; charset="UTF-8" Returning NULL will cause the python interpreter to fail but not report an error. If none wants to be returned then Py_None needs returning. Set the error for the cases returning NULL so that more meaningful interpreter behavior is had. Signed-off-by: Ian Rogers Tested-by: Arnaldo Carvalho de Melo --- tools/perf/util/python.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 2f28f71325a8..3affde0ad15a 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -475,13 +475,19 @@ static PyObject *pyrf_event__new(const union perf_event *event) if ((event->header.type < PERF_RECORD_MMAP || event->header.type > PERF_RECORD_SAMPLE) && !(event->header.type == PERF_RECORD_SWITCH || - event->header.type == PERF_RECORD_SWITCH_CPU_WIDE)) + event->header.type == PERF_RECORD_SWITCH_CPU_WIDE)) { + PyErr_Format(PyExc_TypeError, "Unexpected header type %u", + event->header.type); return NULL; + } // FIXME this better be dynamic or we need to parse everything // before calling perf_mmap__consume(), including tracepoint fields. - if (sizeof(pevent->event) < event->header.size) + if (sizeof(pevent->event) < event->header.size) { + PyErr_Format(PyExc_TypeError, "Unexpected event size: %zd < %u", + sizeof(pevent->event), event->header.size); return NULL; + } ptype = pyrf_event__type[event->header.type]; pevent = PyObject_New(struct pyrf_event, ptype); @@ -1199,8 +1205,10 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, return NULL; md = get_md(evlist, cpu); - if (!md) + if (!md) { + PyErr_Format(PyExc_TypeError, "Unknown CPU '%d'", cpu); return NULL; + } if (perf_mmap__read_init(&md->core) < 0) goto end; -- 2.50.1.552.g942d659e1b-goog