From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D611CA9EAF for ; Mon, 21 Oct 2019 19:13:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BBB02084C for ; Mon, 21 Oct 2019 19:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730036AbfJUTNv (ORCPT ); Mon, 21 Oct 2019 15:13:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:53846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728543AbfJUTNv (ORCPT ); Mon, 21 Oct 2019 15:13:51 -0400 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 369742084C; Mon, 21 Oct 2019 19:13:50 +0000 (UTC) Date: Mon, 21 Oct 2019 15:13:48 -0400 From: Steven Rostedt To: Linus Torvalds Cc: LKML , Ingo Molnar , Andrew Morton , Zhengjun Xing , Prateek Sood Subject: Re: [GIT PULL] tracing: A couple of minor fixes Message-ID: <20191021151348.3a231f04@gandalf.local.home> In-Reply-To: <20191021124508.203ccdb3@gandalf.local.home> References: <20191021124508.203ccdb3@gandalf.local.home> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 21 Oct 2019 12:45:08 -0400 Steven Rostedt wrote: > Linus, > Hi Linus, Please hold off on this. Someone just pointed out to me that one of the change logs has a bunch of crap attached to it that shouldn't be committed. I need to rebase (just the change logs, so no retesting is needed). I'll go and delete this tag and create a new (different one) when ready. -- Steve > Two minor fixes: > > - A race in perf trace initialization (missing mutexes) > > - Minor fix to represent gfp_t in synthetic events as properly signed > > > Please pull the latest trace-v5.4-rc3 tree, which can be found at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git > trace-v5.4-rc3 > > Tag SHA1: 46467c95be6062b0c66aae0efbab5746bee09f1e > Head SHA1: 668993e5696ddc5db01940d66818c7c038895893 > > > Prateek Sood (1): > tracing: Fix race in perf_trace_buf initialization > > Zhengjun Xing (1): > tracing: Fix "gfp_t" format for synthetic events > > ---- > kernel/trace/trace_event_perf.c | 4 ++++ > kernel/trace/trace_events_hist.c | 2 ++ > 2 files changed, 6 insertions(+) > --------------------------- > diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c > index 0892e38ed6fb..a9dfa04ffa44 100644 > --- a/kernel/trace/trace_event_perf.c > +++ b/kernel/trace/trace_event_perf.c > @@ -272,9 +272,11 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) > goto out; > } > > + mutex_lock(&event_mutex); > ret = perf_trace_event_init(tp_event, p_event); > if (ret) > destroy_local_trace_kprobe(tp_event); > + mutex_unlock(&event_mutex); > out: > kfree(func); > return ret; > @@ -282,8 +284,10 @@ int perf_kprobe_init(struct perf_event *p_event, bool is_retprobe) > > void perf_kprobe_destroy(struct perf_event *p_event) > { > + mutex_lock(&event_mutex); > perf_trace_event_close(p_event); > perf_trace_event_unreg(p_event); > + mutex_unlock(&event_mutex); > > destroy_local_trace_kprobe(p_event->tp_event); > } > diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c > index 57648c5aa679..7482a1466ebf 100644 > --- a/kernel/trace/trace_events_hist.c > +++ b/kernel/trace/trace_events_hist.c > @@ -679,6 +679,8 @@ static bool synth_field_signed(char *type) > { > if (str_has_prefix(type, "u")) > return false; > + if (strcmp(type, "gfp_t") == 0) > + return false; > > return true; > }