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 7F3F614830F for ; Thu, 31 Oct 2024 01:43:54 +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=1730339038; cv=none; b=aVMAcf/EiZIK3vOhf3WVBBpWbbsguZ3HrikM2nl4nA9KfM94e7r/GyoziqH8uiydSRk9VI0OH/EHSFZsEHxCvoOb1ijBixfFN/8iIW8p+Xb+fG9yUmO61qlPbVFLz1mR6CXLsOCfxKMxCG/1Eo6FkhduARAxBCBLvrh3rL7uvYo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730339038; c=relaxed/simple; bh=lW07OjyjtiP7BSeHvWrJwzhwe6xJuxZ4Ci6QSD1wU8E=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=hTzIvViXySysykUJdve1OO66IVqu37xyV3JSGTvqJMmedycSnHys2gC17/F0r1/YI43cNlv4P/WLj0XDrtjYu27lkMTVjSW5yf2uVWqCAK5a1VRL1w5iK+unFh3AwFsAxDLdHG/dy4W3Jc7+2OWfE2tStpZWtmTKj2nIjx9dNt4= 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=3oit4txH; 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="3oit4txH" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e2939e25402so731458276.2 for ; Wed, 30 Oct 2024 18:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730339033; x=1730943833; 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=t8Sn8jdbA+NjEGCeG6Gm1wYYNvd28v2iQntXlq3XUm8=; b=3oit4txHj0gb3ZzEWB7LaF7L6IQCTaQP3zQwF0oeuDl8H2aDd3DmRTVnCQAXWPlefd CPggBErzmmxzfh9Bm++ErqJE4wXtmWuyLo7AJMcTPusPL05KVi/jr5mv/EFPY8tG50ZT RmxWrVA0/i/+rRgPOHxcKgwvJLdEzZkGSMzZUOBjA+s9Hkh2ZI/AQEnw/qubxA9Swayo 0w0s5tGoWvJemhZDhOuLdrp3wy8UNNPv22AbL/3o2suxI+lRUVMLye0lhyxYXs4UUNfz lypU6Y+v4wTyUR4sgwSse+XOnpdWccgaNhS/2gP4GQ1NENWMb/HlOOYF7c7SIboz7xHX uY2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730339033; x=1730943833; 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=t8Sn8jdbA+NjEGCeG6Gm1wYYNvd28v2iQntXlq3XUm8=; b=CC93RBS0PjsdUKbkH/rg+vDCACNAfgUd9VwKyUOue42zpHLUs8WHigYWNOiw/R32hF gCkBeMG/4GtQX1qRBAfbt4SFaTtP5huCbMpJCaK6Jy6abdSBiWxEGKRweRmRmyWaczpX 1L1Gm+YggKKoXVbxiu+5+TINf3H6JyoYfYooGvKRICmyiM1srCLxsdne/OB7+kJ8MVHh JdtmWFUOpQ15ONaNGXu60h3DmIrA6LaAFtsNyebQ+9+GBddZ16UWFADb2XOcq313pG9i oE/DCEr9dMXaichyNZ7R3C9cjF3ST5XHQh6/wMd/L3kqR2oI5ttOD2hsXHWgBUklfVcX LbQw== X-Forwarded-Encrypted: i=1; AJvYcCUrFSHokL97/8bpmCdn3y+SCc90B+/v3Ks0DIKe8IbZNumRE1Nu4sj8nbeeQEFafGdcXFPrcvbjXNTvyIvcet04@vger.kernel.org X-Gm-Message-State: AOJu0Yx1T+yRqFNnb1zXSnyFQLzUItvPuptHcK7fDbV0OZ3vubs5hmYv 45Fl1fyB9yJIvtoDKZuoGO+YJ4zCZw7onogE0amOCRxtflqOmWR0VZaHJxgHqB77jv2BEwfZKtM SByap0A== X-Google-Smtp-Source: AGHT+IENQAr4DyjJzfVoLdavjhPbpIIWA4h+VHZAUWU69OewcS/tSnsHo7O4wYPUpEXhUAU71z/C/JUuheGY X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:ad0f:67e7:f1a6:84c4]) (user=irogers job=sendgmr) by 2002:a25:ae64:0:b0:e20:2db0:932e with SMTP id 3f1490d57ef6-e3087bceae0mr63813276.6.1730339033538; Wed, 30 Oct 2024 18:43:53 -0700 (PDT) Date: Wed, 30 Oct 2024 18:42:47 -0700 In-Reply-To: <20241031014252.753588-1-irogers@google.com> Message-Id: <20241031014252.753588-17-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: <20241031014252.753588-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v5 16/21] perf kwork: Make perf_kwork_add_work a callback 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 , Howard Chu , Athira Jajeev , Michael Petlan , Veronika Molnarova , Dapeng Mi , Thomas Richter , Ilya Leoshkevich , Colin Ian King , Weilin Wang , Andi Kleen , Josh Poimboeuf , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" perf_kwork_add_work is declared in builtin-kwork, whereas much kwork code is in util. To avoid needing to stub perf_kwork_add_work in python.c, add a callback to struct perf_kwork and initialize it in builtin-kwork to perf_kwork_add_work - this is the only struct perf_kwork. This removes the need for the stub in python.c. Signed-off-by: Ian Rogers --- tools/perf/builtin-kwork.c | 3 ++- tools/perf/util/bpf_kwork.c | 2 +- tools/perf/util/bpf_kwork_top.c | 2 +- tools/perf/util/kwork.h | 6 ++++-- tools/perf/util/python.c | 12 ------------ 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index c1daf82c9b92..fabfcb74800b 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -1846,7 +1846,7 @@ static void process_skipped_events(struct perf_kwork *kwork, } } -struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork, +static struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork, struct kwork_class *class, struct kwork_work *key) { @@ -2344,6 +2344,7 @@ int cmd_kwork(int argc, const char **argv) .all_runtime = 0, .all_count = 0, .nr_skipped_events = { 0 }, + .add_work = perf_kwork_add_work, }; static const char default_report_sort_order[] = "runtime, max, count"; static const char default_latency_sort_order[] = "avg, max, count"; diff --git a/tools/perf/util/bpf_kwork.c b/tools/perf/util/bpf_kwork.c index 6c7126b7670d..5cff755c71fa 100644 --- a/tools/perf/util/bpf_kwork.c +++ b/tools/perf/util/bpf_kwork.c @@ -285,7 +285,7 @@ static int add_work(struct perf_kwork *kwork, (bpf_trace->get_work_name(key, &tmp.name))) return -1; - work = perf_kwork_add_work(kwork, tmp.class, &tmp); + work = kwork->add_work(kwork, tmp.class, &tmp); if (work == NULL) return -1; diff --git a/tools/perf/util/bpf_kwork_top.c b/tools/perf/util/bpf_kwork_top.c index 7261cad43468..b6f187dd9136 100644 --- a/tools/perf/util/bpf_kwork_top.c +++ b/tools/perf/util/bpf_kwork_top.c @@ -255,7 +255,7 @@ static int add_work(struct perf_kwork *kwork, struct work_key *key, bpf_trace = kwork_class_bpf_supported_list[type]; tmp.class = bpf_trace->class; - work = perf_kwork_add_work(kwork, tmp.class, &tmp); + work = kwork->add_work(kwork, tmp.class, &tmp); if (!work) return -1; diff --git a/tools/perf/util/kwork.h b/tools/perf/util/kwork.h index 76fe2a821bcf..29352ca1d497 100644 --- a/tools/perf/util/kwork.h +++ b/tools/perf/util/kwork.h @@ -251,12 +251,14 @@ struct perf_kwork { * perf kwork top data */ struct kwork_top_stat top_stat; -}; -struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork, + /* Add work callback. */ + struct kwork_work *(*add_work)(struct perf_kwork *kwork, struct kwork_class *class, struct kwork_work *key); +}; + #ifdef HAVE_BPF_SKEL int perf_kwork__trace_prepare_bpf(struct perf_kwork *kwork); diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index c52da509ae58..6e2ff0076daa 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -16,7 +16,6 @@ #include "thread_map.h" #include "trace-event.h" #include "mmap.h" -#include "util/kwork.h" #include "util/sample.h" #include @@ -1297,14 +1296,3 @@ PyMODINIT_FUNC PyInit_perf(void) PyErr_SetString(PyExc_ImportError, "perf: Init failed!"); return module; } - - -/* The following are stubs to avoid dragging in builtin-* objects. */ -/* TODO: move the code out of the builtin-* file into util. */ - -struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork __maybe_unused, - struct kwork_class *class __maybe_unused, - struct kwork_work *key __maybe_unused) -{ - return NULL; -} -- 2.47.0.163.g1226f6d8fa-goog