From patchwork Sat Sep 9 03:16:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 137830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1109714vqo; Sat, 9 Sep 2023 05:47:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2SjO8U4SI0PBmuLzgchl71/m4PCWskUhgne+bY1naz/yGamF4lm4eyvJDiqtf2srmzV5q X-Received: by 2002:a17:906:cc56:b0:9a1:688f:cf2d with SMTP id mm22-20020a170906cc5600b009a1688fcf2dmr3716164ejb.39.1694263632386; Sat, 09 Sep 2023 05:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694263632; cv=none; d=google.com; s=arc-20160816; b=D6a5aXwc62pvoItVNX/70bL8QfgJVvmDi/JnokWVoDxoqENu1lEiXgE3yQqVLON3mG JTv2WYb4/Dnes7HO+MS+xpcVlFxfFYFw1Mb+Ed/cmO1TgbiW63P3ZmlzWNODNrT1KR+V +Gn+PG1MQOYa9uQHzsf9mfGYk5rNb0XYlo3NrVC+Tk2bX9Q00cnr1lTdIqbsC45nvkAw LUk2D2AsnrHQ/Q4g0sHzgBfzC1AgLaUh54SSLKagQmcmtcgJtugcRTdt3RXOU4A51UTl e4gvQ0e3wZdcHB9DEVcHQtTm6wus5UlxpRpKTaaw436hgwlyHvye37OKk/l37UM39ouH +txA== 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=WyE4YGknLvQ2Hq2jIpbaa6jR6HeuqoBIBi2s5vVyIfw=; fh=ynyeVK+tXUghpfDXPiU/9O7GHCMFQEEMQPlauI265Qo=; b=A9sbp04EVrrhd0WU/4fjD5kuBQnurUd7qtFjhqvvHOJSMTyZmR4nw46htCTyPouyTp 7d6awKU4k/GCaF8eAcjolTLvRDrFpDC7qM1uMLO2FbLqnvVa5uV5wnjqe6pdMKjsgEQb eL8+Rnfan9Yd4wfPPN8hb6qEu8hcgYyNYCXwaI0yBV/tEIvnZNd1TfPF+QhHxy1d3G6+ VedvQXG9i+t4Y5HtnuPCifJ4yEBpj/zHUBITV+ZVQPXOy+xqjj7aRrRtiZ8OTyj3whS+ /MUb4CP6h8FEhN6oouzth7dYnmgXYzRgX288bBkgqcealMcxUT7jZp4+WSfmkNTfQtGr skug== 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 x11-20020a1709064a8b00b00991ece4c959si3146567eju.532.2023.09.09.05.47.07; Sat, 09 Sep 2023 05:47:12 -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 S237253AbjIIDY0 (ORCPT + 14 others); Fri, 8 Sep 2023 23:24:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234638AbjIIDXh (ORCPT ); Fri, 8 Sep 2023 23:23:37 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFE621FF6; Fri, 8 Sep 2023 20:23:33 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97E63C433CA; Sat, 9 Sep 2023 03:23:32 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qeoZb-000Yl7-0v; Fri, 08 Sep 2023 23:23:51 -0400 Message-ID: <20230909032351.104588615@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 08 Sep 2023 23:16:30 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , stable@vger.kernel.org, Sven Schnelle Subject: [for-linus][PATCH 15/15] tracing/synthetic: Fix order of struct trace_dynamic_info References: <20230909031615.047488015@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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776564182224124689 X-GMAIL-MSGID: 1776564182224124689 From: "Steven Rostedt (Google)" To make handling BIG and LITTLE endian better the offset/len of dynamic fields of the synthetic events was changed into a structure of: struct trace_dynamic_info { #ifdef CONFIG_CPU_BIG_ENDIAN u16 offset; u16 len; #else u16 len; u16 offset; #endif }; to replace the manual changes of: data_offset = offset & 0xffff; data_offest = len << 16; But if you look closely, the above is: << 16 | offset Which in little endian would be in memory: offset_lo offset_hi len_lo len_hi and in big endian: len_hi len_lo offset_hi offset_lo Which if broken into a structure would be: struct trace_dynamic_info { #ifdef CONFIG_CPU_BIG_ENDIAN u16 len; u16 offset; #else u16 offset; u16 len; #endif }; Which is the opposite of what was defined. Fix this and just to be safe also add "__packed". Link: https://lore.kernel.org/all/20230908154417.5172e343@gandalf.local.home/ Link: https://lore.kernel.org/linux-trace-kernel/20230908163929.2c25f3dc@gandalf.local.home Cc: stable@vger.kernel.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Sven Schnelle Fixes: ddeea494a16f3 ("tracing/synthetic: Use union instead of casts") Signed-off-by: Steven Rostedt (Google) --- include/linux/trace_events.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 12f875e9e69a..21ae37e49319 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -62,13 +62,13 @@ void trace_event_printf(struct trace_iterator *iter, const char *fmt, ...); /* Used to find the offset and length of dynamic fields in trace events */ struct trace_dynamic_info { #ifdef CONFIG_CPU_BIG_ENDIAN - u16 offset; u16 len; + u16 offset; #else - u16 len; u16 offset; + u16 len; #endif -}; +} __packed; /* * The trace entry - the most basic unit of tracing. This is what