From patchwork Wed Oct 19 02:11:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Chen X-Patchwork-Id: 4407 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp87705wrs; Tue, 18 Oct 2022 19:23:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6gDlIHeYoFHfP08XD5PVopXUJDAXprN8SgkWMnrCoGMRd/f5Isfjj1E1kmpw6jq85oaDZD X-Received: by 2002:a17:902:dccb:b0:181:a83b:2a8c with SMTP id t11-20020a170902dccb00b00181a83b2a8cmr6094088pll.10.1666146191808; Tue, 18 Oct 2022 19:23:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666146191; cv=none; d=google.com; s=arc-20160816; b=OesJNMEyRWUcv222fKZ7PN/7AxBz3QbMxvK6wW3Rw0ibe4uPy5SgbapfzIXBn9wl+y Ox7guMJStoUoY/lF8nRzjpHEtwTXvNTFPs4wK8wE1D43zDGOe8JGQZKP4oDDSfckzuX2 B/+n17CHYFwfXzENa9b2VN/12knjiHGmkZP2zRewQuIdY3K19IYbXPvA5kZTQB9gZciQ txfj6vzxDZS6arMsrrE4CD831VlC7iTc/F8LYRNqi9BrTJn43r9SsUnox0z/X+dOGJvS 6sHnc7S0dpPZ+EcEKIkVBunoR7wMSv6Tw9ssVMaaubd8entiFSPAztYIuGp3Za+MuLrO 3RTQ== 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=EsD8j5iiff8e/QPQHMYJjQU+z4+4HrcVFFNw8I9Xqsc=; b=SRI6RjqGPAHwTgMmav/yabOTA+anixbz3w0ODpJf307fPvz/3hZPFXfh2+YDSw+pHS WCTgkV1OAfoNc6gA0kTo2mkVe0ec7FkStQfo7ARPQzBG6d8ZnTpeVOT535UzA1FnjF0f GWoXCagLxWsmPZffXg1WyTLAh9tWgJuwhn+kj5aHxOCQ09giQMlzbk2s39e8uSljF9Nz bn1z2dxr7lwVdz89uSWPApo3SBKkgSBoi9c/IpGeeNFOxyk8MllyLq9CMsYrCAInOs8n 068mue0lYN5arNQt8qTgRVeFI5IjMp6wpDVlRkVNH1Uh1jsYNpu06NjcoXihMqmE8Q1m Nk+A== 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 a6-20020a170902ecc600b0017829e27195si20436153plh.521.2022.10.18.19.22.50; Tue, 18 Oct 2022 19:23:11 -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 S229935AbiJSCL1 (ORCPT + 99 others); Tue, 18 Oct 2022 22:11:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbiJSCL0 (ORCPT ); Tue, 18 Oct 2022 22:11:26 -0400 Received: from 189.cn (ptr.189.cn [183.61.185.102]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 825BBD73F3 for ; Tue, 18 Oct 2022 19:11:24 -0700 (PDT) HMM_SOURCE_IP: 10.64.8.31:51444.1560931561 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-111.162.158.155 (unknown [10.64.8.31]) by 189.cn (HERMES) with SMTP id 6ED7E10032F; Wed, 19 Oct 2022 10:11:21 +0800 (CST) Received: from ([111.162.158.155]) by gateway-153622-dep-787c977d48-v8sdr with ESMTP id 54bbaa6152bb4178846e0ce8118d5e48 for rostedt@goodmis.org; Wed, 19 Oct 2022 10:11:22 CST X-Transaction-ID: 54bbaa6152bb4178846e0ce8118d5e48 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 To: rostedt@goodmis.org, mingo@redhat.com, mhiramat@kernel.org Cc: linux-kernel@vger.kernel.org, xiehuan09@gmail.com, Song Chen Subject: [PATCH v2] trace/kprobe: remove duplicated calls of ring_buffer_event_data Date: Wed, 19 Oct 2022 10:11:18 +0800 Message-Id: <1666145478-4706-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,RCVD_IN_MSPIKE_H2, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747080909197432245?= X-GMAIL-MSGID: =?utf-8?q?1747080909197432245?= 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 does __kretprobe_trace_func. This patch removes those duplicated calls. Signed-off-by: Song Chen Reviewed-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) --- kernel/trace/trace_kprobe.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 23f7f0ec4f4c..f905829b856b 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); @@ -1435,7 +1434,6 @@ __kretprobe_trace_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, return; fbuffer.regs = regs; - entry = fbuffer.entry = ring_buffer_event_data(fbuffer.event); entry->func = (unsigned long)tk->rp.kp.addr; entry->ret_ip = get_kretprobe_retaddr(ri); store_trace_args(&entry[1], &tk->tp, regs, sizeof(*entry), dsize);