Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp915223rwb; Thu, 4 Aug 2022 13:25:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR6pzq+nq5N1FynJ+cviZDYiBcjeKL3CZVc3mOuwQJ3XkJ7oBzWeNBJQwHUbI917kpqami8A X-Received: by 2002:a17:907:6d8f:b0:730:b108:5062 with SMTP id sb15-20020a1709076d8f00b00730b1085062mr2593617ejc.461.1659644716048; Thu, 04 Aug 2022 13:25:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659644716; cv=none; d=google.com; s=arc-20160816; b=0ixmdNI1nNSoQ0ueHc0mMKi4L4qBIdy0m9muyWdUQHQxohYYGgaD6EKZM9I/41+/gy /s+3GxSy2Q7kebi4juhZ9Kx7pwntYmqwxLylCXsBtgirrRYfGApmY/TIHV4x6GivYwm0 kGTH+8Hglex9QOhqddrd9d+ceoCRoxqi96R0OnxdUAph+VP/y0BAFzYjNLRS8UK1A5Bg qN+cbsiW8ZdjaZzRl5yXXq3Dev7Sx0qcxAeG/oqkKgvbN8gNuiVKzvs6TyOQaYW3Ti18 WCAZrErXifUxvxn3seOrg4ih9i2mVI4rtMwxBOzuJtgsSWsuzddnD9Zjo89ig14hbEBF B0dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:date:from:dkim-signature; bh=jXfSwIVHH5n0bd8ihUeImZw7y0OX8igYXCyoA7ZaxS0=; b=v/c9Tye2sS4CLXboeZ2wD+LEOFv4E4PFc5Gixkp3rC0I9MNm5fr4SoyjYpABdylGyp /hxQc8nH6kDXhjdKqn1UF5YKZ59nTCkgYvD5EHfqf7hnvrhl8R111rsddoynlzNvcNRu AIZW8dupKXMwnk/Ehkq3OTfFcdKtW6iomFPLpSm2qsbw/hRtQlnK7H6wqSOP6jBVhJYg 459WvozriRaBaJL8DJUAr35P9LK5AvdazHWVBUIlkX+AqITKxigvwzWVO/EcDghI3VX8 MAu3p9MMEp+vz9KTxGXOAuS93h9yOCtA9FmkivVcKTdVkYOOtqsABqIlHSQ8o+UABULT eKxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LwAXYbKV; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i14-20020a1709064fce00b0072f2f18fd17si1804528ejw.804.2022.08.04.13.24.50; Thu, 04 Aug 2022 13:25:16 -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; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LwAXYbKV; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239436AbiHDUXO (ORCPT + 99 others); Thu, 4 Aug 2022 16:23:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232290AbiHDUXM (ORCPT ); Thu, 4 Aug 2022 16:23:12 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 395E26D556; Thu, 4 Aug 2022 13:23:11 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id m4so1338790ejr.3; Thu, 04 Aug 2022 13:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc; bh=jXfSwIVHH5n0bd8ihUeImZw7y0OX8igYXCyoA7ZaxS0=; b=LwAXYbKVkp+zbNDblZPDf5TS4z/8LXvzWeOvJhDHqCaj+dRAy2vmB/oSk7HnWNsC2c JxKzLvRfwevhn4fzSUG//t5CW8rvx1UmRD5wsfAUAtO3rCUpgBGuwjWINVmWvicQixNS l9H9BP8Dtk3F1oORE/lpWh84boBRpJ8PeUCehbfivHUJ8dE002kGiiRq5Wfn6qVDEP58 ZA2IsJL7kshfxUGMLPNIN3H947Mfkc5eD2iliO8I3DscF0DEuMmNRqiSsPsG8CIrBlc+ od9TjS8/l90kO4XsvsNsligDjxHb86lzqVoLHw1TL+ZyrInSTD9hdp7hS9G44unqf2NO xHqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc; bh=jXfSwIVHH5n0bd8ihUeImZw7y0OX8igYXCyoA7ZaxS0=; b=vPOJCwM6NPUSr6XEL0SycxqildAGkN+ierIxgA7NLpenZsYd4EimtjacpgLKdIb8E6 OWAiew1n4mOBx/PHialWI0Y+AMv3spXyiocXmu7NmkNgRUH8D89821MbADY9ra3kizNl ajNpYby4geRBtItdAu1lxYZDyKi7KMiEMpN1vnnQ83yxaMK9kDpyqe0+BK82CBmjLbAE 07Xb8QtPnMYEV66vSIQlsBdlutNY9rxdH/Uvj+69Yz3n53a/vzBcvAwxa5DAI1hyJiSZ s9A+X+W5zpMuNU7OPXpDbFNJqpCdeu7U4DvSsSVoSQaWiGjYd8D4NRjsXhEWq8lSqqYv cfjA== X-Gm-Message-State: ACgBeo3YpHd5FJVopfh5/hoCKQjI30AprnzNdEM3gXp0NseoNIoMvEA0 K1U0EIUdLIDesL2Nl4Hlzjs= X-Received: by 2002:a17:906:ef8b:b0:730:d348:61b9 with SMTP id ze11-20020a170906ef8b00b00730d34861b9mr2654647ejb.350.1659644589481; Thu, 04 Aug 2022 13:23:09 -0700 (PDT) Received: from krava ([83.240.62.222]) by smtp.gmail.com with ESMTPSA id kx16-20020a170907775000b00724261b592esm661620ejc.186.2022.08.04.13.23.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Aug 2022 13:23:09 -0700 (PDT) From: Jiri Olsa X-Google-Original-From: Jiri Olsa Date: Thu, 4 Aug 2022 22:23:07 +0200 To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Namhyung Kim , James Clark , Kees Cook , "Gustavo A. R. Silva" , Adrian Hunter , Riccardo Mancini , German Gomez , Colin Ian King , Song Liu , Dave Marchevsky , Athira Rajeev , Alexey Bayduraev , Leo Yan , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Stephane Eranian Subject: Re: [PATCH v2 0/6] Corrections to cpu map event encoding Message-ID: References: <20220614143353.1559597-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220614143353.1559597-1-irogers@google.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 On Tue, Jun 14, 2022 at 07:33:47AM -0700, Ian Rogers wrote: > A mask encoding of a cpu map is laid out as: > u16 nr > u16 long_size > unsigned long mask[]; > However, the mask may be 8-byte aligned meaning there is a 4-byte pad > after long_size. This means 32-bit and 64-bit builds see the mask as > being at different offsets. On top of this the structure is in the byte > data[] encoded as: > u16 type > char data[] > This means the mask's struct isn't the required 4 or 8 byte aligned, but > is offset by 2. Consequently the long reads and writes are causing > undefined behavior as the alignment is broken. > > These changes do minor clean up with const, visibility of functions > and using the constant time max function. It then adds 32 and 64-bit > mask encoding variants, packed to match current alignment. Taking the > address of a packed struct leads to unaligned data, so function > arguments are altered to be passed the packed struct. To compact the > mask encoding further and drop the padding, the 4-byte variant is > preferred. Finally a new range encoding is added, that reduces the > size of the common case of a range of CPUs to a single u64. > > On a 72 CPU (hyperthread) machine the original encoding of all CPUs is: > 0x9a98 [0x28]: event: 74 > . > . ... raw event: size 40 bytes > . 0000: 4a 00 00 00 00 00 28 00 01 00 02 00 08 00 00 00 J.....(......... > . 0010: 00 00 ff ff ff ff ff ff ff ff ff 00 00 00 00 00 ................ > . 0020: 00 00 00 00 00 00 00 00 ........ > > 0 0 0x9a98 [0x28]: PERF_RECORD_CPU_MAP > > Using the 4-byte encoding it is: > 0x9a98@pipe [0x20]: event: 74 > . > . ... raw event: size 32 bytes > . 0000: 4a 00 00 00 00 00 20 00 01 00 03 00 04 00 ff ff J..... ......... > . 0010: ff ff ff ff ff ff ff 00 00 00 00 00 00 00 00 00 ................ > > 0 0 0x9a98 [0x20]: PERF_RECORD_CPU_MAP > > Finally, with the range encoding it is: > 0x9ab8@pipe [0x10]: event: 74 > . > . ... raw event: size 16 bytes > . 0000: 4a 00 00 00 00 00 10 00 02 00 00 00 00 00 47 00 J.............G. > > 0 0 0x9ab8 [0x10]: PERF_RECORD_CPU_MAP > > v2. Fixes a bug in the size computation of the update header > introduced by the last patch (Add range data encoding) and caught > by address sanitizer. > > Ian Rogers (6): > perf cpumap: Const map for max > perf cpumap: Synthetic events and const/static > perf cpumap: Compute mask size in constant time > perf cpumap: Fix alignment for masks in event encoding > perf events: Prefer union over variable length array > perf cpumap: Add range data encoding Acked-by: Jiri Olsa thanks, jirka > > tools/lib/perf/cpumap.c | 2 +- > tools/lib/perf/include/perf/cpumap.h | 2 +- > tools/lib/perf/include/perf/event.h | 61 ++++++++- > tools/perf/tests/cpumap.c | 71 ++++++++--- > tools/perf/tests/event_update.c | 14 +-- > tools/perf/util/cpumap.c | 111 +++++++++++++--- > tools/perf/util/cpumap.h | 4 +- > tools/perf/util/event.h | 4 - > tools/perf/util/header.c | 24 ++-- > tools/perf/util/session.c | 35 +++--- > tools/perf/util/synthetic-events.c | 182 +++++++++++++-------------- > tools/perf/util/synthetic-events.h | 2 +- > 12 files changed, 327 insertions(+), 185 deletions(-) > > -- > 2.36.1.476.g0c4daa206d-goog >