From patchwork Fri Mar 3 09:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng-Jui Wang X-Patchwork-Id: 63841 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp316768wrd; Fri, 3 Mar 2023 01:37:20 -0800 (PST) X-Google-Smtp-Source: AK7set8mU04nFL4t3Eg1yLuoz2Sm3tZcfGwzo6kqtKbaJjj6j8UEsxpq7CKl6GbIGJ1RbTy52nU4 X-Received: by 2002:a17:906:1c13:b0:896:427b:148 with SMTP id k19-20020a1709061c1300b00896427b0148mr933019ejg.1.1677836240644; Fri, 03 Mar 2023 01:37:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677836240; cv=none; d=google.com; s=arc-20160816; b=lYsDjmadujcccqs3GiHVqE1D5cC47b5KuVY6GLQCAvv/9Oj66vMQ48BOWg/aWFOs+o C+rLFCm5TOFS2gyZ5JwyVMu3WnYyrdebYm3GeoVXvimLUmMKfJGsVBvfAYkll6AREwFP iW/DAHOUMc+9W/jTQ1AyaWJF9wr4pB5IUO0GePcSPDDwRDIbH2Es04yQUZzQWii8QtEx 7FWc3lGW33YZ/t3aFzPZbTBBPEw6klivSdTagTEIsweKquIuDEjvVBbsP+wbeNocBwBS 8viWWoZmChQBXzP78kWe0EWAnJwaXVjpISHx3iXoOQBVFuP2AaBIG3XKIwAK9h1UAJp9 VmJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=bjh2a7FP8kwe5353qnWJfqpDLdsQ8XYJqlQFAAUXlZs=; b=piSPAOk7bxuwiE5KxRAR3AhzH3jLLW1pzbPXIcP8ghENrulIq6ZD1g7cur1D7ul4J+ PCOw/Z3VZSFceeZVuT1TosbpsI86MLG4CKfG9zR3YpDV46XboYEaEiO6took7Jz8YBQs 9noFEjP/dKV/z+zCr4bkFGzoIMZm/VLk72CdDHcm8N9ntu1pRjCI1NtNn+Pd9Hx2xMHp sC6Efu22zqkeXOb1WLH4xFcmytEov7GBzovwiBKUOaENRO77Cnq4DBBuLLT5oFpZC60T q8/8AC3R1JCww1c59/EJtUd70eWLcbZKCJSCAD6qpA5X1UJA59Zu2II3UaUuQ/U8tmvj 5Hgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=DS3yt4Mq; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m11-20020a50ef0b000000b004aac683bad9si70632eds.379.2023.03.03.01.36.58; Fri, 03 Mar 2023 01:37:20 -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=@mediatek.com header.s=dk header.b=DS3yt4Mq; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230260AbjCCJ0d (ORCPT + 99 others); Fri, 3 Mar 2023 04:26:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231238AbjCCJZp (ORCPT ); Fri, 3 Mar 2023 04:25:45 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D0305C116; Fri, 3 Mar 2023 01:25:24 -0800 (PST) X-UUID: 504404d2b9a511ed945fc101203acc17-20230303 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=bjh2a7FP8kwe5353qnWJfqpDLdsQ8XYJqlQFAAUXlZs=; b=DS3yt4MqRBr1Nu853NpZGTU+eZrENVxT7XlziQ9WKScgNUCLyMx/9YvcxeY6MoWzP3+8id+ALp96cfknQItgeCJXqCJrUQRxJmXCwk2FWMjoKYR//Zp/0ooFA1sbMR0MZpLVX41+4ero/QvziE++1V7fawvYyxs6KagJ2M6c+74=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.20,REQID:b37d915a-7f8f-4d3c-a56a-f2d7a436cb16,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:25b5999,CLOUDID:18be1db2-beed-4dfc-bd9c-e1b22fa6ccc4,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-UUID: 504404d2b9a511ed945fc101203acc17-20230303 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1507035352; Fri, 03 Mar 2023 17:25:18 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.186) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Fri, 3 Mar 2023 17:25:17 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Fri, 3 Mar 2023 17:25:17 +0800 From: Cheng-Jui Wang To: , Lorenzo Pieralisi , Sudeep Holla , "Rafael J. Wysocki" , Daniel Lezcano , Matthias Brugger CC: Peter Zijlstra , Ingo Molnar , Suren Baghdasaryan , Cheng-Jui Wang , , , , Subject: [PATCH 04/10] cpuidle, psci: Push RCU-idle into driver Date: Fri, 3 Mar 2023 17:23:26 +0800 Message-ID: <20230303092347.4825-5-cheng-jui.wang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230303092347.4825-1-cheng-jui.wang@mediatek.com> References: <20230303092347.4825-1-cheng-jui.wang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,UNPARSEABLE_RELAY 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759338813841645268?= X-GMAIL-MSGID: =?utf-8?q?1759338813841645268?= From: Peter Zijlstra commit e038f7b8028a1d1bc8ac82351c71ea538f19a879 upstream. Doing RCU-idle outside the driver, only to then temporarily enable it again, at least twice, before going idle is suboptimal. Notably once implicitly through the cpu_pm_*() calls and once explicitly doing ct_irq_*_irqon(). Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Kajetan Puchalski Tested-by: Tony Lindgren Tested-by: Ulf Hansson Reviewed-by: Frederic Weisbecker Reviewed-by: Guo Ren Acked-by: Rafael J. Wysocki Link: https://lore.kernel.org/r/20230112195539.760296658@infradead.org Signed-off-by: Suren Baghdasaryan Signed-off-by: Cheng-Jui Wang --- drivers/cpuidle/cpuidle-psci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c index 57bc3e3ae391..6a259c94b8b2 100644 --- a/drivers/cpuidle/cpuidle-psci.c +++ b/drivers/cpuidle/cpuidle-psci.c @@ -69,12 +69,12 @@ static int __psci_enter_domain_idle_state(struct cpuidle_device *dev, return -1; /* Do runtime PM to manage a hierarchical CPU toplogy. */ - ct_irq_enter_irqson(); if (s2idle) dev_pm_genpd_suspend(pd_dev); else pm_runtime_put_sync_suspend(pd_dev); - ct_irq_exit_irqson(); + + ct_idle_enter(); state = psci_get_domain_state(); if (!state) @@ -82,13 +82,12 @@ static int __psci_enter_domain_idle_state(struct cpuidle_device *dev, ret = psci_cpu_suspend_enter(state) ? -1 : idx; - ct_irq_enter_irqson(); + ct_idle_exit(); + if (s2idle) dev_pm_genpd_resume(pd_dev); else pm_runtime_get_sync(pd_dev); - ct_irq_exit_irqson(); - cpu_pm_exit(); /* Clear the domain state to start fresh when back from idle. */ @@ -240,6 +239,7 @@ static int psci_dt_cpu_init_topology(struct cpuidle_driver *drv, * of a shared state for the domain, assumes the domain states are all * deeper states. */ + drv->states[state_count - 1].flags |= CPUIDLE_FLAG_RCU_IDLE; drv->states[state_count - 1].enter = psci_enter_domain_idle_state; drv->states[state_count - 1].enter_s2idle = psci_enter_s2idle_domain_idle_state; psci_cpuidle_use_cpuhp = true;