From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 0395C240611 for ; Wed, 29 Apr 2026 06:00:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777442410; cv=none; b=MVf2p9El41XTP+CzWwcMDixhMqmNyYF+OttBrsI3G44E4iCB4xN3I7jnpfTgNXbdbnsTgo5wEOJ74xqPEBoEOHovizzgnVGox0F3XFtW2xPM4bzfy0o1EZ/wOhpkZRdxM4zt951eIyxwymyDHbw3/YM0B/n0tM3Qm2P9DAyITYE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777442410; c=relaxed/simple; bh=7zmS9GDWi3wbZCuXYuItLRAaJ8a2WWSm866VFXPPo2k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=oSOjhwJPYsh8VT+vix+AnAulzLn0ul5Kfo4ViXy1Bcr/wsxI03UDjAoC9F0oJ7WoOQpa1utEHipQuG0WnSLBGv7dmoEn0hGTI19vpJKbAnd/9N0G2NlZNTLCCAFx8TwndRpEaplec5lmCDR4nQJfZIxJzCBSblVyW2r5C5y9+ms= 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=hkAZ6RsL; arc=none smtp.client-ip=209.85.215.179 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="hkAZ6RsL" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c70e27e2b74so4593098a12.0 for ; Tue, 28 Apr 2026 23:00:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777442408; x=1778047208; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mQmqSoETflQHuHRPhCW+E4N8O4HeQPIfoSYzh8kuRv8=; b=hkAZ6RsLCPy09Ei5FpAFDVuXhGs4mUcj9d5hBPE5ZQIDnCM1WjcUyNm4uO1fWo1Q73 yyDDrXf9p+Q5LOgGOD2YDg5/9MX7XyvfglKBEYvTkOCm4Iyg7QV6A2RqgJYw3zTQwD7m P49hOb/4Ivyez7UC856901d1D6ZO/GwassRQu4LtFMQke4ytuuXqOva9eD07S1qMWlBA 9klzpGvLk7MAQba9sz1SAn/dwYc1f3XcRXD3PCAZ+V2k7vTnqBxDAxHmpUo0OfbEAR2c AtoUrfbLwL6se7/HgBHwWaX0BGOckdjhqQNcn0cFHE7wna2EttJY++Z+kudr0PoX67Hv Vv0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777442408; x=1778047208; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mQmqSoETflQHuHRPhCW+E4N8O4HeQPIfoSYzh8kuRv8=; b=gRfd7/UlTCF8CFqCBUzl8v8Pi1xJ0W1t/lueSr+4QV3MlL9L/aJWs+jg5ElK2C5kNE SPQE8MEqnL3MN5ZxdLNxWsAZCh8ndk8WkZApbgtMZkLGwMCarbziBi0CxK/Bplwk3eam yKT0OvG1GxutkC1O74RGWmQ9FflFzC3AgvtIO7dSy7yBMDkNzdHuhwa2P1N//of8zgom Iycj5WmaC/OWDHqUNaVKZHhu4kB1Nfagp8sqbvLCnnQCBk/5gyzjLWzfP8Wy+Z3Z4dOo 2ZHf5uySH6uIqkUb/1sUUYRvsOjB0ajD159LIRidqQHZataXYznwPK4yISoroDm8oELn lwIw== X-Forwarded-Encrypted: i=1; AFNElJ/gNeEh6/zNn43nkc29TSb1iD5GhosAOUJSJPf+jOdAEkbMyTkDwkpIMp4uwNH93omxDPQPd5K0gCdP0qI=@vger.kernel.org X-Gm-Message-State: AOJu0YxlksjhULO7hDlpY/A+vD0Oeohe7iQ81F+AmqvFpMH1OtxQYyRK Fyql98dhPMByFKYFcxt2ttgiiIbxh6TkhhVkJ2YEAOfcJ0kGqmaWWogs X-Gm-Gg: AeBDievxvGxkU2PBGMeABv7CPtHbza9+P3KYj6RQDlSbWMq7bUFUvN503WF+WMFeaBQ 4HBaylfeAsdCqs9VLBnKYRsuFRFOJ24cbPAtjnZO2ZH/+5+9r3ADxLFDxNgwyUJm8FnTSHxGXNd rcecipEFtKyQzpZlZfhHnge3Ux52KZNFmP6YAhIN3lz44iKeP9RgSVvDyBSamkoZFCki08MU8nS ZwSSAA1f04TciYQaOSKvXvwL5LvBcI8p2hREEPxF3heRKXVhX+/kigHhiacHIXsPh0qSMevywnh LHyLFAoXZyPhtaKpEF6xVu8YwK2UQvrQ8a9R3/xBv0NliIjtVWXX12Ki8EYT6BqxOpF7mJpxBqV XT7KkHpnoAVIBqiahmK4rQbsiNSIKyCHN5aT7mFyiuxrdIzDp05NWAm7p3O5dpEgmxNEfn9b82M 5Qs1WjWxxFjw1RG7o7oYa+zXhdq5H/czLZeAVqTNsNFHzfEy4= X-Received: by 2002:a05:6a21:e098:b0:3a2:e568:745c with SMTP id adf61e73a8af0-3a39c25a195mr7186968637.42.1777442408152; Tue, 28 Apr 2026 23:00:08 -0700 (PDT) Received: from localhost.localdomain ([165.132.143.163]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7fd64f219dsm862296a12.18.2026.04.28.23.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 23:00:07 -0700 (PDT) From: Minwoo Ahn To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim Cc: Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Jinkyu Jeong , Minwoo Ahn , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] perf/core: Fix sampling period inconsistency across CPU migration Date: Wed, 29 Apr 2026 05:59:24 +0000 Message-ID: <20260429055924.10594-1-mwahn402@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When per-task software events are sampled, period_left is not managed consistently when task migration happens. The perf_event may observe a different hw_perf_event::period_left on the new CPU, breaking the sampling periodicity. Even if a task was near its sampling point, it would use a stale period_left after migration. Introduce struct perf_task_context as a per-task container to preserve period_left across CPU migrations. A separate structure is used rather than adding fields to hw_perf_event, because hw_perf_event is a general-purpose structure shared by all event types (hardware, software, tracepoint, breakpoint, etc.) and embedding per-task sampling state there would bloat it for the majority of events that do not need it. perf_task_context is only allocated for per-task software sampling events. Multiple per-CPU perf_event instances originating from the same perf_event_open caller share a single perf_task_context via refcounting. The perf_event owner field is used to distinguish events from different perf_event_open callers, preventing unrelated sampling sessions from interfering with each other. For inherited events (where owner is NULL), the inherit flag relaxes the owner check so that child events properly share perf_task_context. The allocation condition for inherited events checks that the parent event actually has a perf_task_ctxp, ensuring only genuine software events propagate the context. The existing perf_task_context lookup uses perf_lock_task_context() to safely access the task's event context under proper RCU and IRQ protection. perf_task_context serves purely as a transport for period_left across CPU migrations. On event removal (swevent_del for non-clock events, cancel_hrtimer for clock events), hw_perf_event::period_left is backed up to perf_task_context::period_left. On event addition (swevent_add for non-clock events, start_hrtimer for clock events), perf_task_context::period_left is restored to hw_perf_event::period_left. During normal operation between migrations, hw_perf_event::period_left remains the sole working copy, keeping existing code paths unaffected. To reproduce, force CPU migration during task-clock sampling: $ sysbench cpu --threads=1 --time=60 run & $ sleep 0.1 $ TID=$(ls /proc/$!/task/ | grep -v "^$!$") $ perf record -e task-clock -c 1000000000 -t $TID & # Force migration across CPUs every 1.2 seconds $ while kill -0 $TID 2>/dev/null; do taskset -p -c 0 $TID; sleep 1.2 taskset -p -c 1 $TID; sleep 1.2 taskset -p -c 2 $TID; sleep 1.2 done # Check sample intervals (expected: ~1.000s each) $ perf script -F time | \ awk 'NR==1 {prev=$1; next} {print $1-prev; prev=$1}' Without this patch, sample intervals show significant deviation from the expected 1-second period after each migration. With this patch, intervals remain consistent. Co-developed-by: Jinkyu Jeong Signed-off-by: Jinkyu Jeong Signed-off-by: Minwoo Ahn --- Changes in v2: - Use perf_lock_task_context() to safely access the task's event context, avoiding a potential use-after-free and IRQ inversion deadlock - Tighten allocation condition for inherited events by checking parent_event->perf_task_ctxp instead of just parent_event include/linux/perf_event.h | 18 +++++++++++ kernel/events/core.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 48d851fbd8ea..84827f81cc9c 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -829,6 +829,9 @@ struct perf_event { u16 read_size; struct hw_perf_event hw; + /* Per-task sampling state for sw events, survives CPU migration */ + struct perf_task_context *perf_task_ctxp; + struct perf_event_context *ctx; /* * event->pmu_ctx points to perf_event_pmu_context in which the event @@ -1148,6 +1151,21 @@ struct perf_cpu_context { struct perf_event *heap_default[2]; }; +#define perf_event_equal_task_ctx(a1, a2) \ + ((a1)->config == (a2)->config && \ + (a1)->sample_period == (a2)->sample_period) + +/** + * struct perf_task_context - per-task software event context + * + * Shared across per-CPU perf_event instances of the same task to + * preserve period_left across CPU migrations. + */ +struct perf_task_context { + refcount_t refcount; + local64_t period_left; +}; + struct perf_output_handle { struct perf_event *event; struct perf_buffer *rb; diff --git a/kernel/events/core.c b/kernel/events/core.c index 6d1f8bad7e1c..f5cb1a273fbf 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5740,6 +5740,13 @@ static bool exclusive_event_installable(struct perf_event *event, static void perf_free_addr_filters(struct perf_event *event); +static void perf_put_task_ctxp(struct perf_event *event) +{ + if (event->perf_task_ctxp && + refcount_dec_and_test(&event->perf_task_ctxp->refcount)) + kfree(event->perf_task_ctxp); +} + /* vs perf_event_alloc() error */ static void __free_event(struct perf_event *event) { @@ -5761,6 +5768,9 @@ static void __free_event(struct perf_event *event) if (event->attach_state & PERF_ATTACH_TASK_DATA) detach_perf_ctx_data(event); + if (event->perf_task_ctxp) + perf_put_task_ctxp(event); + if (event->destroy) event->destroy(event); @@ -11054,9 +11064,14 @@ static void perf_swevent_read(struct perf_event *event) static int perf_swevent_add(struct perf_event *event, int flags) { struct swevent_htable *swhash = this_cpu_ptr(&swevent_htable); + struct perf_task_context *ctxp = event->perf_task_ctxp; struct hw_perf_event *hwc = &event->hw; struct hlist_head *head; + if (ctxp) + local64_set(&hwc->period_left, + local64_read(&ctxp->period_left)); + if (is_sampling_event(event)) { hwc->last_period = hwc->sample_period; perf_swevent_set_period(event); @@ -11076,7 +11091,13 @@ static int perf_swevent_add(struct perf_event *event, int flags) static void perf_swevent_del(struct perf_event *event, int flags) { + struct perf_task_context *ctxp = event->perf_task_ctxp; + hlist_del_rcu(&event->hlist_entry); + + if (ctxp) + local64_set(&ctxp->period_left, + local64_read(&event->hw.period_left)); } static void perf_swevent_start(struct perf_event *event, int flags) @@ -12203,12 +12224,17 @@ static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer) static void perf_swevent_start_hrtimer(struct perf_event *event) { + struct perf_task_context *ctxp = event->perf_task_ctxp; struct hw_perf_event *hwc = &event->hw; s64 period; if (!is_sampling_event(event)) return; + if (ctxp) + local64_set(&hwc->period_left, + local64_read(&ctxp->period_left)); + period = local64_read(&hwc->period_left); if (period) { if (period < 0) @@ -12224,6 +12250,7 @@ static void perf_swevent_start_hrtimer(struct perf_event *event) static void perf_swevent_cancel_hrtimer(struct perf_event *event) { + struct perf_task_context *ctxp = event->perf_task_ctxp; struct hw_perf_event *hwc = &event->hw; /* @@ -12238,8 +12265,13 @@ static void perf_swevent_cancel_hrtimer(struct perf_event *event) */ if (is_sampling_event(event) && (hwc->interrupts != MAX_INTERRUPTS)) { ktime_t remaining = hrtimer_get_remaining(&hwc->hrtimer); + local64_set(&hwc->period_left, ktime_to_ns(remaining)); + if (ctxp) + local64_set(&ctxp->period_left, + ktime_to_ns(remaining)); + hrtimer_try_to_cancel(&hwc->hrtimer); } } @@ -13259,6 +13291,41 @@ static void account_event(struct perf_event *event) account_pmu_sb_event(event); } +static struct perf_task_context * +perf_get_task_ctxp(struct perf_event *event, struct task_struct *task, + bool inherit) +{ + struct perf_task_context *ctxp = NULL; + struct perf_event_context *ctx; + struct perf_event *iter; + unsigned long flags; + + ctx = perf_lock_task_context(task, &flags); + if (ctx) { + list_for_each_entry(iter, &ctx->event_list, event_entry) { + if (iter->perf_task_ctxp && + (iter->owner == current || + (inherit && !iter->owner)) && + perf_event_equal_task_ctx(&iter->attr, + &event->attr)) { + ctxp = iter->perf_task_ctxp; + refcount_inc(&ctxp->refcount); + break; + } + } + raw_spin_unlock_irqrestore(&ctx->lock, flags); + } + + if (!ctxp) { + ctxp = kzalloc_obj(struct perf_task_context); + if (!ctxp) + return NULL; + refcount_set(&ctxp->refcount, 1); + } + + return ctxp; +} + /* * Allocate and initialize an event structure */ @@ -13344,6 +13411,16 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, * pmu before we get a ctx. */ event->hw.target = get_task_struct(task); + + if (attr->sample_period && + attr->config < PERF_COUNT_SW_MAX && + (attr->type == PERF_TYPE_SOFTWARE || + (parent_event && parent_event->perf_task_ctxp))) { + event->perf_task_ctxp = perf_get_task_ctxp(event, task, + !!parent_event); + if (!event->perf_task_ctxp) + return ERR_PTR(-ENOMEM); + } } event->clock = &local_clock; -- 2.49.0