From: Xiao Yang <ice_yangxiao@163.com>
To: Liam.Howlett@Oracle.com, linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org, ltp@lists.linux.it,
oliver.sang@intel.com, Xiao Yang <ice_yangxiao@163.com>
Subject: [PATCH] mm/vma: Return the exact errno for __split_vma() and mas_store_gfp()
Date: Mon, 9 Sep 2024 14:02:26 +0900 [thread overview]
Message-ID: <20240909050226.2053-1-ice_yangxiao@163.com> (raw)
__split_vma() and mas_store_gfp() returns several types of errno on
failure so don't ignore them in vms_gather_munmap_vmas(). For example,
__split_vma() returns -EINVAL when an unaligned huge page is unmapped.
This issue is reproduced by ltp memfd_create03 test.
Fixes: 6898c9039bc8 ("mm/vma: extract the gathering of vmas from do_vmi_align_munmap()")
Signed-off-by: Xiao Yang <ice_yangxiao@163.com>
Reported-by: kernel test robot <oliver.sang@intel.com>
Closes: https://lore.kernel.org/oe-lkp/202409081536.d283a0fb-oliver.sang@intel.com
---
mm/vma.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/mm/vma.c b/mm/vma.c
index 8d1686fc8d5a..3feeea9a8c3d 100644
--- a/mm/vma.c
+++ b/mm/vma.c
@@ -1200,7 +1200,8 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *vms,
goto start_split_failed;
}
- if (__split_vma(vms->vmi, vms->vma, vms->start, 1))
+ error = __split_vma(vms->vmi, vms->vma, vms->start, 1);
+ if (error)
goto start_split_failed;
}
vms->prev = vma_prev(vms->vmi);
@@ -1220,12 +1221,14 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *vms,
}
/* Does it split the end? */
if (next->vm_end > vms->end) {
- if (__split_vma(vms->vmi, next, vms->end, 0))
+ error = __split_vma(vms->vmi, next, vms->end, 0);
+ if (error)
goto end_split_failed;
}
vma_start_write(next);
mas_set(mas_detach, vms->vma_count++);
- if (mas_store_gfp(mas_detach, next, GFP_KERNEL))
+ error = mas_store_gfp(mas_detach, next, GFP_KERNEL);
+ if (error)
goto munmap_gather_failed;
vma_mark_detached(next, true);
--
2.46.0
next reply other threads:[~2024-09-09 5:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 5:02 Xiao Yang [this message]
2024-09-09 9:09 ` Lorenzo Stoakes
2024-09-09 12:55 ` 杨晓
2024-09-09 14:00 ` Liam R. Howlett
2024-09-10 13:37 ` Dan Carpenter
2024-09-10 13:55 ` Liam R. Howlett
2024-09-10 13:55 ` 杨晓
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=20240909050226.2053-1-ice_yangxiao@163.com \
--to=ice_yangxiao@163.com \
--cc=Liam.Howlett@Oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ltp@lists.linux.it \
--cc=oliver.sang@intel.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