From patchwork Wed Apr 24 02:48:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Howard Chu X-Patchwork-Id: 13640981 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 2FF8283A1E; Wed, 24 Apr 2024 02:46:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713926795; cv=none; b=dJCFaUPfNfgzcd44djDz9it38OKcHFRCGTl8B/EV++3Q1pEUVpGAWjQ0lpcQQa6I80cQbbMGEh6+mjYT+ro1nlAxEUCPQ/VG4HnsaGU9eGK1FSlb3okLkOiglQTB5PLh4ftdbTU3N353JUr1WeWIzlaKKxnfXE1UAMwj/IHDdV8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713926795; c=relaxed/simple; bh=7x3bSn+CwYUU5fPN0SrTfXhtq2kTOomoPg+m+5zhRvM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NIFT1KgG7Y1bfsiKj0Znsqo/KFG2+nylGQ3w7PXI/lZU9L9UpjUyUy+/IIdQoxVgKPdZU6Bv2RN4SNC+3YJulx+4S4ZqqJlJwiz/LNmlmf0g2zL8SsB4RlmXpP24TE7UuC3tFjZrzDBxpebpPyeBfgv0vDL8L3H3I0gguCCYTbI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=e6WUGAG3; arc=none smtp.client-ip=209.85.215.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e6WUGAG3" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-60275a82611so1514321a12.1; Tue, 23 Apr 2024 19:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713926793; x=1714531593; darn=vger.kernel.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=9/LdYNrIh2jrT148K4L71/CYqd/g6GGqqQlcIzk9sFI=; b=e6WUGAG3ApzpNeuleawbD8btA4UlButUHsyjpnoFpZ/fTSBUqh060AvJFbmZtNdunN zhdylNtAmt+ZojTPBqNd+SKCh78aFEqkxb96YG4sY/ZgW0f6hSWyV4NdQyElyrmM9rNJ W3wQdt37J18VNN+vRB09vYZNdPXGCHb20RoRigvqD4vuxxmWKpdHrH0QwjAyeDsa509r xI8JnvH0ZrWqrwX1MAB5/ov1wN1Vj57Yj1rtKCRb4grsicMXfxRUeUVOSGhmllNuO0uD pz/NCXHlzHUH8tKCnU6iykA6SmRIWi6xN/E9MNW678DjNwxNRWmCdiLeJFJC0CF1tr+m lAaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713926793; x=1714531593; 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=9/LdYNrIh2jrT148K4L71/CYqd/g6GGqqQlcIzk9sFI=; b=PbeoqOjQ7aPUA6u1J/77utRmkwby0xfLv9srclG9kZ3feBYXTJXUeJgSEmcW/aM3tU eZK+WB0MF7ksixbe+26EK1gJoVY+HzQGMqGLfZ5om62GGlpDxm13AgSicilGNUfF+qNc 1dQl7mFjeacOtnwIBDHVyL7IaJLDjAIYjsG4HZI9rgJK3BdJnj3BcFsrJODV2CXCwv1v X7lF48G64MaqmWUgGoqFqlyYrfwhmVWGSLmg0Ce5d2BOFt/EwR5XFSoSq5/BYt2pJGa7 Xl7zVmMY1Ks5TcZftX3uyIIrjKz8Y6CWF0RqcHqgTI5pwQCWdpZfgbdWCpJRvoy4eruV O8Og== X-Forwarded-Encrypted: i=1; AJvYcCU5MQhHcklo/pE6ddyKP9d5sCoy2oA3cqh2JdW+dox06vfkVoSVaC3BYaE3p6u7yuyGnM8SGuvjxHR1oiByaEMq0P2dW0UPTEtJtOAXqBDLedH35jk9DEseLHqbvAlWI8SK31xMxixIJ+32QE5Bg7L/4eyjX1mNJkdREO5/wqH3LzIYsw== X-Gm-Message-State: AOJu0YxeqoB4pa8/+Xw53od9eAg+rYke7C6EvFlZrmeOaBvnYtkjVWKC i0sn1+mZNZH2WUQBCfYHwf7ggQ5j7q9EN8tLHcab6U16Z2K0JdaA X-Google-Smtp-Source: AGHT+IF/lBJNoZ/yBJVF6QTIK+8p5RUqVNnblvxyiOIEWq5Moxf0xPjKA9tYUiHjTnUJwpffHs0cvA== X-Received: by 2002:a05:6a20:948b:b0:1a3:52ef:cc84 with SMTP id hs11-20020a056a20948b00b001a352efcc84mr1041883pzb.60.1713926793345; Tue, 23 Apr 2024 19:46:33 -0700 (PDT) Received: from localhost.localdomain ([120.229.49.143]) by smtp.gmail.com with ESMTPSA id t6-20020a170902e84600b001e604438791sm10739243plg.156.2024.04.23.19.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 19:46:33 -0700 (PDT) From: Howard Chu To: peterz@infradead.org Cc: mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, zegao2021@gmail.com, leo.yan@linux.dev, ravi.bangoria@amd.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH v2 1/4] perf record off-cpu: Parse off-cpu event, change config location Date: Wed, 24 Apr 2024 10:48:02 +0800 Message-ID: <20240424024805.144759-2-howardchu95@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424024805.144759-1-howardchu95@gmail.com> References: <20240424024805.144759-1-howardchu95@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Parse off-cpu events using parse_event(). Change the location of record__config_off_cpu, after record__open because we need to write mmapped fds into BPF's perf_event_array map, also, write sample_id/sample_type into BPF. In record__pushfn and record__aio_pushfn, handle off-cpu samples by off_cpu_strip. This is because the off-cpu samples that we want to write to perf.data is in off-cpu samples' raw_data section: regular samples: [sample: sample_data] off-cpu samples: [sample: [raw_data: sample_data]] We need to extract the useful sample data out before writing. Hooks record_done just before evlist__disable to stop BPF program from outputting, otherwise, we lose some samples. After samples are collected, change sample_type of off-cpu event to the OFFCPU_SAMPLE_TYPES for parsing correctly, it was PERF_SAMPLE_RAW and some others, because BPF can only output to a specific type of perf_event, which is why `evsel->core.attr.sample_type &= OFFCPU_SAMPLE_TYPES;` is deleted in util/evsel.c. Signed-off-by: Howard Chu --- tools/perf/builtin-record.c | 98 ++++++++++++++++++++++++++++++++++--- tools/perf/util/evsel.c | 8 --- 2 files changed, 91 insertions(+), 15 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 2ff718d3e202..3994adaf4607 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -389,6 +389,8 @@ struct record_aio { static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size) { struct record_aio *aio = to; + char *bf_stripped = NULL; + size_t stripped; /* * map->core.base data pointed by buf is copied into free map->aio.data[] buffer @@ -404,6 +406,31 @@ static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size * from the beginning of the kernel buffer till the end of the data chunk. */ + if (aio->rec->off_cpu) { + if (size == 0) + return 0; + + map->core.start -= size; + size = map->core.end - map->core.start; + + bf_stripped = malloc(size); + + if (bf_stripped == NULL) { + pr_err("Failed to allocate off-cpu strip buffer\n"); + return -ENOMEM; + } + + stripped = off_cpu_strip(aio->rec->evlist, map, bf_stripped, size); + + if (stripped < 0) { + size = (int)stripped; + goto out; + } + + size = stripped; + buf = bf_stripped; + } + if (record__comp_enabled(aio->rec)) { ssize_t compressed = zstd_compress(aio->rec->session, NULL, aio->data + aio->size, mmap__mmap_len(map) - aio->size, @@ -432,6 +459,9 @@ static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size aio->size += size; +out: + free(bf_stripped); + return size; } @@ -635,6 +665,38 @@ static int process_locked_synthesized_event(struct perf_tool *tool, static int record__pushfn(struct mmap *map, void *to, void *bf, size_t size) { struct record *rec = to; + int err; + char *bf_stripped = NULL; + size_t stripped; + + if (rec->off_cpu) { + /* + * We'll read all the events at once without masking. + * When reading the remainder from a map, the size is 0, because + * start is shifted to the end so no more data is to be read. + */ + if (size == 0) + return 0; + + map->core.start -= size; + /* size in total */ + size = map->core.end - map->core.start; + + bf_stripped = malloc(size); + + if (bf_stripped == NULL) { + pr_err("Failed to allocate off-cpu strip buffer\n"); + return -ENOMEM; + } + + stripped = off_cpu_strip(rec->evlist, map, bf_stripped, size); + + if (stripped < 0) + return (int)stripped; + + size = stripped; + bf = bf_stripped; + } if (record__comp_enabled(rec)) { ssize_t compressed = zstd_compress(rec->session, map, map->data, @@ -648,7 +710,11 @@ static int record__pushfn(struct mmap *map, void *to, void *bf, size_t size) } thread->samples++; - return record__write(rec, map, bf, size); + err = record__write(rec, map, bf, size); + + free(bf_stripped); + + return err; } static volatile sig_atomic_t signr = -1; @@ -1790,6 +1856,7 @@ record__finish_output(struct record *rec) if (rec->buildid_all) perf_session__dsos_hit_all(rec->session); } + perf_session__write_header(rec->session, rec->evlist, fd, true); return; @@ -2501,6 +2568,14 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } } + if (rec->off_cpu) { + err = record__config_off_cpu(rec); + if (err) { + pr_err("record__config_off_cpu failed, error %d\n", err); + goto out_free_threads; + } + } + /* * Normally perf_session__new would do this, but it doesn't have the * evlist. @@ -2764,6 +2839,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) * disable events in this case. */ if (done && !disabled && !target__none(&opts->target)) { + perf_hooks__invoke_record_done(); trigger_off(&auxtrace_snapshot_trigger); evlist__disable(rec->evlist); disabled = true; @@ -2827,14 +2903,17 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } else status = err; - if (rec->off_cpu) - rec->bytes_written += off_cpu_write(rec->session); - record__read_lost_samples(rec); record__synthesize(rec, true); /* this will be recalculated during process_buildids() */ rec->samples = 0; + /* change to the correct sample type for parsing */ + if (rec->off_cpu && off_cpu_prepare_parse(rec->evlist)) { + pr_err("ERROR: Failed to change sample type for off-cpu event\n"); + goto out_delete_session; + } + if (!err) { if (!rec->timestamp_filename) { record__finish_output(rec); @@ -3198,7 +3277,7 @@ static int switch_output_setup(struct record *rec) unsigned long val; /* - * If we're using --switch-output-events, then we imply its + * If we're using --switch-output-events, then we imply its * --switch-output=signal, as we'll send a SIGUSR2 from the side band * thread to its parent. */ @@ -4221,9 +4300,14 @@ int cmd_record(int argc, const char **argv) } if (rec->off_cpu) { - err = record__config_off_cpu(rec); + char off_cpu_event[64]; + + snprintf(off_cpu_event, sizeof(off_cpu_event), + "bpf-output/no-inherit=1,name=%s/", OFFCPU_EVENT); + + err = parse_event(rec->evlist, off_cpu_event); if (err) { - pr_err("record__config_off_cpu failed, error %d\n", err); + pr_err("Failed to open off-cpu event\n"); goto out; } } diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 3536404e9447..c08ae6a3c8d6 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1092,11 +1092,6 @@ static void evsel__set_default_freq_period(struct record_opts *opts, } } -static bool evsel__is_offcpu_event(struct evsel *evsel) -{ - return evsel__is_bpf_output(evsel) && evsel__name_is(evsel, OFFCPU_EVENT); -} - /* * The enable_on_exec/disabled value strategy: * @@ -1363,9 +1358,6 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts, if (evsel__is_dummy_event(evsel)) evsel__reset_sample_bit(evsel, BRANCH_STACK); - if (evsel__is_offcpu_event(evsel)) - evsel->core.attr.sample_type &= OFFCPU_SAMPLE_TYPES; - arch__post_evsel_config(evsel, attr); } From patchwork Wed Apr 24 02:48:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Howard Chu X-Patchwork-Id: 13640982 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (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 B9E247F490; Wed, 24 Apr 2024 02:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713926802; cv=none; b=iFYCLXCXEChWIlRBO7WOylbZ9rkb9BhqWZW/RGbbDdKZy8njMI7yNEsgcDOAaHGjtuZKvpSIMXacuq8kx4EDerjvQ9uQwRjankZ1AZSk84iSuQf8MC5X8CJYZSU15gbe1wXyRC09IFnHPlRzetARbQQZwn34p9QbDtRel6e6P+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713926802; c=relaxed/simple; bh=Q4F/mjGL04omI/F4DnqKwPCE80jizvJK5TTsS54Tu7c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kF0PmuCYfwVMOdmPJ51IQGunO2gp1uAC+/VVAft9IIXOmeB8Pe8qOV+BAPsw9EPKwXuTjbOJAGSu5WCKqud3R0v6c0KarHvlj5qtfF0b6IJ4faE6WXpl33icvOLO5V4RYpoEzCHBbipZyFRjx8Z5UCMlePYv/v1za/0DKzlswHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GYpO372l; arc=none smtp.client-ip=209.85.215.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GYpO372l" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-5ce6b5e3c4eso3656611a12.2; Tue, 23 Apr 2024 19:46:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713926800; x=1714531600; darn=vger.kernel.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=jQkaeKT7wGrh6q9+DS5H6+jIFHlXe8EVn0EF1bUWHFE=; b=GYpO372lpw/n+kyKlPWdnjzGQbuhlwowl68Rqs/ZlVaFYZ04e8XkTH5Xj22prpWIdN HawUvFjedaRqg+rA6xehGa9rnr7WhBCcOt4BnjcQxXLO+fStfmTidIkrDqIbJkEO5KY8 2O6M0ExR72AZ8mOPAuJpF6qe5KtYxYOZLnjztzk2vKf3r/OEhmON/efggayREclC1Cok RBdFX5L5L2ibtap4XHCjkGQAN0IQiCh8mw5OGD9ApGBWKI40qeMp2i6yELsdH8NO8+d5 7fUlK1OZilNhunIROM8q3bLtTkC/NsTfx2WZ3NQ9QmyPxhZSXmMtiI71E+y/q3A9WvZ3 wwKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713926800; x=1714531600; 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=jQkaeKT7wGrh6q9+DS5H6+jIFHlXe8EVn0EF1bUWHFE=; b=OWYnszhbnrZiKqkRj7sXE9bWEkYVw/4XfHFZcTbQDdGvyR4BV5Ct/GACI5Gctfj69i S+6lwDs99MXnGUaw3K64bfl5ybOqnbmoGrY+MYv+9CaeOk/GsvZlLxMRsqM9nMSa/Msn 1RzPwIPkFCyf+pocpWhFNiW6BhN29oLKoqoFmtmIpU3nzbifGNyXLus7I+KCBF1gRnC3 yaMIedQNtOdkj8yIEyz0ADVkXc+cka+lBtw8HATPHAxRBsHDexcUMSXflevTPiB6IF1c 77dSEGcjN2lcv4O8lW7fJfpYPONCyWpE7dtYpPXVxJqJ9UT95Gh/f3f3hwt/2mjU1dy3 qD1Q== X-Forwarded-Encrypted: i=1; AJvYcCUFcwzg5hgD8ICEafCvxmAj4G+ZlxejtPGbtM7gstReJ30xTnDPidQz2gyve4bRRjjmNN9cz2XsixXcd7KwVWm6HxTsL5HDG6e5AVY+jViA6w7WK525OvnlpNdwy0W8demdpG/zHhLGqQuaKvvzEQQgIOCfjuwm6tsDU6LSlF2VLsffdw== X-Gm-Message-State: AOJu0YxRQEdjOYentGL1E5Qx8bbd7XxalJOsNMy0BiGy4cUi/1xsQLsF FqeJfWTbYo1BIQkdU+svIF8sJieIJ14iPpy7hj7sY8emNYqgZp6S X-Google-Smtp-Source: AGHT+IF8Z9K4EnFUSaYlfpVn2pahw/Hu8HZxyOI0cPtBT7B65saDGTUPHFHnzAmTWFABTscbirFncA== X-Received: by 2002:a05:6a20:974a:b0:1ad:746:b15a with SMTP id hs10-20020a056a20974a00b001ad0746b15amr1061236pzc.47.1713926800012; Tue, 23 Apr 2024 19:46:40 -0700 (PDT) Received: from localhost.localdomain ([120.229.49.143]) by smtp.gmail.com with ESMTPSA id t6-20020a170902e84600b001e604438791sm10739243plg.156.2024.04.23.19.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 19:46:39 -0700 (PDT) From: Howard Chu To: peterz@infradead.org Cc: mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, zegao2021@gmail.com, leo.yan@linux.dev, ravi.bangoria@amd.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH v2 2/4] perf record off-cpu: BPF perf_event_output on sched_switch Date: Wed, 24 Apr 2024 10:48:03 +0800 Message-ID: <20240424024805.144759-3-howardchu95@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424024805.144759-1-howardchu95@gmail.com> References: <20240424024805.144759-1-howardchu95@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 bpf_perf_event_output the off-cpu samples on sched_switch. Because most of the time can_record() returns 0, we can't collect stacks, so when stack trace is collectable, store it in stack_save for later output. If we don't do that, most of the off-cpu samples won't have a stack trace. And since stack traces are collected in task_storage, we don't need to worry about maps getting data overflow. There is a threshold OUTPUT_THRESHOLD (ns) to decide the minimum off-CPU time to trigger output, it is now set to zero. I need opinions on this value. Signed-off-by: Howard Chu --- tools/perf/util/bpf_skel/off_cpu.bpf.c | 163 ++++++++++++++++++++----- 1 file changed, 135 insertions(+), 28 deletions(-) diff --git a/tools/perf/util/bpf_skel/off_cpu.bpf.c b/tools/perf/util/bpf_skel/off_cpu.bpf.c index d877a0a9731f..81114de2436d 100644 --- a/tools/perf/util/bpf_skel/off_cpu.bpf.c +++ b/tools/perf/util/bpf_skel/off_cpu.bpf.c @@ -17,9 +17,13 @@ #define MAX_STACKS 32 #define MAX_ENTRIES 102400 +#define MAX_CPUS 4096 +#define MAX_OFFCPU_LEN 128 + +/* minimum offcpu time to trigger output */ +#define OUTPUT_THRESHOLD 0ULL struct tstamp_data { - __u32 stack_id; __u32 state; __u64 timestamp; }; @@ -27,17 +31,17 @@ struct tstamp_data { struct offcpu_key { __u32 pid; __u32 tgid; - __u32 stack_id; __u32 state; __u64 cgroup_id; }; -struct { - __uint(type, BPF_MAP_TYPE_STACK_TRACE); - __uint(key_size, sizeof(__u32)); - __uint(value_size, MAX_STACKS * sizeof(__u64)); - __uint(max_entries, MAX_ENTRIES); -} stacks SEC(".maps"); +struct offcpu_array { + u64 array[MAX_OFFCPU_LEN]; +}; + +struct stack_array { + u64 array[MAX_STACKS]; +}; struct { __uint(type, BPF_MAP_TYPE_TASK_STORAGE); @@ -46,13 +50,6 @@ struct { __type(value, struct tstamp_data); } tstamp SEC(".maps"); -struct { - __uint(type, BPF_MAP_TYPE_HASH); - __uint(key_size, sizeof(struct offcpu_key)); - __uint(value_size, sizeof(__u64)); - __uint(max_entries, MAX_ENTRIES); -} off_cpu SEC(".maps"); - struct { __uint(type, BPF_MAP_TYPE_HASH); __uint(key_size, sizeof(__u32)); @@ -74,6 +71,34 @@ struct { __uint(max_entries, 1); } cgroup_filter SEC(".maps"); +struct { + __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(__u32)); + __uint(max_entries, MAX_CPUS); +} offcpu_output SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(struct offcpu_array)); + __uint(max_entries, 1); +} offcpu_data SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(struct stack_array)); + __uint(max_entries, 1); +} stack_frame SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_TASK_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC); + __type(key, int); + __type(value, struct stack_array); +} stack_save SEC(".maps"); + /* new kernel task_struct definition */ struct task_struct___new { long __state; @@ -96,6 +121,8 @@ const volatile bool uses_cgroup_v1 = false; int perf_subsys_id = -1; +u64 sample_id, sample_type; + /* * Old kernel used to call it task_struct->state and now it's '__state'. * Use BPF CO-RE "ignored suffix rule" to deal with it like below: @@ -182,50 +209,130 @@ static inline int can_record(struct task_struct *t, int state) return 1; } +static inline bool check_bounds(int index) +{ + if (index >= 0 && index < MAX_OFFCPU_LEN) + return true; + + return false; +} + +static inline int copy_stack(struct stack_array *from, + struct offcpu_array *to, int n) +{ + int max_stacks = MAX_STACKS, len = 0; + + if (!from) + return len; + + for (int i = 0; i < max_stacks && from->array[i]; ++i) { + if (check_bounds(n + 2 + i)) { + to->array[n + 2 + i] = from->array[i]; + ++len; + } + } + return len; +} + static int off_cpu_stat(u64 *ctx, struct task_struct *prev, struct task_struct *next, int state) { __u64 ts; - __u32 stack_id; struct tstamp_data *pelem; - + struct stack_array *frame, *stack_save_p; ts = bpf_ktime_get_ns(); + int zero = 0, len = 0, size; if (!can_record(prev, state)) goto next; - stack_id = bpf_get_stackid(ctx, &stacks, - BPF_F_FAST_STACK_CMP | BPF_F_USER_STACK); + frame = bpf_map_lookup_elem(&stack_frame, &zero); + if (frame) + len = bpf_get_stack(ctx, frame->array, MAX_STACKS * sizeof(u64), + BPF_F_USER_STACK) / sizeof(u64); + + /* save stacks if collectable */ + if (len > 0) { + stack_save_p = bpf_task_storage_get(&stack_save, prev, NULL, + BPF_LOCAL_STORAGE_GET_F_CREATE); + if (stack_save_p) + for (int i = 0; i < len && i < MAX_STACKS; ++i) + stack_save_p->array[i] = frame->array[i]; + } pelem = bpf_task_storage_get(&tstamp, prev, NULL, BPF_LOCAL_STORAGE_GET_F_CREATE); + if (!pelem) goto next; pelem->timestamp = ts; pelem->state = state; - pelem->stack_id = stack_id; next: pelem = bpf_task_storage_get(&tstamp, next, NULL, 0); + stack_save_p = bpf_task_storage_get(&stack_save, next, NULL, 0); + if (pelem && pelem->timestamp) { struct offcpu_key key = { .pid = next->pid, .tgid = next->tgid, - .stack_id = pelem->stack_id, .state = pelem->state, .cgroup_id = needs_cgroup ? get_cgroup_id(next) : 0, }; - __u64 delta = ts - pelem->timestamp; - __u64 *total; - total = bpf_map_lookup_elem(&off_cpu, &key); - if (total) - *total += delta; - else - bpf_map_update_elem(&off_cpu, &key, &delta, BPF_ANY); + __u64 delta = ts - pelem->timestamp; + struct offcpu_array *data = bpf_map_lookup_elem(&offcpu_data, &zero); + + if (data && delta >= OUTPUT_THRESHOLD) { + int n = 0; + int ip_pos = -1; + + if (sample_type & PERF_SAMPLE_IDENTIFIER && check_bounds(n)) + data->array[n++] = sample_id; + if (sample_type & PERF_SAMPLE_IP && check_bounds(n)) { + ip_pos = n; + data->array[n++] = 0; /* will be updated */ + } + if (sample_type & PERF_SAMPLE_TID && check_bounds(n)) + data->array[n++] = (u64)key.pid << 32 | key.tgid; + if (sample_type & PERF_SAMPLE_TIME && check_bounds(n)) + data->array[n++] = pelem->timestamp; + if (sample_type & PERF_SAMPLE_ID && check_bounds(n)) + data->array[n++] = sample_id; + if (sample_type & PERF_SAMPLE_CPU && check_bounds(n)) + data->array[n++] = 0; + if (sample_type & PERF_SAMPLE_PERIOD && check_bounds(n)) + data->array[n++] = delta; + if (sample_type & PERF_SAMPLE_CALLCHAIN && check_bounds(n + 2)) { + len = 0; + + /* data->array[n] is callchain->nr (updated later) */ + data->array[n + 1] = PERF_CONTEXT_USER; + data->array[n + 2] = 0; + + len = copy_stack(stack_save_p, data, n); + + /* update length of callchain */ + data->array[n] = len + 1; + + /* update sample ip with the first callchain entry */ + if (ip_pos >= 0) + data->array[ip_pos] = data->array[n + 2]; + + /* calculate sample callchain data->array length */ + n += len + 2; + } + if (sample_type & PERF_SAMPLE_CGROUP && check_bounds(n)) + data->array[n++] = key.cgroup_id; + + size = n * sizeof(u64); + if (size >= 0 && size <= MAX_OFFCPU_LEN * sizeof(u64)) + bpf_perf_event_output(ctx, &offcpu_output, BPF_F_CURRENT_CPU, + data, size); + } /* prevent to reuse the timestamp later */ pelem->timestamp = 0; } From patchwork Wed Apr 24 02:48:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Howard Chu X-Patchwork-Id: 13640983 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 99385142910; Wed, 24 Apr 2024 02:46:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713926809; cv=none; b=Z7/CHf3NMYJWFlwThTMlh4FdFYwEUUkAZ+/aSZRY+/63BWapgt7R+BSFuk+gjfk48HLEvkE3FgYTNksdaItzx+PsML/AmVfkCU7JCi3AiDGY292Tk364eptTjsxIR94VBPZX3VXdihclv4PNqpxl7SVO/i0xC2F3GxpJVV+kXrw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713926809; c=relaxed/simple; bh=IAWHe/WGFHNTDrFwvQXGWoYkFQwgloe0onaet/X378k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n/hXnIJtMEIk73Co577m2BSUR+v3MPwVj0i8nXVJRsKPcpz/Fe4HgMVE/NYjKou+yd7EoPBopmlN6GDd2hd3TesR0phWKtpLi7RKjj6CwIPNspfRYhM05H8QgObeKsCZ97d2L1+j4WYz9pIbkRJInsEeASpWXAH4pjSk+w1qRpw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=igf3hcsS; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="igf3hcsS" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1e4bf0b3e06so60037825ad.1; Tue, 23 Apr 2024 19:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713926807; x=1714531607; darn=vger.kernel.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=WD6FLyFd+kaR4G9qqagHI1pHRoK87i1I+Wy5F/wZChs=; b=igf3hcsSz73/jD+uSs5cGYmfVD3nyCNX3JagdGW7Rxm+sI+tBTcLR7Ug+METFAuOTO HRSQ6wEfLZqkf1AqeBTZ/5XOISXR0yoJUpnVunAWPlmvzgOa5qwuB2lRneLuWrNK/cKp x+aZwbV+ieZPDhDkaVtJ/4s6dYMW7T4JWjjRzHsoAxiBO81Wus1lW1wqLsqFLRQqJYoY /ASjkRSjAaPt92Cveh6IkJNLLlQ0bJJEyyJMU+5t6gjuRTdLSolfbUv6ktkYtE6XuvrG H5bO1XcO9qQRZb2J8tHQJFU8lT0BMp2ci9n2QiVnbZyYX1bhq6AK6WZS2XzBFjLC97eW m0Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713926807; x=1714531607; 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=WD6FLyFd+kaR4G9qqagHI1pHRoK87i1I+Wy5F/wZChs=; b=gckCj6IF+ZCMyAbPe8sosMmECmCIuydFIcI9IarVgiCt3nqLpC66Wwt0wx+MY9Hrtb 07srCwvpWJtA04xuxLneGg8w7i/FGGJ+rmn0eEmb2vPIB3dwx5+6lctqWyOTFwgpUxCu UyZXDxOkFtD6DIp6K5zYZi3kVzUCSm70+Gg4rDGvHVsF0+uu5/ZyJi8me1i9dn2u/R7/ auknCiYbiqiBgZ/Mq+AnbH3QC4BdQv9DKOBqELreZhYtDJdcnrjII/PcvUh77LTGtnRg UIHeNnklc83h61+kINfSXCDApZ5pOrcUgx27haPsTovH6jF1ntoCEnq8JIWMT6PznJcD 8ssQ== X-Forwarded-Encrypted: i=1; AJvYcCWWjynYEqvp9Ch9/JDf3WBsf7CREtNAUsp0E0CD0tTdwxCv6RTmicnshKWkJRx4biOg8u86Z/iLu6OPyGUoQlmEIBgBP8SX/Wc2yoqPK0tlW9GRFwGoLj8z+FTZ7eFGj5dLgIjjlyHNWf2lXoVkoG+5g14TwGeW+tyEeZFrvkEFoZYI6Q== X-Gm-Message-State: AOJu0YzTHWWJ2mtJ5k065N2dKEJe49grcrr9s/d40CE9YWxwuWm7NPl8 JAAkR3ow8Q4ZBgLpgCsKISJAJTP4nwFSGH3R4u/Ne/bEwO+rRcW7 X-Google-Smtp-Source: AGHT+IGrT/CLvhvXaeyeMW8KmXQsEeyjRYnG1dAcTKRxQylkrtfhTczpntsU0x2jZAyYRNZ4iLBKqQ== X-Received: by 2002:a17:902:ec91:b0:1e0:983c:d686 with SMTP id x17-20020a170902ec9100b001e0983cd686mr1327968plg.20.1713926806655; Tue, 23 Apr 2024 19:46:46 -0700 (PDT) Received: from localhost.localdomain ([120.229.49.143]) by smtp.gmail.com with ESMTPSA id t6-20020a170902e84600b001e604438791sm10739243plg.156.2024.04.23.19.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 19:46:46 -0700 (PDT) From: Howard Chu To: peterz@infradead.org Cc: mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, zegao2021@gmail.com, leo.yan@linux.dev, ravi.bangoria@amd.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH v2 3/4] perf record off-cpu: extract off-cpu sample data from raw_data Date: Wed, 24 Apr 2024 10:48:04 +0800 Message-ID: <20240424024805.144759-4-howardchu95@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424024805.144759-1-howardchu95@gmail.com> References: <20240424024805.144759-1-howardchu95@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Because we need to extract real sample data from raw_data, an off_cpu_strip function is needed. In this function, we read events one by one, extract actual samples from raw data. After stripping is done, a new stripped buffer will be written to the file(or compressed). The size is end - start without masking, because masking will be handled by perf_mmap__read_event(). Also, there's no need to call perf_mmap__consume() as it will be called by perf_mmap__push(). We read all the data at once, so start will be moved to end, when perf_mmap__push() is called in pushfn the second time, size will be zero, returns directly. Hook record_done instead of record_end to off_cpu_finish. Although moving record_end hook is also fine because currently, only off-cpu is using these hooks, technically record doesn't end when we need to turn off BPF output, so it may confuse if moved. The reason why there's an additional off_cpu_prepare_parse is that it cannot be put into off_cpu_finish because there are still samples to be read(which requires sample_type to stay PERF_SAMPLE_RAW), and it cannot be hooked to record_end because it has to be put before record__finish_output. Signed-off-by: Howard Chu --- tools/perf/util/bpf_off_cpu.c | 242 +++++++++++++----------------- tools/perf/util/off_cpu.h | 14 +- tools/perf/util/perf-hooks-list.h | 1 + 3 files changed, 118 insertions(+), 139 deletions(-) diff --git a/tools/perf/util/bpf_off_cpu.c b/tools/perf/util/bpf_off_cpu.c index 6af36142dc5a..4b055b77d734 100644 --- a/tools/perf/util/bpf_off_cpu.c +++ b/tools/perf/util/bpf_off_cpu.c @@ -12,6 +12,9 @@ #include "util/thread_map.h" #include "util/cgroup.h" #include "util/strlist.h" +#include "util/mmap.h" +#include "util/sample.h" +#include #include #include "bpf_skel/off_cpu.skel.h" @@ -23,51 +26,6 @@ static struct off_cpu_bpf *skel; -struct off_cpu_key { - u32 pid; - u32 tgid; - u32 stack_id; - u32 state; - u64 cgroup_id; -}; - -union off_cpu_data { - struct perf_event_header hdr; - u64 array[1024 / sizeof(u64)]; -}; - -static int off_cpu_config(struct evlist *evlist) -{ - struct evsel *evsel; - struct perf_event_attr attr = { - .type = PERF_TYPE_SOFTWARE, - .config = PERF_COUNT_SW_BPF_OUTPUT, - .size = sizeof(attr), /* to capture ABI version */ - }; - char *evname = strdup(OFFCPU_EVENT); - - if (evname == NULL) - return -ENOMEM; - - evsel = evsel__new(&attr); - if (!evsel) { - free(evname); - return -ENOMEM; - } - - evsel->core.attr.freq = 1; - evsel->core.attr.sample_period = 1; - /* off-cpu analysis depends on stack trace */ - evsel->core.attr.sample_type = PERF_SAMPLE_CALLCHAIN; - - evlist__add(evlist, evsel); - - free(evsel->name); - evsel->name = evname; - - return 0; -} - static void off_cpu_start(void *arg) { struct evlist *evlist = arg; @@ -125,18 +83,29 @@ static void check_sched_switch_args(void) btf__free(btf); } +int off_cpu_prepare_parse(struct evlist *evlist) +{ + struct evsel *evsel; + + evsel = evlist__find_evsel_by_str(evlist, OFFCPU_EVENT); + if (evsel == NULL) + return -1; + + evsel->core.attr.sample_type = OFFCPU_SAMPLE_TYPES; + + return 0; +} + int off_cpu_prepare(struct evlist *evlist, struct target *target, struct record_opts *opts) { int err, fd, i; int ncpus = 1, ntasks = 1, ncgrps = 1; + u64 sid = 0; struct strlist *pid_slist = NULL; struct str_node *pos; - - if (off_cpu_config(evlist) < 0) { - pr_err("Failed to config off-cpu BPF event\n"); - return -1; - } + struct evsel *evsel; + struct perf_cpu pcpu; skel = off_cpu_bpf__open(); if (!skel) { @@ -250,7 +219,6 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, } if (evlist__first(evlist)->cgrp) { - struct evsel *evsel; u8 val = 1; skel->bss->has_cgroup = 1; @@ -272,6 +240,25 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, } } + evsel = evlist__find_evsel_by_str(evlist, OFFCPU_EVENT); + if (evsel == NULL) { + pr_err("%s evsel not found\n", OFFCPU_EVENT); + goto out; + } + + if (evsel->core.id) + sid = evsel->core.id[0]; + + skel->bss->sample_id = sid; + skel->bss->sample_type = OFFCPU_SAMPLE_TYPES; + + perf_cpu_map__for_each_cpu(pcpu, i, evsel->core.cpus) { + bpf_map__update_elem(skel->maps.offcpu_output, + &pcpu.cpu, sizeof(int), + xyarray__entry(evsel->core.fd, pcpu.cpu, 0), + sizeof(__u32), BPF_ANY); + } + err = off_cpu_bpf__attach(skel); if (err) { pr_err("Failed to attach off-cpu BPF skeleton\n"); @@ -279,7 +266,7 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, } if (perf_hooks__set_hook("record_start", off_cpu_start, evlist) || - perf_hooks__set_hook("record_end", off_cpu_finish, evlist)) { + perf_hooks__set_hook("record_done", off_cpu_finish, evlist)) { pr_err("Failed to attach off-cpu skeleton\n"); goto out; } @@ -291,105 +278,88 @@ int off_cpu_prepare(struct evlist *evlist, struct target *target, return -1; } -int off_cpu_write(struct perf_session *session) +ssize_t off_cpu_strip(struct evlist *evlist, struct mmap *mp, char *dst, size_t size) { - int bytes = 0, size; - int fd, stack; - u64 sample_type, val, sid = 0; + /* + * In this function, we read events one by one, + * stripping actual samples from raw data. + */ + + union perf_event *event, tmp; + u64 sample_type = OFFCPU_SAMPLE_TYPES; + size_t written = 0, event_sz, write_sz, raw_sz_aligned, offset = 0; + void *src; + int err = 0, n = 0; + struct perf_sample sample; struct evsel *evsel; - struct perf_data_file *file = &session->data->file; - struct off_cpu_key prev, key; - union off_cpu_data data = { - .hdr = { - .type = PERF_RECORD_SAMPLE, - .misc = PERF_RECORD_MISC_USER, - }, - }; - u64 tstamp = OFF_CPU_TIMESTAMP; - - skel->bss->enabled = 0; - evsel = evlist__find_evsel_by_str(session->evlist, OFFCPU_EVENT); + evsel = evlist__find_evsel_by_str(evlist, OFFCPU_EVENT); if (evsel == NULL) { pr_err("%s evsel not found\n", OFFCPU_EVENT); - return 0; - } - - sample_type = evsel->core.attr.sample_type; - - if (sample_type & ~OFFCPU_SAMPLE_TYPES) { - pr_err("not supported sample type: %llx\n", - (unsigned long long)sample_type); return -1; } - if (sample_type & (PERF_SAMPLE_ID | PERF_SAMPLE_IDENTIFIER)) { - if (evsel->core.id) - sid = evsel->core.id[0]; - } + /* for writing sample time*/ + if (sample_type & PERF_SAMPLE_IDENTIFIER) + ++n; + if (sample_type & PERF_SAMPLE_IP) + ++n; + if (sample_type & PERF_SAMPLE_TID) + ++n; + + /* no need for perf_mmap__consume(), it will be handled by perf_mmap__push() */ + while ((event = perf_mmap__read_event(&mp->core)) != NULL) { + event_sz = event->header.size; + write_sz = event_sz; + src = event; + + if (event->header.type == PERF_RECORD_SAMPLE) { + err = evlist__parse_sample(evlist, event, &sample); + if (err) { + pr_err("Failed to parse off-cpu sample\n"); + return -1; + } - fd = bpf_map__fd(skel->maps.off_cpu); - stack = bpf_map__fd(skel->maps.stacks); - memset(&prev, 0, sizeof(prev)); + if (sample.raw_data && evsel->core.id) { + bool flag = false; - while (!bpf_map_get_next_key(fd, &prev, &key)) { - int n = 1; /* start from perf_event_header */ - int ip_pos = -1; + for (u32 i = 0; i < evsel->core.ids; i++) { + if (sample.id == evsel->core.id[i]) { + flag = true; + break; + } + } + if (flag) { + memcpy(&tmp, event, event_sz); - bpf_map_lookup_elem(fd, &key, &val); + /* raw data has extra bits for alignment, discard them */ + raw_sz_aligned = sample.raw_size - sizeof(u32); + memcpy(tmp.sample.array, sample.raw_data, raw_sz_aligned); - if (sample_type & PERF_SAMPLE_IDENTIFIER) - data.array[n++] = sid; - if (sample_type & PERF_SAMPLE_IP) { - ip_pos = n; - data.array[n++] = 0; /* will be updated */ - } - if (sample_type & PERF_SAMPLE_TID) - data.array[n++] = (u64)key.pid << 32 | key.tgid; - if (sample_type & PERF_SAMPLE_TIME) - data.array[n++] = tstamp; - if (sample_type & PERF_SAMPLE_ID) - data.array[n++] = sid; - if (sample_type & PERF_SAMPLE_CPU) - data.array[n++] = 0; - if (sample_type & PERF_SAMPLE_PERIOD) - data.array[n++] = val; - if (sample_type & PERF_SAMPLE_CALLCHAIN) { - int len = 0; - - /* data.array[n] is callchain->nr (updated later) */ - data.array[n + 1] = PERF_CONTEXT_USER; - data.array[n + 2] = 0; - - bpf_map_lookup_elem(stack, &key.stack_id, &data.array[n + 2]); - while (data.array[n + 2 + len]) - len++; - - /* update length of callchain */ - data.array[n] = len + 1; - - /* update sample ip with the first callchain entry */ - if (ip_pos >= 0) - data.array[ip_pos] = data.array[n + 2]; - - /* calculate sample callchain data array length */ - n += len + 2; - } - if (sample_type & PERF_SAMPLE_CGROUP) - data.array[n++] = key.cgroup_id; + write_sz = sizeof(struct perf_event_header) + + raw_sz_aligned; + + /* without this we'll have out of order events */ + if (sample_type & PERF_SAMPLE_TIME) + tmp.sample.array[n] = sample.time; - size = n * sizeof(u64); - data.hdr.size = size; - bytes += size; + tmp.header.size = write_sz; + tmp.header.type = PERF_RECORD_SAMPLE; + tmp.header.misc = PERF_RECORD_MISC_USER; - if (perf_data_file__write(file, &data, size) < 0) { - pr_err("failed to write perf data, error: %m\n"); - return bytes; + src = &tmp; + } + } } + if (offset + event_sz > size || written + write_sz > size) + break; - prev = key; - /* increase dummy timestamp to sort later samples */ - tstamp++; + memcpy(dst, src, write_sz); + + dst += write_sz; + written += write_sz; + offset += event_sz; } - return bytes; + + return written; } diff --git a/tools/perf/util/off_cpu.h b/tools/perf/util/off_cpu.h index 2dd67c60f211..1d195cd045ad 100644 --- a/tools/perf/util/off_cpu.h +++ b/tools/perf/util/off_cpu.h @@ -20,7 +20,9 @@ struct record_opts; #ifdef HAVE_BPF_SKEL int off_cpu_prepare(struct evlist *evlist, struct target *target, struct record_opts *opts); -int off_cpu_write(struct perf_session *session); +ssize_t off_cpu_strip(struct evlist *evlist, struct mmap *mp, + char *dst, size_t size); +int off_cpu_prepare_parse(struct evlist *evlist); #else static inline int off_cpu_prepare(struct evlist *evlist __maybe_unused, struct target *target __maybe_unused, @@ -28,8 +30,14 @@ static inline int off_cpu_prepare(struct evlist *evlist __maybe_unused, { return -1; } - -static inline int off_cpu_write(struct perf_session *session __maybe_unused) +static inline ssize_t off_cpu_strip(struct evlist *evlist __maybe_unused, + struct mmap *mp __maybe_unused, + char *dst __maybe_unused, + size_t size __maybe_unused) +{ + return -1; +} +static inline int off_cpu_prepare_parse(struct evlist *evlist __maybe_unused) { return -1; } diff --git a/tools/perf/util/perf-hooks-list.h b/tools/perf/util/perf-hooks-list.h index 2867c07ee84e..1ce4d44ace35 100644 --- a/tools/perf/util/perf-hooks-list.h +++ b/tools/perf/util/perf-hooks-list.h @@ -1,3 +1,4 @@ PERF_HOOK(record_start) PERF_HOOK(record_end) +PERF_HOOK(record_done) PERF_HOOK(test) From patchwork Wed Apr 24 02:48:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Howard Chu X-Patchwork-Id: 13640984 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 59769144304; Wed, 24 Apr 2024 02:46:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713926815; cv=none; b=Wz6OOi3cOq4EllxC3h8+Cw1z91eLabdY8ICZmQJwBvItRqPmJeU//pzso4QUiqfMtlE0xQqST2rf3gCf+DfdXQlXvII+bRCaf7CxU1TNCyyxcENZ+RBhTf9wRGabbpiFzwKMW5Ih2zBUf5rv7/YeX2FB+0ITHlpVZMW5jDPsUSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713926815; c=relaxed/simple; bh=WY61HVXMURNBYLhzrLzOFaXGtfOAIKgfGdHLeoKZ0ds=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rqxsl8cYuuOgT/lYwcFxWn3kLPP+IEO0BNy13FkjasvnioQ8VuOVdKXPLgOdOCkY0YJr7oYZzcxAY6J8CKFiBqGntQD4WRR4W3Sc8Cx+YgjM7ll7GroeUxgG7+vfsxmEi0Vs9H4Pskc/dKW01jW5NYjQh21ZFiUGejJrquYXqJ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Mal+LliR; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Mal+LliR" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1e8f68f8e0dso31418805ad.3; Tue, 23 Apr 2024 19:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713926813; x=1714531613; darn=vger.kernel.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=1ovALNIraa1yswgozSIZAuHax4rLf2fy+nreEUNXYnE=; b=Mal+LliRj02EG7Pg92P2wsaU2s7RZ5yM9u3/CWyXUoHorTMAsGytIvKgvorAbNGc6z oLxUf9Obb6w71aDBvI46v/09HMHfRKL08N/FwDRRXUspqZshgUMKPJ+ZInDGvDDxDDSx UY2Vyfsb997ynEZYkXrH3NDiqjBeRf1fB4gC79z4IvZuivFenYXW4oRY8pez1170M2rh XO5Y9VTyjK713jid5vKD0kpCuWYFIFDbvXVDQCODjkjeiNGRilwgaFIuMQ5qxeoc59Lf CZGhORRXkENc165YehvZEGh6HVMOxjzbxpyjvZ02yCnjwQij7dPnWEE+RlaVQDempYmr Fh5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713926813; x=1714531613; 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=1ovALNIraa1yswgozSIZAuHax4rLf2fy+nreEUNXYnE=; b=I0qpHmCIc5zfals8fCK40tzruauTCUnqjf2jRdDEGpCsP01iO+Fk5H4eWaBS50nVU8 IOo572VNNwdn8RwOwOZLiHa1iRaRVgqpkC+qCNse50O/QcUi0uEft+mmdyPRZNNtTLtt 9Gjv9xWNKFJ+GNdr2ZmF7iyWK15oFOqvmqrNyM7w6wtfDujKWDMxOEmWuGT37wTCCUQ1 R71mB2QjZOjIK7GNV8uzASAhX9lkwlK8PjHdFkoGj1WsQgIHvgGsvfcHIA8PjpyCc+7d BvU/lfj6AI/Vb90Q8nwHWCNvlOseDCXtbWeDMmc5Tsgkeg701VqkB0xLQapxkeiJFbPN dh2g== X-Forwarded-Encrypted: i=1; AJvYcCXHUBvZQZ4McP6A2uAAp3HIsZ1sydHQxs7WkuNkqQI/33NYhc30cNbZA4Y/Xj6d6t/IyynSZTsU0wSUYRKfVH8zWNUp0oeRzRDgz4jFbV1PRA2pxjcOinZJtbqjKj6LoXNK3Oj+TAlmBQEKuRUzoNeyvGGMy6hGtiEiy7hbpqC3ze9C0A== X-Gm-Message-State: AOJu0Yz+tBmlbDbRonfShTx8pCbS+tBK6rCER3g5aY+v1NfVuW0o5Q52 70akK9TAAsw7EGikMpVgqDRvwJxJLkfBL3ULr9438eLntk950g2D X-Google-Smtp-Source: AGHT+IEo8XD7BWj1Z9qoTB1jHp9HGR8lvbdf5Znkuj22vJMEQNkAXOO85UQ328kis9neTsmjuW/ceA== X-Received: by 2002:a17:903:2288:b0:1e4:49:de46 with SMTP id b8-20020a170903228800b001e40049de46mr1602492plh.47.1713926813535; Tue, 23 Apr 2024 19:46:53 -0700 (PDT) Received: from localhost.localdomain ([120.229.49.143]) by smtp.gmail.com with ESMTPSA id t6-20020a170902e84600b001e604438791sm10739243plg.156.2024.04.23.19.46.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 19:46:53 -0700 (PDT) From: Howard Chu To: peterz@infradead.org Cc: mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, zegao2021@gmail.com, leo.yan@linux.dev, ravi.bangoria@amd.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH v2 4/4] perf record off-cpu: delete bound-to-fail test Date: Wed, 24 Apr 2024 10:48:05 +0800 Message-ID: <20240424024805.144759-5-howardchu95@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240424024805.144759-1-howardchu95@gmail.com> References: <20240424024805.144759-1-howardchu95@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since `--off-cpu` now uses the same ring buffer as hardware samples, but `perf record --off-cpu -e dummy sleep 1`does not enable evlist, off-cpu samples cannot be read.`test_offcpu_basic` fails and is no longer necessary. Signed-off-by: Howard Chu --- tools/perf/tests/shell/record_offcpu.sh | 29 ------------------------- 1 file changed, 29 deletions(-) diff --git a/tools/perf/tests/shell/record_offcpu.sh b/tools/perf/tests/shell/record_offcpu.sh index 67c925f3a15a..c446c0cdee4f 100755 --- a/tools/perf/tests/shell/record_offcpu.sh +++ b/tools/perf/tests/shell/record_offcpu.sh @@ -36,30 +36,6 @@ test_offcpu_priv() { fi } -test_offcpu_basic() { - echo "Basic off-cpu test" - - if ! perf record --off-cpu -e dummy -o ${perfdata} sleep 1 2> /dev/null - then - echo "Basic off-cpu test [Failed record]" - err=1 - return - fi - if ! perf evlist -i ${perfdata} | grep -q "offcpu-time" - then - echo "Basic off-cpu test [Failed no event]" - err=1 - return - fi - if ! perf report -i ${perfdata} -q --percent-limit=90 | grep -E -q sleep - then - echo "Basic off-cpu test [Failed missing output]" - err=1 - return - fi - echo "Basic off-cpu test [Success]" -} - test_offcpu_child() { echo "Child task off-cpu test" @@ -88,13 +64,8 @@ test_offcpu_child() { echo "Child task off-cpu test [Success]" } - test_offcpu_priv -if [ $err = 0 ]; then - test_offcpu_basic -fi - if [ $err = 0 ]; then test_offcpu_child fi