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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham 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 D46B2C2BD09 for ; Fri, 6 Dec 2019 23:16:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93B632464E for ; Fri, 6 Dec 2019 23:16:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="l2iYo+2t" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726814AbfLFXQH (ORCPT ); Fri, 6 Dec 2019 18:16:07 -0500 Received: from mail-pl1-f201.google.com ([209.85.214.201]:57110 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726584AbfLFXQF (ORCPT ); Fri, 6 Dec 2019 18:16:05 -0500 Received: by mail-pl1-f201.google.com with SMTP id k22so4320763pls.23 for ; Fri, 06 Dec 2019 15:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=rDFkhKN4Qa4UAjWzq9t/ulaVgV1TeB6vVBVra9aNqSg=; b=l2iYo+2t68pAdBzWgV5fmGms6QfS1Pg8gTz83VsBsxTDFIYJfcoW9Y1soxvVL7C6Yo hbCc8XKOn0XWHasomvq7DaIcDzgnPtvlq7iA1kE3gDTR8xfPu7KmI7AwqcUyn6Uq0t/g UTLNVh18F6MhjVd4pXrs8ffLo766mlTP8kMT64LUK2RLQGeaVs+L9OfzClm7cxEk+FQ8 QG3c6MXl1M1vCTngzEsM+K/sgLOilIK3xd4dZE2PDadki3FJ4/b1EyOCQd05K32TjJ9S mhTUK/hTBYg5WD4SRIEK4BEugN2jNC4b2LJEOAS30nkNrP7ntT2729RD1q+LWnzyeIbZ 41ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=rDFkhKN4Qa4UAjWzq9t/ulaVgV1TeB6vVBVra9aNqSg=; b=CTQoi7QNmc7n6kcXDr8qkOVB7qNqlZ1Tx6+2iELOPCDqAUD28SDA+HXeWrXqk8WN5J 4EWhpx9QiWXtD0wJLRHIhug1tAYyM8UZIPIiMEMyiXvAa7LF2lWprldGvQeDzT06sVw5 RgfJsZMHqXgIc0jheZ5N0kB/Vk1pnKw/xrIwLpOKewJN/GNd36TpZdsqe5eC/rpT+FGU S+6qZ/aeJamwl/CJdRlvEA7BP9bJ6D3Fxn2Xsyxq1fi0KjVHfaBWz0UiFHQk/pVkqLQ2 7p54pFSWM2XPhWl8Bd/aQVA2hQojhK9jjpokYgSZ0ifAD1G2gUYyEJoWb1k9BCxgg+mR g2TQ== X-Gm-Message-State: APjAAAXOhTP5X9qjTb0NeXeqf1/aVHOWjy+k3fKXzW1M4wBZ/w9hmq5Z GZ+l4f0b2hUmayHF5HhUe3g7x3y8Dg2g X-Google-Smtp-Source: APXvYqwGRBSwqQ7a2+5kJI4wuFsmVw6vJiRdXQmd/ArHzc+9phNxeLze9fIkjxl44CoxO8fUfFrrr4CDC11R X-Received: by 2002:a63:c652:: with SMTP id x18mr6319006pgg.211.1575674164977; Fri, 06 Dec 2019 15:16:04 -0800 (PST) Date: Fri, 6 Dec 2019 15:15:36 -0800 In-Reply-To: <20191206231539.227585-1-irogers@google.com> Message-Id: <20191206231539.227585-8-irogers@google.com> Mime-Version: 1.0 References: <20191116011845.177150-1-irogers@google.com> <20191206231539.227585-1-irogers@google.com> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog Subject: [PATCH v5 07/10] perf: simplify and rename visit_groups_merge From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andrew Morton , Masahiro Yamada , Kees Cook , Catalin Marinas , Petr Mladek , Mauro Carvalho Chehab , Qian Cai , Joe Lawrence , Tetsuo Handa , "Uladzislau Rezki (Sony)" , Andy Shevchenko , Ard Biesheuvel , "David S. Miller" , Kent Overstreet , Gary Hook , Arnd Bergmann , Kan Liang , linux-kernel@vger.kernel.org Cc: Stephane Eranian , Andi Kleen , Ian Rogers Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To enable a future caching optimization, pass in whether visit_groups_merge is operating on pinned or flexible groups. The is_pinned argument makes the func argument redundant, rename the function to ctx_groups_sched_in as it just schedules pinned or flexible groups in. Compute the cpu and groups arguments locally to reduce the argument list size. Remove sched_in_data as it repeats arguments already passed in. Merge pinned_sched_in and flexible_sched_in and use the pinned argument to determine the active list. Signed-off-by: Ian Rogers --- kernel/events/core.c | 149 ++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 100 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 20e08d0c1cb9..3da9cc1ebc2d 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2133,7 +2133,6 @@ static void perf_group_detach(struct perf_event *event) if (!RB_EMPTY_NODE(&event->group_node)) { add_event_to_groups(sibling, event->ctx); - if (sibling->state == PERF_EVENT_STATE_ACTIVE) { struct list_head *list = sibling->attr.pinned ? &ctx->pinned_active : &ctx->flexible_active; @@ -2456,6 +2455,8 @@ event_sched_in(struct perf_event *event, { int ret = 0; + WARN_ON_ONCE(event->ctx != ctx); + lockdep_assert_held(&ctx->lock); if (event->state <= PERF_EVENT_STATE_OFF) @@ -3524,10 +3525,42 @@ static void __heap_add(struct min_heap *heap, struct perf_event *event) } } -static noinline int visit_groups_merge(struct perf_cpu_context *cpuctx, - struct perf_event_groups *groups, int cpu, - int (*func)(struct perf_event *, void *), - void *data) +static int merge_sched_in(struct perf_event_context *ctx, + struct perf_cpu_context *cpuctx, + struct perf_event *event, + bool is_pinned, + int *can_add_hw) +{ + WARN_ON_ONCE(event->ctx != ctx); + + if (event->state <= PERF_EVENT_STATE_OFF) + return 0; + + if (!event_filter_match(event)) + return 0; + + if (group_can_go_on(event, cpuctx, 1)) { + if (!group_sched_in(event, cpuctx, ctx)) { + list_add_tail(&event->active_list, is_pinned + ? &ctx->pinned_active + : &ctx->flexible_active); + } + } + + if (event->state == PERF_EVENT_STATE_INACTIVE) { + if (is_pinned) + perf_event_set_state(event, PERF_EVENT_STATE_ERROR); + + *can_add_hw = 0; + ctx->rotate_necessary = 1; + } + + return 0; +} + +static int ctx_groups_sched_in(struct perf_event_context *ctx, + struct perf_cpu_context *cpuctx, + bool is_pinned) { #ifdef CONFIG_CGROUP_PERF struct cgroup_subsys_state *css = NULL; @@ -3537,9 +3570,13 @@ static noinline int visit_groups_merge(struct perf_cpu_context *cpuctx, struct min_heap event_heap; struct perf_event **evt; struct perf_event *next; - int ret; + int ret, can_add_hw = 1; + int cpu = smp_processor_id(); + struct perf_event_groups *groups = is_pinned + ? &ctx->pinned_groups + : &ctx->flexible_groups; - if (cpuctx) { + if (ctx == &cpuctx->ctx) { event_heap = (struct min_heap){ .data = cpuctx->itr_storage, .size = 0, @@ -3576,7 +3613,8 @@ static noinline int visit_groups_merge(struct perf_cpu_context *cpuctx, min_heapify_all(&event_heap, &perf_min_heap); while (event_heap.size) { - ret = func(*evt, data); + ret = merge_sched_in(ctx, cpuctx, *evt, is_pinned, &can_add_hw); + if (ret) return ret; @@ -3590,96 +3628,6 @@ static noinline int visit_groups_merge(struct perf_cpu_context *cpuctx, return 0; } -struct sched_in_data { - struct perf_event_context *ctx; - struct perf_cpu_context *cpuctx; - int can_add_hw; -}; - -static int pinned_sched_in(struct perf_event *event, void *data) -{ - struct sched_in_data *sid = data; - - if (event->state <= PERF_EVENT_STATE_OFF) - return 0; - - if (!event_filter_match(event)) - return 0; - - if (group_can_go_on(event, sid->cpuctx, sid->can_add_hw)) { - if (!group_sched_in(event, sid->cpuctx, sid->ctx)) - list_add_tail(&event->active_list, &sid->ctx->pinned_active); - } - - /* - * If this pinned group hasn't been scheduled, - * put it in error state. - */ - if (event->state == PERF_EVENT_STATE_INACTIVE) - perf_event_set_state(event, PERF_EVENT_STATE_ERROR); - - return 0; -} - -static int flexible_sched_in(struct perf_event *event, void *data) -{ - struct sched_in_data *sid = data; - - if (event->state <= PERF_EVENT_STATE_OFF) - return 0; - - if (!event_filter_match(event)) - return 0; - - if (group_can_go_on(event, sid->cpuctx, sid->can_add_hw)) { - int ret = group_sched_in(event, sid->cpuctx, sid->ctx); - if (ret) { - sid->can_add_hw = 0; - sid->ctx->rotate_necessary = 1; - return 0; - } - list_add_tail(&event->active_list, &sid->ctx->flexible_active); - } - - return 0; -} - -static void -ctx_pinned_sched_in(struct perf_event_context *ctx, - struct perf_cpu_context *cpuctx) -{ - struct sched_in_data sid = { - .ctx = ctx, - .cpuctx = cpuctx, - .can_add_hw = 1, - }; - - if (ctx != &cpuctx->ctx) - cpuctx = NULL; - - visit_groups_merge(cpuctx, &ctx->pinned_groups, - smp_processor_id(), - pinned_sched_in, &sid); -} - -static void -ctx_flexible_sched_in(struct perf_event_context *ctx, - struct perf_cpu_context *cpuctx) -{ - struct sched_in_data sid = { - .ctx = ctx, - .cpuctx = cpuctx, - .can_add_hw = 1, - }; - - if (ctx != &cpuctx->ctx) - cpuctx = NULL; - - visit_groups_merge(cpuctx, &ctx->flexible_groups, - smp_processor_id(), - flexible_sched_in, &sid); -} - static void ctx_sched_in(struct perf_event_context *ctx, struct perf_cpu_context *cpuctx, @@ -3716,11 +3664,12 @@ ctx_sched_in(struct perf_event_context *ctx, * in order to give them the best chance of going on. */ if (is_active & EVENT_PINNED) - ctx_pinned_sched_in(ctx, cpuctx); + ctx_groups_sched_in(ctx, cpuctx, /*is_pinned=*/true); + /* Then walk through the lower prio flexible groups */ if (is_active & EVENT_FLEXIBLE) - ctx_flexible_sched_in(ctx, cpuctx); + ctx_groups_sched_in(ctx, cpuctx, /*is_pinned=*/false); } static void cpu_ctx_sched_in(struct perf_cpu_context *cpuctx, -- 2.24.0.393.g34dc348eaf-goog