Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp2625716ybi; Sun, 9 Jun 2019 16:43:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqy59uasQgWh7+sfFfSTyaA1I76HAf97sLOUWg+4iTFwGcdBrDFsPARu2W6RVqdtaSUukHFi X-Received: by 2002:a17:90a:a008:: with SMTP id q8mr18561803pjp.114.1560123829328; Sun, 09 Jun 2019 16:43:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560123829; cv=none; d=google.com; s=arc-20160816; b=w7frbat5tFjZGMhcmm6px8ilMxn63o+aJw9kzl22Vay96gI8aHvOvWUIjXeUgoDo3r mCDLJLzR44YA0eGW5UrIg1tZs+JnuOKgz1N0tmMgwURP/7tcmLBFF6uQk7KFiHf2malv Qflebkj2v/My7kTkUJNy3Gxj8I1DRfop9XOLJvKXMKn5Kx3Gj8PzE7hP5FsBUCAuAEXj IkhvKFlYceI2KH18WPcYFejkSRsDBkfGhH5KsqtxgFxAjBHD0DYqIz1s9voryKB0UmSa nAcPH5Nq6IaOpPgQE+ZFnk6B9mzvfnkh50HEVIfiTGzvdjzq2yf/wsNlXe3wgpeyYUMB 32VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=72IEs0DHzEuTu55M1eCjES2KjxauXBeKyWIRnt96fUI=; b=Eb+WibGZXrK5bGw1GlUBijeJJUsU7EqYotDyA98qKIWOwPUwHmzNvn6gqGig9sE8iK aDcnwF8waknl4Rkad4+1Gp+2KdJNGil/ps6dX9vNX9/h/lzmbROtzXiLnhSplny/i1LN BWyVRsdnz87uMY8+vYuJfeWSg/ewL+p/FV6hN3oHl13kig+j5pWtfoLE1fW4cRBxeXQj dmbftYOjODZoizPtiNXr8LL3SgVul5hUeDKwV+CDU2OaZh4fW4gEfkSO/A4QnsDg9vir Hw23hV9CeCT4BAD7H6I1QVyPIfMKlPA8XsHYjsHjV2cHWwsJ52XDgl6VuemvjxKju7o8 P2mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=auzI147H; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j5si5883766plt.382.2019.06.09.16.42.47; Sun, 09 Jun 2019 16:43:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=auzI147H; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729708AbfFIXiR (ORCPT + 99 others); Sun, 9 Jun 2019 19:38:17 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:4312 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725933AbfFIXiR (ORCPT ); Sun, 9 Jun 2019 19:38:17 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Sun, 09 Jun 2019 16:38:16 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Sun, 09 Jun 2019 16:38:16 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Sun, 09 Jun 2019 16:38:16 -0700 Received: from [10.110.48.28] (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Sun, 9 Jun 2019 23:38:15 +0000 Subject: Re: [PATCH 1/1] lockdep: fix warning: print_lock_trace defined but not used To: , CC: LKML , Frederic Weisbecker , Andrew Morton , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Will Deacon References: <20190521070808.3536-1-jhubbard@nvidia.com> <20190521070808.3536-2-jhubbard@nvidia.com> <20190609135114.GX28207@linux.ibm.com> X-Nvconfidentiality: public From: John Hubbard Message-ID: <7336e00d-11d8-9be1-8856-92e47b42aa37@nvidia.com> Date: Sun, 9 Jun 2019 16:38:15 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190609135114.GX28207@linux.ibm.com> X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL108.nvidia.com (172.18.146.13) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1560123496; bh=72IEs0DHzEuTu55M1eCjES2KjxauXBeKyWIRnt96fUI=; h=X-PGP-Universal:Subject:To:CC:References:X-Nvconfidentiality:From: Message-ID:Date:User-Agent:MIME-Version:In-Reply-To: X-Originating-IP:X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=auzI147HBlJ6kyoY515g3f/wnTWZF+3yEU5fvFLUQEXGfjs3jZjngXm7K0zD8yAF9 AEBfY9hsJT80pap8JAUnKAFZAT+6e3wKa7RUDH++7DDwFGqJJyMLCjccLjIqc3gNon 1Sf7J9C3B5EzEqFXzgyO3nV1gTUxSXhS89hXbaYc13toa8ZxCxlLTCwjpwOsnhlmO2 zv7sGHE1r7OK3Q+X/RVi5fmY+nHnxb+JaZrzRQOJxz02ABxMb/xqwMk53056fwPllV Z/clItiKpt6C9cE7QsHnz/v1xiNV/kSrpNEhycot1BzsDY7pmZQgN5RyFY5a0xeyYj pzMfKkElDWqsw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 6/9/19 6:51 AM, Paul E. McKenney wrote: > On Tue, May 21, 2019 at 12:08:08AM -0700, john.hubbard@gmail.com wrote: >> From: John Hubbard >> >> Commit 0d2cc3b34532 ("locking/lockdep: Move valid_state() inside >> CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING") moved the only usage of >> print_lock_trace() that was originally outside of the CONFIG_PROVE_LOCKI= NG >> case. It moved that usage into a different case: CONFIG_PROVE_LOCKING && >> CONFIG_TRACE_IRQFLAGS. That leaves things not symmetrical, and as a resu= lt, >> the following warning fires on my build, when I have >> >> !CONFIG_TRACE_IRQFLAGS && !CONFIG_PROVE_LOCKING >> >> set: >> >> kernel/locking/lockdep.c:2821:13: warning: =E2=80=98print_lock_trace=E2= =80=99 defined >> but not used [-Wunused-function] >> >> Fix this by only defining print_lock_trace() in cases in which is it >> called. >> >> Fixes: 0d2cc3b34532 ("locking/lockdep: Move valid_state() inside CONFIG_= TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING") >> Cc: Frederic Weisbecker >> Cc: Andrew Morton >> Cc: Linus Torvalds >> Cc: Paul E. McKenney >> Cc: Peter Zijlstra >> Cc: Thomas Gleixner >> Cc: Will Deacon >> Signed-off-by: John Hubbard >> --- >> kernel/locking/lockdep.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c >> index d06190fa5082..3065dc36c27a 100644 >> --- a/kernel/locking/lockdep.c >> +++ b/kernel/locking/lockdep.c >> @@ -2817,11 +2817,14 @@ static inline int validate_chain(struct task_str= uct *curr, >> return 1; >> } >> >> +#if defined(CONFIG_TRACE_IRQFLAGS) >> static void print_lock_trace(struct lock_trace *trace, unsigned int spa= ces) >=20 > This works, but another approach is to put "__maybe_unused" in the > above declaration, which avoids the need to have "#if" in a .c file. Good idea, that approach appeals to me here, because tracing is a natural f= it for "might not be used" types of functions. > But this file already has quite a few #if and #ifdef commands, so maybe > it is OK here. >=20 > Also, "#ifdef CONFIG_TRACE_IRQFLAGS" is a bit more conventional than > the above, should the "__maybe_unused" be undesirable. ah, OK, I'll keep that in mind. (The two seemed identical to my mind, but it's good to make things look like surrounding code, of course.) thanks, --=20 John Hubbard NVIDIA >=20 > Yet another approach is to move this function to include/linux/lockdep.h, > where #ifdef is considered less objectionable. >=20 > But I must defer to the maintainers. >=20 > Thanx, Paul