| Message ID | 20220725134100.128035-1-iii@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | linux-user: Do not treat madvise()'s advice as a bitmask | expand |
Le 25/07/2022 à 15:41, Ilya Leoshkevich a écrit : > Advice is enum, not flags. Doing (advice & MADV_DONTNEED) also matches > e.g. MADV_MERGEABLE. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > linux-user/mmap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux-user/mmap.c b/linux-user/mmap.c > index 4e7a6be6ee..edceaca4a8 100644 > --- a/linux-user/mmap.c > +++ b/linux-user/mmap.c > @@ -891,7 +891,7 @@ abi_long target_madvise(abi_ulong start, abi_ulong len_in, int advice) > * anonymous mappings. In this case passthrough is safe, so do it. > */ > mmap_lock(); > - if ((advice & MADV_DONTNEED) && > + if (advice == MADV_DONTNEED && > can_passthrough_madv_dontneed(start, end)) { > ret = get_errno(madvise(g2h_untagged(start), len, MADV_DONTNEED)); > } Fixes: 892a4f6a750a ("linux-user: Add partial support for MADV_DONTNEED") Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Le 25/07/2022 à 15:41, Ilya Leoshkevich a écrit : > Advice is enum, not flags. Doing (advice & MADV_DONTNEED) also matches > e.g. MADV_MERGEABLE. > > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > linux-user/mmap.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/linux-user/mmap.c b/linux-user/mmap.c > index 4e7a6be6ee..edceaca4a8 100644 > --- a/linux-user/mmap.c > +++ b/linux-user/mmap.c > @@ -891,7 +891,7 @@ abi_long target_madvise(abi_ulong start, abi_ulong len_in, int advice) > * anonymous mappings. In this case passthrough is safe, so do it. > */ > mmap_lock(); > - if ((advice & MADV_DONTNEED) && > + if (advice == MADV_DONTNEED && > can_passthrough_madv_dontneed(start, end)) { > ret = get_errno(madvise(g2h_untagged(start), len, MADV_DONTNEED)); > } Applied to my linux-user-for-7.1 branch. Thanks, Laurent
diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 4e7a6be6ee..edceaca4a8 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -891,7 +891,7 @@ abi_long target_madvise(abi_ulong start, abi_ulong len_in, int advice) * anonymous mappings. In this case passthrough is safe, so do it. */ mmap_lock(); - if ((advice & MADV_DONTNEED) && + if (advice == MADV_DONTNEED && can_passthrough_madv_dontneed(start, end)) { ret = get_errno(madvise(g2h_untagged(start), len, MADV_DONTNEED)); }
Advice is enum, not flags. Doing (advice & MADV_DONTNEED) also matches e.g. MADV_MERGEABLE. Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- linux-user/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)