From patchwork Thu Jul 4 04:31:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13723198 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A34E7C30653 for ; Thu, 4 Jul 2024 04:32:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 379116B00AB; Thu, 4 Jul 2024 00:32:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2D8276B00AC; Thu, 4 Jul 2024 00:32:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DE266B00AD; Thu, 4 Jul 2024 00:32:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DD1706B00AB for ; Thu, 4 Jul 2024 00:32:18 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A30EE140A71 for ; Thu, 4 Jul 2024 04:32:18 +0000 (UTC) X-FDA: 82300798356.20.1E984C7 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf10.hostedemail.com (Postfix) with ESMTP id 90496C000F for ; Thu, 4 Jul 2024 04:32:16 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Sp75Awte; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Mj+n3kpv; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Sp75Awte; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Mj+n3kpv; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf10.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720067516; a=rsa-sha256; cv=none; b=bvFGBIcBDrlu7G08HVb8rF7h+i3KWIwgbw21BJaFAMWkaNQfi6VxsMaCKPlY2apPFdP81n U/yR5rDAgOfMUSsvToQn7zwupwLDJ0tDG0otYK6JhEr8iDFTf0NySfRmvKAimKQ52LJ/JP 7fpb2CmUm9FKsWio/lX4yHffz8mAYt4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Sp75Awte; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Mj+n3kpv; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Sp75Awte; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Mj+n3kpv; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf10.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720067516; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vSKmwPU7BkbGtKq84iiMlBZLjbm/8YgbxNgKPRpjw3o=; b=07icD0LJMZX6ePBY551PhoueZwaNBMWoDwdHCDtNsHC1u71m5in6eJUvYl13ITbSzVyflr YSikTZNij3WuRD5fFTJzrv6pETuATuReKlayWLx3eqyHOiEWZ9nvIwgKcDoSTy9bbLnQbq Z1GVKye4iGc18vPzobJDuF87zBMO0/k= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 487F31FCF9; Thu, 4 Jul 2024 04:32:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1720067535; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vSKmwPU7BkbGtKq84iiMlBZLjbm/8YgbxNgKPRpjw3o=; b=Sp75Awtev0kxk3LPqK9XxrdT8mVKHhhRuRIBMOFdY8fEHNVHNNZ06aTT5CglZTRF8npqNz 2Yy3uyOucP4OPr8Nv3JT4zfkut2bNZa/kPSEfP3yjJrNw6aJH7PjRQ35FXbRRBUM/Hdhb5 qpJvjTmjFlI704iRP7Ya2VX/BQVd3/k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1720067535; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vSKmwPU7BkbGtKq84iiMlBZLjbm/8YgbxNgKPRpjw3o=; b=Mj+n3kpvgdn1kni7UbDFyJvbmlmLCXttzKSC9JGDxhxjtdRvE8XYhxKLUr9QMKGLWWztko A652jlHgiyBk0NDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1720067535; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vSKmwPU7BkbGtKq84iiMlBZLjbm/8YgbxNgKPRpjw3o=; b=Sp75Awtev0kxk3LPqK9XxrdT8mVKHhhRuRIBMOFdY8fEHNVHNNZ06aTT5CglZTRF8npqNz 2Yy3uyOucP4OPr8Nv3JT4zfkut2bNZa/kPSEfP3yjJrNw6aJH7PjRQ35FXbRRBUM/Hdhb5 qpJvjTmjFlI704iRP7Ya2VX/BQVd3/k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1720067535; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vSKmwPU7BkbGtKq84iiMlBZLjbm/8YgbxNgKPRpjw3o=; b=Mj+n3kpvgdn1kni7UbDFyJvbmlmLCXttzKSC9JGDxhxjtdRvE8XYhxKLUr9QMKGLWWztko A652jlHgiyBk0NDg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 28FA913889; Thu, 4 Jul 2024 04:32:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id uClaBc4lhmbnDAAAD6G6ig (envelope-from ); Thu, 04 Jul 2024 04:32:14 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Peter Xu , Muchun Song , David Hildenbrand , SeongJae Park , Miaohe Lin , Michal Hocko , Matthew Wilcox , Christophe Leroy , Oscar Salvador Subject: [PATCH 20/45] fs/proc: Enable gather_pte_stats to handle cont-pte mapped hugetlb vmas Date: Thu, 4 Jul 2024 06:31:07 +0200 Message-ID: <20240704043132.28501-21-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240704043132.28501-1-osalvador@suse.de> References: <20240704043132.28501-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 90496C000F X-Stat-Signature: bux67qmmut66eud4zxayky4mhsjsuncp X-Rspam-User: X-HE-Tag: 1720067536-633005 X-HE-Meta: U2FsdGVkX1+EyOe0yLeoKqjbiFfkkCXMKRAGaF9ESn8p4rqfD1cpny2c9r4YGfNrk9Xr0Ho5dGZ195REIKy0oy8NK7AxuDipCs/NhoH3wOh5zbTwKLqJHya6OFOmxy8dDTYEIR8EYbCq9g0X7rEAgM4sfVAkB/pTOLFT5i1y7Xfq6h0NQVgHdhLXAYSDBfw8x+0B73tY90f8vScsWrhwyF1rKwPI98rQl3o9twhpnraF6GUskbtLUZj/KVuMZAOzRrBN67YtHm1XK8ez6YmNy3dkGEqjzYzoKfXtenM7X9fc4jNbcVMKtu08d2Q1Qup1xXs9a7Lgd0yQIC4kNC0hgQUuS1UIcenlfRqk/7ibgrzskwLxKdguf6WHV3B5ZZQr9PCspSswCN1OrCf3rF6hy/mj/QFjsNIXt9RbOP73CuFiQXzFSelj+Ob2rLu5z0TYZfmH9VCJxao+JRRv3y2ZDXwxBVlt+/zQzaI5StL3IIZbJCwPRfpzs89tNyPG9WmRNTLJCfS+L7udeP2f3L85CCxzO5ScNBQH5QrK9nI7ebF7eR7J+tl5/nhYAmtiiwmC/kWB57PbQU6SpM7llK6a4Zp0pRfWiDtDkL+8BXFgfswkwoYGFgP9g5dGyL2FZCudA0dzX6fFOMkBdnMWjjQJkFanhI98KQMomxPO3M5aa7mpq69v6QeefNliBkLyUBtHLcKR1NJV1Fl0RCHATbYBbhhtk7W8MF6I4Qfb9b1lBAYU3hw6Y+H/Dhjv5BJWS9bDLa52eZ0qTOLWfNeaTuwpVrQWH7xJM2ePIDbq4N1U1rQpcyJ4XZIg+FEuB5QVbaT6CfSJONWUI+Opl8gKCXPSSRPBOrbJ34TzqgXaDYJu2DztCIUQaTVlPm/N6SZMzTXoI6t846acXeJwv3KiVC59XGGRG1s69GiqgXizBFIeVJX9H/ke4YabVmALIYihXIqAPa7QxyQSl4pK7RhYs5O L/HH93wN yvS40dcgRvJ+NkToFo6pqvbkcwPnki0pswIWrgjFUeHae4OL+Jx0cbnGaDXTC/rok5h/mjEhdlCahP8DJ1z/9EoeS+IvVXKTotwUlYl8RWB3MTORl9ceXyWiXinLRNwLbRAWbHHVGghhRDGu8eG1Mek6sRTty3BNggyK06DrgPEO/AflqJ2UVh1RXv2EZ+wZifTkyOsiXrPMl9WEnv0U2A0TYO4Ti5craFbf2ouI5Vv0+z8fkw22YC+vMXTayP3+4VnLPAuRHVdefupOzwdTRwpj6Yylz57B9KmQB 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: List-Subscribe: List-Unsubscribe: HugeTLB pages can be cont-pte mapped, so teach smaps_pte_entry to handle them. Signed-off-by: Oscar Salvador --- fs/proc/task_mmu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index e13754d3246e..98dd03c26e68 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -3175,6 +3175,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, spinlock_t *ptl; pte_t *orig_pte; pte_t *pte; + unsigned long size = PAGE_SIZE, cont_ptes = 1; #ifdef CONFIG_PGTABLE_HAS_HUGE_LEAVES ptl = pmd_huge_lock(pmd, vma); @@ -3200,6 +3201,10 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, walk->action = ACTION_AGAIN; return 0; } + if (pte_cont(ptep_get(pte))) { + size = PAGE_SIZE * CONT_PTES; + cont_ptes = CONT_PTES; + } do { pte_t ptent = ptep_get(pte); struct page *page = can_gather_numa_stats(ptent, vma, addr); @@ -3207,7 +3212,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, continue; gather_stats(page, md, pte_dirty(ptent), 1); - } while (pte++, addr += PAGE_SIZE, addr != end); + } while (pte += cont_ptes, addr += size, addr != end); pte_unmap_unlock(orig_pte, ptl); cond_resched(); return 0;