From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BF96C433F5 for ; Thu, 7 Apr 2022 21:52:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D28726B0072; Thu, 7 Apr 2022 17:52:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CD8066B0073; Thu, 7 Apr 2022 17:52:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B534F6B0074; Thu, 7 Apr 2022 17:52:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id A67E96B0072 for ; Thu, 7 Apr 2022 17:52:46 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 66D06262FC for ; Thu, 7 Apr 2022 21:52:36 +0000 (UTC) X-FDA: 79331432712.07.B32FFBA Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id DFC2640003 for ; Thu, 7 Apr 2022 21:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649368355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pUVt4HvRAcRrp8jAWSNaIy2SDdBijJ3Vk+5LrS/EnzE=; b=Y5ytvYMEO1DSzam841sAVWZGm19xWHxlouQOB629oDI7pi29J88fxMJhcYTwJM2Jnb4O9P hJODEVBwxhUSOjyXpGskIGlTVoBQJY/nXe0V6cgUwlN1RX4goXChVGsaE9Omlv54HwUlXH 9sydEWtr6NN/QW+xs3RvtEkNW+7+1es= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-511-Gbo_NqXiPLupZaeLMu2mCQ-1; Thu, 07 Apr 2022 17:52:34 -0400 X-MC-Unique: Gbo_NqXiPLupZaeLMu2mCQ-1 Received: by mail-qv1-f72.google.com with SMTP id im8-20020a056214246800b00443d3d3956dso7775383qvb.22 for ; Thu, 07 Apr 2022 14:52:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=pUVt4HvRAcRrp8jAWSNaIy2SDdBijJ3Vk+5LrS/EnzE=; b=r9lnN3pvvhgl/jbTgjLg7pxCfMK2kab6NE9urXJ0IPIvAWoB8sFouRnWd/EaF0XBQG xKYaL/eK42EgoId6DUHwsDhdluwDQi5c2/97SrIYkwVOrwe2dMSnw3HJlc/2U33h+4Kd Q3oNUZc2NB2JPnt0rsVxxZl69lRmn5KrXufa118HUamulHNaSWcXL6lLyaEHWkfrXn0D iCLSFzMcNbHWC0j5L7EkUVpW2sIChpIE0RLavkh2F3xK6K025VzB3YCy8LsoJ9jCEtTO aaY0dwIGnpTo0UKmpVL0UuVkN4hCOWLEdvS9VoymQFHXEXsNY5h8nksQOjSwo+9XY1xS 9q8Q== X-Gm-Message-State: AOAM5316F1DAOLKh9mr6kt1TTyEoygUB5TxiyojpPznKGi94shI9yJiB bYsbfPm6THjJMgTAgXJDXM5o3sGD8h1bVrhrn7iPsYzwf27Mv1oq6kL6Fj0GJuwb/6cTCGmPEh3 okQ4rCfYC0fY= X-Received: by 2002:ac8:4993:0:b0:2eb:ba1e:a52e with SMTP id f19-20020ac84993000000b002ebba1ea52emr13169637qtq.148.1649368353819; Thu, 07 Apr 2022 14:52:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYJ6VITxc+pwdFKhvN3EJj/ApoYqfkFBTzIY3CbIcegb7xuzsWSnUtj7kwZJb+zSaLHXp41g== X-Received: by 2002:ac8:4993:0:b0:2eb:ba1e:a52e with SMTP id f19-20020ac84993000000b002ebba1ea52emr13169615qtq.148.1649368353508; Thu, 07 Apr 2022 14:52:33 -0700 (PDT) Received: from [192.168.0.188] ([24.48.139.231]) by smtp.gmail.com with ESMTPSA id x18-20020a05622a001200b002eb856d7786sm16937599qtw.84.2022.04.07.14.52.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 Apr 2022 14:52:33 -0700 (PDT) Message-ID: Date: Thu, 7 Apr 2022 17:52:31 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH v6] oom_kill.c: futex: Don't OOM reap the VMA containing the robust_list_head To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Rafael Aquini , Waiman Long , Baoquan He , Christoph von Recklinghausen , Don Dutile , "Herton R . Krzesinski" , David Rientjes , Michal Hocko , Andrea Arcangeli , Davidlohr Bueso , Thomas Gleixner , Peter Zijlstra , Ingo Molnar , Joel Savitz , Darren Hart References: <20220407184254.3612387-1-npache@redhat.com> <20220407131809.f2d256541e2c039c434c0d72@linux-foundation.org> From: Nico Pache In-Reply-To: <20220407131809.f2d256541e2c039c434c0d72@linux-foundation.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: 7k691eacbo16aamtsb3ra9gwrnp7cwmc Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Y5ytvYME; spf=none (imf17.hostedemail.com: domain of npache@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: DFC2640003 X-HE-Tag: 1649368355-323404 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi Andrew! On 4/7/22 16:18, Andrew Morton wrote: > On Thu, 7 Apr 2022 14:42:54 -0400 Nico Pache wrote: > >> The pthread struct is allocated on PRIVATE|ANONYMOUS memory [1] which can >> be targeted by the oom reaper. This mapping is used to store the futex >> robust list head; the kernel does not keep a copy of the robust list and >> instead references a userspace address to maintain the robustness during >> a process death. A race can occur between exit_mm and the oom reaper that >> allows the oom reaper to free the memory of the futex robust list before >> the exit path has handled the futex death: >> >> CPU1 CPU2 >> ------------------------------------------------------------------------ >> page_fault >> do_exit "signal" >> wake_oom_reaper >> oom_reaper >> oom_reap_task_mm (invalidates mm) >> exit_mm >> exit_mm_release >> futex_exit_release >> futex_cleanup >> exit_robust_list >> get_user (EFAULT- can't access memory) >> >> If the get_user EFAULT's, the kernel will be unable to recover the >> waiters on the robust_list, leaving userspace mutexes hung indefinitely. >> >> Use the robust_list address stored in the kernel to skip the VMA that holds >> it, allowing a successful futex_cleanup. >> >> Theoretically a failure can still occur if there are locks mapped as >> PRIVATE|ANON; however, the robust futexes are a best-effort approach. >> This patch only strengthens that best-effort. >> >> The following case can still fail: >> robust head (skipped) -> private lock (reaped) -> shared lock (skipped) >> >> Reproducer: https://gitlab.com/jsavitz/oom_futex_reproducer > > Should this fix be backported into -stable kernels? Yes I believe so. This is caused by the commit marked under 'Fixes:' which is in stable branch. > >> --- a/include/linux/oom.h >> +++ b/include/linux/oom.h >> @@ -106,7 +106,8 @@ static inline vm_fault_t check_stable_address_space(struct mm_struct *mm) >> return 0; >> } >> >> -bool __oom_reap_task_mm(struct mm_struct *mm); >> +bool __oom_reap_task_mm(struct mm_struct *mm, struct robust_list_head >> + __user *robust_list); > > Should explicitly include futex.h Good point. On second thought I think we also need to surround some of the changes with a ifdef CONFIG_FUTEX. current->robust_list is undefined if we turn that config option off. > >> long oom_badness(struct task_struct *p, >> unsigned long totalpages); >> diff --git a/mm/mmap.c b/mm/mmap.c >> index 3aa839f81e63..c14fe6f8e9a5 100644 >> --- a/mm/mmap.c >> +++ b/mm/mmap.c >> @@ -3126,7 +3126,8 @@ void exit_mmap(struct mm_struct *mm) >> * to mmu_notifier_release(mm) ensures mmu notifier callbacks in >> * __oom_reap_task_mm() will not block. >> */ >> - (void)__oom_reap_task_mm(mm); >> + (void)__oom_reap_task_mm(mm, current->robust_list); >> + >> set_bit(MMF_OOM_SKIP, &mm->flags); >> } >> >> diff --git a/mm/oom_kill.c b/mm/oom_kill.c >> index 7ec38194f8e1..727cfc3bd284 100644 >> --- a/mm/oom_kill.c >> +++ b/mm/oom_kill.c >> @@ -509,9 +509,11 @@ static DECLARE_WAIT_QUEUE_HEAD(oom_reaper_wait); >> static struct task_struct *oom_reaper_list; >> static DEFINE_SPINLOCK(oom_reaper_lock); >> >> -bool __oom_reap_task_mm(struct mm_struct *mm) >> +bool __oom_reap_task_mm(struct mm_struct *mm, struct robust_list_head >> + __user *robust_list) >> { > > It's pretty sad to make such a low-level function aware of futex > internals. How about making it a more general `void *skip_area'? Yes we can make this change. My concern is that the caller may now have to cast the type: __oom_reap_task_mm(mm_struct, (void*) current->robust_list). But I doubt that is a big concern. > >> struct vm_area_struct *vma; >> + unsigned long head = (unsigned long) robust_list; >> bool ret = true; >> >> /* >> @@ -526,6 +528,11 @@ bool __oom_reap_task_mm(struct mm_struct *mm) >> if (vma->vm_flags & (VM_HUGETLB|VM_PFNMAP)) >> continue; >> >> + if (vma->vm_start <= head && vma->vm_end > head) { > > This check as you have it is making assumptions about the length of the > area at *robust_list and about that area's relation to the area > represented by the vma. > > So if this is to be made more generic, we'd also need skip_area_len so > we can perform a full overlap check. Im not sure I follow here. Can a single MMAP call span multiple VMAs? The address would be part of the pthread_t struct which is mmapped by the userspace code. We are simply looking for that VMA and skipping the oom of it. It does not try to find the individual locks (allocated separately and represented on a LinkedList), it just prevents the reaping of the robust_list_head (part of pthread_t) which stores the start of this LL. If some of the locks are private (shared locks are not reaped) we may run into a case where this still fails; however, we haven't been able to reproduce this. Thanks for the review :) I will make the required changes for this to be more config independent. Cheers, -- Nico > > I dunno, maybe not worth it at this time, what do others think. > > But the special-casing in here is pretty painful. > >> + pr_info("oom_reaper: skipping vma, contains robust_list"); >> + continue; >> + } >> + >> /* >> * Only anonymous pages have a good chance to be dropped >> * without additional steps which we cannot afford as we >> @@ -587,7 +594,7 @@ static bool oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm) >> trace_start_task_reaping(tsk->pid); >> >> /* failed to reap part of the address space. Try again later */ >> - ret = __oom_reap_task_mm(mm); >> + ret = __oom_reap_task_mm(mm, tsk->robust_list); >> if (!ret) >> goto out_finish; >> >> @@ -1190,7 +1197,8 @@ SYSCALL_DEFINE2(process_mrelease, int, pidfd, unsigned int, flags) >> * Check MMF_OOM_SKIP again under mmap_read_lock protection to ensure >> * possible change in exit_mmap is seen >> */ >> - if (!test_bit(MMF_OOM_SKIP, &mm->flags) && !__oom_reap_task_mm(mm)) >> + if (!test_bit(MMF_OOM_SKIP, &mm->flags) && >> + !__oom_reap_task_mm(mm, p->robust_list)) >> ret = -EAGAIN; >> mmap_read_unlock(mm); >> >> -- >> 2.35.1 >