[PATCH blktests v2 11/12] common: Use sysfs instead of modinfo for _have_module_param()

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Logan Gunthorpe <logang@deltatee.com>
To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
	Omar Sandoval <osandov@fb.com>
Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
	Michael Moese <mmoese@suse.de>, Theodore Ts'o <tytso@mit.edu>,
	Johannes Thumshirn <jthumshirn@suse.de>,
	Stephen Bates <sbates@raithlin.com>,
	Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH blktests v2 11/12] common: Use sysfs instead of modinfo for _have_module_param()
Date: Wed, 17 Jul 2019 11:12:58 -0600	[thread overview]
Message-ID: <20190717171259.3311-12-logang@deltatee.com> (raw)
In-Reply-To: <20190717171259.3311-1-logang@deltatee.com>

Using modinfo fails if the given module is built-in.

Instead, if the module is already in the kernel, check for the
parameter in sysfs.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
 common/rc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/rc b/common/rc
index a487cc69026c..41aee3aaa735 100644
--- a/common/rc
+++ b/common/rc
@@ -48,6 +48,12 @@ _have_modules() {
 }
 
 _have_module_param() {
+	if [ -d "/sys/module/$1" ]; then
+		if [ -e "/sys/module/$1/parameters/$2" ]; then
+			return 0
+		fi
+	fi
+
 	if ! modinfo -F parm -0 "$1" | grep -q -z "^$2:"; then
 		SKIP_REASON="$1 module does not have parameter $2"
 		return 1
-- 
2.17.1

WARNING: multiple messages have this Message-ID (diff)

From: logang@deltatee.com (Logan Gunthorpe)
Subject: [PATCH blktests v2 11/12] common: Use sysfs instead of modinfo for _have_module_param()
Date: Wed, 17 Jul 2019 11:12:58 -0600	[thread overview]
Message-ID: <20190717171259.3311-12-logang@deltatee.com> (raw)
In-Reply-To: <20190717171259.3311-1-logang@deltatee.com>

Using modinfo fails if the given module is built-in.

Instead, if the module is already in the kernel, check for the
parameter in sysfs.

Signed-off-by: Logan Gunthorpe <logang at deltatee.com>
---
 common/rc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/rc b/common/rc
index a487cc69026c..41aee3aaa735 100644
--- a/common/rc
+++ b/common/rc
@@ -48,6 +48,12 @@ _have_modules() {
 }
 
 _have_module_param() {
+	if [ -d "/sys/module/$1" ]; then
+		if [ -e "/sys/module/$1/parameters/$2" ]; then
+			return 0
+		fi
+	fi
+
 	if ! modinfo -F parm -0 "$1" | grep -q -z "^$2:"; then
 		SKIP_REASON="$1 module does not have parameter $2"
 		return 1
-- 
2.17.1

next prev parent reply	other threads:[~2019-07-17 17:13 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-17 17:12 [PATCH blktests v2 00/12] Fix nvme block test issues Logan Gunthorpe
2019-07-17 17:12 ` Logan Gunthorpe
2019-07-17 17:12 ` [PATCH blktests v2 01/12] Add filter function for nvme discover Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  6:58   ` Johannes Thumshirn
2019-07-18  6:58     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 02/12] nvme: More agressively filter the discovery output Logan Gunthorpe
2019-07-18  6:59   ` Johannes Thumshirn
2019-07-18  6:59     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 03/12] nvme: Add new test to verify the generation counter Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  7:03   ` Johannes Thumshirn
2019-07-18  7:03     ` Johannes Thumshirn
2019-07-18 15:55     ` Logan Gunthorpe
2019-07-18 15:55       ` Logan Gunthorpe
2019-07-17 17:12 ` [PATCH blktests v2 04/12] nvme/003,004: Add missing calls to nvme disconnect Logan Gunthorpe
2019-07-17 17:12   ` [PATCH blktests v2 04/12] nvme/003, 004: " Logan Gunthorpe
2019-07-18  7:03   ` [PATCH blktests v2 04/12] nvme/003,004: " Johannes Thumshirn
2019-07-18  7:03     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 05/12] nvme/005: Don't rely on modprobing to set the multipath paramater Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  7:04   ` Johannes Thumshirn
2019-07-18  7:04     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 06/12] nvme/015: Ensure the namespace is flushed not the char device Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  7:04   ` Johannes Thumshirn
2019-07-18  7:04     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 07/12] nvme/018: Ignore error message generated by nvme read Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  7:05   ` Johannes Thumshirn
2019-07-18  7:05     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 08/12] check: Add the ability to call a cleanup function after a test ends Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  7:07   ` Johannes Thumshirn
2019-07-18  7:07     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 09/12] nvme: Cleanup modprobe lines into helper functions Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  7:07   ` Johannes Thumshirn
2019-07-18  7:07     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 10/12] nvme: Ensure all ports and subsystems are removed on cleanup Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  7:08   ` Johannes Thumshirn
2019-07-18  7:08     ` Johannes Thumshirn
2019-07-17 17:12 ` Logan Gunthorpe [this message]
2019-07-17 17:12   ` [PATCH blktests v2 11/12] common: Use sysfs instead of modinfo for _have_module_param() Logan Gunthorpe
2019-07-18  7:08   ` Johannes Thumshirn
2019-07-18  7:08     ` Johannes Thumshirn
2019-07-17 17:12 ` [PATCH blktests v2 12/12] nvme: Ignore errors when removing modules Logan Gunthorpe
2019-07-17 17:12   ` Logan Gunthorpe
2019-07-18  7:09   ` Johannes Thumshirn
2019-07-18  7:09     ` Johannes Thumshirn
2019-07-29 17:31 ` [PATCH blktests v2 00/12] Fix nvme block test issues Omar Sandoval
2019-07-29 17:31   ` Omar Sandoval

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:a487cc69026 dfblob:a487cc69026 dfblob:41aee3aaa73
dfblob:41aee3aaa73
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190717171259.3311-12-logang@deltatee.com \
    --to=logang@deltatee.com \
    --cc=chaitanya.kulkarni@wdc.com \
    --cc=jthumshirn@suse.de \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=mmoese@suse.de \
    --cc=osandov@fb.com \
    --cc=sbates@raithlin.com \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.