From patchwork Fri Aug 25 04:30:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 805738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Nu1eRxLN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xdpBg3YZnz9t6D for ; Fri, 25 Aug 2017 14:31:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751869AbdHYEbH (ORCPT ); Fri, 25 Aug 2017 00:31:07 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36323 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbdHYEbG (ORCPT ); Fri, 25 Aug 2017 00:31:06 -0400 Received: by mail-pg0-f65.google.com with SMTP id 83so2185754pgb.3 for ; Thu, 24 Aug 2017 21:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/36Y3NtMOchAYvAQVL54p74kBlGCWTMNLEFwP/pN51c=; b=Nu1eRxLNGjvvMZc0o/zYEE93GZ84K9EPI22h52Syeg7m8pmA1gzE0Zw/zdu95JIM/S Fw+va6Mg5XXttOkkRvhybg5Tk0RS8E5UuZaUp/qP4Zh8kwKyoWeTwWdjcl8v1ufiSxoY b4fr+gn5Yicmch9F6sGX5PRHBa8U5edjJvRdjSE8KHuK7g76hVqeiWX3MhT3bqJOpYGo 0i+2lLkB0UqS4YpEI7PtIPGpur4Ubc9J3mK3SEClf2DMUr/OFuxsgs6c9e/5L4onyFXD 5Wix0Mni7mCEyyBHZmMBOtdHck7J0pFn3t0Z+NrmZDFCGapqggbY20FN4jwbE3AoM8s3 I32Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/36Y3NtMOchAYvAQVL54p74kBlGCWTMNLEFwP/pN51c=; b=VPa0MfVgzM8OporIwMBHvmYhlnzziIxDld08mDx7Y5SJX2Bn+q2+wMExDRGarrjdNy at+b+yVaPHNHfHP4a+De/VUJ7+lxmSjrZNosuiiTeJvoLH9ocLPIAKU8sXpfoBrEMGX4 uYCr8sGa2kW/CgscqyEEIV6mSQZYLPYtesuCkq5SvLgMmYLLHNt2te9OW7x0a2WsG3JJ 9O29uvPgl03sy2PaRDr4lfOHGpGLsh/YYo849xSKwsPT8rjLvQYcFSrpbcqDvnCrzvSr +FZuJaMlKk+RC9UUXW3EZATp0yR1qy7QnHOGePeq2kOD+sHKmUC30pva8USTjCo2x8cD VBKw== X-Gm-Message-State: AHYfb5iqpWhlEDav7pY2IDWZDKs2o7wb7p0xShal45FUg4NSkadNBneF Q0+4HZvmaB7Epg== X-Received: by 10.84.248.9 with SMTP id p9mr9509486pll.224.1503635466165; Thu, 24 Aug 2017 21:31:06 -0700 (PDT) Received: from roar.au.ibm.com (203-219-56-202.tpgi.com.au. [203.219.56.202]) by smtp.gmail.com with ESMTPSA id u195sm9010365pgb.82.2017.08.24.21.31.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Aug 2017 21:31:05 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin , kvm-ppc@vger.kernel.org, Paul Mackerras Subject: [PATCH v3 4/4] powerpc/64s: idle ESL=0 stop can avoid MSR and save/restore overhead Date: Fri, 25 Aug 2017 14:30:36 +1000 Message-Id: <20170825043036.18236-5-npiggin@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170825043036.18236-1-npiggin@gmail.com> References: <20170825043036.18236-1-npiggin@gmail.com> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org When stop is executed with EC=ESL=0, it appears to execute like a normal instruction (resuming from NIP when woken by interrupt). So all the save/restore handling can be avoided completely. In particular NV GPRs do not have to be saved, and MSR does not have to be switched back to kernel MSR. So move the test for "lite" sleep states out to power9_idle_stop. Reviewed-by: Gautham R. Shenoy Signed-off-by: Nicholas Piggin Reviewed-by: Paul Mackerras --- arch/powerpc/kernel/idle_book3s.S | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index 32d65ee323a0..fa56120bd0bc 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -315,9 +315,6 @@ enter_winkle: ARCH207_IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE) -/* - * r3 - PSSCR value corresponding to the requested stop state. - */ #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE power_enter_stop_kvm_rm: /* @@ -330,14 +327,11 @@ power_enter_stop_kvm_rm: li r4,KVM_HWTHREAD_IN_IDLE /* DO THIS IN REAL MODE! See comment above. */ stb r4,HSTATE_HWTHREAD_STATE(r13) -#endif -power_enter_stop: /* * Check if we are executing the lite variant with ESL=EC=0 */ - andis. r4,r3,PSSCR_EC_ESL_MASK_SHIFTED - clrldi r3,r3,60 /* r3 = Bits[60:63] = Requested Level (RL) */ - bne .Lhandle_esl_ec_set + andis. r4,r3,PSSCR_EC_ESL_MASK_SHIFTED + bne power_enter_stop_esl PPC_STOP li r3,0 /* Since we didn't lose state, return 0 */ @@ -354,8 +348,13 @@ power_enter_stop: */ li r12, 0 b pnv_wakeup_noloss +#endif -.Lhandle_esl_ec_set: +/* + * r3 - PSSCR value corresponding to the requested stop state. + */ +power_enter_stop_esl: + clrldi r3,r3,60 /* r3 = Bits[60:63] = Requested Level (RL) */ /* * POWER9 DD2 can incorrectly set PMAO when waking up after a * state-loss idle. Saving and restoring MMCR0 over idle is a @@ -428,9 +427,23 @@ ALT_FTR_SECTION_END_NESTED_IFSET(CPU_FTR_ARCH_207S, 66); \ * r3 contains desired PSSCR register value. */ _GLOBAL(power9_idle_stop) - std r3, PACA_REQ_PSSCR(r13) mtspr SPRN_PSSCR,r3 - LOAD_REG_ADDR(r4,power_enter_stop) + + /* + * Check if we are executing the lite variant with ESL=EC=0 + * This case resumes execution after the stop instruction without + * losing any state, so nothing has to be saved. The following + * instructions up to the blr must be skipped if we want to + * use power_enter_stop_kvm_rm. + */ + andis. r4,r3,PSSCR_EC_ESL_MASK_SHIFTED + bne 1f + PPC_STOP + li r3,0 /* Since we didn't lose state, return 0 */ + blr +1: /* state-loss idle */ + std r3, PACA_REQ_PSSCR(r13) + LOAD_REG_ADDR(r4,power_enter_stop_esl) b pnv_powersave_common /* No return */