From patchwork Mon Oct 24 11:31:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8963 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp436766wru; Mon, 24 Oct 2022 05:58:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7/xCwHowmlHC9HCxsOrAXWfPdgTrbiUUA9ty0C9k64JFBtV59oM9PjQHQsV/no41CkaLUw X-Received: by 2002:a05:6a00:170a:b0:563:a40a:b5e1 with SMTP id h10-20020a056a00170a00b00563a40ab5e1mr33188791pfc.40.1666616286184; Mon, 24 Oct 2022 05:58:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616286; cv=none; d=google.com; s=arc-20160816; b=ZMvJOwuheENkOVs3vOis9Nlw4YCrxrWGdWAjvjQN1hGYm2UCgPUsqQ8pUakylAGXCG w4MtkDXcZEe5izqM6jtikpYEr5y6xVnBn2F9+DXG7MvL9E0WQNM8O22bzl+SV64N9iWp h/x6JtY+QFq6mn+A0FwvZYUOM3vfTYsQinDEHaoTMMR3qUQM/7/4wfEsnWwUllYyd9Ii hePLmRENgdkuQlIWZJKFu+eGlPmLrTcv7utpyaFE9nGHu96Ct/ASDadsW20l5ARaeYoB YHIcE91ddbWyDhbF1GtdO7JoIFMZeH0vi2paqLZt76pHPEeGS6LfAQs9nKe/jA3yW99y aDpw== 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=upDPo48Tel9vCrQfd8FK34kJjZAZVEiBHXLNCDRGezM=; b=JhoHo1B67nObxxfJWIUlWE6OMy+tqYyvuBV0XXnOzutYe8I+aKEVtYfk9I4CcqOuuM 2EVK0AIrHwDYTMmEQyd8kMX0OG9w4NcYcQf1NZAcQROlY93pz9IQTTAlYuY0opoZmF1q AV3iBk2Q9H8MI6B9tyRi/BOC54Djj2S0M0Jg4QUQok91vDk5xh8Fc6qpoi0CyrTlCPLv k6n7wp/UOxkyVOyPL316Joh9x3XHYQK2jlhidfsSKr/L/yJOjTVtPQnfrwPsfO7WBToK LN/BXQM2a8j1V85004DsvR/uBbk4v6EqxqYbqa0+NTtFinnGKYDV77rCMcqu4Popg3jk 1b5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Dj11ZVh/"; 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 i2-20020a170902c94200b001867bac69cdsi12349376pla.342.2022.10.24.05.57.52; Mon, 24 Oct 2022 05:58:06 -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="Dj11ZVh/"; 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 S234846AbiJXM5Y (ORCPT + 99 others); Mon, 24 Oct 2022 08:57:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234827AbiJXM5C (ORCPT ); Mon, 24 Oct 2022 08:57:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E5FA3AB14; Mon, 24 Oct 2022 05:16:10 -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 6D34961252; Mon, 24 Oct 2022 12:13:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 806F4C433C1; Mon, 24 Oct 2022 12:13:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613586; bh=QVxdyH9Kh0TLvy8RfnKx31BeDg9LLwu7Ai4bBHeLUhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dj11ZVh/c2tVw3FZFfvE1QiIzoZBLuF3rsQgeFyopp44FL3vq+QECEA0NxKEgZ8lG ZVAC4mjKO3tbVePETcoXrpzDuQalN1ijMy/9F6uWFBnt9nDD7NlhPkqaibhLUkqm6a +rQKKTTpZsfa2RCfvBckf4dOGDcqF4GyHUSmWr8U= 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 5.4 153/255] firmware: google: Test spinlock on panic path to avoid lockups Date: Mon, 24 Oct 2022 13:31:03 +0200 Message-Id: <20221024113007.732606344@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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=unavailable 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?1747573838617634513?= X-GMAIL-MSGID: =?utf-8?q?1747573838617634513?= 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 edaa4e5d84ad..517fb57d07d2 100644 --- a/drivers/firmware/google/gsmi.c +++ b/drivers/firmware/google/gsmi.c @@ -679,6 +679,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; }