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;
References: <20230627042321.1763765-1-surenb@google.com>
 <20230627042321.1763765-6-surenb@google.com>
User-agent: mu4e 1.8.13; emacs 28.2
From:   Alistair Popple <apopple@nvidia.com>
To:     Suren Baghdasaryan <surenb@google.com>
Cc:     akpm@linux-foundation.org, willy@infradead.org, hannes@cmpxchg.org,
        mhocko@suse.com, josef@toxicpanda.com, jack@suse.cz,
        ldufour@linux.ibm.com, laurent.dufour@fr.ibm.com,
        michel@lespinasse.org, liam.howlett@oracle.com, jglisse@google.com,
        vbabka@suse.cz, minchan@google.com, dave@stgolabs.net,
        punit.agrawal@bytedance.com, lstoakes@gmail.com, hdanton@sina.com,
        peterx@redhat.com, ying.huang@intel.com, david@redhat.com,
        yuzhao@google.com, dhowells@redhat.com, hughd@google.com,
        viro@zeniv.linux.org.uk, brauner@kernel.org,
        pasha.tatashin@soleen.com, linux-mm@kvack.org,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        kernel-team@android.com
Subject: Re: [PATCH v3 5/8] mm: make folio_lock_fault indicate the state of
 mmap_lock upon return
Date:   Tue, 27 Jun 2023 18:06:33 +1000
In-reply-to: <20230627042321.1763765-6-surenb@google.com>
Message-ID: <871qhx2uot.fsf@nvdebian.thelocal>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?amkPa9wlJGLT+0BP7zd+uEK8CK7r5YFAPuJwgGGaSbe9lwXoI5i4Lr4H9eav?=
 =?us-ascii?Q?5hcBrhkYSYB0+FB5PhIzVZcaOADnGhWCzlhpftBewpfQDNlNtQ04t9thTsex?=
 =?us-ascii?Q?na0E8n2zi/MD8yLQkAuPQ4piL+h5PgAvfy1Swd99G3ZZwlvAwjFxccch+GJH?=
 =?us-ascii?Q?/FuupgxnnYX2bVrMGB8YcGOrNA/iGj1s2zHJZC6WgKhdc70SXFbZDvI4WDmk?=
 =?us-ascii?Q?AOgX8lpcEg0rvvxl/VvBwxa2t3hESa9/POHY/gDXsrcho+454+iP3RZkYhzo?=
 =?us-ascii?Q?lQwd20VOcDXM/ZCednqKc9aQ3AOkITVLHvVryHioBTKa7Fmowld6jokIwaCm?=
 =?us-ascii?Q?EBIi72+CKa8bewF/xshSuuVjB2oL0sJ50fSSD7Wa+Uq8fWULYrdq8AjPFHH8?=
 =?us-ascii?Q?wUCi2JyF31gOdrwxCYTc21EXO/Paji0Th/0fyy2QPrgep2PD7INKm/OXAhvL?=
 =?us-ascii?Q?J98tf9H1BLTVSdW4utBaiUjushvkpgpwXQCTrEGN5b8XdI1zTWTLMmPRhVbH?=
 =?us-ascii?Q?/eX/GJiKwUfp+V23BlElAxSMfEITQBm9pNTWGAFnwBuivIqLKY1kSrXRBZxA?=
 =?us-ascii?Q?kKva8dwRwOzUP8FufjqmSZw6gBWN65AvEE1dZ02SFKP1u4Q8kuD5nAx2rXf1?=
 =?us-ascii?Q?snGrHWvRTmarmsuKx+8lxJw1499WAC1yLEHInN3vlgIs7Cl+H9We0DYSmKVD?=
 =?us-ascii?Q?FZQ0TtSWgfZuwOYiOt4XbZ+MGIH+uiqpn43kbLrTcfFEHMo4Hk4njvh6Lw/6?=
 =?us-ascii?Q?mdL/gR4w9Z7xf1pbV2fHS8DOADnfMZBSYQViPtHRUt0TudZ9R6FrApQ4Qspg?=
 =?us-ascii?Q?MGcg7k58W0fK4EMuZk1IgfhWN8UHvMesZL4047O3bduidVNU88At+40RtyA6?=
 =?us-ascii?Q?ua4zN9M0f/3bz7raLuZBUiC4em+iLmx4lQMcRnUkjkK9Uw7wS4dtsqnr+Uw6?=
 =?us-ascii?Q?3dMzIXh4QPt2v8EZR0fiIe8wOYIpcD2O/YGZUOm4Ok6f/Y16GdFQ8nAgzeHh?=
 =?us-ascii?Q?6nzm6p+9dwbT18FRpyV5ID/e4q2nMh28Ik1gbxG8C4KhmwY5HXq/M8aQbzAd?=
 =?us-ascii?Q?V5Ga3MOTY0rGLvhEbGDqB2l1PuMKNMF2xfOBCdJLNu+8mHTagfjbN4kvCxXp?=
 =?us-ascii?Q?3O/LknHK4TT9zvpqryDvToqnMijsFUjejRW8QGNfzkr9Sjwmr0YMtuXPLEv+?=
 =?us-ascii?Q?Cuzw3q/8G++5mfvYwBq85gW6Wnt1GQTKJw0rZs+6L9pwWwi0Dg+WMslrKsRS?=
 =?us-ascii?Q?jT5zvcm2NryQRkirT+KvCtwa1R03ekkK2KL3NiOFylsJz9Y8ra28uUFZQyUI?=
 =?us-ascii?Q?lDn6xiLxeXKY+pmQzZbKAGrNvp6rWYO0+vxjPQ19NbNuOJgi+nbSFa+i6oUc?=
 =?us-ascii?Q?072QszZhMTRWqf343IHXiFsfalaKoGC18dxj6WvNoohH6oboV9b0bjxTF0Iy?=
 =?us-ascii?Q?+jMSiRF9MjP/6Myy9XNY31hM0MIursHbPHi5QYDqvsURTiLUS5qTS5cF70Mb?=
 =?us-ascii?Q?RpftGNnqAGKkdCSTkZauqbEl0ggUo1YocrvrtOxeZl6yhgei8x9eOeN4jH2U?=
 =?us-ascii?Q?wW8+qLaMVqD7cpUokoLDOPMtl9/+Y0KzzRefF0Qu?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d316d7c0-796b-4f1c-259f-08db76e5cb1f
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 08:09:13.2114
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ozBv00MJyNbJ+vWoOlRTqq3/+1qTayMNSIBP2dofaTMhGFAc597rylhFEl92p1HACLR8ydQBCdOX0Eu6mGGtxQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8203
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


