Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp283646ybb; Tue, 31 Mar 2020 23:21:15 -0700 (PDT) X-Google-Smtp-Source: APiQypIu+3UL7XgO6gDmdDkOIijz9A04B0IZiuQPfXLGqMzjvPYw23pUFLRg3kVUxjZNj+m8OWzd X-Received: by 2002:aca:aac1:: with SMTP id t184mr1769522oie.14.1585722075061; Tue, 31 Mar 2020 23:21:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585722075; cv=none; d=google.com; s=arc-20160816; b=F9hUO/4rnyKSxtezVXq/TiEDP1qF56H5clxvEKVtGWC2JA6I2X2iYnQfmbD5fi5gWU Mo74QjePAiOHuVgeTriJfcbhseKDnVhZjryZaMGl+5F/g047COS22zq5gwPHfPp++dGw fyD9HcybWujMwdBle6hij52cYO6JGRdCL3Y3/c6T5fgvhI9fQ0F8ijVJEDCUc8N6MScY gYS8If1y3B4Pdh7CFHqUZJ6lewvY9DI/pxVZQQKtgsCZeEpw6K0699gvk/5Ue6ufqjer /o1X4tmwgv0ph4r6Yfws9T2M0EjFEcQeXn8h1u1pOnf6+LvYTvAmmekZLQscYTXhAsTO 3OFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:message-id:in-reply-to:date:references:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=43NZjOROVu3AHJJNWiy28hKlMijCLEBkv2KUJRXjV8U=; b=Gz5BEqzXHuWNUnqn6uCvjSnCCoFCfJoTbws93U1z7QPsYCbMzuJMPFSQKdJOXwkhJO Kp3iErfgu4p1gpoBJpotAOvJcRt6FFmVwXGuaeejRqUL5TqMxpwpzHv6ynfPZKX0i8Xj kCj9bfLAw8GaOJ5NFfUOOqxapf3SH6oIHUjeL3M80NRCnf6d3a1+eQp93g6QPMIZvTWb owi/MTh1l7attoBByQtzsw2lN0yveVKduB6XNcB4vw1B1wEZ2PcU+nELVk4Vy8T9BHiM 567YCHN8kX5W2e4lVkiPfMCBXuahXG0JGR2hwlsXkdFVeiLUttQPWPhvdUKVx+X64r+x jP7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a13si496007otk.158.2020.03.31.23.21.00; Tue, 31 Mar 2020 23:21:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731784AbgDAGUp (ORCPT + 99 others); Wed, 1 Apr 2020 02:20:45 -0400 Received: from mga14.intel.com ([192.55.52.115]:16166 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731725AbgDAGUp (ORCPT ); Wed, 1 Apr 2020 02:20:45 -0400 IronPort-SDR: 2BlpfwQSx3MjfEkkPGwzHYPntSAcyArNCDLo1pKQeznLc2BZNg8qbNQnohzDzCRbvvDf9xycUg xpCcd4S3gYzw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2020 23:20:44 -0700 IronPort-SDR: Qg2g9PH0dmwx2fAkJyMDkbjEDOQUrozu68kmwFTM79fb6iVItTcTqBgFQ+KtX9h7besy5FXr8K InbBKpmawzbQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,330,1580803200"; d="scan'208";a="395840762" Received: from yhuang-dev.sh.intel.com (HELO yhuang-dev) ([10.239.159.23]) by orsmga004.jf.intel.com with ESMTP; 31 Mar 2020 23:20:41 -0700 From: "Huang\, Ying" To: Konstantin Khlebnikov Cc: Andrew Morton , , , Andrea Arcangeli , "Kirill A . Shutemov" , Zi Yan , Vlastimil Babka , Alexey Dobriyan , Michal Hocko , =?utf-8?B?SsOp?= =?utf-8?B?csO0bWU=?= Glisse , Yang Shi Subject: Re: [PATCH] /proc/PID/smaps: Add PMD migration entry parsing References: <20200331085604.1260162-1-ying.huang@intel.com> <49386753-5984-f708-4153-e9c6de632439@yandex-team.ru> <87mu7whr88.fsf@yhuang-dev.intel.com> Date: Wed, 01 Apr 2020 14:20:40 +0800 In-Reply-To: (Konstantin Khlebnikov's message of "Wed, 1 Apr 2020 09:03:45 +0300") Message-ID: <87a73viv5z.fsf@yhuang-dev.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Konstantin Khlebnikov writes: > On 01/04/2020 05.31, Huang, Ying wrote: >> Konstantin Khlebnikov writes: >> >>> On 31/03/2020 11.56, Huang, Ying wrote: >>>> From: Huang Ying >>>> >>>> Now, when read /proc/PID/smaps, the PMD migration entry in page table is simply >>>> ignored. To improve the accuracy of /proc/PID/smaps, its parsing and processing >>>> is added. >>>> >>>> Signed-off-by: "Huang, Ying" >>>> Cc: Andrea Arcangeli >>>> Cc: Kirill A. Shutemov >>>> Cc: Zi Yan >>>> Cc: Vlastimil Babka >>>> Cc: Alexey Dobriyan >>>> Cc: Michal Hocko >>>> Cc: Konstantin Khlebnikov >>>> Cc: "Jérôme Glisse" >>>> Cc: Yang Shi >>>> --- >>>> fs/proc/task_mmu.c | 16 ++++++++++++---- >>>> 1 file changed, 12 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c >>>> index 8d382d4ec067..b5b3aef8cb3b 100644 >>>> --- a/fs/proc/task_mmu.c >>>> +++ b/fs/proc/task_mmu.c >>>> @@ -548,8 +548,17 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr, >>>> bool locked = !!(vma->vm_flags & VM_LOCKED); >>>> struct page *page; >>> >>> struct page *page = NULL; >> >> Looks good. Will do this in the next version. >> >>>> - /* FOLL_DUMP will return -EFAULT on huge zero page */ >>>> - page = follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP); >>>> + if (pmd_present(*pmd)) { >>>> + /* FOLL_DUMP will return -EFAULT on huge zero page */ >>>> + page = follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP); >>>> + } else if (unlikely(is_swap_pmd(*pmd))) { >>>> + swp_entry_t entry = pmd_to_swp_entry(*pmd); >>>> + >>>> + VM_BUG_ON(!is_migration_entry(entry)); >>>> + page = migration_entry_to_page(entry); >>> >>> if (is_migration_entry(entry)) >>> page = migration_entry_to_page(entry); >>> >>> Seems safer and doesn't add much code. >> >> With this, we lose an opportunity to capture some bugs during debugging. >> Right? > > You can keep VM_BUG_ON or VM_WARN_ON_ONCE > > Off-by-page in statistics isn't a big deal and not a good reason to crash (even debug) kernel. > But for normal build should use safe behaviour if this isn't hard. Sounds reasonable! Will revise the code. Thanks! Best Regards, Huang, Ying >> >> Best Regards, >> Huang, Ying >> >>>> + } else { >>>> + return; >>>> + } >>>> if (IS_ERR_OR_NULL(page)) >>>> return; >>>> if (PageAnon(page)) >>>> @@ -578,8 +587,7 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, >>>> ptl = pmd_trans_huge_lock(pmd, vma); >>>> if (ptl) { >>>> - if (pmd_present(*pmd)) >>>> - smaps_pmd_entry(pmd, addr, walk); >>>> + smaps_pmd_entry(pmd, addr, walk); >>>> spin_unlock(ptl); >>>> goto out; >>>> } >>>>