Message ID | 20221111104009.0edfa8a6@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp445343wru; Thu, 10 Nov 2022 16:05:31 -0800 (PST) X-Google-Smtp-Source: AMsMyM6YT5kVt5gtdyO1J0cgiE1y13MkZ3gEMRiBXTuXcHTbiWBz2asW7bnarNwTfugBrELPQ43r X-Received: by 2002:a05:6402:550e:b0:458:ea8c:bfb4 with SMTP id fi14-20020a056402550e00b00458ea8cbfb4mr4024676edb.419.1668125131682; Thu, 10 Nov 2022 16:05:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668125131; cv=none; d=google.com; s=arc-20160816; b=OcVYsk/EIQphauUVR7rUDC58aDrLaNW52l5iaoBzr5d40g7ClIUDpSVsrq+64NUlW1 E8EFFnvjGe1IqqQD5RAq5XjRkWrrwzlsjchfZTaRqgf1irSsCL7Be+CtrNmR485FT3Br w/JZ1HxrcyT8j5Z+tH0eruQIG9Bu42K1gf6fEdf57CxLLCxcwRQkbkWvP8TkjEMECCdh CkrVjvPdGlWDyPZhbLk5Vhnsvedq0t0tp/FLZoZQ0RJ+bZQbUinPxn5aNbOt17DJuzU2 J7sfL16lrFFooA0pGvCnfUre2Rv+JBMBT1uio2Co3GZJfT0+/9MSn2Oqbn7bW9od0SmQ vm0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=v7WFZwCJE44bk4UDPUyj4rHwotdx4Bm2Nb3T9fecMuw=; b=IevG6QN7nNWh8B9Eg9T+/OkOnXA5mH3SZudoAG2NssqrH4VuuHnoP/3wXHDdzrGgyq wZW52Au1O/fKdz1xc9wDocNmStDjSi2WhVw4c4xjBYdOUE4VDWM3ODpTVJqMt95Gxt37 hWRfd0sPMc2TaAPcfeYTR4aA9qasa771zrgqZG9x14m4ibRIBJodmDkstSrV/P0EbhpV N21wtIlBGUMrKmOwpn1cxUTlAxbOWrhxHKHFckfatNxBLHckI5haveHczz1mi1AU6eiN 6/LkO9L2jp100hGbA04i8TXu18ikkK6o5FXKAVCmfiiHZdFD7MCsN8eHTjxZ7wMdtnn/ m3SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Y4r9ZkDp; 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 b21-20020a17090630d500b0078d44c5da0esi501385ejb.667.2022.11.10.16.04.30; Thu, 10 Nov 2022 16:05:31 -0800 (PST) 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=@canb.auug.org.au header.s=201702 header.b=Y4r9ZkDp; 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 S231599AbiKJXkU (ORCPT <rfc822;winker.wchi@gmail.com> + 99 others); Thu, 10 Nov 2022 18:40:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229675AbiKJXkR (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 10 Nov 2022 18:40:17 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A97244E425; Thu, 10 Nov 2022 15:40:15 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4N7dcD5q8Wz4xZb; Fri, 11 Nov 2022 10:40:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668123613; bh=v7WFZwCJE44bk4UDPUyj4rHwotdx4Bm2Nb3T9fecMuw=; h=Date:From:To:Cc:Subject:From; b=Y4r9ZkDpf995uXVoICLmPHujhVCw3qMtTeqwS6JHzBBAJ0h0eNoFqpk5jOO1g3/S8 +fMFzL5SfzVRLJbCv2UdZdGokgYBK+DpTV9fJBGMPNWR7WhCxlbMkMb+UUrGVWzvwK u1fE9bG5m47OZSHZcQ1SWEY6gRk7OF/wK7cZau8wQrB8WRd9GXumsGKJ3OhoEzbjjy 15In/dkOlwsbEWXcl3YAlWLTAPJ2SrrR9KA3M0hOxsNkYW+27XfOXnIwNVSg/7rAhF AIMVzlz4XSl1LyAstg7TRP4oOR4bX7Z+hud+E7G9rqJS+CazrBbeuvpFh2KHE1Mg0S HB9UQ6O+eCbQQ== Date: Fri, 11 Nov 2022 10:40:09 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Borkmann <daniel@iogearbox.net>, Alexei Starovoitov <ast@kernel.org>, Andrii Nakryiko <andrii@kernel.org>, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> Cc: bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>, Arnaldo Carvalho de Melo <acme@redhat.com>, Eduard Zingerman <eddyz87@gmail.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Namhyung Kim <namhyung@kernel.org> Subject: linux-next: manual merge of the bpf-next tree with the perf tree Message-ID: <20221111104009.0edfa8a6@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Mf=VGpDvB3Is_MT5DV3pyQm"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749155977994780225?= X-GMAIL-MSGID: =?utf-8?q?1749155977994780225?= |
Series |
linux-next: manual merge of the bpf-next tree with the perf tree
|
|
Commit Message
Stephen Rothwell
Nov. 10, 2022, 11:40 p.m. UTC
Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: tools/perf/util/stat.c between commit: 8b76a3188b85 ("perf stat: Remove unused perf_counts.aggr field") from the perf tree and commit: c302378bc157 ("libbpf: Hashmap interface update to allow both long and void* keys/values") from the bpf-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
Comments
Hi all, On Fri, 11 Nov 2022 10:40:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the bpf-next tree got a conflict in: > > tools/perf/util/stat.c > > between commit: > > 8b76a3188b85 ("perf stat: Remove unused perf_counts.aggr field") > > from the perf tree and commit: > > c302378bc157 ("libbpf: Hashmap interface update to allow both long and void* keys/values") > > from the bpf-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc tools/perf/util/stat.c > index 3a432a949d46,c0656f85bfa5..000000000000 > --- a/tools/perf/util/stat.c > +++ b/tools/perf/util/stat.c > @@@ -318,7 -258,27 +318,7 @@@ void evlist__copy_prev_raw_counts(struc > evsel__copy_prev_raw_counts(evsel); > } > > - static size_t pkg_id_hash(const void *__key, void *ctx __maybe_unused) > -void evlist__save_aggr_prev_raw_counts(struct evlist *evlist) > -{ > - struct evsel *evsel; > - > - /* > - * To collect the overall statistics for interval mode, > - * we copy the counts from evsel->prev_raw_counts to > - * evsel->counts. The perf_stat_process_counter creates > - * aggr values from per cpu values, but the per cpu values > - * are 0 for AGGR_GLOBAL. So we use a trick that saves the > - * previous aggr value to the first member of perf_counts, > - * then aggr calculation in process_counter_values can work > - * correctly. > - */ > - evlist__for_each_entry(evlist, evsel) { > - *perf_counts(evsel->prev_raw_counts, 0, 0) = > - evsel->prev_raw_counts->aggr; > - } > -} > - > + static size_t pkg_id_hash(long __key, void *ctx __maybe_unused) > { > uint64_t *key = (uint64_t *) __key; > This is now a conflict between perf tree and the net-next tree.
Hi all, On Mon, 14 Nov 2022 12:16:06 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > On Fri, 11 Nov 2022 10:40:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > > Today's linux-next merge of the bpf-next tree got a conflict in: > > > > tools/perf/util/stat.c > > > > between commit: > > > > 8b76a3188b85 ("perf stat: Remove unused perf_counts.aggr field") > > > > from the perf tree and commit: > > > > c302378bc157 ("libbpf: Hashmap interface update to allow both long and void* keys/values") > > > > from the bpf-next tree. > > > > I fixed it up (see below) and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > > > > -- > > Cheers, > > Stephen Rothwell > > > > diff --cc tools/perf/util/stat.c > > index 3a432a949d46,c0656f85bfa5..000000000000 > > --- a/tools/perf/util/stat.c > > +++ b/tools/perf/util/stat.c > > @@@ -318,7 -258,27 +318,7 @@@ void evlist__copy_prev_raw_counts(struc > > evsel__copy_prev_raw_counts(evsel); > > } > > > > - static size_t pkg_id_hash(const void *__key, void *ctx __maybe_unused) > > -void evlist__save_aggr_prev_raw_counts(struct evlist *evlist) > > -{ > > - struct evsel *evsel; > > - > > - /* > > - * To collect the overall statistics for interval mode, > > - * we copy the counts from evsel->prev_raw_counts to > > - * evsel->counts. The perf_stat_process_counter creates > > - * aggr values from per cpu values, but the per cpu values > > - * are 0 for AGGR_GLOBAL. So we use a trick that saves the > > - * previous aggr value to the first member of perf_counts, > > - * then aggr calculation in process_counter_values can work > > - * correctly. > > - */ > > - evlist__for_each_entry(evlist, evsel) { > > - *perf_counts(evsel->prev_raw_counts, 0, 0) = > > - evsel->prev_raw_counts->aggr; > > - } > > -} > > - > > + static size_t pkg_id_hash(long __key, void *ctx __maybe_unused) > > { > > uint64_t *key = (uint64_t *) __key; > > > > This is now a conflict between perf tree and the net-next tree. This is now a conflict between the perf tree and Linus' tree.
diff --cc tools/perf/util/stat.c index 3a432a949d46,c0656f85bfa5..000000000000 --- a/tools/perf/util/stat.c