From patchwork Wed Apr 26 17:17:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 87919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp402258vqo; Wed, 26 Apr 2023 10:28:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6p9eF+KgdwvJyTTquiVBDspGNok+Pwi1jF6x8+dToL9DrDPQ7UNgrfQwSxEaLbrcnS7Uth X-Received: by 2002:a05:6a21:78a2:b0:f5:e533:4dc2 with SMTP id bf34-20020a056a2178a200b000f5e5334dc2mr4009302pzc.12.1682530106529; Wed, 26 Apr 2023 10:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682530106; cv=none; d=google.com; s=arc-20160816; b=a6j67fLsfx2bWySdJNemJ7fFxcutlB+07GZ0WM0Ki3z7RUOu1IPClrt/4gkcs9Gj/J ZI02oA5elC6GbVNO+xIPhoNACowcnWVoLgfehag9BHZ4o2M5Pvs8fp7H5nE5TnziYpZG Qz9CY2XXfx8/Ia3sjqzwoi+XpX7REYHLXA6rDasfQTujFODkEZlI3bfGcM629eexKLJr T64mtnRNdkBE3dB+LpQ71Xs4enRr96DfLupDj7kv/tYYY1RV+cROssN2/qke6/5r+LY1 62yfcbqT2lFnMx/yh4HD7cJuF4EUP37iLpQv9We2T1QLQZGUta11Y77iImUHrP6g+pbq YvNQ== 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=TQJ9p00iFocI28OHCIftCJJDIqwFBzYBlFI4SBfvUWw=; b=Uymq+YXegY5VeFw9e12OhK2OaYNFGGPBZTyVwa2qJyz5JNKz9RBkEry6XSaPGW53sT NOIit9ORDs/7v8U9nMZfQsPgTe9HHMiBEugPXGRcjj6hNGtQvNycvSgy4TQdK6lrX5uo VwjhZ4qJyNgDPJNT0GLx/T5YlGtxY3oRP3QkwbJMJ3Jw/z4HcYvPXRuzi5x8Uq8axrmV /ABzvM9Pmm4H6KzumFxGdREddniDRPS1XOBRCw5Tb0YNzJcJtQfNENTVQ5rHc/QVpCCk V2eXj7424po9ffu/XVO3kHKjNmTEIi3SUb8B7C5k9P4JU9wh8OE0LMwYAdLBR4PYQ6rR coWA== 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 h192-20020a636cc9000000b004fb33a76e2csi16434589pgc.834.2023.04.26.10.28.12; Wed, 26 Apr 2023 10:28:26 -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 S232195AbjDZRSX (ORCPT + 99 others); Wed, 26 Apr 2023 13:18:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234759AbjDZRRy (ORCPT ); Wed, 26 Apr 2023 13:17:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 523BF65B7 for ; Wed, 26 Apr 2023 10:17:53 -0700 (PDT) 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 78C8863049 for ; Wed, 26 Apr 2023 17:17:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53C11C4339E; Wed, 26 Apr 2023 17:17:52 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1prim7-005KdF-1Q; Wed, 26 Apr 2023 13:17:51 -0400 Message-ID: <20230426171751.250610496@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 26 Apr 2023 13:17:14 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ken Lin Subject: [for-next][PATCH 11/11] tracing: Add missing spaces in trace_print_hex_seq() References: <20230426171703.202523909@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, T_SCC_BODY_TEXT_LINE 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?1764260689078853737?= X-GMAIL-MSGID: =?utf-8?q?1764260689078853737?= From: Ken Lin If the buffer length is larger than 16 and concatenate is set to false, there would be missing spaces every 16 bytes. Example: Before: c5 11 10 50 05 4d 31 40 00 40 00 40 00 4d 31 4000 40 00 After: c5 11 10 50 05 4d 31 40 00 40 00 40 00 4d 31 40 00 40 00 Link: https://lore.kernel.org/linux-trace-kernel/20230426032257.3157247-1-lyenting@google.com Signed-off-by: Ken Lin Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_output.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 952cc8aa8e59..15f05faaae44 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -221,8 +221,11 @@ trace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len, const char *ret = trace_seq_buffer_ptr(p); const char *fmt = concatenate ? "%*phN" : "%*ph"; - for (i = 0; i < buf_len; i += 16) + for (i = 0; i < buf_len; i += 16) { + if (!concatenate && i != 0) + trace_seq_putc(p, ' '); trace_seq_printf(p, fmt, min(buf_len - i, 16), &buf[i]); + } trace_seq_putc(p, 0); return ret;