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;
Date:   Fri, 14 Apr 2023 15:19:45 -0700
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     Peter Xu <peterx@redhat.com>
Cc:     linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        Axel Rasmussen <axelrasmussen@google.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        David Hildenbrand <david@redhat.com>,
        Nadav Amit <nadav.amit@gmail.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        linux-stable <stable@vger.kernel.org>
Subject: Re: [PATCH 2/6] mm/hugetlb: Fix uffd-wp bit lost when unsharing
 happens
Message-ID: <20230414221945.GB54118@monkey>
References: <20230413231120.544685-1-peterx@redhat.com>
 <20230413231120.544685-3-peterx@redhat.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230413231120.544685-3-peterx@redhat.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KJVVSxXJvWpWJcAi2ulrYnPmhWy5uhym85oaAv6sx25/TNvL6cyiqwtcwg90?=
 =?us-ascii?Q?IMCtAhQYSSAjkyT7HfYW+BtsgjOCPjb4pV5ZrgtqiP2pGNojZM/7Oo46nY9R?=
 =?us-ascii?Q?BcV4SWEhs6fGUeD9dl9ZeyB81GFVBwjn0jl1B0u6REOOSR7gmojSJccUzCX4?=
 =?us-ascii?Q?mRKCE6ZT1RSzFZliJHyH5aUs3wDDte0YwJgD9Dgz9eeDxnXHxCVEyx92DFRK?=
 =?us-ascii?Q?bleDMSjP0WaebhyvDNGOGYF/w0alry0QMan8nb1QfU1L9SiQRGWfqQuXaWm3?=
 =?us-ascii?Q?0nlRjTo8+2+7NsM5P8jEzYbaFSGPo7FCSHZ4z5Fja8gteaTboU+5jjmvwb48?=
 =?us-ascii?Q?r46FXHlRmJLm0zn4qgzlAOD/Ko4byCai+mbiMF2c4RJIhnY+l12BeK06pJcS?=
 =?us-ascii?Q?Mt7aYNfntJYWUzqgNhB9ptcNB/MNXBpu3prv8jBFsozUYt1+QBRxl/uSuVRS?=
 =?us-ascii?Q?t4UhDS2Xdsu+w1gfckWF35At/dow8y9lOaMtsz0okTDX9KKT8LRX/AXNf059?=
 =?us-ascii?Q?S5uzrtpOVqe6BJjEIC8E2PE3stmA6qHB5fi73sytFngZH1uVibAh2nBDsrp1?=
 =?us-ascii?Q?wXS8dZzDW6MgUr67Ui0OwoPSU84K/EQth1g0UyPm9pIaithwlkcQ0E9yfCXb?=
 =?us-ascii?Q?aBj7REt7LfXQ4/6j553TE5BgXLh0nO1tiiHxEpAYEOsETleIHr+unzuoEWPP?=
 =?us-ascii?Q?QgNCyswEK+vG4mpYJPFJHQNaIfkxfdfRJyP229T6JTLmRLuov58eSIh4zBOM?=
 =?us-ascii?Q?qWxHV8HPzFZhjlAa3WbOc4h+WI6qK1fBj5x7IO0S7DtiyWEGUMGTftC8LIfz?=
 =?us-ascii?Q?cz8pjAFUhF0PiiBLBcyTUbGX/K2wjoZUyqXLsfstwEDP/Mt6Mhbz4Bwm8G9e?=
 =?us-ascii?Q?Q7HA6FqJB+cBulqFbbPn2TO5/rhlL13X67jXzbQJSzilMom0vz5Ah6p6LNH9?=
 =?us-ascii?Q?mDAgcwq/XVPB/ojZTaLv+35HwQZSwW5MNMLUqR3TNmgwcVB7N/KHeJobmIuf?=
 =?us-ascii?Q?1XsgWmXnuBgpfLEX0sVVdrgqHDTLnclGM962JUO6zcvjvKa04GQ8sDk15GrX?=
 =?us-ascii?Q?dqL1Sjw06bsVjZfXPFhQ0A61byRcrWNmvAVDXItnlDVOTWdmLiQb5xjX6Lm8?=
 =?us-ascii?Q?CqQsdwbT6uHhx/VBg/nInVfPnsGQrGye5sYgaV1tKxOf+ExuaDqSQVFdXLpj?=
 =?us-ascii?Q?TbMZHK9UNZYaCc0bo95kVxQz4MDUtX1WNVHWpreTRqgkWbsNHxQbztf1iLzh?=
 =?us-ascii?Q?Syk6iQMGV6fWlQp4uLaO95fZ+aoUGIUaraNtq4hOmT34KyXO1Cmx1vUNntd4?=
 =?us-ascii?Q?SN4ZyoVWfHZmAO93K0TdhXGK0wJuhzKp4KoihWtooW3I3Hjj9EeA2QX8yxhl?=
 =?us-ascii?Q?fFHZUUSoej+DT0ER9lGsg5B1aFG/T8szNNmmMdo4igJ+aPYHLfns0Pwscw5H?=
 =?us-ascii?Q?HxoKVZ/hzLpp37clOM7gn9I/2j4YKjknbZWVzMrKxkRbH3LQSkZKseQ141dP?=
 =?us-ascii?Q?aOfJA0/FBWr7r+ALhyO/FVLIfIrgWLjq6ZflsJ73q+nI+pxguADCxOQRx+6B?=
 =?us-ascii?Q?ocY5AnwAR/Bq4nMSrbzXmijGeBy19FKl5zFUP6iq?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?y66G+BxwC5VeASAlCVJfxKPF4RUgOwNUI6TfY08662ATRKUMHc7wBYERYE4h?=
 =?us-ascii?Q?n9VKyWPPRpH3O84W5Lsf7hGneowmnSyNuVN/B3RaGPMOfJ7f71Dzjm5J/w3D?=
 =?us-ascii?Q?6I8LCcoyfherduZ4tVaKrtQ+IyGgzcT9WrARwk3Rat7R6lq9E7GiKwch3wMQ?=
 =?us-ascii?Q?j3TMMFbPzvRV50e0MnVSyXZvhpqGDGLvpg/B0fFHWgl1KIBmHr/x/H6lv+7Y?=
 =?us-ascii?Q?RdcVYl0v8VC+q754SsTH6DJbHUWSMwMkHVNAsgqKPwtxfQWNz9zCG/NvxneJ?=
 =?us-ascii?Q?4uvgoe9x4avDWywcG1lO+XAi/BdTMYcySk4b9aO5TNTYIZheu0WfVP76XEfO?=
 =?us-ascii?Q?RQnQAp4QwbuJoXCupMmSZ/SfRsR6wus1UNOiSOQlHUQI4ccv1K5AgAAjox+2?=
 =?us-ascii?Q?dVAk0IaxhPH4B334Hoc4E++/DGxFVVTAqSp1vAnQtmegS9MbHlFj8I5E8P+A?=
 =?us-ascii?Q?eP5C0v0w7UDOmW22DSBxeQFvLoS+Jq6qoVTvZwMF2M6oashc9W2CECRpVDg/?=
 =?us-ascii?Q?TFQ+FMc+iP8VBcQ8168JxmVrlv4J1Px6eUQb/isbawzgZyuGP1KNAsSWQrDJ?=
 =?us-ascii?Q?/9yZpTH/zUIxSbsqLsdCnbjR6XWseqr/Z5y7NBBKKhU99UP5k/Yf7njEiZyy?=
 =?us-ascii?Q?AwbKCuE+f/+O1JTs4Pp+mI3Rs/3iNMwcQZUIMHs6gt3xb4uafab57Sh5wycN?=
 =?us-ascii?Q?sMawCaRynpOfYyBE66m1+k0vRF/sYCOzpgLiDFKddJIjq4rXAzV/tC/hFGyl?=
 =?us-ascii?Q?rR6wazLl+C8WS1xMmieJJVlisS64XAlY7C+6sXeuDIu18oL26ITqsTgv1rCz?=
 =?us-ascii?Q?HZYbTCUxU1HKzogKZoQi3bJhsp38AR+roCyvtY2f1Il40b+I0OkuEcYb54Eq?=
 =?us-ascii?Q?oyjBB4y6ykShEkrdiZVAogSNS3Z9ZqhQzsP8LehX2ScFdhI8jWmBi8r+s+Ur?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e718a53f-efd7-4e9c-5df4-08db3d365c2f
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 22:19:48.9192
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: iCqOJyRazbC07ElFA+fJZymdOQiDcaDvvJ+Wkt8D+5OkXCaxU+XhFhxPJqYJnIYw0s9C5zDdOYTECzkGWLwF5Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7330
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-14_14,2023-04-14_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999
 phishscore=0 mlxscore=0 malwarescore=0 suspectscore=0 bulkscore=0
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304140196
X-Proofpoint-GUID: lqSnT7wL8etpvd4kRAyZS0o_lfByGyGd
X-Proofpoint-ORIG-GUID: lqSnT7wL8etpvd4kRAyZS0o_lfByGyGd
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham 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

