From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DF30C83F11 for ; Mon, 28 Aug 2023 08:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229445AbjH1H7a (ORCPT ); Mon, 28 Aug 2023 03:59:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229878AbjH1H7S (ORCPT ); Mon, 28 Aug 2023 03:59:18 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01438114; Mon, 28 Aug 2023 00:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693209555; x=1724745555; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=epWO/Xye8dZDMvpi1RmdhjA58cI/mGNScKOIakfLntU=; b=k1w5MUQFUTZHdwfOCPGg1qnqLQJ7q5YC6/aE9xARHFK3tEHIu5KNy2PV W7eBYGfUzKBkqlQ+Ri3ncn+XeobF7+IkTehqAHaC0A3qv+R8Xwgbz+DUZ 8wYIKncOGxR6uuWpjP0Anatgn9oSYmBfgUl8NKecensZys4dhBj/pXAaL lhyUygES0dVnYsdS8TLoJ78wHpa8Sp+j76oRRAZpgUaOn+cXDsYOM9BLO CDaax3SjDg5UO+KdDmuZOaKzEG0ScuPCJbow6YzIgC3XhQI8+YDfpvqUi SwfE1Tcy5xzw1JZ8Dt3pd6+eI8V3csC2txL0WIVuCsaDoUi+nkfOfXaSz A==; X-IronPort-AV: E=McAfee;i="6600,9927,10815"; a="406032998" X-IronPort-AV: E=Sophos;i="6.02,207,1688454000"; d="scan'208";a="406032998" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2023 00:59:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="881851343" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO [10.0.2.15]) ([10.251.213.104]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2023 00:59:18 -0700 Message-ID: <150a4c24-6082-cf74-035d-c6cf4dacc46d@intel.com> Date: Mon, 28 Aug 2023 10:59:10 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.14.0 Subject: Re: [PATCH v2 3/4] perf tools: Convert to perf_record_header_attr_id() To: Namhyung Kim , Arnaldo Carvalho de Melo , Jiri Olsa Cc: Ian Rogers , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org References: <20230825152552.112913-1-namhyung@kernel.org> <20230825152552.112913-3-namhyung@kernel.org> Content-Language: en-US From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki In-Reply-To: <20230825152552.112913-3-namhyung@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org On 25/08/23 18:25, Namhyung Kim wrote: > Instead of accessing the attr.id directly, use the > perf_record_header_attr_id() helper to handle old versions. > > Signed-off-by: Namhyung Kim > --- > tools/perf/util/header.c | 2 +- > tools/perf/util/session.c | 4 ++-- > tools/perf/util/synthetic-events.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c > index f89321cbfdee..63967c34157d 100644 > --- a/tools/perf/util/header.c > +++ b/tools/perf/util/header.c > @@ -4408,7 +4408,7 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused, > if (perf_evsel__alloc_id(&evsel->core, 1, n_ids)) > return -ENOMEM; > > - ids = (void *)&event->attr.attr + event->attr.attr.size; > + ids = perf_record_header_attr_id(event); > for (i = 0; i < n_ids; i++) { > perf_evlist__id_add(&evlist->core, &evsel->core, 0, i, ids[i]); > } > diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c > index 00d18c74c090..1e9aa8ed15b6 100644 > --- a/tools/perf/util/session.c > +++ b/tools/perf/util/session.c > @@ -833,8 +833,8 @@ static void perf_event__hdr_attr_swap(union perf_event *event, > perf_event__attr_swap(&event->attr.attr); > > size = event->header.size; > - size -= (void *)&event->attr.id - (void *)event; > - mem_bswap_64(event->attr.id, size); > + size -= perf_record_header_attr_id(event) - (void *)event; > + mem_bswap_64(perf_record_header_attr_id(event), size); Should this and below also be a fix for stable? > } > > static void perf_event__event_update_swap(union perf_event *event, > diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c > index 45714a2785fd..a0579c7d7b9e 100644 > --- a/tools/perf/util/synthetic-events.c > +++ b/tools/perf/util/synthetic-events.c > @@ -2145,7 +2145,7 @@ int perf_event__synthesize_attr(struct perf_tool *tool, struct perf_event_attr * > return -ENOMEM; > > ev->attr.attr = *attr; > - memcpy(ev->attr.id, id, ids * sizeof(u64)); > + memcpy(perf_record_header_attr_id(ev), id, ids * sizeof(u64)); > > ev->attr.header.type = PERF_RECORD_HEADER_ATTR; > ev->attr.header.size = (u16)size;