From patchwork Mon Oct 24 11:30:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8668 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp421902wru; Mon, 24 Oct 2022 05:21:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7YbA/XafBMQmiT1E62CWIBaQgJkpcjKGqk+ZVssq2lGzk//MDArPKVkNOY8TXMaMYi0zty X-Received: by 2002:a17:906:4fcd:b0:78d:8059:17c with SMTP id i13-20020a1709064fcd00b0078d8059017cmr28069078ejw.423.1666614085902; Mon, 24 Oct 2022 05:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614085; cv=none; d=google.com; s=arc-20160816; b=bY4VJU2SqMcEmBWZpnrs0ZdaKW6lI/1z6//dCxggGeX6rdhhFJPciIWQ//7+IrcbUI t9O+xlyDKLa0QxNXtOZDEEgfzelnC9I0dFhlpWEAyrpYFu4eeW+XZSFNsXHgCAVrAW96 vrfuKyKub4Lb9d040JZn7UKQmlNO9iajSB/T5HfXO/kW1DDhRlBQdm3JvGt8VNl0QNjz 5mOjgWhP8iaREU4ctQq79YassXKkXdoG182iDGISTYv+456NL2iVLf/2mGuiADzrQ2JA fBnyaa+fkXYk/6oTyqg6XPua2Dy1j0wL0hhExK5XoBGgnJAUduamCg+JlEwNXVsOUWpZ cY+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GnJpkuClr5zuRENPkKpllEHzXugCqzTNJizcrXcdXYc=; b=TMNM/GGURLbsmgkb8xdBmFMwApRAr6uJTDb6iv+iXVMkZc3NqCAb8C2070R7s1Mv0j qZim2DpmR42R1fnHYdAtjbMKJOl7uNhJapIRJ6HO9QMCTh1i19GpzU3Lh5eDVBebxNgX AKJqStH7Q+ym2daqhwgSl3k8L7/rwYSc3lT67irw2i/kfsQsC9jDeUSANs/U3VY7fqH6 oCJGpZiCJLRH7BPi+LLVMMj/6F2TusjMQFCm+YNUpbHfPHD6p+FDCG+mucDW+yrezxoP SwsFdPqcsWjNezX20Xhh9W99z3Uw2w1WwXWLtBWmfrg4gxze8U0aonrztSkWt/FOm0qg 4tLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LL9sXAzb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xg14-20020a170907320e00b00780805b99ccsi31116108ejb.648.2022.10.24.05.21.01; Mon, 24 Oct 2022 05:21:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LL9sXAzb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233209AbiJXMSD (ORCPT + 99 others); Mon, 24 Oct 2022 08:18:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233074AbiJXMQH (ORCPT ); Mon, 24 Oct 2022 08:16:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0E8B7AB1B; Mon, 24 Oct 2022 04:56:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B0C71612D3; Mon, 24 Oct 2022 11:52:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF748C433D6; Mon, 24 Oct 2022 11:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612363; bh=sqEKswuUxTriNBWzsTySPH303zgQ9wiLoNPZnKShKxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LL9sXAzbiKU+xmq0W5kX/y0XmIKW0AS35CpJa7V9er5SkZ8CA1eEl/GExnY66frir L3lIxFlkQSNGNWXjrEypuI3sESKvkpbwQhqXlwp9CcGKdsQpUMl9LBlxDc8tS8O1U+ y+jANXG2M6uZNdlFJ4fkxL7CFb7DFLkjGBY882fs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Morton , Ard Biesheuvel , David Gow , Julius Werner , Petr Mladek , Evan Green , "Guilherme G. Piccoli" , Sasha Levin Subject: [PATCH 4.14 139/210] firmware: google: Test spinlock on panic path to avoid lockups Date: Mon, 24 Oct 2022 13:30:56 +0200 Message-Id: <20221024113001.499468167@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747571531585465401?= X-GMAIL-MSGID: =?utf-8?q?1747571531585465401?= From: Guilherme G. Piccoli [ Upstream commit 3e081438b8e639cc76ef1a5ce0c1bd8a154082c7 ] Currently the gsmi driver registers a panic notifier as well as reboot and die notifiers. The callbacks registered are called in atomic and very limited context - for instance, panic disables preemption and local IRQs, also all secondary CPUs (not executing the panic path) are shutdown. With that said, taking a spinlock in this scenario is a dangerous invitation for lockup scenarios. So, fix that by checking if the spinlock is free to acquire in the panic notifier callback - if not, bail-out and avoid a potential hang. Fixes: 74c5b31c6618 ("driver: Google EFI SMI") Cc: Andrew Morton Cc: Ard Biesheuvel Cc: David Gow Cc: Greg Kroah-Hartman Cc: Julius Werner Cc: Petr Mladek Reviewed-by: Evan Green Signed-off-by: Guilherme G. Piccoli Link: https://lore.kernel.org/r/20220909200755.189679-1-gpiccoli@igalia.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/firmware/google/gsmi.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c index 62337be07afc..2e3ef0eb6e82 100644 --- a/drivers/firmware/google/gsmi.c +++ b/drivers/firmware/google/gsmi.c @@ -661,6 +661,15 @@ static struct notifier_block gsmi_die_notifier = { static int gsmi_panic_callback(struct notifier_block *nb, unsigned long reason, void *arg) { + + /* + * Panic callbacks are executed with all other CPUs stopped, + * so we must not attempt to spin waiting for gsmi_dev.lock + * to be released. + */ + if (spin_is_locked(&gsmi_dev.lock)) + return NOTIFY_DONE; + gsmi_shutdown_reason(GSMI_SHUTDOWN_PANIC); return NOTIFY_DONE; }