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 X-Spam-Level: X-Spam-Status: No, score=-2.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ADECC606C1 for ; Mon, 8 Jul 2019 16:51:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E45D216FD for ; Mon, 8 Jul 2019 16:51:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="QjhYy+eC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389576AbfGHQvc (ORCPT ); Mon, 8 Jul 2019 12:51:32 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:51558 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727947AbfGHQvb (ORCPT ); Mon, 8 Jul 2019 12:51:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=m36oMpQbJ+bpnpx4ZpFk0wXnI2X5g1zDr4Ut8k/z+Hw=; b=QjhYy+eCulA+L7qs9NzBmWbGC dG7aEQ+seYLswy/Q44jOF5h6z8leFZVcArBoTScXvqXQnBrbvdR2ufBlMhUz6cOV+IgHjA2YUswhK UlvFrD28jNI6mT6o3SAEUH2o8Gp8MdlyJ7jwWxSA5au2SyBhIYzyan6w3qFy9b+8FfIKcfWydkbM0 MCNJaUZK6kXI7BE37oh2w0pEgBFtdHruuxCvfgEJzR9gea2YbSUPwN2V+SKVHIxhylGTLwfM3LMeP khfw/wz0Bb0Ud7rJ3gVSJH2jrByQ4ke0eQmlznYX7uPhKhMI2SYEV/Ltkeef3wjIIcCtLLMzaltjK bij8letPg==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=hirez.programming.kicks-ass.net) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hkWrQ-0006zF-6w; Mon, 08 Jul 2019 16:51:28 +0000 Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 9E7A020976EFA; Mon, 8 Jul 2019 18:51:26 +0200 (CEST) Date: Mon, 8 Jul 2019 18:51:26 +0200 From: Peter Zijlstra To: Ian Rogers Cc: Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-kernel@vger.kernel.org, Kan Liang , Stephane Eranian Subject: Re: [PATCH 5/7] perf: cache perf_event_groups_first for cgroups Message-ID: <20190708165126.GJ3463@hirez.programming.kicks-ass.net> References: <20190702065955.165738-1-irogers@google.com> <20190702065955.165738-6-irogers@google.com> <20190708165034.GI3419@hirez.programming.kicks-ass.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190708165034.GI3419@hirez.programming.kicks-ass.net> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 08, 2019 at 06:50:34PM +0200, Peter Zijlstra wrote: > On Mon, Jul 01, 2019 at 11:59:53PM -0700, Ian Rogers wrote: > > @@ -3511,7 +3550,12 @@ static int visit_groups_merge(struct perf_event_context *ctx, > > min_heapify_all(&heap); > > > > while (heap.num_elements > 0) { > > - ret = func(ctx, cpuctx, heap.storage[0], data); > > + if (is_pinned) > > + ret = pinned_sched_in(ctx, cpuctx, heap.storage[0]); > > + else > > + ret = flexible_sched_in(ctx, cpuctx, heap.storage[0], > > + data); > > + > > if (ret) > > return ret; > > > > You can actually merge those two functions; see merge_sched_in() in the > below patch: > > https://lkml.kernel.org/r/20181010104559.GO5728@hirez.programming.kicks-ass.net And this change is again unrelated to the one the Changelog mentions.