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 5DC1BC3F2D1 for ; Tue, 3 Mar 2020 22:34:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EB16E2073B for ; Tue, 3 Mar 2020 22:34:06 +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="dFUwW/Vl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB16E2073B 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 5A5DD6B0005; Tue, 3 Mar 2020 17:34:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 52F816B0006; Tue, 3 Mar 2020 17:34:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41F6E6B0007; Tue, 3 Mar 2020 17:34:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0126.hostedemail.com [216.40.44.126]) by kanga.kvack.org (Postfix) with ESMTP id 268196B0005 for ; Tue, 3 Mar 2020 17:34:06 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A069C16E08 for ; Tue, 3 Mar 2020 22:34:05 +0000 (UTC) X-FDA: 76555505250.10.sofa87_7b03b9045dc21 X-HE-Tag: sofa87_7b03b9045dc21 X-Filterd-Recvd-Size: 3703 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Tue, 3 Mar 2020 22:34:05 +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=C3S9EUxONT30tRfC+G0kumJtTW4itjAcgSChYJGkWNE=; b=dFUwW/VlO1BISoFbrNWXTddGql he94iEd9nNC2dqtsxJOcAsWSfHMegkiX1umAmjrFgIzwyspjqdoSUgXbPIPHZ8Ocdx7wkPPKj3lFu vWr6g8lbRdSBZ/gPowfyatfJDXIy4sD7SNgebb09zHiIsyZXgiF5zzjLywtvuSq0A8hn6+U3cPOOy oQmh2c9grKHjrmUxKaXMSm5ZH+eW3HIuz2n3EaBjm5hbTbJmD/6u9mHZBANOf9v7iNUWpOlYlBbFq S9OvHzK7yOzgnwEcGa8Fz/S4IVdsMwQ/nkzJvD/VhgRJj+Stjoj113AZXhZwoRaZ107lxXc6K8Tj4 wxQKjg1Q==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1j9G6z-0002is-6C; Tue, 03 Mar 2020 22:34:01 +0000 Date: Tue, 3 Mar 2020 14:34:01 -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: <20200303223401.GX29971@bombadil.infradead.org> References: <20200303041125.19358-1-willy@infradead.org> <20200303041125.19358-4-willy@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 01:52:10PM -0800, Alexander Duyck wrote: > On Mon, Mar 2, 2020 at 8:11 PM Matthew Wilcox wrote: > > @@ -1986,14 +1984,10 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, > > khugepaged_scan.address + HPAGE_PMD_SIZE > > > hend); > > if (IS_ENABLED(CONFIG_SHMEM) && vma->vm_file) { > > - struct file *file; > > + struct file *file = get_file(vma->vm_file); > > pgoff_t pgoff = linear_page_index(vma, > > khugepaged_scan.address); > > > > - if (shmem_file(vma->vm_file) > > - && !shmem_huge_enabled(vma)) > > - goto skip; > > - file = get_file(vma->vm_file); > > In the code above you didn't eliminate shmem_huge_enabled, it still > exists and has multiple paths that can return false. Are we guaranteed > that it will return true or is it that it can be ignored here? It probably helps to read this in conjunction with e496cf3d7821 -- that patch did this: 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); so I'm just undoing that.