From patchwork Fri Sep 8 20:01:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 137806 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp819150vqo; Fri, 8 Sep 2023 15:14:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhfdSIW6YNgQQg3BVE5fD/as/LJqS/2ZOpoytcFYVqgUHaB03kXATT2DMFtlyZ6n7OtjdM X-Received: by 2002:a17:906:8a6e:b0:9a5:7f99:be4c with SMTP id hy14-20020a1709068a6e00b009a57f99be4cmr2838403ejc.33.1694211257681; Fri, 08 Sep 2023 15:14:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694211257; cv=none; d=google.com; s=arc-20160816; b=zJiLt0k0itJEGi5//Jj/h9Rgp812jA+6RtO69f5uu2g8GUsGuFracJ0eD7pZFedM1n LPOMOQ1ch0jZU/3/8HyqkZnqep88Eu8PC23DHzIRZO/Luh5Ahssb6IYRpOGIDTje6yF/ c3DkBDxI84FqQL/P8k3X3+fYYznAYcRP9BAc+4dyheiYTWVVMb9zc49upKVRjUmkIdQQ EEXfViK9W5/6CMgmvzEfHIPAX11ylB9sH579WO+2tCmrw06G+go2+E+YSzT2J+qjvMHv 2/vMzYdckPguPJ77D64srRSEDtr1bHL0R0Db57Tuv16ffU44xqprHqbWqNDGRWJd1oGa 9bTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:subject:cc:to:from:date; bh=YGux1hCiEEQrMcv/quWDFTWHuklMgNJg/x76c4IBAPs=; fh=9mNHyMqbtlG9EzHNP5ePi4Z9IiNbSzixY6DH9uKhOq8=; b=ygQ5lVleXYSBuC+0XmMSK0Ce1owSNcFEnU1lo6W/fDtNjNSX2fK1VLWAk1QhnJrLh8 EtMrWM84ul0NZatVcRPBj8kgszbLTT3CG3zidRORo+WB1fke17XYQU2NRMLssg9aruKr Mh9BQPJ260Y2HBiOk9EJ8yU9bzebsdN8q7GAm6b33AYo40yStrELrtQG09Ub3t3qS9bJ KU/sHKdTAwbijL6G/UuNv4IZ+ifUf4XlDaQQgUoa2k9yVjI/rzLK48vp8EHZjQvBKENq Paa2jDHx9nVgED29Crr32wBvhdg/fCzi3KUvXA8GnpZIwhrSy+NpB5rT63iNtBYoiEb/ WArA== 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 f26-20020a1709067f9a00b0099bd58fb8c5si1948481ejr.751.2023.09.08.15.14.07; Fri, 08 Sep 2023 15:14:17 -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 S239662AbjIHUBp (ORCPT + 38 others); Fri, 8 Sep 2023 16:01:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230457AbjIHUBo (ORCPT ); Fri, 8 Sep 2023 16:01:44 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 196498E; Fri, 8 Sep 2023 13:01:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20079C433C8; Fri, 8 Sep 2023 20:01:40 +0000 (UTC) Date: Fri, 8 Sep 2023 16:01:57 -0400 From: Steven Rostedt To: LKML , Linux Trace Devel Cc: Masami Hiramatsu , Mark Rutland , Sven Schnelle Subject: [PATCH] tracing/synthetic: Fix order of struct trace_dynamic_info Message-ID: <20230908160157.1152301f@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) 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: 1776508920431398922 X-GMAIL-MSGID: 1776509263675977389 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/ Cc: stable@vger.kernel.org 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