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 X-Spam-Level: X-Spam-Status: No, score=-23.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 439C4C07E9C for ; Wed, 7 Jul 2021 20:11:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2549461CC9 for ; Wed, 7 Jul 2021 20:11:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233163AbhGGUOJ (ORCPT ); Wed, 7 Jul 2021 16:14:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233148AbhGGUOI (ORCPT ); Wed, 7 Jul 2021 16:14:08 -0400 Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56753C061574 for ; Wed, 7 Jul 2021 13:11:28 -0700 (PDT) Received: by mail-oi1-x236.google.com with SMTP id r29so4805772oiw.13 for ; Wed, 07 Jul 2021 13:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :mime-version; bh=tkLvj3QVD7vexG4Xax0/Xf4fPxWesEvFOVTsRIctnbE=; b=DimYOBmWYQW/QLOGazZvGUH0cOp4BjeBWl22T5GUbw5wwRvZulCYsVwboNvrRtKgwq UttP+xcQqopqEmJD6lfcDBMwkXxLRzo/f/SBb31xXzpSiqzRSlNAV4u7fPRnCbdERf4M N43sXq0FVsEMNu1titCD6BMLDkz2zpPN+ncx2ARPRKlKM0SG0Y9sN34VgP4rYpAXkPYc HpInlzLrD5mBPl85Y5sp4MFCMAAgFK19Mv8ZUq5Hulea2JKiig9Mxr0xe7UzBOP8pluX u20w9JsZtnjA02ns/eiQtUMDKhoqTN12wsem090lv3CIc1F2oPoQwstOetuD2ObZUZom mcZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=tkLvj3QVD7vexG4Xax0/Xf4fPxWesEvFOVTsRIctnbE=; b=iBSX6ZuHasngv0cFOrJ4zmcgY1SQWEDYdUUoySD3ZeN/mjJ4i6CrXgKt046v/h2xux pf1M3rf31YJ2gOVynoez8RjWYxLyF0qypc0OqSquDUwOJtx5SMGS4JFlvZjPw6KbOlII 0aO5zfpWPs9aZ0y7GkHT1pPOZ2NBr9CNpe5rS5Cd/iLvwk6dJoDj9uXVsIAeI9B8CLJS mkLZkf3OryoPdK1t9cUu8bkjuD0uHw02Ir/95xOGp41oS5TXRvSC1Y/moNxkCoNqBnRk JSz8GSg5sW4DDy9mMnn66p/UuSthDlg370mv9EbAzqVE09UthqhAaEXdzycWY1qFLt4y +Tow== X-Gm-Message-State: AOAM533QPCuRcVveuf1yNTmBWb3jtZedvJPcFKkDGiFL6IvSAqxkLziD g3c1maXk5et99sPiRd85XIUaWA== X-Google-Smtp-Source: ABdhPJwD0mdBR7pybFHVGT2gLPjXxfazv3v8K3DlmpChS+1CEKZFMvIAsAQKMffg4mopu3SD6qgumw== X-Received: by 2002:aca:4288:: with SMTP id p130mr20635827oia.80.1625688687563; Wed, 07 Jul 2021 13:11:27 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id o2sm455650oia.47.2021.07.07.13.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 13:11:27 -0700 (PDT) Date: Wed, 7 Jul 2021 13:11:24 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.anvils To: Andrew Morton cc: Hugh Dickins , Alistair Popple , Jason Gunthorpe , Ralph Campbell , Christoph Hellwig , Yang Shi , "Kirill A. Shutemov" , Shakeel Butt , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/4] mm/rmap: fix new bug: premature return from page_mlock_one() In-Reply-To: <563ce5b2-7a44-5b4d-1dfd-59a0e65932a9@google.com> Message-ID: References: <563ce5b2-7a44-5b4d-1dfd-59a0e65932a9@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the unlikely race case that page_mlock_one() finds VM_LOCKED has been cleared by the time it got page table lock, page_vma_mapped_walk_done() must be called before returning, either explicitly, or by a final call to page_vma_mapped_walk() - otherwise the page table remains locked. Fixes: cd62734ca60d ("mm/rmap: split try_to_munlock from try_to_unmap") Signed-off-by: Hugh Dickins --- mm/rmap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 0e83c3be8568..1235368f0628 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1990,14 +1990,13 @@ static bool page_mlock_one(struct page *page, struct vm_area_struct *vma, * this function is never called when PageDoubleMap(). */ mlock_vma_page(page); + /* + * No need to scan further once the page is marked + * as mlocked. + */ page_vma_mapped_walk_done(&pvmw); + return false; } - - /* - * no need to continue scanning other vma's if the page has - * been locked. - */ - return false; } return true; -- 2.26.2 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 X-Spam-Level: X-Spam-Status: No, score=-23.6 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3791DC07E95 for ; Wed, 7 Jul 2021 20:11:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E2B6061CC8 for ; Wed, 7 Jul 2021 20:11:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2B6061CC8 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 903AF6B0011; Wed, 7 Jul 2021 16:11:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B3476B005D; Wed, 7 Jul 2021 16:11:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7546E6B006C; Wed, 7 Jul 2021 16:11:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id 567B06B0011 for ; Wed, 7 Jul 2021 16:11:29 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B370722BEB for ; Wed, 7 Jul 2021 20:11:28 +0000 (UTC) X-FDA: 78336886656.13.7E3FAF1 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by imf05.hostedemail.com (Postfix) with ESMTP id 48B0C50060BE for ; Wed, 7 Jul 2021 20:11:28 +0000 (UTC) Received: by mail-oi1-f176.google.com with SMTP id 65so2887755oie.11 for ; Wed, 07 Jul 2021 13:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :mime-version; bh=tkLvj3QVD7vexG4Xax0/Xf4fPxWesEvFOVTsRIctnbE=; b=DimYOBmWYQW/QLOGazZvGUH0cOp4BjeBWl22T5GUbw5wwRvZulCYsVwboNvrRtKgwq UttP+xcQqopqEmJD6lfcDBMwkXxLRzo/f/SBb31xXzpSiqzRSlNAV4u7fPRnCbdERf4M N43sXq0FVsEMNu1titCD6BMLDkz2zpPN+ncx2ARPRKlKM0SG0Y9sN34VgP4rYpAXkPYc HpInlzLrD5mBPl85Y5sp4MFCMAAgFK19Mv8ZUq5Hulea2JKiig9Mxr0xe7UzBOP8pluX u20w9JsZtnjA02ns/eiQtUMDKhoqTN12wsem090lv3CIc1F2oPoQwstOetuD2ObZUZom mcZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=tkLvj3QVD7vexG4Xax0/Xf4fPxWesEvFOVTsRIctnbE=; b=RJz6HrzWRmBAouyzDe7Mz1KIrMqmIi/XEm2gWRfUK0/Vu4mzojyFp5G8WUnefUW1oj TJ/4eM4rRnQJHnYsM+jrQGqIA21yZ8rlwNwQ57d8l9+MxmWnW47waQ2XMYPRKQGt9t6v Y1JjZjNyLD/1QI4+X97LJMuO+VKZOj5deLN3PQCGMPM3rePr68SxLQMsyH/q9ZzD1fea Ic8qvzxGq5fOuaPxOg/Ckg9P41HpeRcBlUszOXDEbWJxzldh2ywtSs5eklwQ1q4RP+ZG 8YcfIbimSU2AN0yumQSiYMq9z/uglNSFrJ3ANXhNeqAeObpwhYaja5o+a/pBj9fgOGI8 IXfw== X-Gm-Message-State: AOAM531734SlHQgfV7DeCyAUirF7RyvchuefuA/efDVYjZATVgGWXTQa 4T/kMtdAYpwNrgXSVEGP+bhbig== X-Google-Smtp-Source: ABdhPJwD0mdBR7pybFHVGT2gLPjXxfazv3v8K3DlmpChS+1CEKZFMvIAsAQKMffg4mopu3SD6qgumw== X-Received: by 2002:aca:4288:: with SMTP id p130mr20635827oia.80.1625688687563; Wed, 07 Jul 2021 13:11:27 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id o2sm455650oia.47.2021.07.07.13.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 13:11:27 -0700 (PDT) Date: Wed, 7 Jul 2021 13:11:24 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.anvils To: Andrew Morton cc: Hugh Dickins , Alistair Popple , Jason Gunthorpe , Ralph Campbell , Christoph Hellwig , Yang Shi , "Kirill A. Shutemov" , Shakeel Butt , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/4] mm/rmap: fix new bug: premature return from page_mlock_one() In-Reply-To: <563ce5b2-7a44-5b4d-1dfd-59a0e65932a9@google.com> Message-ID: References: <563ce5b2-7a44-5b4d-1dfd-59a0e65932a9@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspam-User: nil Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=DimYOBmW; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of hughd@google.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=hughd@google.com X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 48B0C50060BE X-Stat-Signature: 6syfcr3eu8wx4j88hes5j475qsj93rid X-HE-Tag: 1625688688-633904 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: In the unlikely race case that page_mlock_one() finds VM_LOCKED has been cleared by the time it got page table lock, page_vma_mapped_walk_done() must be called before returning, either explicitly, or by a final call to page_vma_mapped_walk() - otherwise the page table remains locked. Fixes: cd62734ca60d ("mm/rmap: split try_to_munlock from try_to_unmap") Signed-off-by: Hugh Dickins --- mm/rmap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 0e83c3be8568..1235368f0628 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1990,14 +1990,13 @@ static bool page_mlock_one(struct page *page, struct vm_area_struct *vma, * this function is never called when PageDoubleMap(). */ mlock_vma_page(page); + /* + * No need to scan further once the page is marked + * as mlocked. + */ page_vma_mapped_walk_done(&pvmw); + return false; } - - /* - * no need to continue scanning other vma's if the page has - * been locked. - */ - return false; } return true; -- 2.26.2