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:   Mon, 27 Mar 2023 11:34:38 -0700
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     Peter Xu <peterx@redhat.com>
Cc:     David Hildenbrand <david@redhat.com>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Rapoport <rppt@linux.vnet.ibm.com>,
        Nadav Amit <nadav.amit@gmail.com>,
        Axel Rasmussen <axelrasmussen@google.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        Muhammad Usama Anjum <usama.anjum@collabora.com>,
        linux-stable <stable@vger.kernel.org>
Subject: Re: [PATCH v3] mm/hugetlb: Fix uffd wr-protection for CoW
 optimization path
Message-ID: <20230327183438.GC4184@monkey>
References: <20230324142620.2344140-1-peterx@redhat.com>
 <20230324222707.GA3046@monkey>
 <8a06be33-1b44-b992-f80a-8764810ebf3f@redhat.com>
 <ZCBavqZE2cyVOzaW@x1n>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZCBavqZE2cyVOzaW@x1n>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ftx1h5XCr5q/m67MchIobnvkAU7LbZy2XBMuvLzOKitjcGVWbnUEPXIWHQmK?=
 =?us-ascii?Q?J1joBMActu6YjshBtgkoktG/Q+mIE5nWHv0botLq9TtdhCgk7d84GoOstTf8?=
 =?us-ascii?Q?+bk9Yx+qyGY2whqECGaR8uELtltryMFDkdrs2v9o3Uyd3WDp3FHL0lfFG8kB?=
 =?us-ascii?Q?tPxYF4xpxdFWIcSIVi7Gb0qrYzQukzhLPh5XXETPHgWCjrf6mmkHHbDKUB+P?=
 =?us-ascii?Q?fOfYRkcBoi3KzCnICA6FCmCLXjIhjXvVAFRcdcKMtqzKn9Wgk74XVEqdlYpS?=
 =?us-ascii?Q?c6YAiqxYV2JtH5iYy63Ew0EmWcqegT4+6nW+YDQpw1Tu64+oyCAM9/HvCaC3?=
 =?us-ascii?Q?sBOt7wqpvYKrh8yCsrrDxrG4c1RCJlpeFDQ+t4BaMWAGxgblrgCBo9BwEbUb?=
 =?us-ascii?Q?3hMhnQY1nRWme0RO311nCqHUygV0xNJUIjmTyhb9hDajJrrRqZ/2VoLJ2X/F?=
 =?us-ascii?Q?ppkPYmZFgmXrdz19COSOLyNRZTz4SfvXamfDHmWOF0FTJBuxJfoKiHg8LtW9?=
 =?us-ascii?Q?cEO3zbyAXAJ/3dZY6KC0qkv/017uNASEnqNCVZnAv/8solOI78Kd65S+og3B?=
 =?us-ascii?Q?qaGIvR7Osksiucd2eu0hW5ZczawrMZdXksNm2ienIUetYjTbzu25yAyFLlFp?=
 =?us-ascii?Q?LVK0Lz7HYaSf71yxzyX1AI5oMSVUN2IercKiJQEMLWDwN5e3+DQ7eCFzV0fo?=
 =?us-ascii?Q?uwDMiouNgFNgTx9jM/HZ0/e2jNPoFmDFRmpCV+uVsDyMNIVEYni7tHUCPBrO?=
 =?us-ascii?Q?hPnH+mp5+HiCryjuS+uVeyMZ6fOrXhxcaFUUkVrd9yY3yXlv/aU361Ihso3D?=
 =?us-ascii?Q?cO7qiacUPUUHKEucbytiejF1xLOj74a8nG8KwtrMXc9TffDVZzmeSbhpKdzZ?=
 =?us-ascii?Q?sfeUfCle1iy6Fjbg8zli2NXT4gp51+8kv/rijSJ8qLcTYZHyhK83wW89JFrI?=
 =?us-ascii?Q?i7v1zzjQlk6jSqO4o8WE8psksM4fEphDv3sSSO4wcFDGM5wZzgAalVO1Qdbc?=
 =?us-ascii?Q?0K+St5nOQ5aorUqjB4E9Y4w7pBDHe38JXSdavxp9pHtXmgzhML/wTnt+Ab/M?=
 =?us-ascii?Q?k09JIywqlozEPUnpD55AdLjbjMN7VWZ541RRIqojxD/dH4zo9v+f3QBSc17F?=
 =?us-ascii?Q?rp6gUagkAr1F+HjdCeK1xqW6FSp/eLJanm30vj3kJmCVzmonpEb3bukKSyuN?=
 =?us-ascii?Q?QIoLbk/otLB1035hqtNuO59jHvugbA0jXhyrquniL5/B7ZT8Hi8EQ+nUjf74?=
 =?us-ascii?Q?+LalIKLTWKtHsUPcPsWMZzXzh+xt5LpiomLK5n0dBhHmnfC9Ag3QBQR0epLW?=
 =?us-ascii?Q?7x6yvvIQjzsk7Q4300MkyJL2l84SQ1GSBmR5M4fhgekHepdVcezws6mIzZz6?=
 =?us-ascii?Q?By5Gl80K2CdmYej33b/aLRVBnjfHFTGE6CVBoSDIGBYDlSr2P0BfAFkjUfh5?=
 =?us-ascii?Q?XsPInuvJ1VHG9bGl2NbxbfVVzNqGkMyDaoo5/qEV1oSNZYa7VqBtUCTOz6Mu?=
 =?us-ascii?Q?T1Cfk6O05S93HQI3r1aUSXwYAVvFAstNqEQZti6LF4TSPS4g30feqrtbQSQe?=
 =?us-ascii?Q?JofmADqnAB5d2WYjkA6SaoGjCeDwfQenrf8FWKnxRZ2j1zx+UCED2EFOnorX?=
 =?us-ascii?Q?bw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?2y0Ey3wjnBVEi/s7/YFQterFujeZoaogT+A4wdS6KpfjMJWgrt+4xAbDHkcC?=
 =?us-ascii?Q?2hUmcKGanvnyJJCQyrppeiT4X1JpHSwojlBjKYuzLUgkhfva4XgYjNx9LlGE?=
 =?us-ascii?Q?oa7dtw3EHOp24gQw1/02COjXplQqYT/GTqy7C93xyNRugbPSTWXG1VfgiMJR?=
 =?us-ascii?Q?OpdJNoodVFguMl956bJrn+d4MF83IR0LxsUtSHtMXAbIW+Alb+PsdjcBuMp4?=
 =?us-ascii?Q?7nGQNFg1RCUbfFup06B7WFN40dHZWygzYsgKilAexVfeTyvZooGQKj3enrxO?=
 =?us-ascii?Q?Bul/19hZO/wTchcoHSO6C92lYwSzibtSMlMIMDeN5Z6+8QVSwaTOXlZXBVbA?=
 =?us-ascii?Q?HMn1mvxHalOTj/5Zvzr3BE90X4N9NYOEiXvlEk1RisjuWNdhdnw5kDG7m3rO?=
 =?us-ascii?Q?DGkiNoYPqwpk2/34oNOVRSCxYNrkmQt00ZbCweIcvilPvF75cfdZTtopwekW?=
 =?us-ascii?Q?xYGC9YSUiKUFo6xcL6tFL2ankKWDPaXO+MkIeD+/MXgFRjA/EEXehSih+E7F?=
 =?us-ascii?Q?DpwCqnIoFvTgrkJwBNcBQ6c04PgNdKmqY7mkObSOvE5AFduV9sdiSsx1BwQp?=
 =?us-ascii?Q?nlHqD1d5L0CpIhB6cF41YP2has0o2ip1ODpd6YQBNEA+XLEpZnC6mcr1wjLe?=
 =?us-ascii?Q?INRNCyaTMxwljhkUbPPgccOcWq3Tt7RV3+Fb7LxefaatofjxhywvDR+C0+r7?=
 =?us-ascii?Q?bfQKegAD/Y68AuZdHpuYhU77+kf4Mi2o4p3JZxr4qMpwc13KyGH1AKDKR1N1?=
 =?us-ascii?Q?JchImWmuYr03xxn7K23opu6CkOMEZVA+zwZAEzRF1xRuFY0dz08pYvv+yEiF?=
 =?us-ascii?Q?XDPtJ4T6YHxvE0O0jZos+HyudNAyApX+L3Xy5dFZwlBaZ09mQBD3n3bys8ep?=
 =?us-ascii?Q?9ABq98aMDh2TDINow8ncVLOLW2Ths/YUNBBuXvzB8/3EWcHo36rVx2Z0Wa7O?=
 =?us-ascii?Q?gKcttt8074jE1zJf9lcL/iIkR/flaOPHUIwfc/f95yilciYfVmOrUFI90nm8?=
 =?us-ascii?Q?g0NNGptUYK0fe3DzxNlNbgDerQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fb104e6f-78f7-4ed1-1d28-08db2ef1edb9
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2023 18:34:41.5272
 (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: vQGuI5Tbu0EADo7Mab2TrI6wSsN9eBR0VhH2IraGatx71/ylTMPSO3ooL58RUVcrxXXKUi4NtHV9mlMmMib5Fg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5009
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-03-24_11,2023-03-27_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 phishscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2303270152
X-Proofpoint-ORIG-GUID: v81ZORHO9cyxEN-ErFskDsmT6JzLEYQJ
X-Proofpoint-GUID: v81ZORHO9cyxEN-ErFskDsmT6JzLEYQJ
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,
        SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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 03/26/23 10:46, Peter Xu wrote:
> On Fri, Mar 24, 2023 at 11:36:53PM +0100, David Hildenbrand wrote:
> > > > @@ -5487,6 +5487,17 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma,
> > > >   	unsigned long haddr = address & huge_page_mask(h);
> > > >   	struct mmu_notifier_range range;
> > > > +	/*
> > > > +	 * Never handle CoW for uffd-wp protected pages.  It should be only
> > > > +	 * handled when the uffd-wp protection is removed.
> > > > +	 *
> > > > +	 * Note that only the CoW optimization path (in hugetlb_no_page())
> > > > +	 * can trigger this, because hugetlb_fault() will always resolve
> > > > +	 * uffd-wp bit first.
> > > > +	 */
> > > > +	if (!unshare && huge_pte_uffd_wp(pte))
> > > > +		return 0;
> > > 
> > > This looks correct.  However, since the previous version looked correct I must
> > > ask.  Can we have unshare set and huge_pte_uffd_wp true?  If so, then it seems
> > > we would need to possibly propogate that uffd_wp to the new pte as in v2
> 
> Good point, thanks for spotting!
> 
> > 
> > We can. A reproducer would share an anon hugetlb page because parent and
> > child. In the parent, we would uffd-wp that page. We could trigger unsharing
> > by R/O-pinning that page.
> 
> Right.  This seems to be a separate bug..  It should be triggered in
> totally different context and much harder due to rare use of RO pins,
> meanwhile used with userfault-wp.
> 
> If both of you agree, I can prepare a separate patch for this bug, and I'll
> better prepare a reproducer/selftest with it.
> 

I am OK with separate patches, and agree that the R/O pinning case is less
likely to happen.

Since this patch addresses the issue found by Muhammad,

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