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 0BEE1C433F5 for ; Tue, 3 May 2022 12:48:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EC466B0074; Tue, 3 May 2022 08:48:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39BEF6B0075; Tue, 3 May 2022 08:48:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2636C6B0078; Tue, 3 May 2022 08:48:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id 1346B6B0074 for ; Tue, 3 May 2022 08:48:59 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3A08F26037 for ; Tue, 3 May 2022 12:48:57 +0000 (UTC) X-FDA: 79424411514.22.9A99FE3 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf11.hostedemail.com (Postfix) with ESMTP id CE68440077 for ; Tue, 3 May 2022 12:48:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Transfer-Encoding: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Sender:Reply-To:Content-ID:Content-Description; bh=tRbUGbjjcGQFfdammRCNXucl+653Tal2xI+rXFEt4No=; b=iRMxufEImC9oNjZePP4FumjMDE CtY8k2zdt1nuH8evibUF7L+lPX8qp4M3GWjuuOPQfiSdIzSXILudfsVAnKclWzqSrLmUtKOdAZsD5 1iGd8bHIzeoqkI9UtMFHt506kIHQjGQLyBLV2bBT+spWlKb9zeM7tw6UTffiloWE9H3q0h9JfixZG +A9o8PLCFoQtrTr5M5+TCtDeKFWkFgCpw++qKNG+nSNpEC01RfRn6+dTkkzWgEgcZz76ScCxzIhbs SPIf7/rm/U6XrSThHYhfxUINotD87ZjMgkamL9rs5W6wlcHlGnf5UtC6YPoe2tcU7HhA/q1UQGpKB NA6OQxvw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nlrxS-00Fevb-7b; Tue, 03 May 2022 12:48:50 +0000 Date: Tue, 3 May 2022 13:48:50 +0100 From: Matthew Wilcox To: Sebastian Andrzej Siewior Cc: akpm@linuxfoundation.org, linux-mm@kvack.org, tglx@linutronix.de Subject: Re: [PATCH 16/21] mm/shmem: Convert shmem_add_to_page_cache to take a folio Message-ID: References: <20220429192329.3034378-1-willy@infradead.org> <20220429192329.3034378-17-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: CE68440077 Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=iRMxufEI; spf=none (imf11.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspam-User: X-Stat-Signature: ijgjbym8coh7qhf5kqcezq8q9wwx7x7g X-HE-Tag: 1651582132-762799 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: On Tue, May 03, 2022 at 01:10:09PM +0200, Sebastian Andrzej Siewior wrote: > On 2022-04-29 20:23:24 [+0100], Matthew Wilcox (Oracle) wrote: > > diff --git a/mm/shmem.c b/mm/shmem.c > > index 3461bdec6b38..4331a4daac01 100644 > > --- a/mm/shmem.c > > +++ b/mm/shmem.c > > @@ -736,16 +735,16 @@ static int shmem_add_to_page_cache(struct page *page, > > xas_set_err(&xas, -EEXIST); > > goto unlock; > > } > > - xas_store(&xas, page); > > + xas_store(&xas, folio); > > if (xas_error(&xas)) > > goto unlock; > > - if (PageTransHuge(page)) { > > + if (folio_test_large(folio)) { > > count_vm_event(THP_FILE_ALLOC); > > - __mod_lruvec_page_state(page, NR_SHMEM_THPS, nr); > > + __lruvec_stat_mod_folio(folio, NR_SHMEM_THPS, nr); > > } > > | CC mm/shmem.o > |In file included from : > |mm/shmem.c: In function ‘shmem_add_to_page_cache’: > |include/linux/compiler_types.h:352:45: error: call to ‘__compiletime_assert_262’ declared with attribute error: BUILD_BUG failed > | 352 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) > | | ^ > … > |mm/shmem.c:743:40: note: in expansion of macro ‘THP_FILE_ALLOC’ > | 743 | count_vm_event(THP_FILE_ALLOC); Thanks. Stephen already reported that; fix here: https://lore.kernel.org/all/Ym++SI1ftbRg+9zK@casper.infradead.org/