From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E56BC433EF for ; Mon, 4 Oct 2021 14:50:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C173C613AC for ; Mon, 4 Oct 2021 14:50:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C173C613AC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 5E9F794004D; Mon, 4 Oct 2021 10:50:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 598DF94000B; Mon, 4 Oct 2021 10:50:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AFF394004D; Mon, 4 Oct 2021 10:50:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0191.hostedemail.com [216.40.44.191]) by kanga.kvack.org (Postfix) with ESMTP id 3C71594000B for ; Mon, 4 Oct 2021 10:50:32 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EA1C41828000B for ; Mon, 4 Oct 2021 14:50:31 +0000 (UTC) X-FDA: 78659041062.06.B41F279 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP id 27B319008004 for ; Mon, 4 Oct 2021 14:50:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=pS0ASi/81sc9R6hwg8umMOFY0NXDtIk1poxPoXfn+RQ=; b=pGluLTuo3uBmLI7Xd0WbYMCfwY udeF2ZxiQsBZIivFkH4v2JbWF7b+7y7sfJdLi1vucv90NtXFuZ/Fyxn2d7RQixuUBeGOHzYIt4hA3 XRK7Pdh7OtNBk2rgvu0O+rBCT0fbmqLVh0F+5sdvSa1XGM8UGUvskGPAN5+0mFEiRckDtDop2qDUy iH8ZT5B8Xyi+NgBXH65XVMsTbW0JfGXly1vuExF4o4vSJDAaX+XB2a28u6TUS9RVjMslUmfzOwmot GKbuCaQRqdyBxRxPh6fTHsYjM5GDf02wadE5WYwA0zjtHoP4BCBoawzkypUc94SMOEQhT9IlzYYq/ 276RaetQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXPGR-00H1Kr-JV; Mon, 04 Oct 2021 14:48:46 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 49/62] mm/slub: Convert get_map() and __fill_map() to struct slab Date: Mon, 4 Oct 2021 14:46:37 +0100 Message-Id: <20211004134650.4031813-50-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004134650.4031813-1-willy@infradead.org> References: <20211004134650.4031813-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 27B319008004 X-Stat-Signature: jgpkrpbgbpwb9kbzug3btjtdejtk51zh Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=pGluLTuo; dmarc=none; spf=none (imf29.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1633359031-254354 Content-Transfer-Encoding: quoted-printable 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: Improve type safety and remove calls to slab_page(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/slub.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index 0d9299679ea2..86d06f6aa743 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -535,14 +535,14 @@ static unsigned long object_map[BITS_TO_LONGS(MAX_O= BJS_PER_PAGE)]; static DEFINE_RAW_SPINLOCK(object_map_lock); =20 static void __fill_map(unsigned long *obj_map, struct kmem_cache *s, - struct page *page) + struct slab *slab) { - void *addr =3D page_address(page); + void *addr =3D slab_address(slab); void *p; =20 - bitmap_zero(obj_map, page->objects); + bitmap_zero(obj_map, slab->objects); =20 - for (p =3D page->freelist; p; p =3D get_freepointer(s, p)) + for (p =3D slab->freelist; p; p =3D get_freepointer(s, p)) set_bit(__obj_to_index(s, addr, p), obj_map); } =20 @@ -567,19 +567,19 @@ static inline bool slab_add_kunit_errors(void) { re= turn false; } #endif =20 /* - * Determine a map of object in use on a page. + * Determine a map of objects in use in a slab. * - * Node listlock must be held to guarantee that the page does + * Node listlock must be held to guarantee that the slab does * not vanish from under us. */ -static unsigned long *get_map(struct kmem_cache *s, struct page *page) +static unsigned long *get_map(struct kmem_cache *s, struct slab *slab) __acquires(&object_map_lock) { VM_BUG_ON(!irqs_disabled()); =20 raw_spin_lock(&object_map_lock); =20 - __fill_map(object_map, s, page); + __fill_map(object_map, s, slab); =20 return object_map; } @@ -4216,7 +4216,7 @@ static void list_slab_objects(struct kmem_cache *s,= struct slab *slab, slab_err(s, slab, text, s->name); slab_lock(slab_page(slab), &flags); =20 - map =3D get_map(s, slab_page(slab)); + map =3D get_map(s, slab); for_each_object(p, s, addr, slab->objects) { =20 if (!test_bit(__obj_to_index(s, addr, p), map)) { @@ -4964,7 +4964,7 @@ static void validate_slab(struct kmem_cache *s, str= uct slab *slab, goto unlock; =20 /* Now we know that a valid freelist exists */ - __fill_map(obj_map, s, slab_page(slab)); + __fill_map(obj_map, s, slab); for_each_object(p, s, addr, slab->objects) { u8 val =3D test_bit(__obj_to_index(s, addr, p), obj_map) ? SLUB_RED_INACTIVE : SLUB_RED_ACTIVE; @@ -5170,7 +5170,7 @@ static void process_slab(struct loc_track *t, struc= t kmem_cache *s, void *addr =3D slab_address(slab); void *p; =20 - __fill_map(obj_map, s, slab_page(slab)); + __fill_map(obj_map, s, slab); =20 for_each_object(p, s, addr, slab->objects) if (!test_bit(__obj_to_index(s, addr, p), obj_map)) --=20 2.32.0