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=-10.8 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 DAE29C433B4 for ; Fri, 9 Apr 2021 16:50:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FA7A610CF for ; Fri, 9 Apr 2021 16:50:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231402AbhDIQun (ORCPT ); Fri, 9 Apr 2021 12:50:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52433 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234087AbhDIQun (ORCPT ); Fri, 9 Apr 2021 12:50:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617987030; 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=9iFNTLYUdPzXiA/Mpb6WQlIpHAgPoHtKG/OVLOk4/v0=; b=X6BEeKDDMGLSqsLd/bxNHhRikKPDdwAFSvaXa4fAcVaZKsC+GRntdmkvHwLafnjxtzz4L9 ESVsDUVoGHxDkJL2mzFArnfCEYPOZYDk/OcQEzcFBFLaaZV++2RBpF4mp5t0eiWQPQiut5 SiMTKWdVJ5iHX/UYLgaYr0pa4aFjr1s= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-129-azZxEwxSMKaRJh4zxT6tEg-1; Fri, 09 Apr 2021 12:50:27 -0400 X-MC-Unique: azZxEwxSMKaRJh4zxT6tEg-1 Received: by mail-qv1-f71.google.com with SMTP id p18so3534922qvn.19 for ; Fri, 09 Apr 2021 09:50:27 -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=9iFNTLYUdPzXiA/Mpb6WQlIpHAgPoHtKG/OVLOk4/v0=; b=ZlGn/wArbRC72asimNAHzn6m6XFQ0eB1tKPtCqM0jB8vpvQ+/kFCX79hmPr7eT5z3+ AjeuthT/lB5YU/UuZWA6R2uAH67uMpHvxu1aXKaKrP9/MBw14eqWaKpMUsgS3ojdoblu vCuN05OJGXKOTUlMbON/2alh/BmbK+8sz6UxVZAz2iYYZonIqS1iY+W+UB6MP/y577fh koV9lXdJ8NCYap1xQD3Rh92fSVto6jQ3RkFApiWO34vWjkPQdSRZ1936000wWDG6SFaA LF4xdUF8vjO1Wp7Hxyg8mhi5v/2eBMPdpfqSoF+HZBXsbsMAcmwhRjXbdT4nCb524vqt wGsw== X-Gm-Message-State: AOAM532lTIn/3xmcObYgnAsAF86y8Gb9tma3gv7G1sW38m1pLkS96x/D boSkt4upgS9jdOSiKUTqLVeK3znWEJMvR+j9tNTRaM+JVBh4oFG1apMMeiy8dyXH5nThWummNGJ jXNayrpG48U431vwa0ayocLlZWhwO X-Received: by 2002:ac8:698c:: with SMTP id o12mr13565673qtq.340.1617987027106; Fri, 09 Apr 2021 09:50:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9ET8gRIuaxSbZx1jIxLrgNMwEbCyKnI0+eLELufmMdInX+m4v62Vmy9dTudxtDhDqBn9G0g== X-Received: by 2002:ac8:698c:: with SMTP id o12mr13565637qtq.340.1617987026785; Fri, 09 Apr 2021 09:50:26 -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 l4sm984629qkd.105.2021.04.09.09.50.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Apr 2021 09:50:26 -0700 (PDT) Date: Fri, 9 Apr 2021 12:50:24 -0400 From: Peter Xu To: Axel Rasmussen Cc: Alexander Viro , Andrea Arcangeli , Andrew Morton , Daniel Colascione , Hugh Dickins , 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, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Brian Geffon , "Dr . David Alan Gilbert" , Mina Almasry , Oliver Upton Subject: Re: [PATCH 3/9] userfaultfd/shmem: support minor fault registration for shmem Message-ID: <20210409165024.GF792100@xz-x1> References: <20210408234327.624367-1-axelrasmussen@google.com> <20210408234327.624367-4-axelrasmussen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210408234327.624367-4-axelrasmussen@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On Thu, Apr 08, 2021 at 04:43:21PM -0700, Axel Rasmussen wrote: [...] > @@ -1820,16 +1821,27 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, > > page = pagecache_get_page(mapping, index, > FGP_ENTRY | FGP_HEAD | FGP_LOCK, 0); > - if (xa_is_value(page)) { > + swapped = xa_is_value(page); > + if (swapped) { > error = shmem_swapin_page(inode, index, &page, > sgp, gfp, vma, fault_type); > if (error == -EEXIST) > goto repeat; > - > *pagep = page; > - return error; > + if (error) > + return error; > } > > + if (page && vma && userfaultfd_minor(vma)) { > + unlock_page(page); > + put_page(page); > + *fault_type = handle_userfault(vmf, VM_UFFD_MINOR); > + return 0; > + } If we need to consider swapping for UFFDIO_CONTINUE later (as Hugh pointed out previously, which looks the right thing to do), it's indeed a bit awkward to swapin here. Maybe move this chunk to right after pagecache_get_page() returns? Then no need to touch the rest. > + > + if (swapped) > + return 0; > + > if (page) > hindex = page->index; > if (page && sgp == SGP_WRITE) > -- > 2.31.1.295.g9ea45b61b8-goog > -- Peter Xu