From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D06F6268695 for ; Mon, 24 Feb 2025 16:56:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740416213; cv=none; b=YsmV7z5GhFLv/No1CwWieSnjbvbF6/GBmULwDOkPrdiHCO9/pAi6fwqQ1LSiYs9g75yQvE4/G55oppJYTjijN1BBOh/6S/KDiYUc8d0mbHbInqfXSFEvGzL62ZuINC3TfGMQcEhmy8tOVcyjE7Lu/zKZR1JgN+mwdhZUpxGizS8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740416213; c=relaxed/simple; bh=9KDOJkYIHHSmS8EWVgHad+sJWVwCwusKqKnGhETdnT4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BIY8pFyUt3F5wqlowDfpGfuQSGVGEXr7pPQfMlaM5T5j20MlK3SsRFn25tVeJdlNCAfjsc2LKeKh8cvf8TGguJavxsVpOYt+l0hy/eCKZ+G4cCy8wg0PHKBMqBHvKukJf/iNTtEKFvoReHYxLr8LN4/dIUDMWF+f1+NFLhuvR3A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=igoZpsmJ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="igoZpsmJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740416211; h=from:from:reply-to:subject:subject: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=YYLglXDyFMXUmuyPM7L4Wt5NI1TaS59XhalfSABwrEE=; b=igoZpsmJHIbA/X4XPwCBdECzSkwNkUE+uBygZaJMVxoThkZSKMdw1YoqqzBjafk5n1CSN6 xCk1Lq7s3pFWxlWqButIorkVUFdY2RJryCpwyjUmFdgAewrXaTtt1PtI7OQNslICCtYyz8 rjyu2SwNyLqe3grCw6xoNJ8UvbX0qwo= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-438-1hwaq_QBOUqjYx0zOHF0nA-1; Mon, 24 Feb 2025 11:56:47 -0500 X-MC-Unique: 1hwaq_QBOUqjYx0zOHF0nA-1 X-Mimecast-MFC-AGG-ID: 1hwaq_QBOUqjYx0zOHF0nA_1740416206 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-38f62a0ec3fso3491450f8f.2 for ; Mon, 24 Feb 2025 08:56:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740416206; x=1741021006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YYLglXDyFMXUmuyPM7L4Wt5NI1TaS59XhalfSABwrEE=; b=KSQ8B3ocysaaxCRK+7L86vUc1BjwMFeSwzmQLGjYYhkWelVGbRvzG0Qz9FGE9KPhgt +Gqq0wDALk3f8eZUoRzlvhweCRnkpkyJJFeXY8cooyFWS/po6ZCZevYlxTSP2wFteXPH 5rDW1ffWdAc1kuFO3SDHvPpTbj2bP8vCydG577unLaAIj2A23yepDvNNV3T41IuaNDzO AnMWJzd+vBTjZVSE6YMDJTkS8NrDp+ccdQz7vJMOyCIWCgO8qaVCNtoka5R0lULVoRLH FfFCgdfigxk05D+bt4B/x0PeIrGuYe67AESmyPcipOrMLZubxMJf97yelf/IU75yPDTF knyw== X-Forwarded-Encrypted: i=1; AJvYcCWVQg/naL8zQNd8MwH0pdTr5D9ivTqFS100Ui9fZqsJCpebKr5JfagJ3/sm1kbM/R5ANJrxqhQc@vger.kernel.org X-Gm-Message-State: AOJu0Yy0WIVr6iZyNd/8b3dpoh+9Cx7MqSZvOmQKtvlPpF2sQu/DZ168 mjXGEu2Z7tH0klkMzbhP8lBsgWOQ0QoGP57wjSKnp+RTs1fmF2kT0q2x9GmR4zfQrS5Df51BazT 3Z/atyzK7Xh2W0MZYFSNKnRm4TmZZnH5cpOMRU5GqarxoHgFQoTu7Oho= X-Gm-Gg: ASbGncu3DCETRBgVDJ1O49O9Qv+BFDC7JkyKfRXQP1gtyEkg6XjOgFLD/NIBBdzvHZn UZVzoB34Pvm0BJfyargPTXN3gJMQJ6KNZF5+XhzQyfrWTyfPaZzQZ4RWQL5SW8sI3N2sG2Zs2/e OQ1egiPVHqFgcnTW0IMHR7J68A3MSy0hPBvUVXIpkyxFkQtqkyzyN3XBTpJjr7GEsv6Vj0ELUhU 2TLpNMqF4v6KuPkyEHS9eE5ozSbdMb4nIIbhnFFD9j1Fhdof/tOy4D6yOE0ASviXMC51tD2n0XU qqbvBJGoC3IBmIs5tBBQrs8MgFp0L94sxhXVsgdgsQ== X-Received: by 2002:a5d:6da5:0:b0:38d:cf33:31a1 with SMTP id ffacd0b85a97d-38f707afc79mr12824175f8f.23.1740416206024; Mon, 24 Feb 2025 08:56:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7oc6/f/Omy9ecKXhn6XnBr6bqzxs+GSFB5uGM8J4SWQqdkeD7RWsCxWskwEhPaUkzkpZm0Q== X-Received: by 2002:a5d:6da5:0:b0:38d:cf33:31a1 with SMTP id ffacd0b85a97d-38f707afc79mr12824140f8f.23.1740416205579; Mon, 24 Feb 2025 08:56:45 -0800 (PST) Received: from localhost (p4ff234b6.dip0.t-ipconnect.de. [79.242.52.182]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f259f7998sm31659273f8f.82.2025.02.24.08.56.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Feb 2025 08:56:45 -0800 (PST) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-doc@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Tejun Heo , Zefan Li , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Jonathan Corbet , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Muchun Song , "Liam R. Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn Subject: [PATCH v2 19/20] fs/proc/task_mmu: remove per-page mapcount dependency for smaps/smaps_rollup (CONFIG_NO_PAGE_MAPCOUNT) Date: Mon, 24 Feb 2025 17:56:01 +0100 Message-ID: <20250224165603.1434404-20-david@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224165603.1434404-1-david@redhat.com> References: <20250224165603.1434404-1-david@redhat.com> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Let's implement an alternative when per-page mapcounts in large folios are no longer maintained -- soon with CONFIG_NO_PAGE_MAPCOUNT. When computing the output for smaps / smaps_rollups, in particular when calculating the USS (Unique Set Size) and the PSS (Proportional Set Size), we still rely on per-page mapcounts. To determine private vs. shared, we'll use folio_likely_mapped_shared(), similar to how we handle PM_MMAP_EXCLUSIVE. Similarly, we might now under-estimate the USS and count pages towards "shared" that are actually "private" ("exclusively mapped"). When calculating the PSS, we'll now also use the average per-page mapcount for large folios: this can result in both, an over-estimation and an under-estimation of the PSS. The difference is not expected to matter much in practice, but we'll have to learn as we go. We can now provide folio_precise_page_mapcount() only with CONFIG_PAGE_MAPCOUNT, and remove one of the last users of per-page mapcounts when CONFIG_NO_PAGE_MAPCOUNT is enabled. Document the new behavior. Signed-off-by: David Hildenbrand --- Documentation/filesystems/proc.rst | 13 +++++++++++++ fs/proc/internal.h | 8 ++++++++ fs/proc/task_mmu.c | 17 +++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 1aa190017f796..57d55274a1f42 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -506,6 +506,19 @@ Note that even a page which is part of a MAP_SHARED mapping, but has only a single pte mapped, i.e. is currently used by only one process, is accounted as private and not as shared. +Note that in some kernel configurations, all pages part of a larger allocation +(e.g., THP) might be considered "shared" if the large allocation is +considered "shared": if not all pages are exclusive to the same process. +Further, some kernel configurations might consider larger allocations "shared", +if they were at one point considered "shared", even if they would now be +considered "exclusive". + +Some kernel configurations do not track the precise number of times a page part +of a larger allocation is mapped. In this case, when calculating the PSS, the +average number of mappings per page in this larger allocation might be used +as an approximation for the number of mappings of a page. The PSS calculation +will be imprecise in this case. + "Referenced" indicates the amount of memory currently marked as referenced or accessed. diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 16aa1fd260771..70205425a2daa 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -143,6 +143,7 @@ unsigned name_to_int(const struct qstr *qstr); /* Worst case buffer size needed for holding an integer. */ #define PROC_NUMBUF 13 +#ifdef CONFIG_PAGE_MAPCOUNT /** * folio_precise_page_mapcount() - Number of mappings of this folio page. * @folio: The folio. @@ -173,6 +174,13 @@ static inline int folio_precise_page_mapcount(struct folio *folio, return mapcount; } +#else /* !CONFIG_PAGE_MAPCOUNT */ +static inline int folio_precise_page_mapcount(struct folio *folio, + struct page *page) +{ + BUILD_BUG(); +} +#endif /* CONFIG_PAGE_MAPCOUNT */ /** * folio_average_page_mapcount() - Average number of mappings per page in this diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index d7ee842367f0f..7ca0bc3bf417d 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -707,6 +707,8 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page, struct folio *folio = page_folio(page); int i, nr = compound ? compound_nr(page) : 1; unsigned long size = nr * PAGE_SIZE; + bool exclusive; + int mapcount; /* * First accumulate quantities that depend only on |size| and the type @@ -747,18 +749,29 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page, dirty, locked, present); return; } + + if (IS_ENABLED(CONFIG_NO_PAGE_MAPCOUNT)) { + mapcount = folio_average_page_mapcount(folio); + exclusive = !folio_maybe_mapped_shared(folio); + } + /* * We obtain a snapshot of the mapcount. Without holding the folio lock * this snapshot can be slightly wrong as we cannot always read the * mapcount atomically. */ for (i = 0; i < nr; i++, page++) { - int mapcount = folio_precise_page_mapcount(folio, page); unsigned long pss = PAGE_SIZE << PSS_SHIFT; + + if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT)) { + mapcount = folio_precise_page_mapcount(folio, page); + exclusive = mapcount < 2; + } + if (mapcount >= 2) pss /= mapcount; smaps_page_accumulate(mss, folio, PAGE_SIZE, pss, - dirty, locked, mapcount < 2); + dirty, locked, exclusive); } } -- 2.48.1