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,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 E44C7C433B4 for ; Mon, 12 Apr 2021 09:47:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF52261241 for ; Mon, 12 Apr 2021 09:47:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237892AbhDLJrS (ORCPT ); Mon, 12 Apr 2021 05:47:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240537AbhDLJeO (ORCPT ); Mon, 12 Apr 2021 05:34:14 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEAC1C06136E; Mon, 12 Apr 2021 02:31:44 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id h25so8919962pgm.3; Mon, 12 Apr 2021 02:31:44 -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=hnbI4HTxy5h+9wDfXPCcQHa6zzBSTTZbMcq2PaN8c1I=; b=HtwrWWFDbFwS9xUN3hU5q5cxt7V3HjRLojvzWMaJ/+Q7zxE0hWxz4n1PDmChYQ/EMq Ak3U1MP/lV0CYn9AmEqHZz+ifgkH6I6+/QmhECchXang6IFWQAEHW9A6hD7hagYiMEz4 H/kK3/agJLcFRlFvNxuYtb9f/xIjVG1zuPoLQ4rMOmw4QWNCSu6I3BWtAO9Dlj8WKL6i Co3WFHvM9aygZHnLFYSrk0+EqAdDReQa210+u9fTjB4qfHYT1hB6rb5M7LqBjuj7O1oH ZYfP6CC3uCwx2zqZFM5zEWg3FfKqKfRehj1eQNcK8hf4ymWvRwSMr9xzt6ulIU9gqIuD seSQ== 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=hnbI4HTxy5h+9wDfXPCcQHa6zzBSTTZbMcq2PaN8c1I=; b=HFyEMf116ARbD/I66f7ex4ah76o6YHjwkhCVMWEAntIzFTf78Nq/M65/eRqNXfeKKP pgRvgyrs8JHAl9vfEFnibZXts3tilB3j1r+XelXJR1lJ+A/ff/4PtE9Rx6r6Wb+1u3ru Jp2+AodNKvqfZvmGi2p9Ta+pXlFmmz5ND9ZC9Y5rIvx3+SsYTOL2IOTaOJAcf4ATKO8R OT3NL5pSPufRH7Op/Me7oLNtGlkSYRhcXBmhUW/ae9rRUSvNfuPFHkbbKHUQHHXvv0on GjH9qQAL18/xzmbq9Gtg1sDefG0pSCJavIQaOaK2faOiStmBpw0xgo61vdrlTKM59dU/ pmsw== X-Gm-Message-State: AOAM533crW5lZP5ZOAClVzLj+m+jROE1T2LI4Zw6yZUEVQl4kQsQnHCz cOCK+eh3l9f5hSWvbCPyNGc= X-Google-Smtp-Source: ABdhPJwrTzAtgMMxUCRMcseHM+9n719hVrbqnEqDcTiqRlECpevvVYQUFcWEy8URy2tQJXlZxa0hxg== X-Received: by 2002:a65:68d9:: with SMTP id k25mr9891189pgt.236.1618219904290; Mon, 12 Apr 2021 02:31:44 -0700 (PDT) Received: from fmin-OptiPlex-7060.nreal.work ([137.59.103.165]) by smtp.gmail.com with ESMTPSA id r6sm10511879pgp.64.2021.04.12.02.31.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Apr 2021 02:31:43 -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 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 , Gerald Baeza , Erwan Le Ray Subject: [PATCH v2] serial: stm32: optimize spin lock usage Date: Mon, 12 Apr 2021 17:31:38 +0800 Message-Id: <1618219898-4600-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 To avoid potential deadlock in spin_lock usage, use spin_lock_irqsave, spin_trylock_irqsave(), spin_unlock_irqrestore() in process context. remove unused local_irq_save/restore call. Cc: Alexandre Torgue Cc: Maxime Coquelin Cc: Gerald Baeza Cc: Erwan Le Ray Reported-by: kernel test robot Signed-off-by: dillon min --- v2: remove unused code from stm32_usart_threaded_interrupt() according from Greg's review. drivers/tty/serial/stm32-usart.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index b3675cf25a69..b1ba5e36e36e 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -1354,13 +1354,12 @@ 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); + 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,USER_AGENT_GIT autolearn=ham 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 BA4D5C433B4 for ; Mon, 12 Apr 2021 09:33: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 5EDC06121E for ; Mon, 12 Apr 2021 09:33:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5EDC06121E 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=SbwXX7/NT5uerOV5axz8RjD7zOZJej50Yq1Zx27HiyE=; b=kXNQjXcWgvkbPBZhEO9vXPp0Xi hUo+pt/9yV+XbHGC0VdUc1Fi5a3qE9zzbF2VzuIqT2wG+mYRGrOpBUtRVbaKVmimN6/jTCwjJ5YLR Hqo4etgETgt3slX+Q7f00SfAt0bB898B5YtftaGoQRlq8zLBd6Bnkckpyqco0vE3AY0tC/DNPeYlq SnqZ8Lz3lfxfJ+OhMWtFJPXzpQP73VB+nyTuApU8G4hpNQz1qJ3cjibNaz73Mc2hrvlHRbvJtWN9Y l8f9JmOUT1eAy99pfc/PYWrHS6AHb4P6Q3jim9OldoSbio8NeVbgnE/3ztiAbYKZi3/nysV0BErn8 kX22YM5Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVsvC-006I03-RW; Mon, 12 Apr 2021 09:31:55 +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 1lVsv6-006HzL-5I for linux-arm-kernel@desiato.infradead.org; Mon, 12 Apr 2021 09:31:48 +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=hnbI4HTxy5h+9wDfXPCcQHa6zzBSTTZbMcq2PaN8c1I=; b=e05+uNRssXBI2PvBBHh9x0otVV teYEFef80U4g0lRC43xJXBmFlfO0234P1O//ONi0NQ8xxfW3pdbOa/+pDBKHvFaUzBWTGNIr3t347 i/vb8r3RZAMlsyyMfq2RmWA3lolqa0GVe7IoL4m//DQuLLpE6XqwtEwRe1iVlaJkgw0EvU+L3XqbW 1SKbuFaorWB/DI0IEr3VSNOHvzMTKCTCpzyGLW70T/vHS2UmZQk/ZHsBYL3yaPDY5qkcpBHhVul7z zyyQowRGQd3Ajx/m8MNvHRPev7W0qqHHEE+Vl0ycKHWaUlhx8VpjK7FR150kAamsJKnZORiHDTdsZ Or+z31Vg==; Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVsv3-00640a-De for linux-arm-kernel@lists.infradead.org; Mon, 12 Apr 2021 09:31:46 +0000 Received: by mail-pf1-x430.google.com with SMTP id m11so8822683pfc.11 for ; Mon, 12 Apr 2021 02:31:44 -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=hnbI4HTxy5h+9wDfXPCcQHa6zzBSTTZbMcq2PaN8c1I=; b=HtwrWWFDbFwS9xUN3hU5q5cxt7V3HjRLojvzWMaJ/+Q7zxE0hWxz4n1PDmChYQ/EMq Ak3U1MP/lV0CYn9AmEqHZz+ifgkH6I6+/QmhECchXang6IFWQAEHW9A6hD7hagYiMEz4 H/kK3/agJLcFRlFvNxuYtb9f/xIjVG1zuPoLQ4rMOmw4QWNCSu6I3BWtAO9Dlj8WKL6i Co3WFHvM9aygZHnLFYSrk0+EqAdDReQa210+u9fTjB4qfHYT1hB6rb5M7LqBjuj7O1oH ZYfP6CC3uCwx2zqZFM5zEWg3FfKqKfRehj1eQNcK8hf4ymWvRwSMr9xzt6ulIU9gqIuD seSQ== 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=hnbI4HTxy5h+9wDfXPCcQHa6zzBSTTZbMcq2PaN8c1I=; b=smz8xtUozqsn3dEw1LBVgGrtY+m5JM9y33Slwtczwtsmq42meecXGuoAWUbm2SvwR9 PHvNX0oJtT8gyc8BavRgEyHHWOZNr9n7X7cfGlurAGRKR6nCkaT2sonT5JRgCeW2ixG/ swSYJUwAVmQhUmW4wfsEyo73PqlFKVsgs0vTqYuQ+9J9z6A5tVR7jms616BABq0e9q5h 1RtwfWPwOoidyXZ8yqCKb9oO7h/4Zc4+eW35fkjR9yJX8KjgBOrmCXj9W3+3nAY5+TqD FsD2f+tXgip+bZNyn0wWk3Yke2M/wailnxOSJRYDWk9dGYlbkKXX6JBD/AMhwlw26zTg o3/Q== X-Gm-Message-State: AOAM530KSno3ttTtK5pKIs6qhS38EPVeOWeFeROBL3zHWJWQ1zAyn374 wxizNOzhjQYpVg0Sf//lCvw= X-Google-Smtp-Source: ABdhPJwrTzAtgMMxUCRMcseHM+9n719hVrbqnEqDcTiqRlECpevvVYQUFcWEy8URy2tQJXlZxa0hxg== X-Received: by 2002:a65:68d9:: with SMTP id k25mr9891189pgt.236.1618219904290; Mon, 12 Apr 2021 02:31:44 -0700 (PDT) Received: from fmin-OptiPlex-7060.nreal.work ([137.59.103.165]) by smtp.gmail.com with ESMTPSA id r6sm10511879pgp.64.2021.04.12.02.31.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Apr 2021 02:31:43 -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 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 , Gerald Baeza , Erwan Le Ray Subject: [PATCH v2] serial: stm32: optimize spin lock usage Date: Mon, 12 Apr 2021 17:31:38 +0800 Message-Id: <1618219898-4600-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-20210412_023145_480418_448B99B2 X-CRM114-Status: GOOD ( 12.24 ) 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 To avoid potential deadlock in spin_lock usage, use spin_lock_irqsave, spin_trylock_irqsave(), spin_unlock_irqrestore() in process context. remove unused local_irq_save/restore call. Cc: Alexandre Torgue Cc: Maxime Coquelin Cc: Gerald Baeza Cc: Erwan Le Ray Reported-by: kernel test robot Signed-off-by: dillon min --- v2: remove unused code from stm32_usart_threaded_interrupt() according from Greg's review. drivers/tty/serial/stm32-usart.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index b3675cf25a69..b1ba5e36e36e 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -1354,13 +1354,12 @@ 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); + 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="===============3604042919139925806==" MIME-Version: 1.0 From: dillon.minfei@gmail.com To: kbuild-all@lists.01.org Subject: [PATCH v2] serial: stm32: optimize spin lock usage Date: Mon, 12 Apr 2021 17:31:38 +0800 Message-ID: <1618219898-4600-1-git-send-email-dillon.minfei@gmail.com> List-Id: --===============3604042919139925806== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: dillon min To avoid potential deadlock in spin_lock usage, use spin_lock_irqsave, spin_trylock_irqsave(), spin_unlock_irqrestore() in process context. remove unused local_irq_save/restore call. Cc: Alexandre Torgue Cc: Maxime Coquelin Cc: Gerald Baeza Cc: Erwan Le Ray Reported-by: kernel test robot Signed-off-by: dillon min --- v2: remove unused code from stm32_usart_threaded_interrupt() according from Greg's review. drivers/tty/serial/stm32-usart.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-us= art.c index b3675cf25a69..b1ba5e36e36e 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -1354,13 +1354,12 @@ 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); + 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 --===============3604042919139925806==--