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_CR_TRAILER,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 1A937C43461 for ; Wed, 28 Apr 2021 16:23:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 658F8613F8 for ; Wed, 28 Apr 2021 16:23:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 658F8613F8 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 CAE696B00D7; Wed, 28 Apr 2021 12:23:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C84726B00D9; Wed, 28 Apr 2021 12:23:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AFE348D0002; Wed, 28 Apr 2021 12:23:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0105.hostedemail.com [216.40.44.105]) by kanga.kvack.org (Postfix) with ESMTP id 939F86B00D7 for ; Wed, 28 Apr 2021 12:23:39 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 4865F180AD817 for ; Wed, 28 Apr 2021 16:23:39 +0000 (UTC) X-FDA: 78082296558.09.36411B9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 53221C0007E7 for ; Wed, 28 Apr 2021 16:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619627017; 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=AH7csi7wwzGg18f+fG+VSfsyVRHxjn8kIlDKQiqjMRA=; b=WBKY4e3f1wf3a9NfWawBaFethRH62KhZcqjNunR8E6D9sevn8lV6tMyttx3yUoP3YJhIMC Jb7pwZW83oag9Eoy+H76du8D0ripDh+yCc8MBefVkdOXhAXhj48DjsKhu5h1GXGt/lS2Xh uDioy039EeAFXXLoA2SzuUy34eYyLtk= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-248-C-q6jX3XO4WLdpvFfIR3hw-1; Wed, 28 Apr 2021 12:23:36 -0400 X-MC-Unique: C-q6jX3XO4WLdpvFfIR3hw-1 Received: by mail-qt1-f200.google.com with SMTP id i7-20020ac84f470000b02901b944d49e13so17864177qtw.7 for ; Wed, 28 Apr 2021 09:23:36 -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=AH7csi7wwzGg18f+fG+VSfsyVRHxjn8kIlDKQiqjMRA=; b=p4xUOCZDcIpkj2+a+KWureIN0HitvEalmWKj4eoS2T2VGCVmvpxbF1u1dFqOsqfm7o 74sx6uAf6cZ4WmnHv6qTPf6mNNHWM8zS8s09niwKuvY81De+rLKCGzMmxBJuIl732GS/ Bxm0hKt7vKsMvf4rYxHNYRULHyY8wiIhaNqxpVBi6LwwX2c2sjA4ohZCsbINN5HU8BWL hvtIPuKmIJyUq6kZuVmhYpFlz7MOh+6imo1Qw8Sb74M+nvcHF6NSqBnjybrbBEU2Zn5n B/gLd9oFY34omR1Qx89xMns9LnDu8FJlnMsq6V3CIO+2OjkSixfosjVUPtAF/gVeFsXY 9Qhg== X-Gm-Message-State: AOAM533MA6lWbIbBa4SVzusq1/wiAdFDSWyjb+djHxbdjaxkzAL61RwJ l6CM+H164zadZClBT8TJTPpMmVdyeWolSGJgygFWoHy5sVPf6fG+FzRpJ39OisUgJzJw0IlIESx 7PXZtkz1Mn+I= X-Received: by 2002:a0c:ec0f:: with SMTP id y15mr14227310qvo.9.1619627015685; Wed, 28 Apr 2021 09:23:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxbTtNlW1BwVWHBPqrKcGOZYJKpqLvm889MXyWSVHOhrT+49N36LmGWoLkkG+ECXaA21Ximg== X-Received: by 2002:a0c:ec0f:: with SMTP id y15mr14227282qvo.9.1619627015284; Wed, 28 Apr 2021 09:23:35 -0700 (PDT) Received: from xz-x1 (bras-base-toroon474qw-grc-77-184-145-104-227.dsl.bell.ca. [184.145.104.227]) by smtp.gmail.com with ESMTPSA id h8sm333557qtp.47.2021.04.28.09.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 09:23:34 -0700 (PDT) Date: Wed, 28 Apr 2021 12:23:32 -0400 From: Peter Xu To: Axel Rasmussen Cc: Hugh Dickins , Alexander Viro , Andrea Arcangeli , Andrew Morton , Jerome Glisse , Joe Perches , Lokesh Gidra , Mike Kravetz , Mike Rapoport , Shaohua Li , Shuah Khan , Stephen Rothwell , Wang Qing , linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, LKML , linux-kselftest@vger.kernel.org, Linux MM , Brian Geffon , "Dr . David Alan Gilbert" , Mina Almasry , Oliver Upton Subject: Re: [PATCH v5 06/10] userfaultfd/shmem: modify shmem_mcopy_atomic_pte to use install_pte() Message-ID: <20210428162332.GE6584@xz-x1> References: <20210427225244.4326-1-axelrasmussen@google.com> <20210427225244.4326-7-axelrasmussen@google.com> <20210428155638.GD6584@xz-x1> MIME-Version: 1.0 In-Reply-To: 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-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 53221C0007E7 X-Stat-Signature: idne33zne4p3tpmrjj3gc5iztomzj6ds Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf06; 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: 1619627021-968145 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: On Wed, Apr 28, 2021 at 08:59:53AM -0700, Axel Rasmussen wrote: > On Wed, Apr 28, 2021 at 8:56 AM Peter Xu wrote: > > > > On Tue, Apr 27, 2021 at 05:58:16PM -0700, Hugh Dickins wrote: > > > On Tue, 27 Apr 2021, Axel Rasmussen wrote: > > > > > > > In a previous commit, we added the mcopy_atomic_install_pte() helper. > > > > This helper does the job of setting up PTEs for an existing page, to map > > > > it into a given VMA. It deals with both the anon and shmem cases, as > > > > well as the shared and private cases. > > > > > > > > In other words, shmem_mcopy_atomic_pte() duplicates a case it already > > > > handles. So, expose it, and let shmem_mcopy_atomic_pte() use it > > > > directly, to reduce code duplication. > > > > > > > > This requires that we refactor shmem_mcopy_atomic_pte() a bit: > > > > > > > > Instead of doing accounting (shmem_recalc_inode() et al) part-way > > > > through the PTE setup, do it afterward. This frees up > > > > mcopy_atomic_install_pte() from having to care about this accounting, > > > > and means we don't need to e.g. shmem_uncharge() in the error path. > > > > > > > > A side effect is this switches shmem_mcopy_atomic_pte() to use > > > > lru_cache_add_inactive_or_unevictable() instead of just lru_cache_add(). > > > > This wrapper does some extra accounting in an exceptional case, if > > > > appropriate, so it's actually the more correct thing to use. > > > > > > > > Signed-off-by: Axel Rasmussen > > > > > > Not quite. Two things. > > > > > > One, in this version, delete_from_page_cache(page) has vanished > > > from the particular error path which needs it. > > > > Agreed. I also spotted that the set_page_dirty() seems to have been overlooked > > when reusing mcopy_atomic_install_pte(), which afaiu should be move into the > > helper. > > I think this is covered: we explicitly call SetPageDirty() just before > returning in shmem_mcopy_atomic_pte(). If I remember correctly from a > couple of revisions ago, we consciously put it here instead of in the > helper because it resulted in simpler code (error handling in > particular, I think?), and not all callers of the new helper need it. Indeed, yes that looks okay. > > > > > > > > > Two, and I think this predates your changes (so needs a separate > > > fix patch first, for backport to stable? a user with bad intentions > > > might be able to trigger the BUG), in pondering the new error paths > > > and that /* don't free the page */ one in particular, isn't it the > > > case that the shmem_inode_acct_block() on entry might succeed the > > > first time, but atomic copy fail so -ENOENT, then something else > > > fill up the tmpfs before the retry comes in, so that retry then > > > fail with -ENOMEM, and hit the BUG_ON(page) in __mcopy_atomic()? > > > > > > (As I understand it, the shmem_inode_unacct_blocks() has to be > > > done before returning, because the caller may be unable to retry.) > > > > > > What the right fix is rather depends on other uses of __mcopy_atomic(): > > > if they obviously cannot hit that BUG_ON(page), you may prefer to leave > > > it in, and fix it here where shmem_inode_acct_block() fails. Or you may > > > prefer instead to delete that "else BUG_ON(page);" - looks as if that > > > would end up doing the right thing. Peter may have a preference. > > > > To me, the BUG_ON(page) wanted to guarantee mfill_atomic_pte() should have > > consumed the page properly when possible. Removing the BUG_ON() looks good > > already, it will just stop covering the case when e.g. ret==0. > > > > So maybe slightly better to release the page when shmem_inode_acct_block() > > fails (so as to still keep some guard on the page)? > > This second issue, I will take some more time to investigate. :) No worry - take your time. :) -- Peter Xu