Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp3431045imm; Fri, 20 Jul 2018 17:10:09 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfHTBuqVbhqFATxR1oFuvEjNdX+2F1L8c4gkW57nYUkn1sp65mgBZeQRKHGcrU3nkhgHSVq X-Received: by 2002:a63:ae42:: with SMTP id e2-v6mr3840663pgp.351.1532131808968; Fri, 20 Jul 2018 17:10:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532131808; cv=none; d=google.com; s=arc-20160816; b=AONkqbcw/wPhN9DBaWAqm6VtyfA8VOOmgkpyh+AQSQAdkTowpn5/V8Q/0rPrDOOSQI qV2tOrLvJVjPNtZUVG7syJpKwNZedddOdI+EwSAx810ERov5qTN+dwN9cJKlyg/EAyCl PRfDTln7oYtBRppmFsPH4Pe2efX4CjBI1p73qbNuoREpBt3S2RwAmmvBuJm14vOITrfs itDGkW0Qk5MVHSZXsRbpanBeckYNxvKjZEVKJfiONccnSIRQWOV6gB28vyXADLmdK1tg GVexpV7iA8WIFfoipjT9QpD0UYR5U8lLsczSLRcx9I1ZCcn1gmM2Ed4KTxaOcfr+4xuA CJ4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :arc-authentication-results; bh=QOToX9lKlSaF3fM7cantjZBj6oakecjVPqfZddOk7eg=; b=rmNe777A0uNxqon7W+gIa/8kcxCxVHdORzeJxF/S4f2oLP6iPQ8L22EmUpSmEMd3fl 7SCm1AplAYbdM1vEeAK30RVBDW9vPkJwydii+cvoY4aTLLOPx0rrDWeeWGwNxzXTlaO2 4ekA11WZBylwc5A7IXI41EcQ9v89i7fvQjvGW/4bOzC5v72OJkI7j1PBwonyqwBKFlTQ Jr/r8e5AMARIQ3VWMZnECr5qiXjsfRUkf6cF3PfbBW3+BGFuqmanRH1wXO28nK/6WIgu eP076EBM9QfOSY/Zbb2UoTVtTbqlZJfh7C96JnSBJwL8kn+TpdkPOj0vUzXOWBiVcN3Y vxig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z72-v6si2588205pgd.646.2018.07.20.17.09.54; Fri, 20 Jul 2018 17:10:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728333AbeGUA7k (ORCPT + 99 others); Fri, 20 Jul 2018 20:59:40 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:44382 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727404AbeGUA7k (ORCPT ); Fri, 20 Jul 2018 20:59:40 -0400 Received: from akpm3.svl.corp.google.com (unknown [104.133.9.92]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id B5024F2A; Sat, 21 Jul 2018 00:09:03 +0000 (UTC) Date: Fri, 20 Jul 2018 17:09:02 -0700 From: Andrew Morton To: Michal Hocko Cc: LKML , , Michal Hocko , "David (ChunMing) Zhou" , Paolo Bonzini , Radim =?UTF-8?Q?Kr=C4=8Dm=C3=A1=C5=99?= , Alex Deucher , David Airlie , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Doug Ledford , Jason Gunthorpe , Mike Marciniszyn , Dennis Dalessandro , Sudeep Dutt , Ashutosh Dixit , Dimitri Sivanich , Boris Ostrovsky , Juergen Gross , =?ISO-8859-1?Q?J=E9r=F4me?= Glisse , Andrea Arcangeli , Felix Kuehling , kvm@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-rdma@vger.kernel.org, xen-devel@lists.xenproject.org, Christian =?ISO-8859-1?Q?K=F6nig?= , David Rientjes , Leon Romanovsky Subject: Re: [PATCH] mm, oom: distinguish blockable mode for mmu notifiers Message-Id: <20180720170902.d1137060c23802d55426aa03@linux-foundation.org> In-Reply-To: <20180716115058.5559-1-mhocko@kernel.org> References: <20180716115058.5559-1-mhocko@kernel.org> X-Mailer: Sylpheed 3.6.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 16 Jul 2018 13:50:58 +0200 Michal Hocko wrote: > From: Michal Hocko > > There are several blockable mmu notifiers which might sleep in > mmu_notifier_invalidate_range_start and that is a problem for the > oom_reaper because it needs to guarantee a forward progress so it cannot > depend on any sleepable locks. > > ... > > @@ -571,7 +565,12 @@ static bool oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm) > > trace_start_task_reaping(tsk->pid); > > - __oom_reap_task_mm(mm); > + /* failed to reap part of the address space. Try again later */ > + if (!__oom_reap_task_mm(mm)) { > + up_read(&mm->mmap_sem); > + ret = false; > + goto unlock_oom; > + } This function is starting to look a bit screwy. : static bool oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm) : { : if (!down_read_trylock(&mm->mmap_sem)) { : trace_skip_task_reaping(tsk->pid); : return false; : } : : /* : * MMF_OOM_SKIP is set by exit_mmap when the OOM reaper can't : * work on the mm anymore. The check for MMF_OOM_SKIP must run : * under mmap_sem for reading because it serializes against the : * down_write();up_write() cycle in exit_mmap(). : */ : if (test_bit(MMF_OOM_SKIP, &mm->flags)) { : up_read(&mm->mmap_sem); : trace_skip_task_reaping(tsk->pid); : return true; : } : : trace_start_task_reaping(tsk->pid); : : /* failed to reap part of the address space. Try again later */ : if (!__oom_reap_task_mm(mm)) { : up_read(&mm->mmap_sem); : return true; : } : : pr_info("oom_reaper: reaped process %d (%s), now anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n", : task_pid_nr(tsk), tsk->comm, : K(get_mm_counter(mm, MM_ANONPAGES)), : K(get_mm_counter(mm, MM_FILEPAGES)), : K(get_mm_counter(mm, MM_SHMEMPAGES))); : up_read(&mm->mmap_sem); : : trace_finish_task_reaping(tsk->pid); : return true; : } - Undocumented return value. - comment "failed to reap part..." is misleading - sounds like it's referring to something which happened in the past, is in fact referring to something which might happen in the future. - fails to call trace_finish_task_reaping() in one case - code duplication. I'm thinking it wants to be something like this? : /* : * Return true if we successfully acquired (then released) mmap_sem : */ : static bool oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm) : { : if (!down_read_trylock(&mm->mmap_sem)) { : trace_skip_task_reaping(tsk->pid); : return false; : } : : /* : * MMF_OOM_SKIP is set by exit_mmap when the OOM reaper can't : * work on the mm anymore. The check for MMF_OOM_SKIP must run : * under mmap_sem for reading because it serializes against the : * down_write();up_write() cycle in exit_mmap(). : */ : if (test_bit(MMF_OOM_SKIP, &mm->flags)) { : trace_skip_task_reaping(tsk->pid); : goto out; : } : : trace_start_task_reaping(tsk->pid); : : if (!__oom_reap_task_mm(mm)) { : /* Failed to reap part of the address space. Try again later */ : goto finish; : } : : pr_info("oom_reaper: reaped process %d (%s), now anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n", : task_pid_nr(tsk), tsk->comm, : K(get_mm_counter(mm, MM_ANONPAGES)), : K(get_mm_counter(mm, MM_FILEPAGES)), : K(get_mm_counter(mm, MM_SHMEMPAGES))); : finish: : trace_finish_task_reaping(tsk->pid); : out: : up_read(&mm->mmap_sem); : return true; : } - Increases mmap_sem hold time a little by moving trace_finish_task_reaping() inside the locked region. So sue me ;) - Sharing the finish: path means that the trace event won't distinguish between the two sources of finishing. Please take a look?