From patchwork Thu Oct 26 01:27:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 158347 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp355665vqb; Wed, 25 Oct 2023 18:28:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRbwJmT1RWlcJcYc6Mnq6uV2Mo9uzWR1XMQtjpm5Z92OaBEQy4SbXhh2HeWHckZJxbzUYL X-Received: by 2002:a81:83ca:0:b0:5a7:b8a5:1474 with SMTP id t193-20020a8183ca000000b005a7b8a51474mr20178376ywf.22.1698283684636; Wed, 25 Oct 2023 18:28:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698283684; cv=none; d=google.com; s=arc-20160816; b=vz/2RBB9yu/pDrNZ4zT3VA03XYPJha5tmXFQRSsqKnC1f2c3pkKDEQzlz5BiVjJkxT X+zNoV5vRoXhENX1rMvImHSerVWYjFahpZrvWrQtbOy88Cu7nebmcPBDVZs8CR7/jewX p+qzpW6DWahR/FwNHnusi8gyoW+LejiPvp6n5CbEW2KP8hmME4BRmo2KVHM3KihZpp/D XT4xo0+20wt4YgX02xqNoqgXusdZ00zQ6AA7BYY6BLkwTLSuegp4ubzR363sN+NS2GkO IZqF/fSW7dvji64QTPl8VoPXTwefku9NdMixJ75rJD+4yUJvRYJhsmTiX71CE/BX2k7N 8xxg== 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=uISItmdW+E1oV3DzBqqyAE3rRr+Eb+OFfTdQVNeIpDU=; fh=easJR01Tb+n7upxYiKQ8cYY2fdzmtdLkK9f6VckevDI=; b=AmCrd7THsRz/quqZAzEu9ZzeuFESBv9rKu+dLyjfX28LIKUqf0Qb+eKEWGZHbDoLZw ufQKfrlDlqHlRzclrm9hRtQhR1WecGJzRD+auchmsBC1tCvUUIRp+LhX5ZyU5AyzUNQ6 K+IXo8VlOfDq+ahplSvbuTtGmD/dIbtQSF9TslvJU2YT5H0QhODZmKkS5ZFTkgLczVob ZicSGk08Ekse5oj0bqmnRJwv52wpVqAHTE8TyV2xHVpDRU5p187g+x/iSI6NcwvDvjkg JKdoaK5k93RGThNKlMwycSbaC92PRHw0PCBlyCYsGD3Vpuufbq1/XSsy9LMojZJFzAf1 KZwQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id v5-20020a0dd305000000b0058c99180384si12214430ywd.440.2023.10.25.18.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 18:28:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 620E881B75FA; Wed, 25 Oct 2023 18:28:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232904AbjJZB16 (ORCPT + 25 others); Wed, 25 Oct 2023 21:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231288AbjJZB15 (ORCPT ); Wed, 25 Oct 2023 21:27:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03EDCCC for ; Wed, 25 Oct 2023 18:27:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA0E5C433C9; Thu, 26 Oct 2023 01:27:54 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qvpA9-00CqSz-1x; Wed, 25 Oct 2023 21:27:53 -0400 Message-ID: <20231026012753.418244796@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Oct 2023 21:27:35 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Christophe JAILLET , Mukesh ojha Subject: [for-next][PATCH 1/4] tracing/histograms: Simplify last_cmd_set() References: <20231026012734.358814002@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 25 Oct 2023 18:28:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780779513093960759 X-GMAIL-MSGID: 1780779513093960759 From: Christophe JAILLET Turn a kzalloc()+strcpy()+strncat() into an equivalent and less verbose kasprintf(). Link: https://lore.kernel.org/linux-trace-kernel/30b6fb04dadc10a03cc1ad08f5d8a93ef623a167.1697899346.git.christophe.jaillet@wanadoo.fr Cc: Masami Hiramatsu Signed-off-by: Christophe JAILLET Reviewed-by: Mukesh ojha Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_hist.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index d06938ae0717..1abc07fba1b9 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -774,23 +774,16 @@ static void last_cmd_set(struct trace_event_file *file, char *str) { const char *system = NULL, *name = NULL; struct trace_event_call *call; - int len; if (!str) return; - /* sizeof() contains the nul byte */ - len = sizeof(HIST_PREFIX) + strlen(str); kfree(last_cmd); - last_cmd = kzalloc(len, GFP_KERNEL); + + last_cmd = kasprintf(GFP_KERNEL, HIST_PREFIX "%s", str); if (!last_cmd) return; - strcpy(last_cmd, HIST_PREFIX); - /* Again, sizeof() contains the nul byte */ - len -= sizeof(HIST_PREFIX); - strncat(last_cmd, str, len); - if (file) { call = file->event_call; system = call->class->system;