On 04/13/23 19:11, Peter Xu wrote:
> When we try to unshare a pinned page for a private hugetlb, uffd-wp bit can
> get lost during unsharing.  Fix it by carrying it over.
> 
> This should be very rare, only if an unsharing happened on a private
> hugetlb page with uffd-wp protected (e.g. in a child which shares the same
> page with parent with UFFD_FEATURE_EVENT_FORK enabled).
> 
> Cc: linux-stable <stable@vger.kernel.org>
> Fixes: 166f3ecc0daf ("mm/hugetlb: hook page faults for uffd write protection")
> Reported-by: Mike Kravetz <mike.kravetz@oracle.com>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  mm/hugetlb.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 7320e64aacc6..083aae35bff8 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -5637,13 +5637,16 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma,
>  	spin_lock(ptl);
>  	ptep = hugetlb_walk(vma, haddr, huge_page_size(h));
>  	if (likely(ptep && pte_same(huge_ptep_get(ptep), pte))) {
> +		pte_t newpte = make_huge_pte(vma, &new_folio->page, !unshare);
> +
>  		/* Break COW or unshare */
>  		huge_ptep_clear_flush(vma, haddr, ptep);
>  		mmu_notifier_invalidate_range(mm, range.start, range.end);
>  		page_remove_rmap(old_page, vma, true);
>  		hugepage_add_new_anon_rmap(new_folio, vma, haddr);
> -		set_huge_pte_at(mm, haddr, ptep,
> -				make_huge_pte(vma, &new_folio->page, !unshare));
> +		if (huge_pte_uffd_wp(pte))
> +			newpte = huge_pte_mkuffd_wp(newpte);
> +		set_huge_pte_at(mm, haddr, ptep, newpte);
>  		folio_set_hugetlb_migratable(new_folio);
>  		/* Make the old page be freed below */
>  		new_folio = page_folio(old_page);
> -- 
> 2.39.1
> 

Thanks!  Looks good,

Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>

-- 
Mike Kravetz