Stable Archive mirror
 help / color / mirror / Atom feed
From: Shuah Khan <skhan@linuxfoundation.org>
To: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>,
	stable@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>
Cc: shuah@kernel.org, sashal@kernel.org, vegard.nossum@oracle.com,
	darren.kenny@oracle.com, Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: [PATCH 4.19.y] Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems"
Date: Wed, 8 May 2024 16:07:31 -0600	[thread overview]
Message-ID: <527dd523-18c3-44bc-b8e6-adad397cdb43@linuxfoundation.org> (raw)
In-Reply-To: <20240506105724.3068232-1-harshit.m.mogalapalli@oracle.com>

On 5/6/24 04:57, Harshit Mogalapalli wrote:
> This reverts commit abdbd5f3e8c504d864fdc032dd5a4eb481cb12bf.
> 
> map_hugetlb.c:18:10: fatal error: vm_util.h: No such file or directory
>     18 | #include "vm_util.h"
>        |          ^~~~~~~~~~~
> compilation terminated.
> 
> vm_util.h is not present in 4.19.y, as commit:642bc52aed9c ("selftests:
> vm: bring common functions to a new file") is not present in stable
> kernels <=6.1.y
> 
> Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
> ---

Looks good to me. Adding Andrew.

> This can't be tested on 4.19.y as the selftests for vm/ are not
> compiled since 4.19.17. I have bisected it to this one, commit:
> 7696248f9b5a ("selftests: Fix test errors related to lib.mk khdr
> target"), the reason for reverting it on 4.19.y is to keep 4.19.y in
> sync with higher stable trees(i.e reverts are sent to 5.4.y, 5.10.y and
> 5.15.y)
> ---
>   tools/testing/selftests/vm/map_hugetlb.c | 7 -------
>   1 file changed, 7 deletions(-)
> 
> diff --git a/tools/testing/selftests/vm/map_hugetlb.c b/tools/testing/selftests/vm/map_hugetlb.c
> index c65c55b7a789..312889edb84a 100644
> --- a/tools/testing/selftests/vm/map_hugetlb.c
> +++ b/tools/testing/selftests/vm/map_hugetlb.c
> @@ -15,7 +15,6 @@
>   #include <unistd.h>
>   #include <sys/mman.h>
>   #include <fcntl.h>
> -#include "vm_util.h"
>   
>   #define LENGTH (256UL*1024*1024)
>   #define PROTECTION (PROT_READ | PROT_WRITE)
> @@ -71,16 +70,10 @@ int main(int argc, char **argv)
>   {
>   	void *addr;
>   	int ret;
> -	size_t hugepage_size;
>   	size_t length = LENGTH;
>   	int flags = FLAGS;
>   	int shift = 0;
>   
> -	hugepage_size = default_huge_page_size();
> -	/* munmap with fail if the length is not page aligned */
> -	if (hugepage_size > length)
> -		length = hugepage_size;
> -
>   	if (argc > 1)
>   		length = atol(argv[1]) << 20;
>   	if (argc > 2) {


      reply	other threads:[~2024-05-08 22:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-06 10:57 [PATCH 4.19.y] Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems" Harshit Mogalapalli
2024-05-08 22:07 ` Shuah Khan [this message]

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=527dd523-18c3-44bc-b8e6-adad397cdb43@linuxfoundation.org \
    --to=skhan@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=darren.kenny@oracle.com \
    --cc=harshit.m.mogalapalli@oracle.com \
    --cc=sashal@kernel.org \
    --cc=shuah@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=vegard.nossum@oracle.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).