| Message ID | 20190712235742.22646-12-logang@deltatee.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix nvme block test issues | expand |
On Fri, Jul 12, 2019 at 05:57:41PM -0600, Logan Gunthorpe wrote: > Using modinfo fails if the given module is built-in. Instead, > just check for the parameter's existence in sysfs. > > Signed-off-by: Logan Gunthorpe <logang@deltatee.com> > --- > common/rc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/common/rc b/common/rc > index 49050c71dabf..d48f73c5bf3d 100644 > --- a/common/rc > +++ b/common/rc > @@ -48,7 +48,7 @@ _have_modules() { > } > > _have_module_param() { > - if ! modinfo -F parm -0 "$1" | grep -q -z "^$2:"; then > + if ! [ -e "/sys/module/$1/parameters/$2" ]; then > SKIP_REASON="$1 module does not have parameter $2" > return 1 > fi But this now fails if the module isn't loaded yet. IMHO we'll need to check if "/sys/module/$1" exists and if it does check for "/sys/module/$1/parameters/$2", if not try modinfo. Does that make sense? Byte, Johannes
On 2019-07-15 1:21 a.m., Johannes Thumshirn wrote: > On Fri, Jul 12, 2019 at 05:57:41PM -0600, Logan Gunthorpe wrote: >> Using modinfo fails if the given module is built-in. Instead, >> just check for the parameter's existence in sysfs. >> >> Signed-off-by: Logan Gunthorpe <logang@deltatee.com> >> --- >> common/rc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/common/rc b/common/rc >> index 49050c71dabf..d48f73c5bf3d 100644 >> --- a/common/rc >> +++ b/common/rc >> @@ -48,7 +48,7 @@ _have_modules() { >> } >> >> _have_module_param() { >> - if ! modinfo -F parm -0 "$1" | grep -q -z "^$2:"; then >> + if ! [ -e "/sys/module/$1/parameters/$2" ]; then >> SKIP_REASON="$1 module does not have parameter $2" >> return 1 >> fi > > But this now fails if the module isn't loaded yet. IMHO we'll need to check if > "/sys/module/$1" exists and if it does check for > "/sys/module/$1/parameters/$2", if not try modinfo. > > Does that make sense? Yup, will fix for v2. Thanks, Logan
diff --git a/common/rc b/common/rc index 49050c71dabf..d48f73c5bf3d 100644 --- a/common/rc +++ b/common/rc @@ -48,7 +48,7 @@ _have_modules() { } _have_module_param() { - if ! modinfo -F parm -0 "$1" | grep -q -z "^$2:"; then + if ! [ -e "/sys/module/$1/parameters/$2" ]; then SKIP_REASON="$1 module does not have parameter $2" return 1 fi
Using modinfo fails if the given module is built-in. Instead, just check for the parameter's existence in sysfs. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)