From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f182.google.com ([209.85.223.182]:35194 "EHLO mail-io0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965761AbcBDR0t convert rfc822-to-8bit (ORCPT ); Thu, 4 Feb 2016 12:26:49 -0500 Received: by mail-io0-f182.google.com with SMTP id d63so100574282ioj.2 for ; Thu, 04 Feb 2016 09:26:49 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1454526390-19792-5-git-send-email-zohar@linux.vnet.ibm.com> References: <1454526390-19792-1-git-send-email-zohar@linux.vnet.ibm.com> <1454526390-19792-5-git-send-email-zohar@linux.vnet.ibm.com> Date: Thu, 4 Feb 2016 09:26:48 -0800 Message-ID: Subject: Re: [PATCH v3 04/22] firmware: simplify dev_*() print messages for generic helpers From: Kees Cook To: Mimi Zohar Cc: linux-security-module , "Luis R. Rodriguez" , Kexec Mailing List , linux-modules@vger.kernel.org, "linux-fsdevel@vger.kernel.org" , David Howells , David Woodhouse , Dmitry Torokhov , Dmitry Kasatkin , Eric Biederman , Rusty Russell , "Luis R. Rodriguez" , Andrew Morton , Greg Kroah-Hartman , Casey Schaufler , Ming Lei , Takashi Iwai , =?UTF-8?B?Vm9qdMSbY2ggUGF2bMOtaw==?= , Kyle McMartin , Matthew Garrett , LKML Content-Type: text/plain; charset=UTF-8 Sender: owner-linux-modules@vger.kernel.org List-ID: On Wed, Feb 3, 2016 at 11:06 AM, Mimi Zohar wrote: > From: "Luis R. Rodriguez" > > Simplify a few of the *generic* shared dev_warn() and dev_dbg() > print messages for three reasons: > > 0) Historically firmware_class code was added to help > get device driver firmware binaries but these days > request_firmware*() helpers are being repurposed for > general *system data* needed by the kernel. > > 1) This will also help generalize shared code as much as possible > later in the future in consideration for a new extensible firmware > API which will enable to separate usermode helper code out as much > as possible. > > 2) Kees Cook pointed out the the prints already have the device > associated as dev_*() helpers are used, that should help identify > the user and case in which the helpers are used. That should provide > enough context and simplifies the messages further. > > v4: generalize debug/warn messages even further as suggested by > Kees Cook. > > Cc: Rusty Russell > Cc: Andrew Morton > Cc: Greg Kroah-Hartman > Cc: David Howells > Cc: Kees Cook > Cc: Casey Schaufler > Cc: Ming Lei > Cc: Takashi Iwai > Cc: Vojtěch Pavlík > Cc: Kyle McMartin > Cc: Matthew Garrett > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Luis R. Rodriguez > Signed-off-by: Mimi Zohar Acked-by: Kees Cook -Kees > --- > drivers/base/firmware_class.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c > index 8524450..3358f5d 100644 > --- a/drivers/base/firmware_class.c > +++ b/drivers/base/firmware_class.c > @@ -353,15 +353,15 @@ static int fw_get_filesystem_firmware(struct device *device, > rc = fw_read_file_contents(file, buf); > fput(file); > if (rc) > - dev_warn(device, "firmware, attempted to load %s, but failed with error %d\n", > - path, rc); > + dev_warn(device, "loading %s failed with error %d\n", > + path, rc); > else > break; > } > __putname(path); > > if (!rc) { > - dev_dbg(device, "firmware: direct-loading firmware %s\n", > + dev_dbg(device, "direct-loading %s\n", > buf->fw_id); > mutex_lock(&fw_lock); > set_bit(FW_STATUS_DONE, &buf->status); > @@ -1051,7 +1051,7 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name, > } > > if (fw_get_builtin_firmware(firmware, name)) { > - dev_dbg(device, "firmware: using built-in firmware %s\n", name); > + dev_dbg(device, "using built-in %s\n", name); > return 0; /* assigned */ > } > > -- > 2.1.0 > -- Kees Cook Chrome OS & Brillo Security