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=-10.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 00250C4338F for ; Wed, 4 Aug 2021 08:08:54 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4A6D660E96 for ; Wed, 4 Aug 2021 08:08:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4A6D660E96 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4GfksJ4Ch7z3cHQ for ; Wed, 4 Aug 2021 18:08:52 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=soV5H8Ia; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1029; helo=mail-pj1-x1029.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=soV5H8Ia; dkim-atps=neutral Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4Gfkrn5bfJz302N for ; Wed, 4 Aug 2021 18:08:24 +1000 (AEST) Received: by mail-pj1-x1029.google.com with SMTP id o44-20020a17090a0a2fb0290176ca3e5a2fso2479585pjo.1 for ; Wed, 04 Aug 2021 01:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:subject:to:cc:references:in-reply-to:mime-version :message-id:content-transfer-encoding; bh=iF8GqUw3fJkSuKkM1TDURToz/fDqSBL3RQMnD7NkKi4=; b=soV5H8Iaxlk13Zsqs/hVkR+nh/fQ+droSHbxWuKIwOf/yzzy9YzHm5qGn9Pld7ekHR Zle8+Ikp4lSC2Q6X4IgF4ktAwCDEKcB/BtF5gYxik/DpNXWJXqu0cHVHRvwH07fzeHCK EDEUHZCk+GgCP00JIkDa8C7NLzZUbJrmjWKIHpBVo+Zd6NlaJ3nhBINpBwUgRgWr4F9A v2oLTpGT67CgWpTpZv+Zci1E5QMBgP7dzQ0BMpyRdLrO7t7GODl0XfaZ2GzRruXDpGIb Qflmjn7ajBMMJcVk8uSsYjSZ1Zb4aNTaaaygAfe6EwPCM9X5WyPI8MrO+Jtx/7OaBmrp dljQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:subject:to:cc:references:in-reply-to :mime-version:message-id:content-transfer-encoding; bh=iF8GqUw3fJkSuKkM1TDURToz/fDqSBL3RQMnD7NkKi4=; b=IwsFIZmKz3vmHwNaiHwVX6O//+AMDP3q/NIe7sJril7brSS0Rn9H6Hy1vAijf28WAk itwld+nteNZpc6njWKHI+V0tnQGZ2qrzCN1YU2xhcRC8Lj5xhhQwqxkUjCX23gK4TsVJ G6npoZyuYh2/ljXUGBEIRqnUsV46v7zMcHXeKKN+JjJlQf974fduUN3Z6LFQbXXQkfWC JkwkDNJzjA0MVZDFD7Ipvsu3YswZ3puwbIk2H698ha51m2kTbBGik4Ax7jhhchbtTE3F oD/y2BT6B7dy5iaSRdNBmRyZDyR1Jg41X/02Ob3V0ChDN5lRavimHCJgxwf/jPonm/ds eBDA== X-Gm-Message-State: AOAM531sRoinICoRqk2g6h1eJixUmbtOm8MfcIczXqBtEBuKwc6tsXT5 hXwHnYjtH6A9pHcz8MGsxmA= X-Google-Smtp-Source: ABdhPJzBcxvudp/M5au72pgDSSu33yGC2Lt+KJhqCRM8D6bWhoyw/dh6MAN471eUedhDYAR6imgz3g== X-Received: by 2002:a62:e416:0:b029:3c5:f084:7212 with SMTP id r22-20020a62e4160000b02903c5f0847212mr343016pfh.76.1628064501299; Wed, 04 Aug 2021 01:08:21 -0700 (PDT) Received: from localhost (60-242-181-102.static.tpgi.com.au. [60.242.181.102]) by smtp.gmail.com with ESMTPSA id j19sm1662743pfr.82.2021.08.04.01.08.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 01:08:20 -0700 (PDT) Date: Wed, 04 Aug 2021 18:08:16 +1000 From: Nicholas Piggin Subject: Re: [PATCH] powerpc: Remove MSR_PR check in interrupt_exit_{user/kernel}_prepare() To: Benjamin Herrenschmidt , Christophe Leroy , Michael Ellerman , Paul Mackerras References: In-Reply-To: MIME-Version: 1.0 Message-Id: <1628064412.48kzr1eula.astroid@bobo.none> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Excerpts from Christophe Leroy's message of August 4, 2021 3:27 pm: > In those hot functions that are called at every interrupt, any saved > cycle is worth it. >=20 > interrupt_exit_user_prepare() and interrupt_exit_kernel_prepare() are > called from three places: > - From entry_32.S > - From interrupt_64.S > - From interrupt_exit_user_restart() and interrupt_exit_kernel_restart() >=20 > In entry_32.S, there are inambiguously called based on MSR_PR: >=20 > interrupt_return: > lwz r4,_MSR(r1) > addi r3,r1,STACK_FRAME_OVERHEAD > andi. r0,r4,MSR_PR > beq .Lkernel_interrupt_return > bl interrupt_exit_user_prepare > ... > .Lkernel_interrupt_return: > bl interrupt_exit_kernel_prepare >=20 > In interrupt_64.S, that's similar: >=20 > interrupt_return_\srr\(): > ld r4,_MSR(r1) > andi. r0,r4,MSR_PR > beq interrupt_return_\srr\()_kernel > interrupt_return_\srr\()_user: /* make backtraces match the _kernel vari= ant */ > addi r3,r1,STACK_FRAME_OVERHEAD > bl interrupt_exit_user_prepare > ... > interrupt_return_\srr\()_kernel: > addi r3,r1,STACK_FRAME_OVERHEAD > bl interrupt_exit_kernel_prepare >=20 > In interrupt_exit_user_restart() and interrupt_exit_kernel_restart(), > MSR_PR is verified respectively by BUG_ON(!user_mode(regs)) and > BUG_ON(user_mode(regs)) prior to calling interrupt_exit_user_prepare() > and interrupt_exit_kernel_prepare(). >=20 > The verification in interrupt_exit_user_prepare() and > interrupt_exit_kernel_prepare() are therefore useless and can be removed. >=20 > Signed-off-by: Christophe Leroy Probably okay to do now things are ironing out. Unless we want to make a new define for interrupt handler debug and put=20 a bunch of these asserts under it. There's quite a lot more here, and in asm/interrupt.h, etc. Thanks, Nick > --- > arch/powerpc/kernel/interrupt.c | 2 -- > 1 file changed, 2 deletions(-) >=20 > diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interr= upt.c > index 21bbd615ca41..f26caf911ab5 100644 > --- a/arch/powerpc/kernel/interrupt.c > +++ b/arch/powerpc/kernel/interrupt.c > @@ -465,7 +465,6 @@ notrace unsigned long interrupt_exit_user_prepare(str= uct pt_regs *regs) > =20 > if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x)) > BUG_ON(!(regs->msr & MSR_RI)); > - BUG_ON(!(regs->msr & MSR_PR)); > BUG_ON(arch_irq_disabled_regs(regs)); > CT_WARN_ON(ct_state() =3D=3D CONTEXT_USER); > =20 > @@ -499,7 +498,6 @@ notrace unsigned long interrupt_exit_kernel_prepare(s= truct pt_regs *regs) > if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x) && > unlikely(!(regs->msr & MSR_RI))) > unrecoverable_exception(regs); > - BUG_ON(regs->msr & MSR_PR); > /* > * CT_WARN_ON comes here via program_check_exception, > * so avoid recursion. > --=20 > 2.25.0 >=20 >=20