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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 D10F7C3F2C6 for ; Tue, 3 Mar 2020 22:55:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8F0B3206E6 for ; Tue, 3 Mar 2020 22:55:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kz3h8tmR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F0B3206E6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 28A576B000A; Tue, 3 Mar 2020 17:55:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 239DD6B000C; Tue, 3 Mar 2020 17:55:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 129AB6B000D; Tue, 3 Mar 2020 17:55:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0163.hostedemail.com [216.40.44.163]) by kanga.kvack.org (Postfix) with ESMTP id EB4C46B000A for ; Tue, 3 Mar 2020 17:55:07 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 8FE4F16902 for ; Tue, 3 Mar 2020 22:55:07 +0000 (UTC) X-FDA: 76555558254.10.turn93_f9b09dad891e X-HE-Tag: turn93_f9b09dad891e X-Filterd-Recvd-Size: 6542 Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Tue, 3 Mar 2020 22:55:07 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id c17so225956ioc.4 for ; Tue, 03 Mar 2020 14:55:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ANSl4+6JwS1WS3LeALDIvgtwXCX4H9nKLKageGYkpTs=; b=Kz3h8tmRMOJeeccCqg+E5Tj3ifQUIBKygc0xcdOkytbeEianX+iovKqS6/NPkfGDSB RkRU4egzU0crwhhcdAMcLmF96ar4skCjzF4LkFqGmsogHoRVh56EX/n/SLcoz5tvYffC PPDE0wxiKl8OJ6ZWMU+qei1QhG7ygX9HxurI5XRk69rw/5UQFI0RhndTRDNqDHTLwf22 ge3qcVKHOKT0S9mkiGmS6t+na/ZbpBc9+gDKYegrnR1MqWzPzvobeUFreA5FJzOD16Qn byaAvXJztzbP7/Mu0GSSDahlHBe6zPPH/kx5QPzpE3Rk4nIbx9+lFqcI7DUx++MbpPPL w5fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ANSl4+6JwS1WS3LeALDIvgtwXCX4H9nKLKageGYkpTs=; b=YBMCRKlLtzi6RilDxmkbC/WPEsDDLejMsc494/bMTOSvchWjgdoGOEpceUwz2b5QQL Vbo2qGKwXSn6Mnmwnswv8HytMvuO9mHA6hB+qPVgr6A7SGJNoFS2bt+l0YAIJDSEpJCM 1HAku2Nk1X3b4ft7163GTxHWqJvuB+M/S/qd7LMChs46b/Ws5Q54yOfPZMx8ORjOJsdn mY5mFqo2aTS7PHyPJByepwX0//rVAfMGSz3xNautz0JDzTfcRzAbO/uxSwsEHW2LGeZG 7Eec8Fthtuvbb0A2zMXqDSCmRz7gPYNrFUYaOLsf9Jkyrb2lLOF7SP9rR7pli1S12nvR YhwA== X-Gm-Message-State: ANhLgQ2dg9bXLZeljeowd8ePlnt/xjrTDVXm2lEi0a9Wxy0nKMlHxgnG JL/spmLQevu7SNeg3syHZy+1+BHE79bwwoB+K/Y= X-Google-Smtp-Source: ADFU+vu22ANM41h2cfS+8M9eshV46WfEI6LaJSB0wMbGdOyc2erDBDXtOlG8po1ByL/ihCnggpOfh5Y8/sKcIEfShS0= X-Received: by 2002:a05:6638:618:: with SMTP id g24mr126445jar.87.1583276106345; Tue, 03 Mar 2020 14:55:06 -0800 (PST) MIME-Version: 1.0 References: <20200303041125.19358-1-willy@infradead.org> <20200303041125.19358-4-willy@infradead.org> <20200303223401.GX29971@bombadil.infradead.org> In-Reply-To: <20200303223401.GX29971@bombadil.infradead.org> From: Alexander Duyck Date: Tue, 3 Mar 2020 14:54:55 -0800 Message-ID: Subject: Re: [PATCH 3/6] mm: Remove CONFIG_TRANSPARENT_HUGE_PAGECACHE To: Matthew Wilcox Cc: linux-mm , "Kirill A . Shutemov" , "Aneesh Kumar K . V" Content-Type: text/plain; charset="UTF-8" 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 3, 2020 at 2:34 PM Matthew Wilcox wrote: > > 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. 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.