From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvSoXpURm6/oEgtqP3p5olHkuwhTC3elydhOEQtRizFDCVFJbnLr7X49sf4gnkC/0hS5QYD ARC-Seal: i=1; a=rsa-sha256; t=1520691327; cv=none; d=google.com; s=arc-20160816; b=YxqAbaaRVwBSQaFGKQE0O/dBTPbLPYYc88fZkG9/9gv68FtJW2p/Wyc8pqEk55vEie ZJgBbx20P11+5TbGPnjTv+oo2FbjTrW4Fi+kOz1PiP/PKnnaZA/qVIBkaaPXHfDJPzjf OsJtYmzCsqaEonZBqKyc2x8f3ZOUgZgRbInbwOEPfrHU3/uunXov+4aekX9HUdVg2VSV ZgTymRuMr7Z9y2rbUG/Sq/AuiEPXP9UJPQKZtfiJxo7Zz4FE7JESIRhQ4fyVP/oRZng5 qYWdt63km4TG4ORGRm4wI0IYWGUjK3qJxxl/kf1of9jXjRbCACz+o/wgLrm50T4Qc3E4 Yj3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dmarc-filter:arc-authentication-results; bh=f8oxiO0d0D9nHeQsWlMFfBLlvWSGj55zUM+FMX8K79Q=; b=YXAsiKF75y9MtweHQDp9VNHV3qB8WxDHf4sqWSANu3m1ehADGn0x0mJNBIAX7R10BQ J9puHs1wSr9UM59Uzt0mxtLd6mFL+1fuaP0Eb+EBkHS1f4eP4GKgMjRTgDokUjvZOmhH 3oIoQXIqJynlfGOtERrnwFL5ZVWqfbHT0U7xhBT0Ye35e7ldz7k2pHNuYMaVySqROF9D 9HiWTy+lO50vP3FnPwYITcYN9VobKMp/r9piFE+Jn9ouleNu3Soo6X2f8sgj4VNLUVdS 9LylyzBFXVfSsRgorSeuvjtX+Pje7ppsFtCBQFIEvOFY1QCPmUNzbVWjNtFnY/mwY/um tzUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of mcgrof@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=mcgrof@kernel.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of mcgrof@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=mcgrof@kernel.org DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF057217C7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mcgrof@kernel.org From: "Luis R. Rodriguez" To: gregkh@linuxfoundation.org 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, "Luis R. Rodriguez" Subject: [PATCH v3 11/20] firmware: enable to force disable the fallback mechanism at run time Date: Sat, 10 Mar 2018 06:14:52 -0800 Message-Id: <20180310141501.2214-12-mcgrof@kernel.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180310141501.2214-1-mcgrof@kernel.org> References: <20180310141501.2214-1-mcgrof@kernel.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594560429046312575?= X-GMAIL-MSGID: =?utf-8?q?1594560429046312575?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: You currently need four different kernel builds to test the firmware API fully. By adding a proc knob to force disable the fallback mechanism completely we are able to reduce the amount of kernels you need built to test the firmware API down to two. Acked-by: Kees Cook Signed-off-by: Luis R. Rodriguez --- drivers/base/firmware_loader/fallback.c | 5 +++++ drivers/base/firmware_loader/fallback.h | 4 ++++ drivers/base/firmware_loader/fallback_table.c | 9 +++++++++ 3 files changed, 18 insertions(+) diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 45cc40933a47..d6838e7ec00c 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -643,6 +643,11 @@ static bool fw_force_sysfs_fallback(unsigned int opt_flags) static bool fw_run_sysfs_fallback(unsigned int opt_flags) { + if (fw_fallback_config.ignore_sysfs_fallback) { + pr_info_once("Ignoring firmware sysfs fallback due to debugfs knob\n"); + return false; + } + if ((opt_flags & FW_OPT_NOFALLBACK)) return false; diff --git a/drivers/base/firmware_loader/fallback.h b/drivers/base/firmware_loader/fallback.h index ca7e69a8417b..dfebc644ed35 100644 --- a/drivers/base/firmware_loader/fallback.h +++ b/drivers/base/firmware_loader/fallback.h @@ -14,12 +14,16 @@ * as if one had enabled CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y. * Useful to help debug a CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y * functionality on a kernel where that config entry has been disabled. + * @ignore_sysfs_fallback: force to disable the sysfs fallback mechanism. + * This emulates the behaviour as if we had set the kernel + * config CONFIG_FW_LOADER_USER_HELPER=n. * @old_timeout: for internal use * @loading_timeout: the timeout to wait for the fallback mechanism before * giving up, in seconds. */ struct firmware_fallback_config { unsigned int force_sysfs_fallback; + unsigned int ignore_sysfs_fallback; int old_timeout; int loading_timeout; }; diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c index 92365e053e30..7428659d8df9 100644 --- a/drivers/base/firmware_loader/fallback_table.c +++ b/drivers/base/firmware_loader/fallback_table.c @@ -39,6 +39,15 @@ struct ctl_table firmware_config_table[] = { .extra1 = &zero, .extra2 = &one, }, + { + .procname = "ignore_sysfs_fallback", + .data = &fw_fallback_config.ignore_sysfs_fallback, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = proc_douintvec_minmax, + .extra1 = &zero, + .extra2 = &one, + }, { } }; EXPORT_SYMBOL_GPL(firmware_config_table); -- 2.16.2