Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp750885pxb; Wed, 29 Sep 2021 08:58:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwH8WslU63B4MgXKdrPXojHxVIVcoHAho7oBKu+GcufepV5BZ3uBNUkTYgHwkSo2qv6refY X-Received: by 2002:a50:e18f:: with SMTP id k15mr798637edl.48.1632931111710; Wed, 29 Sep 2021 08:58:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632931111; cv=none; d=google.com; s=arc-20160816; b=h/+cIWKF5ac9EYlwSY2Fy9rQ3jIIEex5KvHRB+SorKD5oIQoHu6L7Xaob5rPhZjzGD b/7/bmLRSJ+e+tsFAgaxKuo6/WWbMy3yWKXblZHsCjLgCMzafEhAiIDjti5qoTmIBqD1 aMJZeBfCu0RO2Q86zkBmG3bLlxF6PqQIqlO7Pmj3XIeCi+ywmkgGlYhYKaXiBxiAf39Y 0w7O8fZDrUaxHpikG4S05vzooZ/Cj9JAmt2ZrCSUwwTgafiMF8i9IkbFuhzfONQqmMpo VUqPTKFhi81MH4sGVsiUCkA6zjn7P4W5W6obqi9YNYhCUROrN7kWD1l2zn0Bpqml4Tms 4qdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=R09ZdQ38Gjov5fgnh9AgbLsrc7iMs2G0FACLkKI5Kwo=; b=XOobNvUObqpV2+81JhYHaUNLy8k7J/iyfu6NkCU2xqTTgYm2EQkfeBNLlJkQdYDnVL hklce0bJAU6rzb8xQYQIluNQNb0H0isF98+gEebfuvsAIOw3bHSVq0O+3xQBoj+gMxLY PlN7+hPTyAV1b67iUiezeS4CEQR1j433tNhVL2b8f/eUP3Z+DCSGajQSG6/G48/ImuKy 3iEjGk5jj/Ip3cvweAAJaJ64IBhrnnzH9VyRz523tQyqbZ7Df1xE+s8DQb+QAGJut+6b 3/oX24LnpqqmwRvwm0QQ5jggk4qnLsO1MmmFz16yWW3I+0m9DTjDCj1Fd6VHgqi0YeBC kaVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Fx8BOuFd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id js2si304835ejc.614.2021.09.29.08.57.57; Wed, 29 Sep 2021 08:58:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Fx8BOuFd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245127AbhI2ObI (ORCPT + 99 others); Wed, 29 Sep 2021 10:31:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26465 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244345AbhI2ObH (ORCPT ); Wed, 29 Sep 2021 10:31:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632925766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=R09ZdQ38Gjov5fgnh9AgbLsrc7iMs2G0FACLkKI5Kwo=; b=Fx8BOuFdpCeadwYRbEQK5PwVItBrSvnyEosCEwONb1LVyPWMj1RAvNB3LTh+qt6xzLVxF7 +0hHEL/Bsiyijhpl6zrJwCFW24gnkBeyEmlnq1f6cYOt35dUKbNRQ37pT9ijRdtAl/SH6K sHMZYUq/McXFNsu/YzBJhqXQRs8cuEE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-370-tiKltBP2PCSyCNJzMlUUIg-1; Wed, 29 Sep 2021 10:29:22 -0400 X-MC-Unique: tiKltBP2PCSyCNJzMlUUIg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A035279EE0; Wed, 29 Sep 2021 14:29:20 +0000 (UTC) Received: from piliu.users.ipa.redhat.com (ovpn-8-24.pek2.redhat.com [10.72.8.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 90CF660CA0; Wed, 29 Sep 2021 14:29:15 +0000 (UTC) Date: Wed, 29 Sep 2021 22:29:09 +0800 From: Pingfan Liu To: Mark Rutland Cc: Marc Zyngier , Pingfan Liu , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Will Deacon , Joey Gouly , Sami Tolvanen , Julien Thierry , Thomas Gleixner , Yuichi Ito , linux-kernel@vger.kernel.org Subject: Re: [PATCHv2 4/5] irqchip/GICv3: let gic_handle_irq() utilize irqentry on arm64 Message-ID: References: <20210924132837.45994-1-kernelfans@gmail.com> <20210924132837.45994-5-kernelfans@gmail.com> <20210928091053.GD1924@C02TD0UTHF1T.local> <87mtnvu9to.wl-maz@kernel.org> <20210929092358.GB33284@C02TD0UTHF1T.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210929092358.GB33284@C02TD0UTHF1T.local> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 29, 2021 at 10:23:58AM +0100, Mark Rutland wrote: > On Wed, Sep 29, 2021 at 04:27:11PM +0800, Pingfan Liu wrote: > > On Wed, Sep 29, 2021 at 08:20:35AM +0100, Marc Zyngier wrote: > > > On Wed, 29 Sep 2021 04:10:11 +0100, > > > Pingfan Liu wrote: > > > > > > > > On Tue, Sep 28, 2021 at 10:10:53AM +0100, Mark Rutland wrote: > > > > > On Fri, Sep 24, 2021 at 09:28:36PM +0800, Pingfan Liu wrote: > > > > > > The call to rcu_irq_enter() originated from gic_handle_irq() is > > > > > > redundant now, since arm64 has enter_from_kernel_mode() akin to > > > > > > irqenter_entry(), which has already called rcu_irq_enter(). > > > > > > > > > > Here I think you're referring to the call in handle_domain_irq(), but > > > > > that isn't clear from the commit message. > > > > > > > > > Yes, and I will make it clear in V2. > > > > > > > > > > Based on code analysis, the redundant can raise some mistake, e.g. > > > > > > rcu_data->dynticks_nmi_nesting inc 2, which causes > > > > > > rcu_is_cpu_rrupt_from_idle() unexpected. > > > > > > > > > > > > So eliminate the call to irq_enter() in handle_domain_irq(). And > > > > > > accordingly supplementing irq_enter_rcu(). > > > > > > > > > > We support many more irqchips on arm64, and GICv3 can be used on regular > > > > > 32-bit arm, so this isn't right. Moving the irq_enter_rcu() call > > > > > into the GICv3 driver specifically breaks other drivers on arm64 by > > > > > removing the call, and breaks the GICv3 driver on arm by adding a > > > > > duplicate call. > > > > > > > > > Oops. I forgot to protect the code in GICv3 with CONFIG_HAVE_ARCH_IRQENTRY > > > > > > > > > It looks like this should live in do_interrupt_handler() in > > > > > arch/arm64/kernel/entry-common.c, e.g. > > > > > > > > > > | static void do_interrupt_handler(struct pt_regs *regs, > > > > > | void (*handler)(struct pt_regs *)) > > > > > | { > > > > > | irq_enter_rcu(); > > > > > | if (on_thread_stack()) > > > > > | call_on_irq_stack(regs, handler); > > > > > | else > > > > > | handler(regs); > > > > > | irq_exit_rcu(); > > > > > | } > > > > > > > > > > ... unless there's some problem with that? > > > > > > > > > Yeah, do_interrupt_handler() is a more suitable place. But to resolve > > > > the performance regression of rescheduling IPI [1], it is badly demanded to > > > > distinguish irqnr before calling irq_enter_rcu() (please see 5/5 and [2] > > > > for the context). So it is a compromise to host the code in GICv3. > > > > > > > > Any good idea? > > > > > > There is no way we are going to single out a particular interrupt > > > controller. As for the "regression", we'll have to look at the numbers > > > once we have fixed the whole infrastructure. > > > > > But I just realize that at present, gic_handle_nmi() sits behind > > gic_handle_irq(). So it will make an mistaken for accounting of normal > > interrupt if calling irq_enter_rcu() in do_interrupt_handler(). > > We can restructure entry-common.c to avoid that if necessary. > > TBH, the more I see problems in this area the more I want to rip out the > pNMI bits... > Overlook the undetermined pNMI, what about the partial patch like the following: diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c index 32f9796c4ffe..3c46f8fd0e2e 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -219,17 +219,20 @@ static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs) lockdep_hardirqs_on(CALLER_ADDR0); } -static void noinstr enter_el1_irq_or_nmi(struct pt_regs *regs) +static bool noinstr enter_el1_irq_or_nmi(struct pt_regs *regs) { - if (IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) && !interrupts_enabled(regs)) + if (IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) && !interrupts_enabled(regs)) { arm64_enter_nmi(regs); - else + return false; + } else { enter_from_kernel_mode(regs); + return true; + } } -static void noinstr exit_el1_irq_or_nmi(struct pt_regs *regs) +static void noinstr exit_el1_irq_or_nmi(struct pt_regs *regs, bool is_irq) { - if (IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) && !interrupts_enabled(regs)) + if (IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) && !is_irq) arm64_exit_nmi(regs); else exit_to_kernel_mode(regs); @@ -261,12 +264,19 @@ static void __sched arm64_preempt_schedule_irq(void) } static void do_interrupt_handler(struct pt_regs *regs, - void (*handler)(struct pt_regs *)) + void (*handler)(struct pt_regs *), + bool is_irq) { + if (likely(is_irq)) + irq_enter_rcu(); + if (on_thread_stack()) call_on_irq_stack(regs, handler); else handler(regs); + + if (likely(is_irq)) + irq_exit_rcu(); } extern void (*handle_arch_irq)(struct pt_regs *); @@ -435,10 +445,12 @@ asmlinkage void noinstr el1h_64_sync_handler(struct pt_regs *regs) static void noinstr el1_interrupt(struct pt_regs *regs, void (*handler)(struct pt_regs *)) { + bool is_irq; + write_sysreg(DAIF_PROCCTX_NOIRQ, daif); - enter_el1_irq_or_nmi(regs); - do_interrupt_handler(regs, handler); + is_irq = enter_el1_irq_or_nmi(regs); + do_interrupt_handler(regs, handler, is_irq); /* * Note: thread_info::preempt_count includes both thread_info::count @@ -449,7 +461,7 @@ static void noinstr el1_interrupt(struct pt_regs *regs, READ_ONCE(current_thread_info()->preempt_count) == 0) arm64_preempt_schedule_irq(); - exit_el1_irq_or_nmi(regs); + exit_el1_irq_or_nmi(regs, is_irq); } asmlinkage void noinstr el1h_64_irq_handler(struct pt_regs *regs) -- 2.31.1 And the rest of do_interrupt_handler() in entry-common.c should be converted accordingly. Thanks, Pingfan