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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5C07C6FD1F for ; Tue, 2 Apr 2024 05:26:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 406086B0095; Tue, 2 Apr 2024 01:26:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B5FD6B0099; Tue, 2 Apr 2024 01:26:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A47C6B009B; Tue, 2 Apr 2024 01:26:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 0E2B76B0095 for ; Tue, 2 Apr 2024 01:26:20 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AD90E1209B6 for ; Tue, 2 Apr 2024 05:26:19 +0000 (UTC) X-FDA: 81963456078.29.1E61158 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id 7F5624000A for ; Tue, 2 Apr 2024 05:26:17 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=krFd6x85; spf=none (imf27.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712035578; a=rsa-sha256; cv=none; b=6D2Am3DqMiXxqMMwFoWK5hqSHzA/47S+uLPMbW0khPwt0HjQTqZFbsmb+QTtKx6eTbRfoI kyWktA4A+eF81sDvLlaUaZDyFPajXXTDdA58z/F7SxqLXLmS91nILdNZmiWAK3Kzc7/3Hl TmNWheSshNGJ7Ex/tItlwLiA6Ggxqx4= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=krFd6x85; spf=none (imf27.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712035578; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7t2WjsmH8l5lF/Pmb1Te6bnqZx4BXhCY++fg2NjSv5c=; b=y8d+x/92UYiB4R44SSiphWBFcf7aomAZ42f5kRP8qIrg2IcXET4vZ1zqvYCJQ70E/mSQsd BprpIjRgjgQVLFghlwYY4jyom4S98ImrLGXXt9qj0INl9CHjAppEwg5ti26pW6jh26m8jW zU5SkQ22nY8jOrHp4Uvl6K9Ezjgz4js= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=7t2WjsmH8l5lF/Pmb1Te6bnqZx4BXhCY++fg2NjSv5c=; b=krFd6x850goqIRx5xWkc8LQbPX L1dVt9sISoRBhDUDFdjSOa+piX61bhGbbqw9U0isYl17RkNU8lWzACm/gP/t2y6ANPlSuHGH5aNxa 4g/8D1C2AHt5QAzmbLYw+HSLhkvlnuD1V+feTdMOCwfZdZX4UCL33os5bnrdVnHIiM/GOosC+VvdT KBibFwG2gIRfqLeaB4LCXAauvUp7WgKgOD1wcsbz2/amhCfiz71r3erRdjAVppW28F3YMBivo9g9x VqfGKcCzgQI3TRVb0RtvEMFjDlTKEtQP1WO6aE2p0dLKjQKlwTUwZjKzjt1E/QptSTmaP6bWy/WUn dbRihOuA==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrWev-00000002HaX-2ykM; Tue, 02 Apr 2024 05:26:10 +0000 Date: Tue, 2 Apr 2024 06:26:09 +0100 From: Matthew Wilcox To: kernel test robot Cc: oe-lkp@lists.linux.dev, lkp@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, ltp@lists.linux.it, Andrew Morton , David Hildenbrand , Vlastimil Babka , Miaohe Lin , Muchun Song , Oscar Salvador Subject: Re: [PATCH 7/9] mm: Free up PG_slab Message-ID: References: <20240321142448.1645400-8-willy@infradead.org> <202403312344.c0d273ab-oliver.sang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202403312344.c0d273ab-oliver.sang@intel.com> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 7F5624000A X-Stat-Signature: zcpke3aa8obkgwi943h5y9ppkttqprt4 X-Rspam-User: X-HE-Tag: 1712035577-900421 X-HE-Meta: U2FsdGVkX18suNfH8+mE8XC5Mndj+/vD6Njxe1ltFzyW3XIDEsKTTdsu7vnSBTIEwhok2Pj7SekTluNK5y8zPpkWQ5dm7obCr1kpW7rXVSPkAyUcAx77INbVNgvqsrgDFehK4vL4RHtHTtzhNWysv0nJHzEo3imgIco7bHtvf3TH8rlyYw+Vel3tb7c9TXiIjZiGtq/r3F3TaMEFGinWHFAZKnYGA5TgrO2cPF+KXAAO2hy9Z956ZDD2LL6D30OTQevqDKhv6rC026Xs9XymULmZYLC5UChMGjCIAzqLjMwXm7PNOliDAWZfCWSTO27eI44biffAepkWYTwir3wFcqFt3IQxOG0btSfNTuVhnS3UIHLr3RQRBJcImdiOTVHfonPFHRQ/FErnGbZ3nHTq7EOZihddoFchXW8OZT/TJFgCYZCwC7+IrvdvBrnCRESJnXasHEX77h/8XFDScaFQ7Oyycn9jpBcKqJgr1+u8NKefgPR3P8TyQNHDJk0m2grPTYG2u0ZJ4Zw1F4iJAE2b8Yj/BAiHq1Fv6FMGttoEQdJbwVZt7FdyWadqeutB3wfqZRRIeaQV9ZZEz97fMEBWWUXEcH+ayNNvK70r9a4JCy7T/Ks0/S3MP9duK47kCrm+4nDXW51UoxamkhDTzy20xlhFMUagAQhzFXnCoPfNDMvVJkEdeHUgHgmEke4JJx/MmIKesIYCqZLr2jEQuRJeDXAfKh7sJqE3XS2bD2jHWXyKM3ORwx64LIcMVB41w9RPga+vqwvxiJdhLNmOxb31bbmeCqsONa4pgvL0x1mwdgo6LRs8UuNMLlr74y6HWmftVGzj7EXzHf9mwj6xT16aHImCnx2h58sIkukPsPgoHT5K2cY8pVQHWk3ZCdk6TEYX X-Bogosity: Ham, tests=bogofilter, spamicity=0.318915, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Sun, Mar 31, 2024 at 11:11:10PM +0800, kernel test robot wrote: > kernel test robot noticed "UBSAN:shift-out-of-bounds_in_fs/proc/page.c" on: > > commit: 30e5296811312a13938b83956a55839ac1e3aa40 ("[PATCH 7/9] mm: Free up PG_slab") Quite right. Spotted another one while I was at it. Not able to test right now, but this should do the trick: diff --git a/fs/proc/page.c b/fs/proc/page.c index 5bc82828c6aa..55b01535eb22 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -175,6 +175,8 @@ u64 stable_page_flags(const struct page *page) u |= 1 << KPF_OFFLINE; if (PageTable(page)) u |= 1 << KPF_PGTABLE; + if (folio_test_slab(folio)) + u |= 1 << KPF_SLAB; #if defined(CONFIG_PAGE_IDLE_FLAG) && defined(CONFIG_64BIT) u |= kpf_copy_bit(k, KPF_IDLE, PG_idle); @@ -184,7 +186,6 @@ u64 stable_page_flags(const struct page *page) #endif u |= kpf_copy_bit(k, KPF_LOCKED, PG_locked); - u |= kpf_copy_bit(k, KPF_SLAB, PG_slab); u |= kpf_copy_bit(k, KPF_ERROR, PG_error); u |= kpf_copy_bit(k, KPF_DIRTY, PG_dirty); u |= kpf_copy_bit(k, KPF_UPTODATE, PG_uptodate); diff --git a/tools/cgroup/memcg_slabinfo.py b/tools/cgroup/memcg_slabinfo.py index 1d3a90d93fe2..270c28a0d098 100644 --- a/tools/cgroup/memcg_slabinfo.py +++ b/tools/cgroup/memcg_slabinfo.py @@ -146,12 +146,11 @@ def detect_kernel_config(): def for_each_slab(prog): - PGSlab = 1 << prog.constant('PG_slab') - PGHead = 1 << prog.constant('PG_head') + PGSlab = ~prog.constant('PG_slab') for page in for_each_page(prog): try: - if page.flags.value_() & PGSlab: + if page.page_type.value_() == PGSlab: yield cast('struct slab *', page) except FaultError: pass