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 X-Spam-Level: X-Spam-Status: No, score=-0.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92164C3F2C6 for ; Wed, 4 Mar 2020 02:06:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 377D820866 for ; Wed, 4 Mar 2020 02:06:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="ex9x4miP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 377D820866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 862826B0003; Tue, 3 Mar 2020 21:06:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8134D6B0005; Tue, 3 Mar 2020 21:06:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 701DE6B0006; Tue, 3 Mar 2020 21:06:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0243.hostedemail.com [216.40.44.243]) by kanga.kvack.org (Postfix) with ESMTP id 553CD6B0003 for ; Tue, 3 Mar 2020 21:06:26 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 30CB6180AD801 for ; Wed, 4 Mar 2020 02:06:26 +0000 (UTC) X-FDA: 76556040372.02.desk92_550b23463a40e X-HE-Tag: desk92_550b23463a40e X-Filterd-Recvd-Size: 3827 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Wed, 4 Mar 2020 02:06:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=+Aj/HZb5iET2JfYyjr1hhfLFrtTfQPUVO5W5vep5dPk=; b=ex9x4miPOrA9+fchzR7FVD3+h4 wn74TyIL8BuDKzplKMT8jNs2isat/yXN4ttdNVE2/xtASRwryyi6I2DT6tRL3NBme8Pzytg6H7nak RCFOjk8skyIyBN7+8tU6Io8xPfi3ghCoizHJ8uw8qn4HX/xhn9UHRXJrNAXDOc0DViQbV20M7UthI ghLE/CjDNHNgwu32vKiF2I2TDwXcHRErmSfJ0VggaaMaWx3urDNBvFU5pRp2gmKsO58A+l4WY9lG4 pzqhimYRt33xpXDzUF0atg+LaGysJJWzDTYeOb74kTZpDwtplGP8REjIToQ7F6UJOeb842XwXOxI7 pmxoQS/g==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j9JQR-0000I1-Iu; Wed, 04 Mar 2020 02:06:19 +0000 Date: Tue, 3 Mar 2020 18:06:19 -0800 From: Matthew Wilcox To: Alexander Duyck Cc: linux-mm , "Kirill A . Shutemov" , "Aneesh Kumar K . V" Subject: Re: [PATCH 3/6] mm: Remove CONFIG_TRANSPARENT_HUGE_PAGECACHE Message-ID: <20200304020619.GY29971@bombadil.infradead.org> References: <20200303041125.19358-1-willy@infradead.org> <20200303041125.19358-4-willy@infradead.org> <20200303223401.GX29971@bombadil.infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 Tue, Mar 03, 2020 at 02:54:55PM -0800, Alexander Duyck wrote: > It looks like you are only doing a partial revert though. The original > changes in the function were: > @@ -1681,8 +1683,6 @@ static unsigned int > khugepaged_scan_mm_slot(unsigned int pages, > if (khugepaged_scan.address < hstart) > khugepaged_scan.address = hstart; > VM_BUG_ON(khugepaged_scan.address & ~HPAGE_PMD_MASK); > - if (shmem_file(vma->vm_file) && !shmem_huge_enabled(vma)) > - goto skip; > > while (khugepaged_scan.address < hend) { > int ret; > @@ -1694,9 +1694,12 @@ static unsigned int > khugepaged_scan_mm_slot(unsigned int pages, > khugepaged_scan.address + HPAGE_PMD_SIZE > > hend); > if (shmem_file(vma->vm_file)) { > - struct file *file = get_file(vma->vm_file); > + struct file *file; > pgoff_t pgoff = linear_page_index(vma, > khugepaged_scan.address); > + if (!shmem_huge_enabled(vma)) > + goto skip; > + file = get_file(vma->vm_file); > up_read(&mm->mmap_sem); > ret = 1; > khugepaged_scan_shmem(mm, file->f_mapping, > > You reverted the second piece, but I didn't notice you reverting the > first. WIth the first piece being reverted it would make more sense as > you would just be skipping the block that much sooner. Ah; that was an oversight on my part. Thank you for catching it! I'll resubmit with that fixed.