diff mbox series

[v1] Skip cgroup-related tests if `/sys/fs/cgroup` readonly

Message ID 20230925144206.16895-1-mkittler@suse.de
State Accepted
Headers show
Series [v1] Skip cgroup-related tests if `/sys/fs/cgroup` readonly | expand

Commit Message

Marius Kittler Sept. 25, 2023, 2:42 p.m. UTC
Otherwise clone303 fails with TBROK when `/sys/fs/cgroup` is mounted as
read-only which is normal in a container. The test result should better
be TCONF like it is already done in case of a permission error.

Signed-off-by: Marius Kittler <mkittler@suse.de>
---
 lib/tst_cgroup.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Petr Vorel Sept. 25, 2023, 3:17 p.m. UTC | #1
Hi all,

> Otherwise clone303 fails with TBROK when `/sys/fs/cgroup` is mounted as
> read-only which is normal in a container. The test result should better
> be TCONF like it is already done in case of a permission error.

Reviewed-by: Petr Vorel <pvorel@suse.cz>

IMHO another candidate for merging before release.

Kind regards,
Petr

> Signed-off-by: Marius Kittler <mkittler@suse.de>
> ---
>  lib/tst_cgroup.c | 3 +++
>  1 file changed, 3 insertions(+)

> diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c
> index fdeac6059..5240aadaa 100644
> --- a/lib/tst_cgroup.c
> +++ b/lib/tst_cgroup.c
> @@ -383,6 +383,9 @@ static void cgroup_dir_mk(const struct cgroup_dir *const parent,
>  		tst_brk(TCONF | TERRNO,
>  			"Lack permission to make '%s/%s'; premake it or run as root",
>  			dpath, dir_name);
> +	} else if (errno == EROFS) {
> +		tst_brk(TCONF | TERRNO, "'%s/%s' must not be read-only",
> +			dpath, dir_name);
>  	} else {
>  		tst_brk(TBROK | TERRNO,
>  			"mkdirat(%d<%s>, '%s', 0777)",
Wei Gao Sept. 26, 2023, 7:12 a.m. UTC | #2
On Mon, Sep 25, 2023 at 05:17:28PM +0200, Petr Vorel wrote:
> Hi all,
> 
> > Otherwise clone303 fails with TBROK when `/sys/fs/cgroup` is mounted as
> > read-only which is normal in a container. The test result should better
> > be TCONF like it is already done in case of a permission error.
> 
> Reviewed-by: Petr Vorel <pvorel@suse.cz>
  Tested-by: Wei Gao <wegao@suse.com>
> 
> IMHO another candidate for merging before release.
> 
> Kind regards,
> Petr
> 
> > Signed-off-by: Marius Kittler <mkittler@suse.de>
> > ---
> >  lib/tst_cgroup.c | 3 +++
> >  1 file changed, 3 insertions(+)
> 
> > diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c
> > index fdeac6059..5240aadaa 100644
> > --- a/lib/tst_cgroup.c
> > +++ b/lib/tst_cgroup.c
> > @@ -383,6 +383,9 @@ static void cgroup_dir_mk(const struct cgroup_dir *const parent,
> >  		tst_brk(TCONF | TERRNO,
> >  			"Lack permission to make '%s/%s'; premake it or run as root",
> >  			dpath, dir_name);
> > +	} else if (errno == EROFS) {
> > +		tst_brk(TCONF | TERRNO, "'%s/%s' must not be read-only",
> > +			dpath, dir_name);
> >  	} else {
> >  		tst_brk(TBROK | TERRNO,
> >  			"mkdirat(%d<%s>, '%s', 0777)",
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp
Richard Palethorpe Sept. 26, 2023, 10:27 a.m. UTC | #3
Hello,

Marius Kittler <mkittler@suse.de> writes:

> Otherwise clone303 fails with TBROK when `/sys/fs/cgroup` is mounted as
> read-only which is normal in a container. The test result should better
> be TCONF like it is already done in case of a permission error.
>
> Signed-off-by: Marius Kittler <mkittler@suse.de>

Reviewed-by: Richard Palethorpe <rpalethorpe@suse.com>

> ---
>  lib/tst_cgroup.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c
> index fdeac6059..5240aadaa 100644
> --- a/lib/tst_cgroup.c
> +++ b/lib/tst_cgroup.c
> @@ -383,6 +383,9 @@ static void cgroup_dir_mk(const struct cgroup_dir *const parent,
>  		tst_brk(TCONF | TERRNO,
>  			"Lack permission to make '%s/%s'; premake it or run as root",
>  			dpath, dir_name);
> +	} else if (errno == EROFS) {
> +		tst_brk(TCONF | TERRNO, "'%s/%s' must not be read-only",
> +			dpath, dir_name);
>  	} else {
>  		tst_brk(TBROK | TERRNO,
>  			"mkdirat(%d<%s>, '%s', 0777)",
> -- 
> 2.42.0
Petr Vorel Sept. 27, 2023, 5:43 a.m. UTC | #4
Hi Richie, Wei,

thanks for your review/testing, merged.

Kind regards,
Petr
Petr Vorel Sept. 27, 2023, 5:52 a.m. UTC | #5
Hi,

...
> > Reviewed-by: Petr Vorel <pvorel@suse.cz>
>   Tested-by: Wei Gao <wegao@suse.com>
    ^
	Unwanted whitespace before the tag.

Wei, please don't put this whitespace space next time.

Not only this is wrong, but it breaks automatic adding of your tag.
Patchwork (https://patchwork.ozlabs.org/project/ltp/list/) which we use for
downloading patches automatically adds all tags associated with the patch,
unless there is whitespace before the tag.

Kind regards,
Petr
Wei Gao Sept. 27, 2023, 7:36 a.m. UTC | #6
On Wed, Sep 27, 2023 at 07:52:21AM +0200, Petr Vorel wrote:
> Hi,
> 
> ...
> > > Reviewed-by: Petr Vorel <pvorel@suse.cz>
> >   Tested-by: Wei Gao <wegao@suse.com>
>     ^
> 	Unwanted whitespace before the tag.
> 
> Wei, please don't put this whitespace space next time.
> 
> Not only this is wrong, but it breaks automatic adding of your tag.
> Patchwork (https://patchwork.ozlabs.org/project/ltp/list/) which we use for
> downloading patches automatically adds all tags associated with the patch,
> unless there is whitespace before the tag.
Got it. Thanks for correcting the error.
> 
> Kind regards,
> Petr
diff mbox series

Patch

diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c
index fdeac6059..5240aadaa 100644
--- a/lib/tst_cgroup.c
+++ b/lib/tst_cgroup.c
@@ -383,6 +383,9 @@  static void cgroup_dir_mk(const struct cgroup_dir *const parent,
 		tst_brk(TCONF | TERRNO,
 			"Lack permission to make '%s/%s'; premake it or run as root",
 			dpath, dir_name);
+	} else if (errno == EROFS) {
+		tst_brk(TCONF | TERRNO, "'%s/%s' must not be read-only",
+			dpath, dir_name);
 	} else {
 		tst_brk(TBROK | TERRNO,
 			"mkdirat(%d<%s>, '%s', 0777)",