Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Roman Gushchin <guro@fb.com>
To:     Andrew Morton <akpm@linux-foundation.org>, <linux-mm@kvack.org>
CC:     Shakeel Butt <shakeelb@google.com>,
        Johannes Weiner <hannes@cmpxchg.org>,
        Michal Hocko <mhocko@kernel.org>,
        Christoph Lameter <cl@linux.com>,
        <linux-kernel@vger.kernel.org>, <kernel-team@fb.com>,
        Roman Gushchin <guro@fb.com>
Subject: [PATCH 1/2] mm: slub: call account_slab_page() after slab page initialization
Date:   Tue, 10 Nov 2020 11:57:52 -0800
Message-ID: <20201110195753.530157-1-guro@fb.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
Precedence: bulk

It's convenient to have page->objects initialized before calling
into account_slab_page(). In particular, this information can be
used to pre-alloc the obj_cgroup vector.

Let's call account_slab_page() a bit later, after the initialization
of page->objects.

This commit doesn't bring any functional change, but is required for
further optimizations.

Signed-off-by: Roman Gushchin <guro@fb.com>
---
 mm/slub.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/slub.c b/mm/slub.c
index 8c9fa24ebbf3..ccdbb62e025d 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1622,9 +1622,6 @@ static inline struct page *alloc_slab_page(struct k=
mem_cache *s,
 	else
 		page =3D __alloc_pages_node(node, flags, order);
=20
-	if (page)
-		account_slab_page(page, order, s);
-
 	return page;
 }
=20
@@ -1777,6 +1774,8 @@ static struct page *allocate_slab(struct kmem_cache=
 *s, gfp_t flags, int node)
=20
 	page->objects =3D oo_objects(oo);
=20
+	account_slab_page(page, oo_order(oo), s, flags);
+
 	page->slab_cache =3D s;
 	__SetPageSlab(page);
 	if (page_is_pfmemalloc(page))
--=20
2.26.2