Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Song Liu <songliubraving@fb.com>
To:     Yang Shi <shy828301@gmail.com>
CC:     Hugh Dickins <hughd@google.com>,
        "sunhao.th@gmail.com" <sunhao.th@gmail.com>,
        Matthew Wilcox <willy@infradead.org>,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        "andrea.righi@canonical.com" <andrea.righi@canonical.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linux Memory Management List <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [PATCH] mm: khugepaged: skip huge page collapse for special files
Thread-Topic: [PATCH] mm: khugepaged: skip huge page collapse for special
 files
Thread-Index: AQHXy2wtAJJR+AGuU0SPw4erOqc4Z6vnTVIA
Date:   Wed, 27 Oct 2021 20:34:49 +0000
Message-ID: <C8C6E50C-D300-40D4-AA5C-490F673BADFE@fb.com>
References: <20211027195221.3825-1-shy828301@gmail.com>
In-Reply-To: <20211027195221.3825-1-shy828301@gmail.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?aLbsABn/PcoIrAMtBXStmp+NrJzcOQ2fvoq5hBuRXumQ2fEKvim621Yvps06?=
 =?us-ascii?Q?GPHVjvTK+CaOW40M4f83qdW2+3Gmf6Md+iVoxJnRVIMjDVsbpX5pdbTX71mb?=
 =?us-ascii?Q?+uYhJNLbKUNDqCMIv9HdBog2I/iZjNTMzLt3WJh5EDqVyHzDN4O6V+s/x/3p?=
 =?us-ascii?Q?dQC4zimTndMh40NX8R2poJTWRZ1UjVuD/tKSrQOiUHNrMKU6jRJi89sxDdRP?=
 =?us-ascii?Q?/nc+5Kf44GRHnY2wwh6GJ0QJqVdIF/mX1psUqFEHfpEXf7DR7D0RZVN8ltVk?=
 =?us-ascii?Q?ufVYuN0XmKnaNjOdD67KE7IPAx8ogM3OQgGnL9qZgEb1FqKJLXiVSPrXeBTH?=
 =?us-ascii?Q?Y7jbUz3JBRW/K/SuR9Hdt/zY8tcnyqUc4V19bMtQ8ACloDlREpiqkfMPrPYT?=
 =?us-ascii?Q?aBPFh1c/jb6rTj1roKDYTU+3LG5DypchyIEQWJORCC2vdrdvCe/3Ye4BtjHE?=
 =?us-ascii?Q?F3teaGdb7V+FKwQvJI8qai8xbYi7sRSn96wTq1pgdnu8JpENBmOlxwsGcxUK?=
 =?us-ascii?Q?K8/bweQE+0CHtoSx6n0RHVEQTjl9hTEpbuZXU1YNg4U/73YhQAIPyhTL5gnu?=
 =?us-ascii?Q?SDqlmU90PnPexKFQZ3TuJXWIPNXJvcI04WUrohstgj12aiP/GwQnPI8/wY1O?=
 =?us-ascii?Q?CqpECmNFxqF9gLJTGLdDPLpzeoD492MBaNsH/EK4rL2+ERS5ll6UVlwjo15H?=
 =?us-ascii?Q?I2CVbOSUKMiOg2xaJm1gz3rVXGcRTb0jOmgXplmRu4lxjUky2SjcAbIq3wzX?=
 =?us-ascii?Q?jgimmN1bs42Cf0m4FHzVXIci2YF9+7Q6soQpBo0dSr7YbI0nQ7lE/UJ7TjEk?=
 =?us-ascii?Q?uiRu4F5Ph4mq42Yj0hJJt1ClIVTfS1g0SaH4ncA9AWLO1Uqm0VM2aiWPwwC8?=
 =?us-ascii?Q?A5AQHdmpkc240bGqszjdGkAXWOnxYdSfu7qujPFkH1Dag2BY/LmN6C1ByFqv?=
 =?us-ascii?Q?G/H8zBNuVdD68Lx2p6JeCJTMoZHekLPyhMz89Z0ysi1unv4SgMG0OeguchqN?=
 =?us-ascii?Q?4WaGoh0e3XPwAIZ++Y2bhagDjY+XVw5EfNjc8i3jUdRx1X0pJux9yuK1cudC?=
 =?us-ascii?Q?6rFiz2q4BJYPb5aeelaHQvxaP/pxzRxSGokY8+RCQHicZmFLPJPTIrpVeFJc?=
 =?us-ascii?Q?Wg0mpfpRjhtZfj04TKwoiZPSZUdYBZHz4CLYn95jDpZcy7rDv5oojJ6NAQGj?=
 =?us-ascii?Q?mh7bhXJORsR7XPZkoOheIWxUfWckENjOwNHE41cA1zIAHk4Fwhb8iO/mx5Kg?=
 =?us-ascii?Q?9v2HjqPgIquuN+kryV0WTq340UnsRnpMKKBMWQMxh89MSX6ce8dr12aIhbrW?=
 =?us-ascii?Q?nIS1gOhjKkUFy/qaZ7yqJWrIigpr9258S5MYBDKsOwMFm7Ng5cJZKvqr5bLb?=
 =?us-ascii?Q?8iPeC7HHhDDO0VQVAlDpiTVSD+Vz5lQrrV9rESzFGfOzuYcy9NuAOhu/pJh3?=
 =?us-ascii?Q?q5sXhvJ+GG1b8nG6R1bAUcqFODkR4YasslXY80OqF86Ysq5l2OxrQWWwNSrc?=
 =?us-ascii?Q?yHOpDB8CR0QTniZ4hnxphP4nCZzFSX+M8ECB113qgNa1tu5GTXqLanpeFxO9?=
 =?us-ascii?Q?3lKgtXIsMbz/PhCqQiSnjrmQIBymvApPj2VhNr1hlNzzjMMVIjqzX5SV72F7?=
 =?us-ascii?Q?UMQ8kgfaFMDdnkHsCrB560WIm1Uv7hifoE0xxh0hpSVDjqdIl8t3w9VstoxX?=
 =?us-ascii?Q?a5c0Hg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <09C0D7897F3A6C478F3EF192F3BEFDE6@namprd15.prod.outlook.com>
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SA1PR15MB5109.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 352b548d-8c48-43ac-03d9-08d99989390e
X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Oct 2021 20:34:49.5449
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 7yrfQT1ANDTJv0zyqJVGSa2YwtScxJPgRMbFv05lkivYD8VlReV9rV8oEN+A89MgecnOd5ufj3ASdQ72aeCbag==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR15MB5188
X-OriginatorOrg: fb.com
X-Proofpoint-ORIG-GUID: 1Nz8A9JNeIuIJf4nhFCDyPxuF-0ywEqT
X-Proofpoint-GUID: 1Nz8A9JNeIuIJf4nhFCDyPxuF-0ywEqT
X-Proofpoint-UnRewURL: 0 URL was un-rewritten
MIME-Version: 1.0
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475
 definitions=2021-10-27_06,2021-10-26_01,2020-04-07_01
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 bulkscore=0
 malwarescore=0 adultscore=0 spamscore=0 mlxscore=0 impostorscore=0
 clxscore=1011 priorityscore=1501 lowpriorityscore=0 phishscore=0
 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.12.0-2110150000 definitions=main-2110270116
