| Message ID | 1671434187-2038-2-git-send-email-xuyang2018.jy@fujitsu.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] tst_kvercmp: Add rhel9 support | expand |
On Mon, Dec 19, 2022 at 2:16 PM Yang Xu <xuyang2018.jy@fujitsu.com> wrote: > The kernel patch has been merged on RHEL9. You can see it > in url[1], to avoid false report, so add a fallback for this. > > [1] > http://www.rpmfind.net/linux/RPM/centos-stream/9/baseos/x86_64/kernel-5.14.0-205.el9.x86_64.html > Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> > Reviewed-by: Li Wang <liwang@redhat.com> --- > testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh > b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh > index 004946456..dbb61e6b1 100755 > --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh > +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh > @@ -403,7 +403,9 @@ fi > > # Post 4.16 kernel updates stat in batch (> 32 pages) every time > # Post 6.1 kernel updates stat in batch (> 64 pages) every time > -if tst_kvcmp -lt "6.1"; then > +# 1813e51eece0ad6 ("memcg: increase MEMCG_CHARGE_BATCH to 64") > +# has been merged since 5.14.0-191.el9. > +if tst_kvcmp -lt "6.1 RHEL9:5.14.0-191" ; then > PAGESIZES=$(($PAGESIZE * 33)) > else > PAGESIZES=$(($PAGESIZE * 65)) > -- > 2.31.1 > >
diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh index 004946456..dbb61e6b1 100755 --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh @@ -403,7 +403,9 @@ fi # Post 4.16 kernel updates stat in batch (> 32 pages) every time # Post 6.1 kernel updates stat in batch (> 64 pages) every time -if tst_kvcmp -lt "6.1"; then +# 1813e51eece0ad6 ("memcg: increase MEMCG_CHARGE_BATCH to 64") +# has been merged since 5.14.0-191.el9. +if tst_kvcmp -lt "6.1 RHEL9:5.14.0-191" ; then PAGESIZES=$(($PAGESIZE * 33)) else PAGESIZES=$(($PAGESIZE * 65))
The kernel patch has been merged on RHEL9. You can see it in url[1], to avoid false report, so add a fallback for this. [1]http://www.rpmfind.net/linux/RPM/centos-stream/9/baseos/x86_64/kernel-5.14.0-205.el9.x86_64.html Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> --- testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)