Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1759382ybz; Sat, 18 Apr 2020 07:55:28 -0700 (PDT) X-Google-Smtp-Source: APiQypKCMsiE6xo/wSfcaMLl130UUfRZC6YDJOePZS2XDKxG7KDTyCuQ99M9TfH0SN3cqECAE+21 X-Received: by 2002:a17:906:5051:: with SMTP id e17mr7812352ejk.142.1587221728334; Sat, 18 Apr 2020 07:55:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587221728; cv=none; d=google.com; s=arc-20160816; b=G+vkbcBAKAmN5gkWzggQMe7ao4+Y1GGe0O2fja0ipzCnNlShuE3n3MwK6QK4uigyIw sDB4EpV90jkzTWZINDX7Mn3aV2NwayADA16vbLDtR53Ky11gOdnBIm28H9pYT/TL6fkZ GZLAdb2jnjnS1pmPQY8rUDnlVKPQ198BXcw4huaNvAaecK2XbkQIWWoROcDBTBdHHEkg fjGqojImXa8KQi42ZzMMOnsJ/HRM7wh23v8mGdAJXDHdVXoTtuSrYi/4E8rSIrelZ+3+ 7b98DXOHbQQisbdv8G1qIshv5na0zSt20fJsuYB1VqtpumOKGO+15WBwd63K0JHDF6sK CZQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WnkzTV1DyScMW5HzcDz3slmclD6YT9V/EZ87d/JY5Bw=; b=zdRDEaKzc4xYQ5ltu+fEJBjpOu+flA46Zlawfi5Wj2f7bArj7mTCpzPxXKBTnGK/eb 4kzt78pD3GdFwaMIq7Ogo7q8K7RIR0jNas4ovn9plemOIF7Iu1On8+EP5XPv8XGdgznU y8nvIvAJCHGj067dMfg/UpgANwTJjlYyxixnGIS11TaJixaqSMUCRyD9RksCrYF++gnG coy6Dt8eLgPRtiDLbQOsdw+Oj6MyV0zL1LIiag5cyf20jqQYP3i7iXsgds1a2nijqQgG rc4979UbfkoybuZXw2Prus+KYTebtm66/hRbHOqjE0+uOEiQ7vG1xQdL9FKHpSZ7nWLQ RCtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TORmxiTo; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g6si17079818edn.379.2020.04.18.07.55.05; Sat, 18 Apr 2020 07:55:28 -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=@kernel.org header.s=default header.b=TORmxiTo; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728237AbgDROmE (ORCPT + 99 others); Sat, 18 Apr 2020 10:42:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:51690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728211AbgDROl7 (ORCPT ); Sat, 18 Apr 2020 10:41:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1830121D79; Sat, 18 Apr 2020 14:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220919; bh=MsdXjTPkgyliNIoLtzi9+2TMlllwSufYQvHCDgJ9Qxo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TORmxiTo/WVm8mp7c2Swe/3PxI1k6N2H6LPs7g+NEDBwvSQNzR2yeiQms8lnXwbmK 9YQHbpM7bTzKHyHszuoh+fYoS5JmxgLjdfvjyLg3Hi4Vu5zLYw4M9VKbswG+SC7pnw 8C6HrLnsRf879mqX2K64tucfnhwjKMABLEBsw9kY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wen Yang , Corey Minyard , Arnd Bergmann , Greg Kroah-Hartman , openipmi-developer@lists.sourceforge.net, Corey Minyard , Sasha Levin Subject: [PATCH AUTOSEL 5.4 57/78] ipmi: fix hung processes in __get_guid() Date: Sat, 18 Apr 2020 10:40:26 -0400 Message-Id: <20200418144047.9013-57-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wen Yang [ Upstream commit 32830a0534700f86366f371b150b17f0f0d140d7 ] The wait_event() function is used to detect command completion. When send_guid_cmd() returns an error, smi_send() has not been called to send data. Therefore, wait_event() should not be used on the error path, otherwise it will cause the following warning: [ 1361.588808] systemd-udevd D 0 1501 1436 0x00000004 [ 1361.588813] ffff883f4b1298c0 0000000000000000 ffff883f4b188000 ffff887f7e3d9f40 [ 1361.677952] ffff887f64bd4280 ffffc90037297a68 ffffffff8173ca3b ffffc90000000010 [ 1361.767077] 00ffc90037297ad0 ffff887f7e3d9f40 0000000000000286 ffff883f4b188000 [ 1361.856199] Call Trace: [ 1361.885578] [] ? __schedule+0x23b/0x780 [ 1361.951406] [] schedule+0x36/0x80 [ 1362.010979] [] get_guid+0x118/0x150 [ipmi_msghandler] [ 1362.091281] [] ? prepare_to_wait_event+0x100/0x100 [ 1362.168533] [] ipmi_register_smi+0x405/0x940 [ipmi_msghandler] [ 1362.258337] [] try_smi_init+0x529/0x950 [ipmi_si] [ 1362.334521] [] ? std_irq_setup+0xd0/0xd0 [ipmi_si] [ 1362.411701] [] init_ipmi_si+0x492/0x9e0 [ipmi_si] [ 1362.487917] [] ? ipmi_pci_probe+0x280/0x280 [ipmi_si] [ 1362.568219] [] do_one_initcall+0x50/0x180 [ 1362.636109] [] ? kmem_cache_alloc_trace+0x142/0x190 [ 1362.714330] [] do_init_module+0x5f/0x200 [ 1362.781208] [] load_module+0x1898/0x1de0 [ 1362.848069] [] ? __symbol_put+0x60/0x60 [ 1362.913886] [] ? security_kernel_post_read_file+0x6b/0x80 [ 1362.998514] [] SYSC_finit_module+0xe5/0x120 [ 1363.068463] [] ? SYSC_finit_module+0xe5/0x120 [ 1363.140513] [] SyS_finit_module+0xe/0x10 [ 1363.207364] [] do_syscall_64+0x74/0x180 Fixes: 50c812b2b951 ("[PATCH] ipmi: add full sysfs support") Signed-off-by: Wen Yang Cc: Corey Minyard Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: openipmi-developer@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org # 2.6.17- Message-Id: <20200403090408.58745-1-wenyang@linux.alibaba.com> Signed-off-by: Corey Minyard Signed-off-by: Sasha Levin --- drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 0b6e7f8d97297..90f5292e2051c 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -3207,8 +3207,8 @@ static void __get_guid(struct ipmi_smi *intf) if (rv) /* Send failed, no GUID available. */ bmc->dyn_guid_set = 0; - - wait_event(intf->waitq, bmc->dyn_guid_set != 2); + else + wait_event(intf->waitq, bmc->dyn_guid_set != 2); /* dyn_guid_set makes the guid data available. */ smp_rmb(); -- 2.20.1