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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 B6DF2C433ED for ; Fri, 16 Apr 2021 10:10:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 946B4610FB for ; Fri, 16 Apr 2021 10:10:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240697AbhDPKLV (ORCPT ); Fri, 16 Apr 2021 06:11:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235372AbhDPKLR (ORCPT ); Fri, 16 Apr 2021 06:11:17 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1D74C061574; Fri, 16 Apr 2021 03:10:51 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id e8-20020a17090a7288b029014e51f5a6baso9076185pjg.2; Fri, 16 Apr 2021 03:10:51 -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; bh=A/7hIeNkh74sMxQ2VoT+6Wb/XxhlYBDSbBqmEWtFsMs=; b=c79qb3AjMlo1Z8G/mAYAiOnq/4a7c+i4Jom/W81ehb6DnIfKOzIBQiUIq9mKKAMARo PBgsd5rq5IVVGzuy+V+5HUabNdELc1rtuVP90E+ITMmpLsPr068Gm2BwTtIawqmQmTjU 3kGxB3pPrbDah9+K2vEpCT2zbIa6t37VjzbTyDflz0xamHlE3yIH4p56JjyKWMt6+ZHQ Sj038Cnp4xo42nLHZmmlscTOzj7i4VXMk/FMmGDRy5R6rcrkSzwN6EEJDya0bQTq0GjG jhKRIa2iimZW61QRHZ5y/TVUt3OugdR/nI/2MkOGBVk3AxNaedM3opJpguEh1Hbmwudg beog== 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; bh=A/7hIeNkh74sMxQ2VoT+6Wb/XxhlYBDSbBqmEWtFsMs=; b=rx/lR0uMcxWtIvHgqNq9NZaBjL++KAByHTzkmeMB0KDXohw0fIh/JD0AdIS7uxdwqY 2Ccv1v/W317qxOa1SSiYwiHeABooeXHnxVZm1QbmaFVA3whNao/F/GB6tqXKC3hc4CWg XO2zn+/s/skkQPOZQDgU5jRAassD/eSNPJhVrq94hI7e04SRreQ3MpHBLyynJ0aM4SnL XJOPYOq8DNuWb1qm8MbUMdrjvMhpWI3GYycNazjhzC7ckGlDozxtIiThO60qqpZBNHvK As3kN++jiI8bWcO0/iqE3EMgZejS3zcte3YgA7VMEkV9sy+bh2+WqgseNaHHp/nIUJHu b5+A== X-Gm-Message-State: AOAM531L3L67A9Nw6Bt90IMhHPSnr1zREMXdPu75Zx6kVX/3Y301+t9K wbTSJgjVq4hdgAOyERs+22Y= X-Google-Smtp-Source: ABdhPJyL6O0IvkWzDC0x4hnKmxrsWJIdNewo78CdAaYdxeGULaN/XIlJR3v96Xo95TfHQscGqhU7Qw== X-Received: by 2002:a17:90b:4a46:: with SMTP id lb6mr9025629pjb.45.1618567851417; Fri, 16 Apr 2021 03:10:51 -0700 (PDT) Received: from fmin-OptiPlex-7060.nreal.work ([137.59.103.165]) by smtp.gmail.com with ESMTPSA id t67sm4601440pfb.210.2021.04.16.03.10.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Apr 2021 03:10:46 -0700 (PDT) From: dillon.minfei@gmail.com To: gregkh@linuxfoundation.org, jirislaby@kernel.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, lkp@intel.com, johan@kernel.org, gerald.baeza@foss.st.com, erwan.leray@foss.st.com Cc: linux-serial@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kbuild-all@lists.01.org, clang-built-linux@googlegroups.com, dillon min Subject: [PATCH v3] serial: stm32: optimize spin lock usage Date: Fri, 16 Apr 2021 18:10:41 +0800 Message-Id: <1618567841-18546-1-git-send-email-dillon.minfei@gmail.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: dillon min This patch aims to fix two potential bug: - no lock to protect uart register in this case stm32_usart_threaded_interrupt() spin_lock(&port->lock); ... stm32_usart_receive_chars() uart_handle_sysrq_char(); sysrq_function(); printk(); stm32_usart_console_write(); locked = 0; //since port->sysrq is not zero, no lock to protect forward register access. - if add spin_trylock_irqsave() to protect uart register for sysrq = 1 case, that might got recursive locking under UP. So, use uart_prepare_sysrq_char(), uart_unlock_and_check_sysrq() move sysrq handler position to irq/thread_d handler, just record sysrq_ch in stm32_usart_receive_chars() by uart_prepare_sysrq_char() delay the sysrq process to next interrupt handler. new flow: stm32_usart_threaded_interrupt()/stm32_usart_interrupt() spin_lock_irqsave(&port->lock); ... uart_unlock_and_check_sysrq(); spin_unlock_irqrestore(); handle_sysrq(sysrq_ch); stm32_usart_threaded_interrupt()//stm32_usart_interrupt() return Cc: Johan Hovold Cc: Alexandre Torgue Cc: Maxime Coquelin Cc: Gerald Baeza Cc: Erwan Le Ray Reported-by: kernel test robot Signed-off-by: dillon min --- v3: add uart_prepare_sysrq_char(), uart_unlock_and_check_sysrq() to move sysrq handler inside interrupt routinei to avoid recursive locking, according to Johan Hovold suggestion, thanks. drivers/tty/serial/stm32-usart.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index b3675cf25a69..981f50ec784e 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -271,7 +271,7 @@ static void stm32_usart_receive_chars(struct uart_port *port, bool threaded) } } - if (uart_handle_sysrq_char(port, c)) + if (uart_prepare_sysrq_char(port, c)) continue; uart_insert_char(port, sr, USART_SR_ORE, c, flag); } @@ -457,9 +457,10 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr) struct uart_port *port = ptr; struct stm32_port *stm32_port = to_stm32_port(port); const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs; + unsigned long flags; u32 sr; - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); sr = readl_relaxed(port->membase + ofs->isr); @@ -477,7 +478,7 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr) if ((sr & USART_SR_TXE) && !(stm32_port->tx_ch)) stm32_usart_transmit_chars(port); - spin_unlock(&port->lock); + uart_unlock_and_check_sysrq(port, flags); if (stm32_port->rx_ch) return IRQ_WAKE_THREAD; @@ -489,13 +490,14 @@ static irqreturn_t stm32_usart_threaded_interrupt(int irq, void *ptr) { struct uart_port *port = ptr; struct stm32_port *stm32_port = to_stm32_port(port); + unsigned long flags; - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); if (stm32_port->rx_ch) stm32_usart_receive_chars(port, true); - spin_unlock(&port->lock); + uart_unlock_and_check_sysrq(port, flags); return IRQ_HANDLED; } @@ -1354,13 +1356,10 @@ static void stm32_usart_console_write(struct console *co, const char *s, u32 old_cr1, new_cr1; int locked = 1; - local_irq_save(flags); - if (port->sysrq) - locked = 0; - else if (oops_in_progress) - locked = spin_trylock(&port->lock); + if (oops_in_progress) + locked = spin_trylock_irqsave(&port->lock, flags); else - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); /* Save and disable interrupts, enable the transmitter */ old_cr1 = readl_relaxed(port->membase + ofs->cr1); @@ -1374,8 +1373,7 @@ static void stm32_usart_console_write(struct console *co, const char *s, writel_relaxed(old_cr1, port->membase + ofs->cr1); if (locked) - spin_unlock(&port->lock); - local_irq_restore(flags); + spin_unlock_irqrestore(&port->lock, flags); } static int stm32_usart_console_setup(struct console *co, char *options) -- 2.7.4 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 E6BDEC433B4 for ; Fri, 16 Apr 2021 10:13:28 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 69E4D6115B for ; Fri, 16 Apr 2021 10:13:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69E4D6115B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=29z9SlMConFWKefifH10MsVHNoutTDaooOC2atbm43M=; b=FDxd0t7tMAtKnbo0TQwZTh8SXR +Y9EnBPgojRcUjk0c/HA6lhnx3d16RHIK4Ei7kiqdUOmPrXsDqPYFSvg8j3PGkNpn6x5dYNYpeQlp eNp9UAzwj+dbwlMg5wmh+mQZveeaNxJR9U+WG1DnrQ2dcXvBAaNP0Ccy0YKunQudGU7ehCBhjeU0f nvLeNOJtErwGcgXCH2+VoFjsjZG1rqbWJqbcJbR/pRgoaF17z1qwfmIxAgKBWHioj1vvO/V98ggki Pgu4rfuhBxzzuNWZL6+9RFlNgFICjHJ8zdoed3KM53P+sbTGwrLTRMspsj1p52k/Hmff+IghXg2pO OMn+jIPQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lXLRG-001h4V-TC; Fri, 16 Apr 2021 10:11:03 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lXLR9-001h3B-7o for linux-arm-kernel@desiato.infradead.org; Fri, 16 Apr 2021 10:10:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:In-Reply-To:References; bh=A/7hIeNkh74sMxQ2VoT+6Wb/XxhlYBDSbBqmEWtFsMs=; b=tKU0Xnd7ukuGxd4E6hrYe9cGJX Au4hLhXe0kBfI9MPl3vZJydGU+pGQGSjde0JlGHcBJRmgUSCtVnPJ1p30S2qYduhSaf0rKKyqAR4X 50+LOZ02ivGmKyy6Azhe6Y1Ur1+SMFEZKkGbOY5/yCHThxK2QxxzcPYICVuN/EiCRETlZo2vzOFMN XupGM4K9Zhx4CNklVrR6xbvgH8amH4I+zlOd6PU58WSrPjWCerj7KkHKj7L4KFP3g4dOYljIZFpKz ZrXH3N9F52UTfB8oYSfkYLaltQ+DucAKuMgoOQ4ea/x570/K0w/RHitlHJc4WA2MLr0hNXbWVudYA eKJcuLiQ==; Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lXLR6-009Gkh-He for linux-arm-kernel@lists.infradead.org; Fri, 16 Apr 2021 10:10:54 +0000 Received: by mail-pj1-x102e.google.com with SMTP id b8-20020a17090a5508b029014d0fbe9b64so16078306pji.5 for ; Fri, 16 Apr 2021 03:10:51 -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; bh=A/7hIeNkh74sMxQ2VoT+6Wb/XxhlYBDSbBqmEWtFsMs=; b=c79qb3AjMlo1Z8G/mAYAiOnq/4a7c+i4Jom/W81ehb6DnIfKOzIBQiUIq9mKKAMARo PBgsd5rq5IVVGzuy+V+5HUabNdELc1rtuVP90E+ITMmpLsPr068Gm2BwTtIawqmQmTjU 3kGxB3pPrbDah9+K2vEpCT2zbIa6t37VjzbTyDflz0xamHlE3yIH4p56JjyKWMt6+ZHQ Sj038Cnp4xo42nLHZmmlscTOzj7i4VXMk/FMmGDRy5R6rcrkSzwN6EEJDya0bQTq0GjG jhKRIa2iimZW61QRHZ5y/TVUt3OugdR/nI/2MkOGBVk3AxNaedM3opJpguEh1Hbmwudg beog== 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; bh=A/7hIeNkh74sMxQ2VoT+6Wb/XxhlYBDSbBqmEWtFsMs=; b=oXciLoqIoWxrQ8AXqPcjEgzeIcLxLqONKqIf3Gmlsu0oIr5bLeDZVwAxiaK6kcl33e deYX4yI7goc1wDdIYsJmaiVRKDpj35Qv1oHsG9/l4EgjmW01AWnW/skSUvJmw2fYi55d U+x7DPt4Ipxji2ffni4SKXv6X/fIzF4qz2DpFoh5V9CR6qM2x+OoJXBFetNwo7AdztWy cDtzWjpZb+203CNxb8vGSwMLVUIcsRfiwjyXEcDgRpVPLp+aJt/AOpuUwKmLFAkm0yFz 6Fmo37qWXVm0gkBAfiULQpemryFj8B3PSiewYqsCoQgrDHIImXJGHe5L0fUZs0+C8Qze 6ERA== X-Gm-Message-State: AOAM532Hk3E4R0pKVequRwGm7izRSf1hTj3Ki3NuckS5CZW2seuW9A2I HjmJxgbChMUyRsQ7ypsLHw0= X-Google-Smtp-Source: ABdhPJyL6O0IvkWzDC0x4hnKmxrsWJIdNewo78CdAaYdxeGULaN/XIlJR3v96Xo95TfHQscGqhU7Qw== X-Received: by 2002:a17:90b:4a46:: with SMTP id lb6mr9025629pjb.45.1618567851417; Fri, 16 Apr 2021 03:10:51 -0700 (PDT) Received: from fmin-OptiPlex-7060.nreal.work ([137.59.103.165]) by smtp.gmail.com with ESMTPSA id t67sm4601440pfb.210.2021.04.16.03.10.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Apr 2021 03:10:46 -0700 (PDT) From: dillon.minfei@gmail.com To: gregkh@linuxfoundation.org, jirislaby@kernel.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, lkp@intel.com, johan@kernel.org, gerald.baeza@foss.st.com, erwan.leray@foss.st.com Cc: linux-serial@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kbuild-all@lists.01.org, clang-built-linux@googlegroups.com, dillon min Subject: [PATCH v3] serial: stm32: optimize spin lock usage Date: Fri, 16 Apr 2021 18:10:41 +0800 Message-Id: <1618567841-18546-1-git-send-email-dillon.minfei@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210416_031052_606715_F011BFA1 X-CRM114-Status: GOOD ( 14.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: dillon min This patch aims to fix two potential bug: - no lock to protect uart register in this case stm32_usart_threaded_interrupt() spin_lock(&port->lock); ... stm32_usart_receive_chars() uart_handle_sysrq_char(); sysrq_function(); printk(); stm32_usart_console_write(); locked = 0; //since port->sysrq is not zero, no lock to protect forward register access. - if add spin_trylock_irqsave() to protect uart register for sysrq = 1 case, that might got recursive locking under UP. So, use uart_prepare_sysrq_char(), uart_unlock_and_check_sysrq() move sysrq handler position to irq/thread_d handler, just record sysrq_ch in stm32_usart_receive_chars() by uart_prepare_sysrq_char() delay the sysrq process to next interrupt handler. new flow: stm32_usart_threaded_interrupt()/stm32_usart_interrupt() spin_lock_irqsave(&port->lock); ... uart_unlock_and_check_sysrq(); spin_unlock_irqrestore(); handle_sysrq(sysrq_ch); stm32_usart_threaded_interrupt()//stm32_usart_interrupt() return Cc: Johan Hovold Cc: Alexandre Torgue Cc: Maxime Coquelin Cc: Gerald Baeza Cc: Erwan Le Ray Reported-by: kernel test robot Signed-off-by: dillon min --- v3: add uart_prepare_sysrq_char(), uart_unlock_and_check_sysrq() to move sysrq handler inside interrupt routinei to avoid recursive locking, according to Johan Hovold suggestion, thanks. drivers/tty/serial/stm32-usart.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index b3675cf25a69..981f50ec784e 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -271,7 +271,7 @@ static void stm32_usart_receive_chars(struct uart_port *port, bool threaded) } } - if (uart_handle_sysrq_char(port, c)) + if (uart_prepare_sysrq_char(port, c)) continue; uart_insert_char(port, sr, USART_SR_ORE, c, flag); } @@ -457,9 +457,10 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr) struct uart_port *port = ptr; struct stm32_port *stm32_port = to_stm32_port(port); const struct stm32_usart_offsets *ofs = &stm32_port->info->ofs; + unsigned long flags; u32 sr; - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); sr = readl_relaxed(port->membase + ofs->isr); @@ -477,7 +478,7 @@ static irqreturn_t stm32_usart_interrupt(int irq, void *ptr) if ((sr & USART_SR_TXE) && !(stm32_port->tx_ch)) stm32_usart_transmit_chars(port); - spin_unlock(&port->lock); + uart_unlock_and_check_sysrq(port, flags); if (stm32_port->rx_ch) return IRQ_WAKE_THREAD; @@ -489,13 +490,14 @@ static irqreturn_t stm32_usart_threaded_interrupt(int irq, void *ptr) { struct uart_port *port = ptr; struct stm32_port *stm32_port = to_stm32_port(port); + unsigned long flags; - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); if (stm32_port->rx_ch) stm32_usart_receive_chars(port, true); - spin_unlock(&port->lock); + uart_unlock_and_check_sysrq(port, flags); return IRQ_HANDLED; } @@ -1354,13 +1356,10 @@ static void stm32_usart_console_write(struct console *co, const char *s, u32 old_cr1, new_cr1; int locked = 1; - local_irq_save(flags); - if (port->sysrq) - locked = 0; - else if (oops_in_progress) - locked = spin_trylock(&port->lock); + if (oops_in_progress) + locked = spin_trylock_irqsave(&port->lock, flags); else - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); /* Save and disable interrupts, enable the transmitter */ old_cr1 = readl_relaxed(port->membase + ofs->cr1); @@ -1374,8 +1373,7 @@ static void stm32_usart_console_write(struct console *co, const char *s, writel_relaxed(old_cr1, port->membase + ofs->cr1); if (locked) - spin_unlock(&port->lock); - local_irq_restore(flags); + spin_unlock_irqrestore(&port->lock, flags); } static int stm32_usart_console_setup(struct console *co, char *options) -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============7676044779250053759==" MIME-Version: 1.0 From: dillon.minfei@gmail.com To: kbuild-all@lists.01.org Subject: [PATCH v3] serial: stm32: optimize spin lock usage Date: Fri, 16 Apr 2021 18:10:41 +0800 Message-ID: <1618567841-18546-1-git-send-email-dillon.minfei@gmail.com> List-Id: --===============7676044779250053759== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: dillon min This patch aims to fix two potential bug: - no lock to protect uart register in this case stm32_usart_threaded_interrupt() spin_lock(&port->lock); ... stm32_usart_receive_chars() uart_handle_sysrq_char(); sysrq_function(); printk(); stm32_usart_console_write(); locked =3D 0; //since port->sysrq is not zero, no lock to protect forward register access. - if add spin_trylock_irqsave() to protect uart register for sysrq =3D 1 ca= se, that might got recursive locking under UP. So, use uart_prepare_sysrq_char(), uart_unlock_and_check_sysrq() move sysrq handler position to irq/thread_d handler, just record sysrq_ch in stm32_usart_receive_chars() by uart_prepare_sysrq_char() delay the sysrq process to next interrupt handler. new flow: stm32_usart_threaded_interrupt()/stm32_usart_interrupt() spin_lock_irqsave(&port->lock); ... uart_unlock_and_check_sysrq(); spin_unlock_irqrestore(); handle_sysrq(sysrq_ch); stm32_usart_threaded_interrupt()//stm32_usart_interrupt() return Cc: Johan Hovold Cc: Alexandre Torgue Cc: Maxime Coquelin Cc: Gerald Baeza Cc: Erwan Le Ray Reported-by: kernel test robot Signed-off-by: dillon min --- v3: add uart_prepare_sysrq_char(), uart_unlock_and_check_sysrq() to move sysrq handler inside interrupt routinei to avoid recursive locking, according to Johan Hovold suggestion, thanks. drivers/tty/serial/stm32-usart.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-us= art.c index b3675cf25a69..981f50ec784e 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -271,7 +271,7 @@ static void stm32_usart_receive_chars(struct uart_port = *port, bool threaded) } } = - if (uart_handle_sysrq_char(port, c)) + if (uart_prepare_sysrq_char(port, c)) continue; uart_insert_char(port, sr, USART_SR_ORE, c, flag); } @@ -457,9 +457,10 @@ static irqreturn_t stm32_usart_interrupt(int irq, void= *ptr) struct uart_port *port =3D ptr; struct stm32_port *stm32_port =3D to_stm32_port(port); const struct stm32_usart_offsets *ofs =3D &stm32_port->info->ofs; + unsigned long flags; u32 sr; = - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); = sr =3D readl_relaxed(port->membase + ofs->isr); = @@ -477,7 +478,7 @@ static irqreturn_t stm32_usart_interrupt(int irq, void = *ptr) if ((sr & USART_SR_TXE) && !(stm32_port->tx_ch)) stm32_usart_transmit_chars(port); = - spin_unlock(&port->lock); + uart_unlock_and_check_sysrq(port, flags); = if (stm32_port->rx_ch) return IRQ_WAKE_THREAD; @@ -489,13 +490,14 @@ static irqreturn_t stm32_usart_threaded_interrupt(int= irq, void *ptr) { struct uart_port *port =3D ptr; struct stm32_port *stm32_port =3D to_stm32_port(port); + unsigned long flags; = - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); = if (stm32_port->rx_ch) stm32_usart_receive_chars(port, true); = - spin_unlock(&port->lock); + uart_unlock_and_check_sysrq(port, flags); = return IRQ_HANDLED; } @@ -1354,13 +1356,10 @@ static void stm32_usart_console_write(struct consol= e *co, const char *s, u32 old_cr1, new_cr1; int locked =3D 1; = - local_irq_save(flags); - if (port->sysrq) - locked =3D 0; - else if (oops_in_progress) - locked =3D spin_trylock(&port->lock); + if (oops_in_progress) + locked =3D spin_trylock_irqsave(&port->lock, flags); else - spin_lock(&port->lock); + spin_lock_irqsave(&port->lock, flags); = /* Save and disable interrupts, enable the transmitter */ old_cr1 =3D readl_relaxed(port->membase + ofs->cr1); @@ -1374,8 +1373,7 @@ static void stm32_usart_console_write(struct console = *co, const char *s, writel_relaxed(old_cr1, port->membase + ofs->cr1); = if (locked) - spin_unlock(&port->lock); - local_irq_restore(flags); + spin_unlock_irqrestore(&port->lock, flags); } = static int stm32_usart_console_setup(struct console *co, char *options) -- = 2.7.4 --===============7676044779250053759==--