Received: by 10.213.65.68 with SMTP id h4csp1177614imn; Wed, 14 Mar 2018 11:56:29 -0700 (PDT) X-Google-Smtp-Source: AG47ELubxesqpCLFgo4JlbtgTgiQ8TTd4QONeuuHEYqGEfItnss+S8cHYJGgS9w+yAPKY7N/QYDF X-Received: by 2002:a17:902:2f43:: with SMTP id s61-v6mr5153761plb.236.1521053789920; Wed, 14 Mar 2018 11:56:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521053789; cv=none; d=google.com; s=arc-20160816; b=SBQqFurmdgWXvxqeIBIQ55IXAffW0cJK48KkkijPvLHtvfId4kYvrjLiAW4WDH+z5Q SDUjEzng1xL0eNNnhVZMSUZkxb/37/Wdj7b/Nbh+N7B95967P8tqofoyLVpG4W7VdVKj lLW1HIRuFQX5q6H6IeZ2nILRmQTSiWN1WQD0xJMNHvZm3ALHCRAJqEDvnEMG0coX8/iD qbLeD+mr8joRPiN1ox0SO0KsF5tnKwJA3Nj6F1eLQVMKD30NVkA2Pc9rbCIV6yVDEEKQ 0JQU4x2G7+EDmAR+/h1euWyQ3qX1KWHMr9hXPbN52nkdrAJLwuxvzBIXByI1ZnmIzO6A a/jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:arc-authentication-results; bh=YDKDV9KmWOV4c7rMuqlqtz7gSHf2pP1J1/AAZRosaiU=; b=yaWlQnUOHEaCjSej/dYp9UpZWYfKC9lZ5fs0Oc+OsOQmgfKpgvA1vgkJ9gTdxJxqTe PAvsIkju4FJNuMs2QaVV/7ps2oKiOZOx90AMmxjJXCQdAd0EB2ijkCIq29xIIugv84q1 2EaPrjszbv12tCfXkiTuQ1hThxYPeK/s29iCHAigD3xO2BJVi7KpqEIAXD4W06ktaev6 6DuDtDChphZC/7MMag6a1lhFbq93/BKVG1fJdvJUDjBAZoaHyQ2Z3mHjznO/+n3Wnvty xC3g1ygXxZ4rn9j2zAXTrTrSAAZnoEcLvKzxfUWVJOFjDeKppAwKa4OmwfOHp0ZJP72c driw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t11-v6si2364869plr.411.2018.03.14.11.56.15; Wed, 14 Mar 2018 11:56:29 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751977AbeCNSxu (ORCPT + 99 others); Wed, 14 Mar 2018 14:53:50 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:58992 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751390AbeCNSxs (ORCPT ); Wed, 14 Mar 2018 14:53:48 -0400 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 74FFDD38; Wed, 14 Mar 2018 18:53:47 +0000 (UTC) Date: Wed, 14 Mar 2018 19:53:47 +0100 From: Greg KH To: "Luis R. Rodriguez" Cc: akpm@linux-foundation.org, cantabile.desu@gmail.com, kubakici@wp.pl, linux-wireless@vger.kernel.org, keescook@chromium.org, shuah@kernel.org, mfuzzey@parkeon.com, zohar@linux.vnet.ibm.com, dhowells@redhat.com, pali.rohar@gmail.com, tiwai@suse.de, arend.vanspriel@broadcom.com, zajec5@gmail.com, nbroeking@me.com, markivx@codeaurora.org, broonie@kernel.org, dmitry.torokhov@gmail.com, dwmw2@infradead.org, torvalds@linux-foundation.org, Abhay_Salunke@dell.com, bjorn.andersson@linaro.org, jewalt@lgsinnovations.com, oneukum@suse.com, ast@fb.com, andresx7@gmail.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH v3 05/20] firmware: simplify CONFIG_FW_LOADER_USER_HELPER_FALLBACK further Message-ID: <20180314185347.GA15837@kroah.com> References: <20180310141501.2214-1-mcgrof@kernel.org> <20180310141501.2214-6-mcgrof@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180310141501.2214-6-mcgrof@kernel.org> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Mar 10, 2018 at 06:14:46AM -0800, Luis R. Rodriguez wrote: > All CONFIG_FW_LOADER_USER_HELPER_FALLBACK really is, is just a bool, > initailized at build time. Define it as such. This simplifies the > logic even further, removing now all explicit #ifdefs around the code. > > Acked-by: Kees Cook > Signed-off-by: Luis R. Rodriguez > --- > drivers/base/firmware_loader.c | 25 ++++++++++++++++++------- > 1 file changed, 18 insertions(+), 7 deletions(-) > > diff --git a/drivers/base/firmware_loader.c b/drivers/base/firmware_loader.c > index 7dd36ace6152..59dba794ce1a 100644 > --- a/drivers/base/firmware_loader.c > +++ b/drivers/base/firmware_loader.c > @@ -266,6 +266,22 @@ static inline bool fw_state_is_aborted(struct fw_priv *fw_priv) > > #ifdef CONFIG_FW_LOADER_USER_HELPER > > +/** > + * struct firmware_fallback_config - firmware fallback configuratioon settings > + * > + * Helps describe and fine tune the fallback mechanism. > + * > + * @force_sysfs_fallback: force the sysfs fallback mechanism to be used > + * as if one had enabled CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y. > + */ > +struct firmware_fallback_config { > + bool force_sysfs_fallback; > +}; This is C, why are you messing around with a structure and "getters and setters" for a set of simple values? > +static const struct firmware_fallback_config fw_fallback_config = { > + .force_sysfs_fallback = IS_ENABLED(CONFIG_FW_LOADER_USER_HELPER_FALLBACK), > +}; static bool force_sysfs_fallback = IS_ENABLED(CONFIG_FW_LOADER_USER_HELPER_FALLBACK); Then just read/write the foolish thing, don't make this more complex than is needed please. There is a "getter and setters are evil" rant somewhere out there online, if you really need me to dig up the old tired arguments :) thanks, greg k-h > + > static inline bool fw_sysfs_done(struct fw_priv *fw_priv) > { > return __fw_state_check(fw_priv, FW_STATUS_DONE); > @@ -1151,19 +1167,14 @@ static int fw_load_from_user_helper(struct firmware *firmware, > return ret; > } > > -#ifdef CONFIG_FW_LOADER_USER_HELPER_FALLBACK > -static bool fw_force_sysfs_fallback(unsigned int opt_flags) > -{ > - return true; > -} > -#else > static bool fw_force_sysfs_fallback(unsigned int opt_flags) > { > + if (fw_fallback_config.force_sysfs_fallback) Ok, you directly access it here, but your later patches get a lot more "complex" it seems... thanks, greg k-h