From patchwork Wed May 12 14:51:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 435614 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5066087jao; Wed, 12 May 2021 11:12:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhZR64rZ8kI6zQB5pbuMCm2ju6fzf/hwxPRW9DSWM7OKOry6sqbXEG2Ut+Wsgocn7KiaPw X-Received: by 2002:a5d:9644:: with SMTP id d4mr1327107ios.84.1620843145568; Wed, 12 May 2021 11:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620843145; cv=none; d=google.com; s=arc-20160816; b=PbKpSb6CActrc807TExqD5DgXD2Smk+NNbNezqEG61m/HPEc53Ns32LGF9YekRat7e 446rnabs0TNhApdshFZFf4rRRC/DwNFFEU0bmFzKJEQuUfj6iEUQPx72C4UYnLIYa2ig p5x4/Wa7dJAHgw9fmZgwCRIUxsyGz4DGMvVQQe/DCFkGG76QjDwJsnYfWlBdXadj4hgY jAXyg6ujyPheltWn2hecNwHoAx7Z6vk5HNOOChigGjlAHGaB2dFzxKdX38wf11/wll7k S5hxfIWJxLzQdTLWJyU61e/N+jiRK8izklBo84a60kIH2Aa8CF9qJFy8ButvrLZcDv92 mPZg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CtfqHVgE9XvRkTLzcPjj1EsDoInB9/XzG8BI6/fCodo=; b=D1nq9mw9ryGeDT41YcG1XEjHshxrsOpdYuWy0u94iqhbNFj9sxPK4fYpNPk6d8Z9OZ K26yjvrWX6TL8Cg+97XCiFESlUyIViMSmmfWxr16UpuKfB8pzSd2iW4xjMuKh0MR1OvG DMb5e/poJFEIjC422ZCfjPdf2LgYuOu3vw/Livqa62zZajOVhEypI4AZPLKIYGAXMDAp HX2lrXFvEyiovuh3tNGUpt+bfdKDE6Fq0i9N8Xr9d9rZEZEXUWtffRCLZ2e+xE/3HpWV k7GAlSKVqlU65ocgC9LGjmqAUWGc2BxB7iynjRFzziXIpsiBqMjwpPG3YVdwzHluuZXy Tl0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bpJ36PfD; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q8si330223ior.12.2021.05.12.11.12.25; Wed, 12 May 2021 11:12:25 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bpJ36PfD; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241875AbhELQbD (ORCPT + 12 others); Wed, 12 May 2021 12:31:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:44582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240930AbhELQ0E (ORCPT ); Wed, 12 May 2021 12:26:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6729061DA3; Wed, 12 May 2021 15:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834540; bh=brDECwq0ads36K/hjlP+Sn6y3VTsqo9k6dOwc+CzcbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bpJ36PfDQMyMDJqmYyBKBx3S+TlWdJm6CpWHEfUTiYoeESFbn5PpetwOdTKznArl2 Uza3DByigasi2ceoD9ZzGzicntQULfh9nNmXX0VgqVA2FZPCN2avsxOseFaPvVRbIN 7tYEzbvUSaPGSXrIvHAgF/r8kcyAIz9xGR8qQ0cY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Hunter , Leo Yan , Alexander Shishkin , "Gustavo A. R. Silva" , Ingo Molnar , Jiri Olsa , Kan Liang , Mark Rutland , Namhyung Kim , Peter Zijlstra , Steve MacLean , Yonatan Goldschmidt , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.11 584/601] perf tools: Change fields type in perf_record_time_conv Date: Wed, 12 May 2021 16:51:01 +0200 Message-Id: <20210512144847.078101552@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Leo Yan [ Upstream commit e1d380ea8b00db4bb14d1f513000d4b62aa9d3f0 ] C standard claims "An object declared as type _Bool is large enough to store the values 0 and 1", bool type size can be 1 byte or larger than 1 byte. Thus it's uncertian for bool type size with different compilers. This patch changes the bool type in structure perf_record_time_conv to __u8 type, and pads extra bytes for 8-byte alignment; this can give reliable structure size. Fixes: d110162cafc8 ("perf tsc: Support cap_user_time_short for event TIME_CONV") Suggested-by: Adrian Hunter Signed-off-by: Leo Yan Acked-by: Adrian Hunter Cc: Alexander Shishkin Cc: Gustavo A. R. Silva Cc: Ingo Molnar Cc: Jiri Olsa Cc: Kan Liang Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Steve MacLean Cc: Yonatan Goldschmidt Link: https://lore.kernel.org/r/20210428120915.7123-2-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/lib/perf/include/perf/event.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/perf/event.h index 988c539bedb6..baf64ea74e10 100644 --- a/tools/lib/perf/include/perf/event.h +++ b/tools/lib/perf/include/perf/event.h @@ -336,8 +336,9 @@ struct perf_record_time_conv { __u64 time_zero; __u64 time_cycles; __u64 time_mask; - bool cap_user_time_zero; - bool cap_user_time_short; + __u8 cap_user_time_zero; + __u8 cap_user_time_short; + __u8 reserved[6]; /* For alignment */ }; struct perf_record_header_feature {