| Message ID | 1666077186-6042-1-git-send-email-chensong_2000@189.cn |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1822194wrs;
Tue, 18 Oct 2022 00:33:34 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM59J9xB9I0nmxB6tJrzmDenUwJGF9QGjzl2U/0UIkseqK4fp+Ak4LbJjXx50wA/io1tty7H
X-Received: by 2002:a63:194b:0:b0:457:7295:8de0 with SMTP id
11-20020a63194b000000b0045772958de0mr1602705pgz.612.1666078414325;
Tue, 18 Oct 2022 00:33:34 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1666078414; cv=none;
d=google.com; s=arc-20160816;
b=ngu5qKYXCXIf5bARDnxtowkdO1RvzuFlFWR9pw401XGgB226nSEDFUG2k72mMlFVRe
CodxkEL8w9g25pRWBDB8NpheNwDTKZ46vepjsACKfdXrXL2c0MoDn+YxLc/Ilvzooo8g
0e9/HQZHTf6n7EPC2fqtBJKdqSqkjdDGphkCSNvNu5/Am8ouz1Pu5OgakUC4jFaDDTwM
v22ZPwia5CFkOWF8UfmQ6fJRGhtmMv1LD/v+JV8pmBZ6L9Ax9qR5ywvEcyni69uTaXu8
VHkFPXzSApRONJJWRAB8Ud5DKXl1E3GfNm6hOo75vOPiNP6ybLzIFse7F8Qf9d3kfrob
bezg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:message-id:date:subject:cc:to:from:sender
:hmm_source_type:hmm_attache_num:hmm_source_ip;
bh=qOEbqWMd4tZdIyz5OzCi3uF2xr2x9KalWzRIUG20HQo=;
b=d7vakvTkeqdDdV/db0sH3f8Dai4rLMpsC9A9E7KGCbL1p5GxFKvL+OXoDYleYqNFDP
PRV9zIKX4qln2eDbVqeHcngbSZqr6QwAUOc09oCaAUCSqteBdpFdLL1O2+bVcKwt+Ej8
OWHblb/vxJMjD/6cOvnf5wFkQ+0MdzIS9zf6T04LrDX0Mfj2kWEvlKxJtviV6ole9YsO
I6QJrT1eJGYCzQaZo7FW/GJYhePiGYqc7iQtZ1C/SvVYe6ts9XTotOlNjGswVGOmRjJN
YNE2Vv8D3SGF57ayXR2Brxv7eZPJIGoF4+LJHl6CZYq8apjKqv2RXDr/BMXj1+y+UCPE
ccLQ==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
pq8-20020a17090b3d8800b0020ad8a730dbsi12358508pjb.58.2022.10.18.00.33.22;
Tue, 18 Oct 2022 00:33:34 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229785AbiJRHZD (ORCPT <rfc822;carlos.wei.hk@gmail.com>
+ 99 others); Tue, 18 Oct 2022 03:25:03 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46040 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229686AbiJRHZB (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 18 Oct 2022 03:25:01 -0400
X-Greylist: delayed 359 seconds by postgrey-1.37 at lindbergh.monkeyblade.net;
Tue, 18 Oct 2022 00:24:57 PDT
Received: from 189.cn (ptr.189.cn [183.61.185.104])
by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3758C4DB57
for <linux-kernel@vger.kernel.org>;
Tue, 18 Oct 2022 00:24:55 -0700 (PDT)
HMM_SOURCE_IP: 10.64.8.43:36526.1712495038
HMM_ATTACHE_NUM: 0000
HMM_SOURCE_TYPE: SMTP
Received: from clientip-111.162.158.155 (unknown [10.64.8.43])
by 189.cn (HERMES) with SMTP id 9E03E1002D6;
Tue, 18 Oct 2022 15:13:23 +0800 (CST)
Received: from ([111.162.158.155])
by gateway-153622-dep-787c977d48-59pdt with ESMTP id
68899f125ad14432bd8a16e068113e36 for rostedt@goodmis.org;
Tue, 18 Oct 2022 15:13:23 CST
X-Transaction-ID: 68899f125ad14432bd8a16e068113e36
X-Real-From: chensong_2000@189.cn
X-Receive-IP: 111.162.158.155
X-MEDUSA-Status: 0
Sender: chensong_2000@189.cn
From: Song Chen <chensong_2000@189.cn>
To: rostedt@goodmis.org, mingo@redhat.com
Cc: linux-kernel@vger.kernel.org, xiehuan09@gmail.com,
Song Chen <chensong_2000@189.cn>
Subject: [PATCH] trace/kprobe: remove duplicated call of
ring_buffer_event_data
Date: Tue, 18 Oct 2022 15:13:06 +0800
Message-Id: <1666077186-6042-1-git-send-email-chensong_2000@189.cn>
X-Mailer: git-send-email 2.7.4
X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,
FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,SPF_HELO_PASS,SPF_PASS
autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1747009839371331641?=
X-GMAIL-MSGID: =?utf-8?q?1747009839371331641?=
|
| Series |
trace/kprobe: remove duplicated call of ring_buffer_event_data
|
|
Commit Message
Song Chen
Oct. 18, 2022, 7:13 a.m. UTC
Function __kprobe_trace_func calls ring_buffer_event_data to get
a ring buffer, however, it has been done in above call
trace_event_buffer_reserve.
So remove one of them.
Signed-off-by: Song Chen <chensong_2000@189.cn>
---
kernel/trace/trace_kprobe.c | 1 -
1 file changed, 1 deletion(-)
Comments
[ Added Masami who's the new co-maintainer, and this is his code ] On Tue, 18 Oct 2022 15:13:06 +0800 Song Chen <chensong_2000@189.cn> wrote: > Function __kprobe_trace_func calls ring_buffer_event_data to get > a ring buffer, however, it has been done in above call > trace_event_buffer_reserve. > > So remove one of them. > May as well add: Fixes: 5e6cd84e2f8bd ("tracing/kprobes: Do not open code event reserve logic") Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> -- Steve > Signed-off-by: Song Chen <chensong_2000@189.cn> > --- > kernel/trace/trace_kprobe.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c > index 23f7f0ec4f4c..dfd5809a4a65 100644 > --- a/kernel/trace/trace_kprobe.c > +++ b/kernel/trace/trace_kprobe.c > @@ -1394,7 +1394,6 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, > return; > > fbuffer.regs = regs; > - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event); > entry->ip = (unsigned long)tk->rp.kp.addr; > store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize); >
Hi, On Tue, 18 Oct 2022 09:59:32 -0400 Steven Rostedt <rostedt@goodmis.org> wrote: > > [ Added Masami who's the new co-maintainer, and this is his code ] > > On Tue, 18 Oct 2022 15:13:06 +0800 > Song Chen <chensong_2000@189.cn> wrote: > > > Function __kprobe_trace_func calls ring_buffer_event_data to get > > a ring buffer, however, it has been done in above call > > trace_event_buffer_reserve. > > > > So remove one of them. > > > > May as well add: > > Fixes: 5e6cd84e2f8bd ("tracing/kprobes: Do not open code event reserve logic") > > Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> Oops, and we have another line in __kretprobe_trace_func() too. Song, can you update this patch to fix the __kretprobe_trace_func() too? Thank you, > > -- Steve > > > > Signed-off-by: Song Chen <chensong_2000@189.cn> > > --- > > kernel/trace/trace_kprobe.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c > > index 23f7f0ec4f4c..dfd5809a4a65 100644 > > --- a/kernel/trace/trace_kprobe.c > > +++ b/kernel/trace/trace_kprobe.c > > @@ -1394,7 +1394,6 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, > > return; > > > > fbuffer.regs = regs; > > - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event); > > entry->ip = (unsigned long)tk->rp.kp.addr; > > store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize); > > >
Hi, 在 2022/10/18 23:22, Masami Hiramatsu (Google) 写道: > Hi, > > On Tue, 18 Oct 2022 09:59:32 -0400 > Steven Rostedt <rostedt@goodmis.org> wrote: > >> >> [ Added Masami who's the new co-maintainer, and this is his code ] >> >> On Tue, 18 Oct 2022 15:13:06 +0800 >> Song Chen <chensong_2000@189.cn> wrote: >> >>> Function __kprobe_trace_func calls ring_buffer_event_data to get >>> a ring buffer, however, it has been done in above call >>> trace_event_buffer_reserve. >>> >>> So remove one of them. >>> >> >> May as well add: >> >> Fixes: 5e6cd84e2f8bd ("tracing/kprobes: Do not open code event reserve logic") >> >> Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> > > Oops, and we have another line in __kretprobe_trace_func() too. > > Song, can you update this patch to fix the __kretprobe_trace_func() too? > > Thank you, > will do Song >> >> -- Steve >> >> >>> Signed-off-by: Song Chen <chensong_2000@189.cn> >>> --- >>> kernel/trace/trace_kprobe.c | 1 - >>> 1 file changed, 1 deletion(-) >>> >>> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c >>> index 23f7f0ec4f4c..dfd5809a4a65 100644 >>> --- a/kernel/trace/trace_kprobe.c >>> +++ b/kernel/trace/trace_kprobe.c >>> @@ -1394,7 +1394,6 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, >>> return; >>> >>> fbuffer.regs = regs; >>> - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event); >>> entry->ip = (unsigned long)tk->rp.kp.addr; >>> store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize); >>> >> > >
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 23f7f0ec4f4c..dfd5809a4a65 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1394,7 +1394,6 @@ __kprobe_trace_func(struct trace_kprobe *tk, struct pt_regs *regs, return; fbuffer.regs = regs; - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event); entry->ip = (unsigned long)tk->rp.kp.addr; store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);