Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp2842558pxb; Fri, 8 Oct 2021 17:04:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmmoZVuIFfcKIJOZcqhgTtunmwqqGR6IRrLnnwB0bg5bc9JzgWEPHlN12OZqKquLqcVg4i X-Received: by 2002:a63:1d53:: with SMTP id d19mr6967046pgm.85.1633737872470; Fri, 08 Oct 2021 17:04:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633737872; cv=none; d=google.com; s=arc-20160816; b=K6A0CiOg0+9k32DbHQgCGrShUsF891FGWoXtQTYsBW4DJOddoNGobWRulLa2C1lWN4 O28ZEoAF5+ZhZnP1KrGIAIic3XplGOID6+oqeSC0BX0ql6L8xALMpFS5pDtPCd7PNvsc 0rNXnIc6Ga+l6aARkjMHWAUbtd+fy1kRc32ReFIvdSMgg2CAcs96ETwte34vggYCUa3H KckLTPyeBJfO6i/x7rrBtPjjzTdpT5RtaRsuBZTOukHPUN3IeofDjtTYCQezw1rVYEUU 17Fo93UMNEdxmEuKZp/M5LDCWfMZno1D0vOlNeLPFRaaR5/8Jm35HyGC5q8GloXZLUx5 BAJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date; bh=tGgk6kPswXkPyoCUiZkHJfv7JSG/DsWf+nXW5BGLmZI=; b=ugGTjO2YNBwu9928OrEeCoAmwWHCEiOmX6SB/1dixkRPPAS+7mwIQVTZjzFrCbZpY1 BkuPTIieLofZqVhOUL2p7vFFjO4Qf9OhoVukdFLUPc3L2sdW4cv+jUiUglRY5clCvtkn EIKflyYxJjKeFqft+8jRz/UlwL3/rZvSBHbfPY7eNjdqMg55xECF5Iqp/96E/oxPFsIB J1TkwZEbf54llw2x0n7OgMKqmWKQjDnqiPoIvDDj1p4ps7VOIcxwRtriC2YzP4Q7D+bx 0leAhpunSIRo8SGkVdgUcbvJsP+ml6jVsM8NV10daw8OL7Q22ObPhtRYLZocT0SGnCK2 tu0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y187si995729pfg.94.2021.10.08.17.04.19; Fri, 08 Oct 2021 17:04:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243850AbhJIAFc convert rfc822-to-8bit (ORCPT + 99 others); Fri, 8 Oct 2021 20:05:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:53630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243797AbhJIAFb (ORCPT ); Fri, 8 Oct 2021 20:05:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7275060FC1; Sat, 9 Oct 2021 00:03:35 +0000 (UTC) Date: Fri, 8 Oct 2021 20:03:28 -0400 From: Steven Rostedt To: =?UTF-8?B?546L6LSH?= Cc: Ingo Molnar , open list , Peter Zijlstra , Jiri Olsa Subject: Re: [RESEND PATCH v2] trace: prevent preemption in perf_ftrace_function_call() Message-ID: <20211008200328.5b88422d@oasis.local.home> In-Reply-To: References: X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 28 Sep 2021 11:12:24 +0800 王贇 wrote: > With CONFIG_DEBUG_PREEMPT we observed reports like: > > BUG: using smp_processor_id() in preemptible > caller is perf_ftrace_function_call+0x6f/0x2e0 > CPU: 1 PID: 680 Comm: a.out Not tainted > Call Trace: > > dump_stack_lvl+0x8d/0xcf > check_preemption_disabled+0x104/0x110 > ? optimize_nops.isra.7+0x230/0x230 > ? text_poke_bp_batch+0x9f/0x310 > perf_ftrace_function_call+0x6f/0x2e0 > ... It would be useful to see the full backtrace, to know how this happened. Please do not shorten back traces. -- Steve > __text_poke+0x5/0x620 > text_poke_bp_batch+0x9f/0x310 > > This telling us the CPU could be changed after task is preempted, and > the checking on CPU before preemption will be invalid. > > This patch just turn off preemption in perf_ftrace_function_call() > to prevent CPU changing. > > Reported-by: Abaci > Signed-off-by: Michael Wang > --- > kernel/trace/trace_event_perf.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c > index 6aed10e..dcbefdf 100644 > --- a/kernel/trace/trace_event_perf.c > +++ b/kernel/trace/trace_event_perf.c > @@ -441,12 +441,19 @@ void perf_trace_buf_update(void *record, u16 type) > if (!rcu_is_watching()) > return; > > + /* > + * Prevent CPU changing from now on. rcu must > + * be in watching if the task was migrated and > + * scheduled. > + */ > + preempt_disable_notrace(); > + > if ((unsigned long)ops->private != smp_processor_id()) > - return; > + goto out; > > bit = ftrace_test_recursion_trylock(ip, parent_ip); > if (bit < 0) > - return; > + goto out; > > event = container_of(ops, struct perf_event, ftrace_ops); > > @@ -468,16 +475,18 @@ void perf_trace_buf_update(void *record, u16 type) > > entry = perf_trace_buf_alloc(ENTRY_SIZE, NULL, &rctx); > if (!entry) > - goto out; > + goto unlock; > > entry->ip = ip; > entry->parent_ip = parent_ip; > perf_trace_buf_submit(entry, ENTRY_SIZE, rctx, TRACE_FN, > 1, ®s, &head, NULL); > > -out: > +unlock: > ftrace_test_recursion_unlock(bit); > #undef ENTRY_SIZE > +out: > + preempt_enable_notrace(); > } > > static int perf_ftrace_function_register(struct perf_event *event)