From patchwork Sun Aug 25 20:06:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Zhao X-Patchwork-Id: 11113659 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B236B14DB for ; Sun, 25 Aug 2019 20:06:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 720BD206BA for ; Sun, 25 Aug 2019 20:06:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="L2Jg/CqW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 720BD206BA Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 91A6A6B0514; Sun, 25 Aug 2019 16:06:30 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8CB1E6B0515; Sun, 25 Aug 2019 16:06:30 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BC8E6B0516; Sun, 25 Aug 2019 16:06:30 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0077.hostedemail.com [216.40.44.77]) by kanga.kvack.org (Postfix) with ESMTP id 5FE246B0514 for ; Sun, 25 Aug 2019 16:06:30 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id EDF90824CA2A for ; Sun, 25 Aug 2019 20:06:29 +0000 (UTC) X-FDA: 75862032498.15.earth73_55cdb9893ae10 X-Spam-Summary: 2,0,0,3d4e8e02a07ac1ea,d41d8cd98f00b204,3ropixqykcjunjo6zd5dd5a3.1dba7cjm-bb9kz19.dg5@flex--yuzhao.bounces.google.com,:akpm@linux-foundation.org:willy@infradead.org:rcampbell@nvidia.com:jglisse@redhat.com:will@kernel.org:peterz@infradead.org:aneesh.kumar@linux.ibm.com:airlied@redhat.com:thellstrom@vmware.com:jrdr.linux@gmail.com::linux-kernel@vger.kernel.org:yuzhao@google.com,RULES_HIT:41:152:355:379:541:800:960:973:988:989:1260:1277:1313:1314:1345:1437:1516:1518:1534:1540:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3152:3352:3866:3867:3868:3870:3871:3872:4250:4321:5007:6119:6261:6653:6742:7903:9969:10004:10400:11026:11658:11914:12297:12555:12895:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21444:21627:30054:30070,0,RBL:209.85.221.201:@flex--yuzhao.bounces.google.com:.lbl8.mailshell.net-62.18.175.100 66.100.201.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutra l,Custom X-HE-Tag: earth73_55cdb9893ae10 X-Filterd-Recvd-Size: 3683 Received: from mail-vk1-f201.google.com (mail-vk1-f201.google.com [209.85.221.201]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Sun, 25 Aug 2019 20:06:29 +0000 (UTC) Received: by mail-vk1-f201.google.com with SMTP id t205so6709101vke.9 for ; Sun, 25 Aug 2019 13:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=+zhJzMhw6LdP2t6/07CSEKMx7kRxH5t+tfZUooODa+g=; b=L2Jg/CqWUEmpIPG5COD9iu+asYhkTPlrV1Q3nfbiS5JqpeyeQnVPxOO004YatNuXGf IgNfpUj++zV6+P/wRxIyR8YTZkOnyFOrRMiBK/iWdspcpYQ/KE4jfczN2CAXOjsbjxp2 KPBOK4JZFlOEwrkTbfaA8vlJYhSeHMgy2NOHcKNcm5bQITXTprbs+teNnc1K0gCWygv6 s6XrXKTToFH57nXNdsBmUAjL+pLjKWkLeb7k6wwPsyxyge0vVicDVzpevV7DEKKozbmn xtZw/n1Y4ugLmDh16MnQjI7OxbqpgUvVEaHzjTfD3yzx7ZEP3Z9QdMfPWp4m1yHVEr7o m/9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=+zhJzMhw6LdP2t6/07CSEKMx7kRxH5t+tfZUooODa+g=; b=Ll4Bn4bh8+B58yV9zX8u4zkW3xhUDvmOn+/16ru9uJk4r76xM8EJ7gE7ClSwNx0bF0 Jp/YRhblPB3U6Q7T7ug1rBhZL63bppF7pwgBlzw42LsYm9i4OY/qSb8E5Trqdy5UI7vR ehfqQosbuN4ncTi30nb5qn1UeTpnuV3wvywLNdFXLVfWCf2/0fF3qylB990U2YVjAmLY DTBLpzSCbLgOxZaR2qSjsGp4QSF662vw1VtvIyeUsM8Slil+4cygUeRlRMJm/gfUF+HO Vyv5iels2ZkKravkeCTjvKmLGFsfpQGquTsN8+CVwy+hDPZinQ7+MmfPm8JhAX3H16+w wKoA== X-Gm-Message-State: APjAAAU+6xGoQDsBWeVDeAgBGmx2CJRTIuWMHqP3aZzHhfKRB+LsC3qc uNvUql0nUorYITTCIUizs1kVC+5IxE0= X-Google-Smtp-Source: APXvYqwCbijI/fQz4VN4t/HjzBu52ybOI+J9R6kFb3HnnUqczko0IsLssuLE/txa+OJ4ol1ptVGpIhwCSCw= X-Received: by 2002:a67:bb18:: with SMTP id m24mr8073907vsn.201.1566763588690; Sun, 25 Aug 2019 13:06:28 -0700 (PDT) Date: Sun, 25 Aug 2019 14:06:21 -0600 Message-Id: <20190825200621.211494-1-yuzhao@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH] mm: replace is_zero_pfn with is_huge_zero_pmd for thp From: Yu Zhao To: Andrew Morton Cc: Matthew Wilcox , Ralph Campbell , " =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= " , Will Deacon , Peter Zijlstra , "Aneesh Kumar K . V" , Dave Airlie , Thomas Hellstrom , Souptick Joarder , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yu Zhao 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: For hugely mapped thp, we use is_huge_zero_pmd() to check if it's zero page or not. We do fill ptes with my_zero_pfn() when we split zero thp pmd, but this is not what we have in vm_normal_page_pmd(). pmd_trans_huge_lock() makes sure of it. This is a trivial fix for /proc/pid/numa_maps, and AFAIK nobody complains about it. Signed-off-by: Yu Zhao --- mm/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memory.c b/mm/memory.c index e2bb51b6242e..ea3c74855b23 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -654,7 +654,7 @@ struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr, if (pmd_devmap(pmd)) return NULL; - if (is_zero_pfn(pfn)) + if (is_huge_zero_pmd(pmd)) return NULL; if (unlikely(pfn > highest_memmap_pfn)) return NULL;