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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D92E7C433F5 for ; Wed, 27 Oct 2021 20:53:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 75CBE6109E for ; Wed, 27 Oct 2021 20:53:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 75CBE6109E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id EB0886B0071; Wed, 27 Oct 2021 16:53:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E60266B0072; Wed, 27 Oct 2021 16:53:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4F08940007; Wed, 27 Oct 2021 16:53:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0206.hostedemail.com [216.40.44.206]) by kanga.kvack.org (Postfix) with ESMTP id A8E146B0071 for ; Wed, 27 Oct 2021 16:53:34 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 3DB7D1828B311 for ; Wed, 27 Oct 2021 20:53:34 +0000 (UTC) X-FDA: 78743418348.07.76E70AD Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf27.hostedemail.com (Postfix) with ESMTP id C714F7000247 for ; Wed, 27 Oct 2021 20:53:33 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id EA91D6109E; Wed, 27 Oct 2021 20:53:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1635368011; bh=zdJMv/mcj2CSAz9FcD1BLV11LsawzqVlhl6XTfTo+yU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=aBN6tBRiJHK7zgB6g4Onng7fU3uF0uidbUnpgzP53zxq/tXivVzJgRl1j62oYPSGf Jrod8DKfnHR6VnSJdnrG96os3vY9iXIilyp305YLdHGhmw4CoxpU002qA6DabhnZfm SXz5GWAOKHoIq144LxnUYWzEGZ+KseHoHI2W29fk= Date: Wed, 27 Oct 2021 13:53:28 -0700 From: Andrew Morton To: Yang Shi Cc: Song Liu , Hugh Dickins , "sunhao.th@gmail.com" , Matthew Wilcox , "Kirill A. Shutemov" , "andrea.righi@canonical.com" , Linux Memory Management List , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: Re: [PATCH] mm: khugepaged: skip huge page collapse for special files Message-Id: <20211027135328.001e4582a9535e8e4be785bb@linux-foundation.org> In-Reply-To: References: <20211027195221.3825-1-shy828301@gmail.com> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C714F7000247 X-Stat-Signature: eqx5jo5fn41u6yt4156e9atmtqmey4h7 Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=aBN6tBRi; dmarc=none; spf=pass (imf27.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org X-HE-Tag: 1635368013-741732 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: On Wed, 27 Oct 2021 13:44:37 -0700 Yang Shi wrote: > > > --- 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? > > Oh, yes, you are right. My mistake. > > Andrew, > > Could you please apply the below fix? um, how well tested are these changes?