From patchwork Tue Jun 23 19:53:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191544 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2294556ile; Tue, 23 Jun 2020 13:09:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1Y+plkcdiB3mI0/Wod5ePqWV6FAIYTUvE3m6TB5NzhlHHPzFBIkNYDQcyG0SZU5Ffh872 X-Received: by 2002:a17:906:6959:: with SMTP id c25mr17648911ejs.375.1592942947911; Tue, 23 Jun 2020 13:09:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592942947; cv=none; d=google.com; s=arc-20160816; b=kyWvo2U3vhHVDeNi56PnAfMJD4odZkPNIfRAmBIYAPmkJH7IzYFD+5SL1EcM2hB0xG R+nZXItWVR741SCrp1sne3qDNOC1RHgic7rqhV2QaEVFqeXkKM4PPnYszUMugwP2PFN6 XXZ81onmoTB1h3DhkE6mwSDWBRqOma6soTN6BL44TIUWNjAeqdXfdj03I/FTjsCViViE DrTiCrh1V4yhAjEJz0puPKmeHr55TplERyhCJjBaYgbadMZSnEsZ6H2mthT230Y1kgqQ UYtqjV4SF+vqApQnVusJi9Ineae5b/2073JIsXhtx4UCmgZlVIphEZGhA46RD1jahZxP 4noQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KtbdENe9dsg+/L7uD2FVPjZHkW2NBrwy9YLriDlTEBc=; b=tuAxPPfWsb01Gqtb9YMEBKqOpwep96KBwDHHVKZMoLiTfF3TBxmvbwkafuGablyV72 8JqXS1nFp9crktsZad61SSfSIwOwpT1oFpSB+JUeCcQ5m8C3CO77sCnf4xHjMGIaEVcq m7UZRiknc8PDz/MrSz4E+sLKL9S3kUF2u/KZMlKrL2NSXEf3U30g9s8JJdvNvw1nOM7b KG1keLzKRp65r6QMLhnmFJz1GGwfm6B4m9O2yzswm7Jy+DW/NeZ3gMChGL4NaMkBAxvs UKb7RbQXJBYzQyxKzC+ISrs17jhg6upbdyn/gqHkiE93Ha6j6YHa+aYQp1bOO61PBFnp sT4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wpzorop1; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d11si5809625edz.263.2020.06.23.13.09.07; Tue, 23 Jun 2020 13:09:07 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=wpzorop1; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387884AbgFWUJE (ORCPT + 15 others); Tue, 23 Jun 2020 16:09:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:50028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388300AbgFWUJB (ORCPT ); Tue, 23 Jun 2020 16:09:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 08B072064B; Tue, 23 Jun 2020 20:08:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942940; bh=soDd+QyUzhwN2rtXSi47bYrnlf+mZDpo7wt+h1PlRxc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wpzorop1QMSnlGYszKL8LrMr32jK7Ek1NgK/CComSn8oAjiM2/3HitfNve6LSw1vo 5erDP2pbgyAMQJ4EzIa4exo3ITjjQbOmyWsXzMu0oTvKkzuT5Effa0KZSATkaHX804 r4HrJHEakG6Sm3J7W424kJo8izdf8UjqMvirGjgw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josh Poimboeuf , clang-built-linux@googlegroups.com, Arnd Bergmann , David Teigland , Sasha Levin Subject: [PATCH 5.7 195/477] dlm: remove BUG() before panic() Date: Tue, 23 Jun 2020 21:53:12 +0200 Message-Id: <20200623195416.806348964@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit fe204591cc9480347af7d2d6029b24a62e449486 ] Building a kernel with clang sometimes fails with an objtool error in dlm: fs/dlm/lock.o: warning: objtool: revert_lock_pc()+0xbd: can't find jump dest instruction at .text+0xd7fc The problem is that BUG() never returns and the compiler knows that anything after it is unreachable, however the panic still emits some code that does not get fully eliminated. Having both BUG() and panic() is really pointless as the BUG() kills the current process and the subsequent panic() never hits. In most cases, we probably don't really want either and should replace the DLM_ASSERT() statements with WARN_ON(), as has been done for some of them. Remove the BUG() here so the user at least sees the panic message and we can reliably build randconfig kernels. Fixes: e7fd41792fc0 ("[DLM] The core of the DLM for GFS2/CLVM") Cc: Josh Poimboeuf Cc: clang-built-linux@googlegroups.com Signed-off-by: Arnd Bergmann Signed-off-by: David Teigland Signed-off-by: Sasha Levin --- fs/dlm/dlm_internal.h | 1 - 1 file changed, 1 deletion(-) -- 2.25.1 diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index 416d9de356791..4311d01b02a8b 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h @@ -97,7 +97,6 @@ do { \ __LINE__, __FILE__, #x, jiffies); \ {do} \ printk("\n"); \ - BUG(); \ panic("DLM: Record message above and reboot.\n"); \ } \ }