Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 8 Nov 2021 14:31:32 -0800
From:   "Darrick J. Wong" <djwong@kernel.org>
To:     Lukas Czerner <lczerner@redhat.com>
Cc:     fstests@vger.kernel.org, linux-ext4@vger.kernel.org, guan@eryu.me
Subject: Re: [PATCH v2 1/2] common/rc: add _require_kernel_config and
 _has_kernel_config
Message-ID: <20211108223132.GB24255@magnolia>
References: <20211108151916.27845-1-lczerner@redhat.com>
 <20211108210423.28980-1-lczerner@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211108210423.28980-1-lczerner@redhat.com>
Precedence: bulk

On Mon, Nov 08, 2021 at 10:04:23PM +0100, Lukas Czerner wrote:
> Add _require_kernel_config() and _has_kernel_config() helpers to check
> whether a specific kernel configuration is enabled on the kernel.
> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> ---
> v2: Document KCONFIG_PATH in README
> 
>  README        |  2 ++
>  common/config |  1 +
>  common/rc     | 29 +++++++++++++++++++++++++++++
>  3 files changed, 32 insertions(+)
> 
> diff --git a/README b/README
> index 63f0641a..e9284b22 100644
> --- a/README
> +++ b/README
> @@ -129,6 +129,8 @@ Preparing system for tests:
>                 xfs_check to check the filesystem.  As of August 2021,
>                 xfs_repair finds all filesystem corruptions found by xfs_check,
>                 and more, which means that xfs_check is no longer run by default.
> +	     - Set KCONFIG_PATH to specify your preferred location of kernel
> +	       config file.

The indentation here looks kind of off, but the core logic looks
correct.

With that fixed:
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

>  
>          - or add a case to the switch in common/config assigning
>            these variables based on the hostname of your test
> diff --git a/common/config b/common/config
> index 164381b7..e0a5c5df 100644
> --- a/common/config
> +++ b/common/config
> @@ -226,6 +226,7 @@ export OPENSSL_PROG="$(type -P openssl)"
>  export ACCTON_PROG="$(type -P accton)"
>  export E2IMAGE_PROG="$(type -P e2image)"
>  export BLKZONE_PROG="$(type -P blkzone)"
> +export GZIP_PROG="$(type -P gzip)"
>  
>  # use 'udevadm settle' or 'udevsettle' to wait for lv to be settled.
>  # newer systems have udevadm command but older systems like RHEL5 don't.
> diff --git a/common/rc b/common/rc
> index 0d261184..84154868 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -4703,6 +4703,35 @@ _require_names_are_bytes() {
>          esac
>  }
>  
> +_has_kernel_config()
> +{
> +	option=$1
> +	uname=$(uname -r)
> +	config_list="$KCONFIG_PATH
> +		     /proc/config.gz
> +		     /lib/modules/$uname/build/.config
> +		     /boot/config-$uname
> +		     /lib/kernel/config-$uname"
> +
> +	for config in $config_list; do
> +		[ ! -f $config ] && continue
> +		[ $config = "/proc/config.gz" ] && break
> +		grep -qE "^${option}=[my]" $config
> +		return
> +	done
> +
> +	[ ! -f $config ] && _notrun "Could not locate kernel config file"
> +
> +	# We can only get here with /proc/config.gz
> +	_require_command "$GZIP_PROG" gzip
> +	$GZIP_PROG -cd $config | grep -qE "^${option}=[my]"
> +}
> +
> +_require_kernel_config()
> +{
> +	_has_kernel_config $1 || _notrun "Installed kernel not built with $1"
> +}
> +
>  init_rc
>  
>  ################################################################################
> -- 
> 2.31.1
>