Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp1940038imn; Mon, 1 Aug 2022 05:50:03 -0700 (PDT) X-Google-Smtp-Source: AA6agR5EVsEgfO+RaTphjWVOmhSxpUlfJapVn80hQeCTXoCXReuXqbz/L3wLojeSPCi4KY1bprof X-Received: by 2002:a17:903:2c6:b0:16a:276a:ad81 with SMTP id s6-20020a17090302c600b0016a276aad81mr17122159plk.65.1659358203103; Mon, 01 Aug 2022 05:50:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659358203; cv=none; d=google.com; s=arc-20160816; b=t7EBb4VmnoE0RMCHZKvMum62+G9Fz0b3snhMYFjYIBrNsxQvsEoVxK85szMCKrURNX A38Pknnc2XzVibJKVmL9lwyXYIMOtprzS8bP47weUIQq6/3SO0l2NfL0Are7SQUOyCXZ MIQ/3NoYC6skPGpy/+PaV3VP01OiennXyNPKElByxasyQMaBIs9oAEMnJ9dzfQ9sebSS GNyHTcMeZ7Dcwa09ZNheklzV/oEwVxrEJr5CaP3N9+GrMVxYzTrxWSPLUl5nUsruhZcD k21rc0MgbNKUpVc/Cvre03YPj9Y72z0ZIT2KewrFXriBN8/1aaMQFd11AZfDP6+eEHo6 70aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ty51a072ipNYg3gJtpR0WqhAGt2QUqITDqlglMkqESo=; b=lTk/Y8ldhdS8nZOV5peJgcDHfcKy5s4wY2/4EeWujbUF12OG18xGQaUoVw9UovYSxn zBaLGjUvyAbFoGhDeRv1a5RSJT9eAFcax/jnekpqCccJprLzvBpigyLscPnM/8oVwyrT Nab2lyZoZ/Sk5fXjvK+UKVxognQREvB3st30VCACKTir4FiJ2buatTktUurGrH6duWOJ xMYwS4OQ+Qge9zDFe1K5cHYcfEnP7thvm/BN94cR34vQuRXirC2ZG/bfg9ji591e1gBe WyzrW+fe2tDxM1JOoiNJTbabe3yXtQPgMS1eI4LhWEW2pntNbEuHhw+jqglFg8Hgz8wA RFHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xahs9axa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q10-20020a170902f78a00b0016a50167a61si12240515pln.282.2022.08.01.05.49.47; Mon, 01 Aug 2022 05:50:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xahs9axa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233877AbiHAMJN (ORCPT + 99 others); Mon, 1 Aug 2022 08:09:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233744AbiHAMIa (ORCPT ); Mon, 1 Aug 2022 08:08:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 217C545F4A; Mon, 1 Aug 2022 04:55:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C8E40B80EAC; Mon, 1 Aug 2022 11:55:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27D77C433C1; Mon, 1 Aug 2022 11:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1659354953; bh=6uHo3ZP7kvSw4oagX/VlqwE8fSt9Rspmj2PhTp3d8WU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xahs9axabjgREQ/imEmSmabi61C84h1OBoebizQLaHAqeXcgtFdpif6cxaNjlTFur z0C/YmJUJ+H+gHizCUZFutQmie/V3OAhtF59YR1g6qlleGo73DekpBO6TeabJOikn0 DLzuavGVLJ//oIi3wzy4w9t+27pzzjTblS7AmGJE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , Rik van Riel , Chris Mason , "Kirill A. Shutemov" , "Matthew Wilcox (Oracle)" , Andrew Morton Subject: [PATCH 5.18 10/88] mm: fix page leak with multiple threads mapping the same page Date: Mon, 1 Aug 2022 13:46:24 +0200 Message-Id: <20220801114138.522672752@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220801114138.041018499@linuxfoundation.org> References: <20220801114138.041018499@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik commit 3fe2895cfecd03ac74977f32102b966b6589f481 upstream. We have an application with a lot of threads that use a shared mmap backed by tmpfs mounted with -o huge=within_size. This application started leaking loads of huge pages when we upgraded to a recent kernel. Using the page ref tracepoints and a BPF program written by Tejun Heo we were able to determine that these pages would have multiple refcounts from the page fault path, but when it came to unmap time we wouldn't drop the number of refs we had added from the faults. I wrote a reproducer that mmap'ed a file backed by tmpfs with -o huge=always, and then spawned 20 threads all looping faulting random offsets in this map, while using madvise(MADV_DONTNEED) randomly for huge page aligned ranges. This very quickly reproduced the problem. The problem here is that we check for the case that we have multiple threads faulting in a range that was previously unmapped. One thread maps the PMD, the other thread loses the race and then returns 0. However at this point we already have the page, and we are no longer putting this page into the processes address space, and so we leak the page. We actually did the correct thing prior to f9ce0be71d1f, however it looks like Kirill copied what we do in the anonymous page case. In the anonymous page case we don't yet have a page, so we don't have to drop a reference on anything. Previously we did the correct thing for file based faults by returning VM_FAULT_NOPAGE so we correctly drop the reference on the page we faulted in. Fix this by returning VM_FAULT_NOPAGE in the pmd_devmap_trans_unstable() case, this makes us drop the ref on the page properly, and now my reproducer no longer leaks the huge pages. [josef@toxicpanda.com: v2] Link: https://lkml.kernel.org/r/e90c8f0dbae836632b669c2afc434006a00d4a67.1657721478.git.josef@toxicpanda.com Link: https://lkml.kernel.org/r/2b798acfd95c9ab9395fe85e8d5a835e2e10a920.1657051137.git.josef@toxicpanda.com Fixes: f9ce0be71d1f ("mm: Cleanup faultaround and finish_fault() codepaths") Signed-off-by: Josef Bacik Signed-off-by: Rik van Riel Signed-off-by: Chris Mason Acked-by: Kirill A. Shutemov Cc: Matthew Wilcox (Oracle) Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/memory.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/mm/memory.c +++ b/mm/memory.c @@ -4108,9 +4108,12 @@ vm_fault_t finish_fault(struct vm_fault return VM_FAULT_OOM; } - /* See comment in handle_pte_fault() */ + /* + * See comment in handle_pte_fault() for how this scenario happens, we + * need to return NOPAGE so that we drop this page. + */ if (pmd_devmap_trans_unstable(vmf->pmd)) - return 0; + return VM_FAULT_NOPAGE; vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl);