On Thu, Feb 23, 2023 at 08:39:58PM -0800, Stefan Roesch wrote:
> This adds a new prctl to API to enable and disable KSM on a per process
> basis instead of only at the VMA basis (with madvise).
>
> 1) Introduce new MMF_VM_MERGE_ANY flag
>
> This introduces the new flag MMF_VM_MERGE_ANY flag. When this flag is
> set, kernel samepage merging (ksm) gets enabled for all vma's of a
> process.
>
> 2) add flag to __ksm_enter
>
> This change adds the flag parameter to __ksm_enter. This allows to
> distinguish if ksm was called by prctl or madvise.
>
> 3) add flag to __ksm_exit call
>
> This adds the flag parameter to the __ksm_exit() call. This allows to
> distinguish if this call is for an prctl or madvise invocation.
>
> 4) invoke madvise for all vmas in scan_get_next_rmap_item
>
> If the new flag MMF_VM_MERGE_ANY has been set for a process, iterate
> over all the vmas and enable ksm if possible. For the vmas that can be
> ksm enabled this is only done once.
>
> 5) support disabling of ksm for a process
>
> This adds the ability to disable ksm for a process if ksm has been
> enabled for the process.
>
> 6) add new prctl option to get and set ksm for a process
>
> This adds two new options to the prctl system call
> - enable ksm for all vmas of a process (if the vmas support it).
> - query if ksm has been enabled for a process.
>
> Signed-off-by: Stefan Roesch <shr@xxxxxxxxxxxx>
Hey Stefan, thanks for merging the patches into one. I found it much
easier to review.
Overall this looks straight-forward to me. A few comments below:
> @@ -2659,6 +2660,34 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
> case PR_SET_VMA:
> error = prctl_set_vma(arg2, arg3, arg4, arg5);
> break;
> +#ifdef CONFIG_KSM
> + case PR_SET_MEMORY_MERGE:
> + if (!capable(CAP_SYS_RESOURCE))
> + return -EPERM;
> +
> + if (arg2) {
> + if (mmap_write_lock_killable(me->mm))
> + return -EINTR;
> +
> + if (test_bit(MMF_VM_MERGEABLE, &me->mm->flags))
> + error = -EINVAL;
So if the workload has already madvised specific VMAs the
process-enablement will fail. Why is that? Shouldn't it be possible to
override a local decision from an outside context that has more
perspective on both sharing opportunities and security aspects?
If there is a good reason for it, the -EINVAL should be addressed in
the manpage. And maybe add a comment here as well.
> + else if (!test_bit(MMF_VM_MERGE_ANY, &me->mm->flags))
> + error = __ksm_enter(me->mm, MMF_VM_MERGE_ANY);
> + mmap_write_unlock(me->mm);
> + } else {
> + __ksm_exit(me->mm, MMF_VM_MERGE_ANY);
> + }
> + break;
> + case PR_GET_MEMORY_MERGE:
> + if (!capable(CAP_SYS_RESOURCE))
> + return -EPERM;
> +
> + if (arg2 || arg3 || arg4 || arg5)
> + return -EINVAL;
> +
> + error = !!test_bit(MMF_VM_MERGE_ANY, &me->mm->flags);
> + break;
> +#endif
> default:
> error = -EINVAL;
> break;
> diff --git a/mm/ksm.c b/mm/ksm.c
> index 56808e3bfd19..23d6944f78ad 100644
> --- a/mm/ksm.c
> +++ b/mm/ksm.c
> @@ -1063,6 +1063,7 @@ static int unmerge_and_remove_all_rmap_items(void)
>
> mm_slot_free(mm_slot_cache, mm_slot);
> clear_bit(MMF_VM_MERGEABLE, &mm->flags);
> + clear_bit(MMF_VM_MERGE_ANY, &mm->flags);
> mmdrop(mm);
> } else
> spin_unlock(&ksm_mmlist_lock);
> @@ -2329,6 +2330,17 @@ static struct ksm_rmap_item *get_next_rmap_item(struct ksm_mm_slot *mm_slot,
> return rmap_item;
> }
>
> +static bool vma_ksm_mergeable(struct vm_area_struct *vma)
> +{
> + if (vma->vm_flags & VM_MERGEABLE)
> + return true;
> +
> + if (test_bit(MMF_VM_MERGE_ANY, &vma->vm_mm->flags))
> + return true;
> +
> + return false;
> +}
> +
> static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page)
> {
> struct mm_struct *mm;
> @@ -2405,8 +2417,20 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page)
> goto no_vmas;
>
> for_each_vma(vmi, vma) {
> - if (!(vma->vm_flags & VM_MERGEABLE))
> + if (!vma_ksm_mergeable(vma))
> continue;
> + if (!(vma->vm_flags & VM_MERGEABLE)) {
IMO, the helper obscures the interaction between the vma flag and the
per-process flag here. How about:
if (!(vma->vm_flags & VM_MERGEABLE)) {
if (!test_bit(MMF_VM_MERGE_ANY, &vma->vm_mm->flags))
continue;
/*
* With per-process merging enabled, have the MM scan
* enroll any existing and new VMAs on the fly.
*
ksm_madvise();
}
> + unsigned long flags = vma->vm_flags;
> +
> + /* madvise failed, use next vma */
> + if (ksm_madvise(vma, vma->vm_start, vma->vm_end, MADV_MERGEABLE, &flags))
> + continue;
> + /* vma, not supported as being mergeable */
> + if (!(flags & VM_MERGEABLE))
> + continue;
> +
> + vm_flags_set(vma, VM_MERGEABLE);
I don't understand the local flags. Can't it pass &vma->vm_flags to
ksm_madvise()? It'll set VM_MERGEABLE on success. And you know it
wasn't set before because the whole thing is inside the !set
branch. The return value doesn't seem super useful, it's only the flag
setting that matters:
ksm_madvise(vma, vma->vm_start, vma->vm_end, MADV_MERGEABLE, &vma->vm_flags);
/* madvise can fail, and will skip special vmas (pfnmaps and such) */
if (!(vma->vm_flags & VM_MERGEABLE))
continue;
> + }
> if (ksm_scan.address < vma->vm_start)
> ksm_scan.address = vma->vm_start;
> if (!vma->anon_vma)
> @@ -2491,6 +2515,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page)
>
> mm_slot_free(mm_slot_cache, mm_slot);
> clear_bit(MMF_VM_MERGEABLE, &mm->flags);
> + clear_bit(MMF_VM_MERGE_ANY, &mm->flags);
> mmap_read_unlock(mm);
> mmdrop(mm);
> } else {
> @@ -2664,12 +2690,39 @@ int __ksm_enter(struct mm_struct *mm)
> return 0;
> }
>
> -void __ksm_exit(struct mm_struct *mm)
> +static void unmerge_vmas(struct mm_struct *mm)
> +{
> + struct vm_area_struct *vma;
> + struct vma_iterator vmi;
> +
> + vma_iter_init(&vmi, mm, 0);
> +
> + mmap_read_lock(mm);
> + for_each_vma(vmi, vma) {
> + if (vma->vm_flags & VM_MERGEABLE) {
> + unsigned long flags = vma->vm_flags;
> +
> + if (ksm_madvise(vma, vma->vm_start, vma->vm_end, MADV_UNMERGEABLE, &flags))
> + continue;
> +
> + vm_flags_clear(vma, VM_MERGEABLE);
ksm_madvise() tests and clears VM_MERGEABLE, so AFAICS
for_each_vma(vmi, vma)
ksm_madvise();
should do it...
> + }
> + }
> + mmap_read_unlock(mm);
> +}
> +
> +void __ksm_exit(struct mm_struct *mm, int flag)
> {
> struct ksm_mm_slot *mm_slot;
> struct mm_slot *slot;
> int easy_to_free = 0;
>
> + if (!(current->flags & PF_EXITING) && flag == MMF_VM_MERGE_ANY &&
> + test_bit(MMF_VM_MERGE_ANY, &mm->flags)) {
> + clear_bit(MMF_VM_MERGE_ANY, &mm->flags);
> + unmerge_vmas(mm);
...and then it's short enough to just open-code it here and drop the
unmerge_vmas() helper.