Suren Baghdasaryan <surenb@google.com> writes:

> folio_lock_fault might drop mmap_lock before returning and to extend it
> to work with per-VMA locks, the callers will need to know whether the
> lock was dropped or is still held. Introduce new fault_flag to indicate
> whether the lock got dropped and store it inside vm_fault flags.
>
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> ---
>  include/linux/mm_types.h | 1 +
>  mm/filemap.c             | 2 ++
>  2 files changed, 3 insertions(+)
>
> diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
> index 79765e3dd8f3..6f0dbef7aa1f 100644
> --- a/include/linux/mm_types.h
> +++ b/include/linux/mm_types.h
> @@ -1169,6 +1169,7 @@ enum fault_flag {
>  	FAULT_FLAG_UNSHARE =		1 << 10,
>  	FAULT_FLAG_ORIG_PTE_VALID =	1 << 11,
>  	FAULT_FLAG_VMA_LOCK =		1 << 12,
> +	FAULT_FLAG_LOCK_DROPPED =	1 << 13,

Minor nit but this should also be added to the enum documentation
comment above this.

>  };
>  
>  typedef unsigned int __bitwise zap_flags_t;
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 87b335a93530..8ad06d69895b 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -1723,6 +1723,7 @@ vm_fault_t __folio_lock_fault(struct folio *folio, struct vm_fault *vmf)
>  			return VM_FAULT_RETRY;
>  
>  		mmap_read_unlock(mm);
> +		vmf->flags |= FAULT_FLAG_LOCK_DROPPED;
>  		if (vmf->flags & FAULT_FLAG_KILLABLE)
>  			folio_wait_locked_killable(folio);
>  		else
> @@ -1735,6 +1736,7 @@ vm_fault_t __folio_lock_fault(struct folio *folio, struct vm_fault *vmf)
>  		ret = __folio_lock_killable(folio);
>  		if (ret) {
>  			mmap_read_unlock(mm);
> +			vmf->flags |= FAULT_FLAG_LOCK_DROPPED;
>  			return VM_FAULT_RETRY;
>  		}
>  	} else {