From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 6FB0E3B71B4 for ; Mon, 29 Jun 2026 09:59:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782727145; cv=none; b=nZeNvWSN0kcBPvVld1UnxGV9Gsr6qTDbmeSLa+Xw9pcj/Pc2eA6DuotOYA5JLmwKATF5X0epfcDEUKogXR8qAGgY22QvEJ0SC/bSgQ1riUsk39xCM9Qe7O/WjBaZJkCpXltlFTPwrmOT84qUzZVM3xibQErGuQMBp+/P0Bdr7/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782727145; c=relaxed/simple; bh=4FjJMIJIqV4UpdTxqBp9mxXGDEPdHlUbmfRxRfFRVHU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=jawgQZfzEZD/F9BkaDkFgcG+2GNTPPcBQV8yWYUQksMhyIRcmTVlpTNb4midDd/Qyc2UQfxlRCaBH5dpXyNR5lhjAFNRT5FQMkwfqQbeKLvjdvemo6dAd0nK5xalBS3XqGM1gJhn7H9bXmhaxCBGznTxtftdqLb0n0kXBwLoulA= 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=NtiTJJVh; arc=none smtp.client-ip=209.85.216.48 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="NtiTJJVh" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-37f7a5a217fso1099175a91.0 for ; Mon, 29 Jun 2026 02:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782727144; x=1783331944; 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=CIOSdeAgJ4xdVXXOLPnviXzuudcbRcbd9u51YC2jtkY=; b=NtiTJJVhs4RTer+08psl3YOBnJ9QqcWtNSm67uNIeoJa0LF5Zaz+m5EbcHqmHoT27x VgU4dX/ULVZQBPYL+BIcuiXUrZ2i5KsDXq5YRQV49iDVkITHAZ7a8Ci23ABhP5ctkYl7 QW6hXtzw5F3R3jH+qRPJ1i7hDoLeemU5Q3qNaBlewGHnPCly3ED6IoMwpbFGCXOTEnus YlqKsGSgSbSGJAiHsAKi7qdqTnQl363Cn7hs15tdHLrwW+kUZ8uk37OMw1xv0xecWoee q/7GwvhDtHVzhBs1SiY93ddYa6VwmoDgjZNOI8gw33PLzgBccfD2sbUUcdNP/xTqEPlt peHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782727144; x=1783331944; 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=CIOSdeAgJ4xdVXXOLPnviXzuudcbRcbd9u51YC2jtkY=; b=giRh1f5JTNMkbpSodEnnP+8n/aJuoRMIAK2NTtdU6d3oPOw0z+be0jQpOKstRtMpmW oyMfT2Wu+/h617m8WlrIi7tgpnXll5gCLyjwbldQq9T1RcYpqNqoleMYPfxoozpsWneO AeCwFNJ7hHDAeH+6PozW+T7jPhLpcZ7eSGUHYIMs4RZ3xmsP8h/wy2VPOtppGiToIIme CRby3gmB2H2oBhxRVs4iNEVAtRUbGE1fMaMCQQASFaJj7uPDhYwZyVSwQRwbjUC+Z7wT D5ABS/EoR7pJmRKoPwhRS/8f04/d3KEB6INiRDdyo94xCRGMldJhHpJKLfS4+Dju7loX Mpag== X-Gm-Message-State: AOJu0YxF3CkhtT+cST+yqtQ1nnd70YaZyl7RSMIqfmS2iaKa5lh2fYqM Dk6VA/m/99YLjbY4kFpSKH6yK+zAORbAnJRWK8mqWnAJfSObJM7iflWundto8+Ef4QISLQ== X-Gm-Gg: AfdE7ckR0MjjZs5niugDFNyVJUA1s8VMO4KKjjqRRePb59HwwSPQPdCfr3wt3VBamn/ 1RCHO15k31nXAIPB5EmZN7BfjNT7vXXlKe063cziK1sryfO/OQIETYIxr8eLoKy6lDyUkUXCrzo VjeyJSdbe+PYbEqcHdEMXvHqJgwrGp72xOVR0qKiFTHiBRSsIcZousnUU+Bnf30O903L6c9eGcb QqeG76qiQvciIyKgun8S5pEXuvvHGNoMtLX8flhfmH0hIwvpvcSz68NSyQEArvrpuDWV4FpR/q3 XbPMVXtRDeY8GsTA8IEBCYGjIO+mUWdwgxDD/k/oh6vVaKWHxU2QtrsZfpOh+XQ6mn261Y16Ajg iqjZh+YOjdKSD0cSaMpY0zDL0ovlArYrBUamiDp1ZlNOWJXcajMxvavKJcQ3eL5i0t389Wegi4m KCjye1 X-Received: by 2002:a17:90b:57ce:b0:37e:2005:6507 with SMTP id 98e67ed59e1d1-37e20056697mr9153254a91.15.1782727143321; Mon, 29 Jun 2026 02:59:03 -0700 (PDT) Received: from martin ([2405:9800:b862:14dc:12ff:e0ff:fecd:7ddc]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37ed2a68075sm5081813a91.10.2026.06.29.02.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 02:59:02 -0700 (PDT) From: Martin Weiss X-Google-Original-From: Martin Weiss To: linux-kernel@vger.kernel.org Cc: Martin Weiss , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , linux-trace-kernel@vger.kernel.org Subject: [PATCH] trace_branch: use per-cpu counters for correct/incorrect stats Date: Mon, 29 Jun 2026 16:58:38 +0700 Message-ID: <20260629095838.601926-1-Martin.weiss2410@gmail.com> X-Mailer: git-send-email 2.54.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 Replace per-task counters with per-cpu increments to avoid race conditions in the branch profiler fast path. Fixes FIXME about atomicity. Signed-off-by: Martin Weiss --- kernel/trace/trace_branch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index d8e97ad798f0..960bcb3d7dbf 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -213,11 +213,11 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, */ trace_likely_condition(f, val, expect); - /* FIXME: Make this atomic! */ + /* use per-cpu counters to avoid contention */ if (val == expect) - f->data.correct++; + this_cpu_inc(f->data.correct); else - f->data.incorrect++; + this_cpu_inc(f->data.incorrect); user_access_restore(flags); } -- 2.54.0