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 2E74BC433F5 for ; Tue, 16 Nov 2021 00:17:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D282663238 for ; Tue, 16 Nov 2021 00:17:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D282663238 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id C846C6B0096; Mon, 15 Nov 2021 19:16:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 83A806B00A0; Mon, 15 Nov 2021 19:16:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2871C6B0096; Mon, 15 Nov 2021 19:16:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0165.hostedemail.com [216.40.44.165]) by kanga.kvack.org (Postfix) with ESMTP id 75E936B0095 for ; Mon, 15 Nov 2021 19:16:42 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2E6831815CBE8 for ; Tue, 16 Nov 2021 00:16:42 +0000 (UTC) X-FDA: 78812877444.30.8091236 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf29.hostedemail.com (Postfix) with ESMTP id AFEE79000269 for ; Tue, 16 Nov 2021 00:16:40 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id CEEBC2195F; Tue, 16 Nov 2021 00:16:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1637021798; 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=1hx1s/ST3RmEDo/GXuXz/V6S5vW536V72th0RgvR1AY=; b=FSCBg0HcyuQxEkWd6g/9Ecg8TYYm/VswanZGxvT/bup/BDCiCuhYpEangT4XgeNT7Bjw5d CEQoSvOJRG2RKFip2iQunKvRdthLEcoQSoVStIL6MHvPJNTxhQws0QbAitwFh83en1LOQ2 FYXK1Mv4TEZc3S1gHS2bUbhVka1bfqU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1637021798; 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=1hx1s/ST3RmEDo/GXuXz/V6S5vW536V72th0RgvR1AY=; b=QIPxUq5iXzlRrC6y653cf0lwGLvjJb60a3zqUE1EJxXz6IX5cz4ldOFLmfatqTY18v5PKw lmZI3qX7TjjLccBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id B3916139DB; Tue, 16 Nov 2021 00:16:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id KNMuK2b4kmFjXAAAMHmgww (envelope-from ); Tue, 16 Nov 2021 00:16:38 +0000 From: Vlastimil Babka To: Matthew Wilcox , linux-mm@kvack.org, Christoph Lameter , David Rientjes , Joonsoo Kim , Pekka Enberg Cc: Vlastimil Babka Subject: [RFC PATCH 12/32] mm/slub: Convert print_page_info() to print_slab_info() Date: Tue, 16 Nov 2021 01:16:08 +0100 Message-Id: <20211116001628.24216-13-vbabka@suse.cz> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211116001628.24216-1-vbabka@suse.cz> References: <20211116001628.24216-1-vbabka@suse.cz> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1796; i=vbabka@suse.cz; h=from:subject; bh=t/V+8W/eZenTzDIpSZJOiVw6YyEWPVZBXEzzijI0b3c=; b=owEBbQGS/pANAwAIAeAhynPxiakQAcsmYgBhkvg26lWbbhV/Ng7N4kud+nD/134hx+O2I68yupvN muJN1xaJATMEAAEIAB0WIQSNS5MBqTXjGL5IXszgIcpz8YmpEAUCYZL4NgAKCRDgIcpz8YmpEFA2B/ 93we2EokJOJaceQa3QyHqNsie6z4wbrkmmvX8DpmnY15bo2OiV+j5n0ww/TN+I+sW7I1+F9kh4HfTd BZMpR/5SuuotUKkX74MPf3jNdH0JGQn+f0jv1PYyOr8VgxJDI8BmAU3fmrlImTK0ReXFVS6NwRxEPX 7/LZcfo0iLOxgQhCBcqSqhoPCA1YVHgLltg9gP0fec+d0brGwXrUrfF4x83qu4LJujNgts9OHBlg8i j3m/VJZtCm/41SoZ28OXKD/9jWwEeLbN1ZDprnKDwl8fyXG1jJvFeEak/QnLMJJx3//TpaMVBG+9VQ rmzReBFAxqLdElGbgs5fmJbZcuuKfM X-Developer-Key: i=vbabka@suse.cz; a=openpgp; fpr=A940D434992C2E8E99103D50224FA7E7CC82A664 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: AFEE79000269 X-Stat-Signature: 73krze8pwfkhfm7s4yuy6exr8gigtrjf Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=FSCBg0Hc; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=QIPxUq5i; spf=pass (imf29.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none X-HE-Tag: 1637021800-42219 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: From: "Matthew Wilcox (Oracle)" Improve the type safety and prepare for further conversion. For flags access, convert to folio internally. [ vbabka@suse.cz: access flags via folio_flags() ] Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Vlastimil Babka --- mm/slub.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index f2822f2fb553..294f97add1d9 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -788,12 +788,13 @@ void print_tracking(struct kmem_cache *s, void *obj= ect) print_track("Freed", get_track(s, object, TRACK_FREE), pr_time); } =20 -static void print_page_info(struct page *page) +static void print_slab_info(const struct slab *slab) { - pr_err("Slab 0x%p objects=3D%u used=3D%u fp=3D0x%p flags=3D%pGp\n", - page, page->objects, page->inuse, page->freelist, - &page->flags); + struct folio *folio =3D (struct folio *)slab_folio(slab); =20 + pr_err("Slab 0x%p objects=3D%u used=3D%u fp=3D0x%p flags=3D%pGp\n", + slab, slab->objects, slab->inuse, slab->freelist, + folio_flags(folio, 0)); } =20 static void slab_bug(struct kmem_cache *s, char *fmt, ...) @@ -833,7 +834,7 @@ static void print_trailer(struct kmem_cache *s, struc= t page *page, u8 *p) =20 print_tracking(s, p); =20 - print_page_info(page); + print_slab_info(page_slab(page)); =20 pr_err("Object 0x%p @offset=3D%tu fp=3D0x%p\n\n", p, p - addr, get_freepointer(s, p)); @@ -903,7 +904,7 @@ static __printf(3, 4) void slab_err(struct kmem_cache= *s, struct page *page, vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); slab_bug(s, "%s", buf); - print_page_info(page); + print_slab_info(page_slab(page)); dump_stack(); add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); } --=20 2.33.1