X-FB-Internal: deliver
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Oct 27, 2021, at 12:52 PM, Yang Shi <shy828301@gmail.com> wrote:
> 
> The read-only THP for filesystems would collapse THP for file opened
> readonly and mapped with VM_EXEC, the intended usecase is to avoid TLB
> miss for large text segment.  But it doesn't restrict the file types so
> THP could be collapsed for non-regular file, for example, block device,
> if it is opened readonly and mapped with EXEC permission.  This may
> cause bugs, like [1] and [2].
> 
> This is definitely not intended usecase, so just collapsing THP for regular
> file in order to close the attack surface.
> 
> [1] https://lore.kernel.org/lkml/CACkBjsYwLYLRmX8GpsDpMthagWOjWWrNxqY6ZLNQVr6yx+f5vA@mail.gmail.com/
> [2] https://lore.kernel.org/linux-mm/000000000000c6a82505ce284e4c@google.com/
> 
> Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS")
> Reported-by: Hao Sun <sunhao.th@gmail.com>
> Reported-by: syzbot+aae069be1de40fb11825@syzkaller.appspotmail.com
> Cc: Hao Sun <sunhao.th@gmail.com>
> Cc: Matthew Wilcox <willy@infradead.org>
> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> Cc: Song Liu <songliubraving@fb.com>
> Cc: Andrea Righi <andrea.righi@canonical.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Hugh Dickins <hughd@google.com>
> Signed-off-by: Yang Shi <shy828301@gmail.com>
> ---
> The patch is basically based off the proposal from Hugh
> (https://lore.kernel.org/linux-mm/a07564a3-b2fc-9ffe-3ace-3f276075ea5c@google.com/).
> It seems Hugh is too busy to prepare the patch for formal submission (I
> didn't hear from him by pinging him a couple of times on mailing list),
> so I prepared the patch and added his SOB.
> 
> mm/khugepaged.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index 045cc579f724..e91b7271275e 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -445,22 +445,25 @@ static bool hugepage_vma_check(struct vm_area_struct *vma,
> 	if (!transhuge_vma_enabled(vma, vm_flags))
> 		return false;
> 
> -	/* Enabled via shmem mount options or sysfs settings. */
> -	if (shmem_file(vma->vm_file) && shmem_huge_enabled(vma)) {
> +	if (vma->vm_file)
> 		return IS_ALIGNED((vma->vm_start >> PAGE_SHIFT) - vma->vm_pgoff,
> 				HPAGE_PMD_NR);

Am I misreading this? If we return here for vma->vm_file, the following 
logic (shmem_file(), etc.) would be skipped, no? 

Thanks,
Song

> -	}
> +
> +	/* Enabled via shmem mount options or sysfs settings. */
> +	if (shmem_file(vma->vm_file))
> +		return shmem_huge_enabled(vma);
> 
> 	/* THP settings require madvise. */
> 	if (!(vm_flags & VM_HUGEPAGE) && !khugepaged_always())
> 		return false;
> 
> -	/* Read-only file mappings need to be aligned for THP to work. */
> +	/* Only regular file is valid */
> 	if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && vma->vm_file &&
> -	    !inode_is_open_for_write(vma->vm_file->f_inode) &&
> 	    (vm_flags & VM_EXEC)) {
> -		return IS_ALIGNED((vma->vm_start >> PAGE_SHIFT) - vma->vm_pgoff,
> -				HPAGE_PMD_NR);
> +		struct inode *inode = vma->vm_file->f_inode;
> +
> +		return !inode_is_open_for_write(inode) &&
> +			S_ISREG(inode->i_mode);
> 	}
> 
> 	if (!vma->anon_vma || vma->vm_ops)
> -- 
> 2.26.2
>