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:   Thu, 5 Jan 2023 10:37:41 -0800
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     Peter Xu <peterx@redhat.com>
Cc:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Muchun Song <songmuchun@bytedance.com>,
        Nadav Amit <nadav.amit@gmail.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        David Hildenbrand <david@redhat.com>,
        James Houghton <jthoughton@google.com>,
        Axel Rasmussen <axelrasmussen@google.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        linux-stable <stable@vger.kernel.org>
Subject: Re: [PATCH 1/3] mm/hugetlb: Pre-allocate pgtable pages for uffd
 wr-protects
Message-ID: <Y7cY9XHStZv60P+z@monkey>
References: <20230104225207.1066932-1-peterx@redhat.com>
 <20230104225207.1066932-2-peterx@redhat.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230104225207.1066932-2-peterx@redhat.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+bMAL7Xb7SIxOxttWc1TQ5XWwtlT9hg1VVB7EXxlhNcdGxCb8ikOPYuyWA8n?=
 =?us-ascii?Q?ULI+TbSSS9hqUKvMHq3StHjih4y+UHMrsPfTaQ95HVKWp1rpQa1uljxYJNXx?=
 =?us-ascii?Q?DHMk4qOIsGdUqFg3x31ld9PNwthgaKLnT+b0tXXIz0JyBliI4i1O1ofCnuSs?=
 =?us-ascii?Q?AAn6z5E3bBEwgCSPwVn9BX1WP6+dp9rO7OVBVFjXZC3h2O0IOiTup2dtQCCj?=
 =?us-ascii?Q?byNUjtGGEgI8NlUo9+Yi0lqEwsXTFzc9i8E4zRvYXo1pYngFdiAzgpeX9YDb?=
 =?us-ascii?Q?ggEPvzvUSe+eOYO7C6WzehXvhZ9UYODWOT9I+FS8LL/eLGnWf4FOCzqjb78f?=
 =?us-ascii?Q?aJ72J5qSvtzcpgwDjqiuPs+CON4+z4FcvpaoaJhjNLtwd8CNFk+7S/2p8ZlX?=
 =?us-ascii?Q?geTq1flyxZCS9gl0OqYGFwyKN5ohBYmZxzX9R+TI5LCd8C0FbYj22V+Z7K/j?=
 =?us-ascii?Q?N2XUfXC9lVlHnyTk+vk1zTpITnRQHbYT6daRI8EI+OyaKqe4UPlkb2TS+4HS?=
 =?us-ascii?Q?kJWTBd8MguwGEEoumsQ83KflHRgerxqJUSHDL+u4B6aK7QuqINz1CLg+Cmwq?=
 =?us-ascii?Q?vhJr3z8pv7fBIdHmcF9u1dEBJXr1+CAUt7BRlIaGfQCD7bcuRhBUO21Z7MSQ?=
 =?us-ascii?Q?vgw0FPKZmbnQ09RHPE4mvF+/FYlPpv9H6+kY1lZL3kxRuPgfhvgu2VvfZidt?=
 =?us-ascii?Q?0h49h1MVNUXSiDtOuGvpTW2xXNSBYlIepUwcc+VtXifUUpwb8vD+ER/CgNDH?=
 =?us-ascii?Q?zMuvzDxeSRB4MwI0H4+L+EJNGvENEUBrnwgAJ17YVZIcuJrEoma2U+QrCXlm?=
 =?us-ascii?Q?7afhOsD5kw4tCmaqhxk95VCJsYR2m96omtccyx+qGVobWm5eNogf9m93nawC?=
 =?us-ascii?Q?gqFooyn4c6YuHT3i+Coxb3cdhz6rtdkGJFldfaKSxqDIDyJJ/ihlacYXdeWL?=
 =?us-ascii?Q?+thbSOBs3WqQJ1RATxuCrJBUOE6MXdoyy5Yoctj7uXNYbwE6ekCDMawr6jo4?=
 =?us-ascii?Q?T1uWRmnIHasHQi7uPJm9tdI4XMMokOlegMw11J5+o4wzAljX5v0rvphhE6Ly?=
 =?us-ascii?Q?NkEWVvx+hdnEQfryoTtdMB62mEeXqIxvM2yVWxQPy9PkPZPhrqQle6A8Ea7K?=
 =?us-ascii?Q?Pcz6giDxy9E7MBl7RCb5auXGKLxOYU8ita5mDFOFQrbIFPoGoO5EibRJwW7+?=
 =?us-ascii?Q?A26sB2sU21TjCcq244lvWsBQjgIDzLuDFLHwygbgue5QFWqvqL2pqledP3O+?=
 =?us-ascii?Q?1tW8ve7WeElmADTEULHTmVc6VWuXm7Z06LI5s8Kn87dI2W5EAYfKL/Y2Oaa0?=
 =?us-ascii?Q?8aExaSPfv0szbQHYhF/bAsm8+wmxMDWjuIrtc01gXNjLgUlHGp5whhgmDBzQ?=
 =?us-ascii?Q?QuHINBRpGqZHKTIS+7YmlzqWfeOGCBH29/Ion+sgp6BsnkwWacApJaMnTnQT?=
 =?us-ascii?Q?khbW847SEP7DHdFSKZLmYDtjNDV6F8mLrSeOaH8tOi7z6C3M+p3cfs2X8RK9?=
 =?us-ascii?Q?xh73Jo8Dx8LOeGVow8Kn4HVlNIahxqBj/ntyRPk1hjpW8sJZYxGPM2yu10Od?=
 =?us-ascii?Q?q2xVGXz41+PavpBaRzx7oyBE/fUYQYg3waTTwJsidsaFgxBZdXAS68WxRc93?=
 =?us-ascii?Q?sA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?0aC7F4NxP8vLgu334HCPXAIkz2dJqnPo3oEw2wF2CKBNERNpPjaCh8UhWB2H?=
 =?us-ascii?Q?tKY5xUfFGw68IgbD0/sqSOZBnNJG1+zfD7ejF1ty2Uwr8s9nmqO+GpKSX9/e?=
 =?us-ascii?Q?R7NnzUxsMh+MqvsLpVms3wo0jaeYzCYNsMfu3RtmJRwZVamIA1x5rmG1SMk2?=
 =?us-ascii?Q?4t4qMD3JaoiSL6Pfx9mMXJC4bD5PVB2OWPG1KmX1vhYzwSyd4KVtxnka7MlL?=
 =?us-ascii?Q?1MPCbOKMp8blgkyao6jhPCtH6BqEp8Wq5UEEgRVT6bkk3pxF103JoFbdvLjW?=
 =?us-ascii?Q?lJcTIPDBT42DS5zwYtduUp7Zct9KSiVN4TvCCAd8LTyczYlegNWY1YWoNEp8?=
 =?us-ascii?Q?O6NNODnffWdtjMMDVeafxsg+uQoqB2MFR8QfwJk9AXhTzeFiYCxeJEFPQ4+z?=
 =?us-ascii?Q?Mc/e4CoLclregVwlCUYKj3zA6VrgBZx7JB0W+++ZJJLiciACsv0c1/D0MLmD?=
 =?us-ascii?Q?3/EI3Kttw4YkpsXRxVVxLKIxwXIYes/G0IRTlHC+Tco+yTBO782adzUfk3SU?=
 =?us-ascii?Q?noAKR18IBxexy0rMQiuTO++pBzxxOIFDxf8QCcrJUSb6d6afIxFXPcpnctIt?=
 =?us-ascii?Q?9TDec9RRmrlGUyR7x71QUqeo2zewsQ8smtvX63iZb9blvZQWr0m2TLsYKcg6?=
 =?us-ascii?Q?+DhznqrvKeYTu6rz1zgXFySAte1VFDzsvwdaoXyZa0oaxfnQOOU3cV7Nb/ys?=
 =?us-ascii?Q?bxQKX7AI3C37QEoTU3/1082GNANmtESWYuG2FwJnrM863EmDDZ4Jp4S0UB1v?=
 =?us-ascii?Q?ZCN+A/Y95nF8BMiwxBW9vOv0RYk60ya/lJcwGBVeiZ8kQo4W+6XGuxiac6Q9?=
 =?us-ascii?Q?lkPW40sesnHr9TZtkPsU5TUwipSIdaXMqTc+W8y0cLPwM6AGotQpp9Pt1+O6?=
 =?us-ascii?Q?zDluICvHpn1GJBzk4YsVQTI1ogtETztBiHL12yqXUwqMKXw/U+dgoRd7HSTA?=
 =?us-ascii?Q?6/0L6ZuVqcWifpt34my1e7fxAhzoWUwA6Qb+hZF7xgD8vSm++hYjog5V3TnP?=
 =?us-ascii?Q?196+sVlNQsWjONAC31R1tABdxLPq2iBERf61ZZMwIhMOl7RtHlftcHqKkyq0?=
 =?us-ascii?Q?4H37bENu6e3pDj5QBovnVj9T/aWa5Q=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aff75cac-e10e-42a2-c3bd-08daef4befa9
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2023 18:37:45.1780
 (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: bRKnQWzgSsiMCQOslihvFNPukbJag8QQuPvXqydiha7FNcU8lvi2WIaYAjo8pPGh6OCsIf8i7XtEqIxD7BJsxQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4277
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-05_10,2023-01-05_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 adultscore=0
 spamscore=0 malwarescore=0 bulkscore=0 phishscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301050146
X-Proofpoint-ORIG-GUID: _EfQqk_SsORFK8a33fYErqCKVRojCABx
X-Proofpoint-GUID: _EfQqk_SsORFK8a33fYErqCKVRojCABx
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 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 01/04/23 17:52, Peter Xu wrote:
> Userfaultfd-wp uses pte markers to mark wr-protected pages for both shmem
> and hugetlb.  Shmem has pre-allocation ready for markers, but hugetlb path
> was overlooked.
> 
> Doing so by calling huge_pte_alloc() if the initial pgtable walk fails to
> find the huge ptep.  It's possible that huge_pte_alloc() can fail with high
> memory pressure, in that case stop the loop immediately and fail silently.
> This is not the most ideal solution but it matches with what we do with
> shmem meanwhile it avoids the splat in dmesg.
> 
> Cc: linux-stable <stable@vger.kernel.org> # 5.19+
> Fixes: 60dfaad65aa9 ("mm/hugetlb: allow uffd wr-protect none ptes")
> Reported-by: James Houghton <jthoughton@google.com>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  mm/hugetlb.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)

Thanks Peter and James!

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

> 
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index bf7a1f628357..017d9159cddf 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -6649,8 +6649,17 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
>  		spinlock_t *ptl;
>  		ptep = hugetlb_walk(vma, address, psize);
>  		if (!ptep) {
> -			address |= last_addr_mask;
> -			continue;
> +			if (!uffd_wp) {
> +				address |= last_addr_mask;
> +				continue;
> +			}
> +			/*
> +			 * Userfaultfd wr-protect requires pgtable
> +			 * pre-allocations to install pte markers.
> +			 */
> +			ptep = huge_pte_alloc(mm, vma, address, psize);
> +			if (!ptep)
> +				break;
>  		}
>  		ptl = huge_pte_lock(h, mm, ptep);
>  		if (huge_pmd_unshare(mm, vma, address, ptep)) {
> -- 
> 2.37.3
>