From patchwork Sat Dec 10 13:57:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1325339wrr; Sat, 10 Dec 2022 05:59:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf7pjA3q+ytuR9DsuI2n/2K++Gcrkhm8wCXCpxeGCvvhQYWc4CmE6cknUJnpcxskcXQ7oiex X-Received: by 2002:a2e:b5aa:0:b0:279:eacf:4b22 with SMTP id f10-20020a2eb5aa000000b00279eacf4b22mr2279713ljn.52.1670680777061; Sat, 10 Dec 2022 05:59:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670680777; cv=none; d=google.com; s=arc-20160816; b=dekX9CcD/HILvq6wrYP/d/pRb+26KgtmLl0Cc+lAuiXpnDugbvfT9Q9FwoS+bup/Ta WQMuhPbiWzc6f9Sd9NdosCakhFzwKKutsKwzaBuk+/Zmjz3lWFm/FKwlc4qRLwVNb5lW wIeR8lpZU/cZlBoL7uC6ypvQteEs/8sidWPIwXMumb9ocYlGr1mMATHmmZ0rfVhWlpEl YHegUOLXBC330NQxrfJzwLrqo0MW26t2vSp/XhPmxQYQBsach90BOzqHdOT22H6tJXqS xAB3D3Qwa83Mvi8TDj+OzM/M2+Qx1KoiaVE8VAvdUefcdG8skSeaqY2PPJaGhv19ZACd pdCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=CYfG0uallPL7mdRg2NnKExZbSoLUsaxUToZwBNJcmck=; b=GbUZ9XOBinwCmbn0VS8YCjxA3uYRmKtfWTijxoxj0V/lROu+ATQ+R1YiFyZxfXBu8D IRE08NqQuGpqTY79cRDiAR2KPtboWrYaTjgez4t/5rKFXdRL2vmC7452Rz6tm6NezDN+ 4OA0vtXM9hJR7cSsA4FZeVE0aQB+3lQNUtoJRYKaA+PIxsH2AWwtzlG51J6yrdfq36zt 9i9a7kpBMZd6jNYxaFqSD+38ieN0YLY3AP2/efC15qDXoVDtDG3iS9HKc46te230g92n 2/7BkCZ27N7a2q5ELdXHSuRGa+L4gaVetycbCCNr7apk2LNaANzzBF4IH0pAwBvIIFyk Sd1w== 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 tl2-20020a170907c30200b007c08a2c2409si1975995ejc.77.2022.12.10.05.59.12; Sat, 10 Dec 2022 05:59:37 -0800 (PST) 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 S229915AbiLJN6i (ORCPT + 99 others); Sat, 10 Dec 2022 08:58:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbiLJN61 (ORCPT ); Sat, 10 Dec 2022 08:58:27 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C3AC16599 for ; Sat, 10 Dec 2022 05:58:26 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3998D60C13 for ; Sat, 10 Dec 2022 13:58:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2D09C433B4; Sat, 10 Dec 2022 13:58:25 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p40My-000koq-2R; Sat, 10 Dec 2022 08:58:24 -0500 Message-ID: <20221210135824.622690768@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 10 Dec 2022 08:57:59 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Song Chen Subject: [for-next][PATCH 09/25] trace/kprobe: remove duplicated calls of ring_buffer_event_data References: <20221210135750.425719934@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1751835766574249902?= X-GMAIL-MSGID: =?utf-8?q?1751835766574249902?= From: Song Chen 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. Link: https://lore.kernel.org/all/1666145478-4706-1-git-send-email-chensong_2000@189.cn/ Reviewed-by: Steven Rostedt (Google) Acked-by: Masami Hiramatsu (Google) Signed-off-by: Song Chen Signed-off-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 5a75b039e586..ee77c8203bd5 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1344,7 +1344,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); @@ -1385,7 +1384,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);