From patchwork Sat Nov 18 15:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 166574 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1242529vqn; Sat, 18 Nov 2023 07:56:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IF9Jan8KepP6zQocchhUnIJXpjQZXWZUop61Zfzymrt/sMrfyauPTEFOICGPzTKvsz+2Xf1 X-Received: by 2002:a17:902:f684:b0:1cc:f064:8d6a with SMTP id l4-20020a170902f68400b001ccf0648d6amr3767196plg.5.1700322997497; Sat, 18 Nov 2023 07:56:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700322997; cv=none; d=google.com; s=arc-20160816; b=FtY2I9A0IAL6058AjoWUzTHb36uR1gDfuYmeUESq3F8eG7g3pejI1MZOvV4Z/PTe4y Ini2dyksiFptUbnm304ozBvon2OzDSvAR1o9b+MRjCz3LaxIUQ2b3ELMV2dp7bPRk/NZ G02mboqOXtJSUrpPGggJFfzFKTFVyyTI8+hmKp4MkaLKj3ZwW8WLXDFg+9oy+z+QlHk6 PvHEBoZClMsr57Bf4CdJKS7XC0eAKC3JODWDaPIFcghUdjI2UVf1ziV7exehn4tpOfTm irwdMOjOHZBgm7kwhtW3kaN4Rmoi8SnRorulmvzA/pdA6Hnprh0/Yd4zuFj39FGilqL5 dcGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Faq88orJ2tLAcgJ6Ak512QARxmUWD9dLolef7kGFuP8=; fh=V07Y7/Of3KrBfHU2cMfr8TK0/Ci4lES6l66hWNCmgf0=; b=KBrOb3gGKAqH4Z7UT8pR2RRlEFoXb9vF5LH5JwTzLJdW8bGAqpQD3yeIdfUUQ8dIMA on4i8gWvniJOLCo6ES56iM102AwQSwL0d2lbP9sPj2TRpPPlrIY/S07obSflv6Sv12Sl eQf9vIqKCYXN951q4xembUi99Tpn9fGLmO5pT8DDNtlKEg4efeS1RZxyh+mxezCm357S yp3LhIVDYKRD18dumaSXYx6UxVbkdwJsx08KRWRXfj/GeL6+2yTTdVgCr3DUq7fSwECn 7e/gNq5bz1+ZKw6wN9uD+zp7om1frbR8HohWRBAj+9WpOrSTWr9kUr1XJm0CCUBt1285 iYHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hcACIPzB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id jj4-20020a170903048400b001cc5d28bb2csi4196758plb.151.2023.11.18.07.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 07:56:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hcACIPzB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id F2A8D8068970; Sat, 18 Nov 2023 07:55:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233111AbjKRPyz (ORCPT + 29 others); Sat, 18 Nov 2023 10:54:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231244AbjKRPxh (ORCPT ); Sat, 18 Nov 2023 10:53:37 -0500 Received: from mail-yw1-x1132.google.com (mail-yw1-x1132.google.com [IPv6:2607:f8b0:4864:20::1132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0482A1FFF for ; Sat, 18 Nov 2023 07:51:56 -0800 (PST) Received: by mail-yw1-x1132.google.com with SMTP id 00721157ae682-5a822f96aedso33743847b3.2 for ; Sat, 18 Nov 2023 07:51:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700322715; x=1700927515; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Faq88orJ2tLAcgJ6Ak512QARxmUWD9dLolef7kGFuP8=; b=hcACIPzBulOdtEuNm05hpsAR7UMnLmhav62wLOz5hBaF+NaS7TnMBjmZHBpNdNHso7 P+9DV7JUtJnclhdlegEPImotD8CuVBTQDwux3woKsjUay2BnxPd5e1M1kxlObqXfmW9f eJ4woQpt6fPpUx+nrbRY+zo9r+TviA7/olG313tK0nFv7FVi9jbvrpDy7JNbHiBZnO5Q vlzDinRv+pOhYFNrtwso2pyKM+KN6ZBtu/kX2ySchrgrM7X1/CdEJifdY7AuZ+2UWLvt B3vXQCjt4YnsaFdhCtvdY7QKaz39r/mGjN5n3SgC8583qWYGThYiyCTAfYiZsADh5+Id m+Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700322715; x=1700927515; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Faq88orJ2tLAcgJ6Ak512QARxmUWD9dLolef7kGFuP8=; b=JNc5YYZnll6ePdQcSaPx2sghkts4R9MBTS3h1tH4SQlVASTAnJe0clnWBBlCm/RjCu fBflDx9U3C6UuiL5NoONY+dTAq5DQ6e6ME+RjU7iMOrOiVu/JJIo/4KulRv5m7y2bgZr X7H/+56lmoqpqxWPRSISL1z7TO1fHtNhlGzdjzMdr+9SOP+LEbrrqTbnq7c/JR9EHm4K 3l6JIXmQjBoOer9TyQoZDdyRh/Ox9FtpkFbb8calxffJaJ/rQedOnlydFtsFisFCOK9J uamcJNszenxE6mtP+a0XoOMfuRG3Ne1KMMUocjrwoVzDH17cvGYkK077cMOut91SZKeQ t2aQ== X-Gm-Message-State: AOJu0YzG4hn18fS2Zjol7VvwKRdjHeVWM075jq3Qv+rVtcyG/14LtHv7 LYT3eq+BRER3bBppTWItmliUODBYksqaIf6K X-Received: by 2002:a0d:cb0b:0:b0:5a7:dda6:cbaf with SMTP id n11-20020a0dcb0b000000b005a7dda6cbafmr2882441ywd.19.1700322714741; Sat, 18 Nov 2023 07:51:54 -0800 (PST) Received: from localhost ([2601:344:8301:57f0:48a9:bd4c:868d:dc97]) by smtp.gmail.com with ESMTPSA id k186-20020a0dfac3000000b00559f1cb8444sm1186383ywf.70.2023.11.18.07.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 07:51:54 -0800 (PST) From: Yury Norov To: linux-kernel@vger.kernel.org, Will Deacon , Mark Rutland , Marc Zyngier , linux-arm-kernel@lists.infradead.org Cc: Yury Norov , Jan Kara , Mirsad Todorovac , Matthew Wilcox , Rasmus Villemoes , Andy Shevchenko , Maxim Kuvyrkov , Alexey Klimov Subject: [PATCH 31/34] drivers/perf: optimize m1_pmu_get_event_idx() by using find_bit() API Date: Sat, 18 Nov 2023 07:51:02 -0800 Message-Id: <20231118155105.25678-32-yury.norov@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231118155105.25678-1-yury.norov@gmail.com> References: <20231118155105.25678-1-yury.norov@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sat, 18 Nov 2023 07:55:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782917887221866550 X-GMAIL-MSGID: 1782917887221866550 The function searches used_mask for a bit in a for-loop bit by bit. We can do it faster by using atomic find_and_set_bit(). The comment to the function says that it searches for the first free counter, but obviously for_each_set_bit() searches for the first set counter. The following test_and_set_bit() tries to enable already set bit, which is weird. This patch, by using find_and_set_bit(), fixes this automatically. Fixes: a639027a1be1 ("drivers/perf: Add Apple icestorm/firestorm CPU PMU driver") Signed-off-by: Yury Norov --- drivers/perf/apple_m1_cpu_pmu.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c index cd2de44b61b9..2d50670ffb01 100644 --- a/drivers/perf/apple_m1_cpu_pmu.c +++ b/drivers/perf/apple_m1_cpu_pmu.c @@ -447,12 +447,8 @@ static int m1_pmu_get_event_idx(struct pmu_hw_events *cpuc, * counting on the PMU at any given time, and by placing the * most constraining events first. */ - for_each_set_bit(idx, &affinity, M1_PMU_NR_COUNTERS) { - if (!test_and_set_bit(idx, cpuc->used_mask)) - return idx; - } - - return -EAGAIN; + idx = find_and_set_bit(cpuc->used_mask, M1_PMU_NR_COUNTERS); + return idx < M1_PMU_NR_COUNTERS ? idx : -EAGAIN; } static void m1_pmu_clear_event_idx(struct pmu_hw_events *cpuc,