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=-11.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 B7222C433C1 for ; Thu, 25 Mar 2021 00:52:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3BAE660C3E for ; Thu, 25 Mar 2021 00:52:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3BAE660C3E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B476D6B0036; Wed, 24 Mar 2021 20:52:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF79C6B006C; Wed, 24 Mar 2021 20:52:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 958576B006E; Wed, 24 Mar 2021 20:52:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0142.hostedemail.com [216.40.44.142]) by kanga.kvack.org (Postfix) with ESMTP id 75CD26B0036 for ; Wed, 24 Mar 2021 20:52:41 -0400 (EDT) Received: from smtpin31.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 25D56180295AA for ; Thu, 25 Mar 2021 00:52:41 +0000 (UTC) X-FDA: 77956571322.31.44FDF86 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 9221480192DA for ; Thu, 25 Mar 2021 00:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616633559; 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: in-reply-to:in-reply-to:references:references; bh=a/I8HMRSY8uGPzIO7tttoD3dS3yWYP/iDM4q6Ir57s4=; b=LAkSIrUlWk3kaq9Ijt7Spe/2d/OVsJK/Q8NxoNpe8T2MoYL+E3W9pNnYXm/bQaZRKdzIb3 NvDe6a12JELpCiEO4DUfhoqGt2fcxDIdcWAjmmfCmVJ1tUAFuiIz/UlEWg2ECjeu8rAdCX XBYKkY8phRKTS6J1WSkJniSwBKoscNA= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-224-crYG-X58Pz-brYnn5YzaDA-1; Wed, 24 Mar 2021 20:52:37 -0400 X-MC-Unique: crYG-X58Pz-brYnn5YzaDA-1 Received: by mail-qk1-f200.google.com with SMTP id y9so2839215qki.14 for ; Wed, 24 Mar 2021 17:52:37 -0700 (PDT) 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:message-id:references :mime-version:content-disposition:in-reply-to; bh=a/I8HMRSY8uGPzIO7tttoD3dS3yWYP/iDM4q6Ir57s4=; b=GHmnHDobMKttf8idkHKdOq0UoTKfKnx/9lxd7g8tJPoIe3Ing2LWWmZVEzVJLsBiC6 oupy6X/k3/kyLTCvLL6dHhsjdAu5WgjCvqoU9flTMzd+aRY75xyAIBhEN/kI5LNw2eB9 u4cv7cMYsK22/P8xUe7naqoFi6lGklNMxpHSp6mYDQ7EU1cXR2TuNMgkEkMgdq0tAFhv fptu8BRp6vljP9pdr+82lZNtikdrcfP4u0N2lOcaZunSuPRQ3S+ZgWxTDaoW+KvSfyaY 7UvEydTt6gtGHYaROUd+JKfY4Hk7ItcqJpHkkiiUOk67tIQNqdDEnX4T+R/97AbhNxfT Dg2g== X-Gm-Message-State: AOAM532yrqOA8/9/iSiqkhTIjaSRkgjLc1GxZq8uOwGsQP/47DgBB+Ld fm3Ys7JIvWPeFTTAj8DGLUgh5dDV6IAphV1HLMrGWQN9jODWT9qCChdIEGZQCvOOFx1NVJwslcv RFllYWxW40yQ= X-Received: by 2002:ac8:6a04:: with SMTP id t4mr5714171qtr.258.1616633557073; Wed, 24 Mar 2021 17:52:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwf9lYUsnxZG/nhvJyxohZp2hC5gok7X1yMvcKfPeM5sVJS83vfqZvs4qyqdec2U35Zf3Et5A== X-Received: by 2002:ac8:6a04:: with SMTP id t4mr5714138qtr.258.1616633556783; Wed, 24 Mar 2021 17:52:36 -0700 (PDT) Received: from xz-x1 (bras-base-toroon474qw-grc-82-174-91-135-175.dsl.bell.ca. [174.91.135.175]) by smtp.gmail.com with ESMTPSA id k4sm3078112qke.13.2021.03.24.17.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Mar 2021 17:52:36 -0700 (PDT) Date: Wed, 24 Mar 2021 20:52:34 -0400 From: Peter Xu To: Andrew Morton Cc: Axel Rasmussen , Alexander Viro , Andrea Arcangeli , Hugh Dickins , Jerome Glisse , Joe Perches , Lokesh Gidra , Mike Rapoport , Shaohua Li , Shuah Khan , Wang Qing , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Brian Geffon , Cannon Matthews , "Dr . David Alan Gilbert" , David Rientjes , Michel Lespinasse , Mina Almasry , Oliver Upton Subject: Re: [PATCH] userfaultfd/shmem: fix minor fault page leak Message-ID: <20210325005234.GG219069@xz-x1> References: <20210322204836.1650221-1-axelrasmussen@google.com> <20210324162027.cc723b545ff62b1ad6f5223e@linux-foundation.org> MIME-Version: 1.0 In-Reply-To: <20210324162027.cc723b545ff62b1ad6f5223e@linux-foundation.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Stat-Signature: r49aoj9o34rhyqo8nrjneaw7o69jyqru X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 9221480192DA Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf16; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=170.10.133.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616633558-396492 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 Wed, Mar 24, 2021 at 04:20:27PM -0700, Andrew Morton wrote: > On Mon, 22 Mar 2021 13:48:35 -0700 Axel Rasmussen wrote: > > > This fix is analogous to Peter Xu's fix for hugetlb [0]. If we don't > > put_page() after getting the page out of the page cache, we leak the > > reference. > > > > The fix can be verified by checking /proc/meminfo and running the > > userfaultfd selftest in shmem mode. Without the fix, we see MemFree / > > MemAvailable steadily decreasing with each run of the test. With the > > fix, memory is correctly freed after the test program exits. > > > > Fixes: 00da60b9d0a0 ("userfaultfd: support minor fault handling for shmem") > > Confused. The affected code: > > > --- a/mm/shmem.c > > +++ b/mm/shmem.c > > @@ -1831,6 +1831,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, > > > > if (page && vma && userfaultfd_minor(vma)) { > > unlock_page(page); > > + put_page(page); > > *fault_type = handle_userfault(vmf, VM_UFFD_MINOR); > > return 0; > > } > > Is added by Peter's "page && vma && userfaultfd_minor". I assume that > "Fixes:" is incorrect? > It seems to me the commit is correct as pointed to in "Fixes", but I do have a different commit ID here: commit 63c826b1372c4930f89b8a55092699fa7f0d6f4e Author: Axel Rasmussen Date: Thu Mar 18 10:20:43 2021 -0400 userfaultfd: support minor fault handling for shmem Axel, did you fetched the commit ID from your local tree, perhaps? Since I should have fetched from hnaz/linux-mm and I can see Andrew's sign-off too. Thanks, -- Peter Xu