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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A1FCC48BEB for ; Thu, 22 Feb 2024 08:43:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B35B6B0072; Thu, 22 Feb 2024 03:43:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 963D96B0075; Thu, 22 Feb 2024 03:43:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 805236B0078; Thu, 22 Feb 2024 03:43:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 714FB6B0072 for ; Thu, 22 Feb 2024 03:43:34 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 37F54160CAA for ; Thu, 22 Feb 2024 08:43:34 +0000 (UTC) X-FDA: 81818801148.25.CDC994E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id EABBC100008 for ; Thu, 22 Feb 2024 08:43:31 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=aSGG+t6M; spf=pass (imf14.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708591412; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mgHUUX8dMByqbwsZEjiWnQCuj3pWXP8pIG0ICD0fFAw=; b=7b8mpl2fkuG1IxgoWAzJwOytpuOZK86ubv3Smvdeyv9hKuhgW5/Un6BcI8lWDqEjpVKOvR l05ekdlVKK4FqJafMsri1cuRQRlMnrtXVUYd919GW/muwXg0bcf8x0ZDVH16dzRG3hOPzE G0nwt1Gqi2y2jAeqfZABWTjP+H5ZzAc= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=aSGG+t6M; spf=pass (imf14.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708591412; a=rsa-sha256; cv=none; b=FUsMaZpxczjLT9U0ileMsKjrYBzVubXORE1FmypxpIGOPp3QgI0ddgSCPEZ0pUJFfZN4n4 3ieiw30G49YjLmLtMkrC/Nc8hWRFug3IongdmvZ+pVrIhVEnLCn0RxIsXroD8WLFo8TfVZ wl7YcT55htikYdBB2oCCKZvI+s7xTw0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708591411; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=mgHUUX8dMByqbwsZEjiWnQCuj3pWXP8pIG0ICD0fFAw=; b=aSGG+t6MfeXUcecIvVoLrbM8UQiBjefpaA03MQhA9FgF8rDGQddtka5ufY7jO1rvK+Nvxk v8WEzJ+0KUYMHD/s/LrUtmPqoZKlWZDDhiWBdVQT3rOsZLSj6soeer/3+B1PP6u5Lr6aVD irbbunBGFYzuqpnZWBi0hYDe/0GNWuU= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-586-O96WfY0UNumjmn_ar3J9rQ-1; Thu, 22 Feb 2024 03:43:29 -0500 X-MC-Unique: O96WfY0UNumjmn_ar3J9rQ-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4121c06be80so40756545e9.1 for ; Thu, 22 Feb 2024 00:43:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708591409; x=1709196209; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mgHUUX8dMByqbwsZEjiWnQCuj3pWXP8pIG0ICD0fFAw=; b=W80zsy2nw/EFWfoCwm8ASFr0w8xaRIRkO5JJ8rOby4ph6r5CqtKDCHwAjX/VdgkasN TAu80HfJfuB+p+4dYUp5CMJFJC4HkEThc304EILuECofDrLCMoXu0nzz4dDD+m3fsH5I 9+Qao0lXKKBLVAUP6Ng+0scdHIwXLnMP48zcs5hDhrloE/65KLgVOjjnk1wQwrUEkZt6 qC2r6COd8IdcK5WjBlMM+pOtsF+v/ZKI3+kRMVZbOVT1VEfgAJh28/YUF6mnWX23iT1M ByHCIoFdmiESeRMbnjL9OztldR5aEVB09J/hdTfR/RMrtRRwE7B/S2xCiAvRGZThTg8j v0Ig== X-Gm-Message-State: AOJu0YzK7qolhy1GT2yg69IIXCzgsbDZDXHLvYOz9qyjSqSE+Kd/JV00 LE5fM7v7POSNAPbqfkexcJMgcrsN1/d6gRD/S7ZTtzul+1FeOnYEj6i7qVM6LlIPT8RTNWFlPdL kqFWdRIB/hbDNyO4X1ps/ZJfvad83l5rQrwTYXQO19rjhKv4t X-Received: by 2002:adf:e787:0:b0:33d:3f27:6626 with SMTP id n7-20020adfe787000000b0033d3f276626mr8381105wrm.22.1708591408766; Thu, 22 Feb 2024 00:43:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IF1a7Zh8vxk81NSij5wcg0YuK58zsgXpQIUWwDXJgS2mwlHf0fFKAqJT450/wl0hmXtSLcTMg== X-Received: by 2002:adf:e787:0:b0:33d:3f27:6626 with SMTP id n7-20020adfe787000000b0033d3f276626mr8381095wrm.22.1708591408334; Thu, 22 Feb 2024 00:43:28 -0800 (PST) Received: from ?IPV6:2003:cb:c70f:8b00:ed48:6d18:2152:1cda? (p200300cbc70f8b00ed486d1821521cda.dip0.t-ipconnect.de. [2003:cb:c70f:8b00:ed48:6d18:2152:1cda]) by smtp.gmail.com with ESMTPSA id bq18-20020a5d5a12000000b0033d97bd5ddasm517571wrb.85.2024.02.22.00.43.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Feb 2024 00:43:27 -0800 (PST) Message-ID: Date: Thu, 22 Feb 2024 09:43:27 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm: userfaultfd: fix unexpected change to src_folio when UFFDIO_MOVE fails To: Qi Zheng , akpm@linux-foundation.org, aarcange@redhat.com, surenb@google.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240222080815.46291-1-zhengqi.arch@bytedance.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240222080815.46291-1-zhengqi.arch@bytedance.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: EABBC100008 X-Rspam-User: X-Stat-Signature: unwjszqfd85ggww7a5jmpfnqed5p5o9m X-Rspamd-Server: rspam01 X-HE-Tag: 1708591411-715249 X-HE-Meta: U2FsdGVkX1/3shqFslgfsJcTezKgYomY8WZAdUprwsn3d1hAF2WU/P4RJJ2iOSg7nwgaNetI4T/ailro90bWtZdwXoNkobdzHo171NOI6UnEfD1T58DRwYBBhV4ot9us5uckQJZMYdq2MPHkkfgBx3vuF/7l7wFO5VMUw8pFpPfzpHsyPsarBpT3BFHfT7F/oRe3awVRHXb45K5QOMXr39TNpqXQCoK0ay1aSgNjPbHM+JDLVEi4Zb09y9E41CP25kpgmHpiK7mjiMK4Hpesf9i8kwVs8UNR3TiWECda7/Ku49RyXK8+77LBB+FtrzmTjbjFyCR+J0UMSEblKgnMhvJx5LYiD2fqBqb9LwpoqAU+5e5/1ysvcHRAXPmQ/ugBz0cUaWvyx0B+TvQYQUK6J0waa5Zw6ZwH8IZJk91qN4ONRKoBgqz/qeS+ZUFCyiHfi4/egYTrOvEq3BaG8a9ZIj3tB0btTpG2kCVZcpDmZyG+ab5ej+m7j/H9TKhCFyBsrqeCgwwNBN+FXQ+c6F72Rm9lc3UTpp2xDW5h2cYjpoaUBmfyrJWtAkV5yfTDBfYdhgLgKIE8d6TV3Y9d5t4Pe5+kdL2IPq3toN5e6fxR1vXRKKFDtOPVuhtw4IlL/evi3zNpOCvUOxLl4gPH0qAPtcfQJMN+2Ierv4SN9Dvp7dlSr2zE0Ix2wqWjat0dn2+IWqaVJgLJ4hRbFLTiCxXYpStlSoo22H2FzANQoA/qDCJuW4DF6qGKTZP90AoXpZyav6xTD0mLR/34Y48jQs+Otv0pwhlFbWkaUvhMEp59BKkumpBBHMbLBVS+7gtZ2z9a0mnmbzn4Qt4jBUcKzW+KO/CmVwTjia0OjfM5vnRJdwzWyaYWV0aqpJKOarrQ1t+3zWxn697eK957u74OrMtDw3HCChmc2lf91o2FkCk4J28cmlgC1PPoxOOpfmuVDkeXSaV5CB8Nd97smsiTQhW KAKHdufQ MN8O41Ecqkm7XI/A6mzvydZ4rcJR+b/NDvrgt5HCWiGxD741b8KlxZk2z74BZhmgNKY5sqgF056+rKtcBKcsVOXOfvGfmRBHrH5HQc6Z+6WvwnrVGCTKzF7QsVOyqZumIHRvdQauqaewyHENKf/w99GEJqAY635kSG2bI5OpjJHkMQsbRJjGKaxhlkJYHojm9MfGkyqEGYUbVCNMvaMsb9vnJ+E3t+OGtW68RMxsxlyYYVe4dUoSC/Iis5QMWBdMzpDFH887SvbV1OTl3vwsJH5BM/viuz32oNdM1nDtHm/WdVpASFh/Y8ncd8xJBjPQUVGf+o6kLRZtTQwMBrBa2RvzvZkGvAjfGrZ+cFAuFSsPu1NE7mhqs8Bvflu+aqyJ4w+T06FUWqZ/0zzOcdA9a8uoiWc3KJ2MIhrXA/yj9AB63R8Wu38YxgC9pGuqnu+v4DWEgkf8OsPP282xsTQ+rOLL+K94xkN2ktQQ07mEsH0z5bj45droytdtWVaDUoL9pk3sO24NOBC9Ol8gWG7iOo1o+AiiiR12x2C89CMqbi34kdiQ= 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: List-Subscribe: List-Unsubscribe: On 22.02.24 09:08, Qi Zheng wrote: > After ptep_clear_flush(), if we find that src_folio is pinned we will fail > UFFDIO_MOVE and put src_folio back to src_pte entry, but the change to > src_folio->{mapping,index} is not restored in this process. This is not > what we expected, so fix it. > > Fixes: adef440691ba ("userfaultfd: UFFDIO_MOVE uABI") > Signed-off-by: Qi Zheng > --- > mm/userfaultfd.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c > index 4744d6a96f96..503ea77c81aa 100644 > --- a/mm/userfaultfd.c > +++ b/mm/userfaultfd.c > @@ -1008,9 +1008,6 @@ static int move_present_pte(struct mm_struct *mm, > goto out; > } > > - folio_move_anon_rmap(src_folio, dst_vma); > - WRITE_ONCE(src_folio->index, linear_page_index(dst_vma, dst_addr)); > - > orig_src_pte = ptep_clear_flush(src_vma, src_addr, src_pte); > /* Folio got pinned from under us. Put it back and fail the move. */ > if (folio_maybe_dma_pinned(src_folio)) { > @@ -1019,6 +1016,9 @@ static int move_present_pte(struct mm_struct *mm, > goto out; > } > > + folio_move_anon_rmap(src_folio, dst_vma); > + WRITE_ONCE(src_folio->index, linear_page_index(dst_vma, dst_addr)); > + > orig_dst_pte = mk_pte(&src_folio->page, dst_vma->vm_page_prot); > /* Follow mremap() behavior and treat the entry dirty after the move */ > orig_dst_pte = pte_mkwrite(pte_mkdirty(orig_dst_pte), dst_vma); Indeed, LGTM. Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb