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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F161AEE49A3 for ; Tue, 22 Aug 2023 04:01:42 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=Fc8rKzY4; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4RVFyr5JYLz3c4R for ; Tue, 22 Aug 2023 14:01:40 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=Fc8rKzY4; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=djwong@kernel.org; receiver=lists.ozlabs.org) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4RVFxq4ZmQz2y1Y for ; Tue, 22 Aug 2023 14:00:47 +1000 (AEST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B8EFD60918; Tue, 22 Aug 2023 04:00:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23E24C433C7; Tue, 22 Aug 2023 04:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692676844; bh=wF7a9DTAEc49b0LtDfqEP844tiSjl8LoV4OyVI84GrI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Fc8rKzY4a6NetmVD0Ho2yK279RGwV6y2FgZFgttHBRx7f8WzmFqM8tmWigz1DznfN 2K44pbbAm/BlD9hp9bYFmXCa3Rhg3Xhq7MWr2jPVIjB8VyO7Zt6d5PgPVqGgFQHdyQ qszgAydz84pRpkftlQ0C7Lwnv6IYTu95rJmqCJbKCzgqePq6vpoI0Z51KozWW7xcKw qLjcT7UzTqVVTMNz+dJFFWnWi2Ec+p8ACc9djXjXB8+SxGeZO8D7FAaLWgYyZTWQu+ 8zSjo4c2TLMErstWhrj7rPhOpdcOuYR+S54H2VN3pVK95MgPzS3NxmKAtvLI0jg74j vZtxLgnFBuuqA== Date: Mon, 21 Aug 2023 21:00:43 -0700 From: "Darrick J. Wong" To: Matthew Wilcox Subject: Re: linux-next: build failure after merge of the mm tree Message-ID: <20230822040043.GB11263@frogsfrogsfrogs> References: <20230822095537.500047f7@canb.auug.org.au> <20230822112217.185c3357@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , Linux Kernel Mailing List , Nicholas Piggin , linux-xfs@vger.kernel.org, Linux Next Mailing List , Andrew Morton , linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Tue, Aug 22, 2023 at 02:34:06AM +0100, Matthew Wilcox wrote: > On Tue, Aug 22, 2023 at 11:22:17AM +1000, Stephen Rothwell wrote: > > Hi Matthew, > > > > On Tue, 22 Aug 2023 02:11:44 +0100 Matthew Wilcox wrote: > > > > > > On Tue, Aug 22, 2023 at 09:55:37AM +1000, Stephen Rothwell wrote: > > > > In file included from include/trace/trace_events.h:27, > > > > from include/trace/define_trace.h:102, > > > > from fs/xfs/xfs_trace.h:4428, > > > > from fs/xfs/xfs_trace.c:45: > > > > include/linux/pgtable.h:8:25: error: initializer element is not constant > > > > 8 | #define PMD_ORDER (PMD_SHIFT - PAGE_SHIFT) > > > > > > Ummm. PowerPC doesn't have a compile-time constant PMD size? > > > > Yeah, you are not the first (or probably the last) to be caught by that. > > I think this will do the trick. Any comments? > > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h > index 1904eaf7a2e9..d5a4e6c2dcd1 100644 > --- a/fs/xfs/xfs_trace.h > +++ b/fs/xfs/xfs_trace.h > @@ -796,15 +796,6 @@ DEFINE_INODE_EVENT(xfs_inode_reclaiming); > DEFINE_INODE_EVENT(xfs_inode_set_need_inactive); > DEFINE_INODE_EVENT(xfs_inode_inactivating); > > -/* > - * ftrace's __print_symbolic requires that all enum values be wrapped in the > - * TRACE_DEFINE_ENUM macro so that the enum value can be encoded in the ftrace > - * ring buffer. Somehow this was only worth mentioning in the ftrace sample > - * code. > - */ Please leave this ^^^ comment, because the need for TRACE_DEFINE_ENUM to make enums work in tracepoints is not at all obvious. > -TRACE_DEFINE_ENUM(PMD_ORDER); > -TRACE_DEFINE_ENUM(PUD_ORDER); > - > TRACE_DEFINE_ENUM(XFS_REFC_DOMAIN_SHARED); > TRACE_DEFINE_ENUM(XFS_REFC_DOMAIN_COW); > > @@ -823,13 +814,10 @@ TRACE_EVENT(xfs_filemap_fault, > __entry->order = order; > __entry->write_fault = write_fault; > ), > - TP_printk("dev %d:%d ino 0x%llx %s write_fault %d", > + TP_printk("dev %d:%d ino 0x%llx order:%u write_fault %d", "order %u" to match the (non dev_t) style of the rest of the xfs tracepoints. --D > MAJOR(__entry->dev), MINOR(__entry->dev), > __entry->ino, > - __print_symbolic(__entry->order, > - { 0, "PTE" }, > - { PMD_ORDER, "PMD" }, > - { PUD_ORDER, "PUD" }), > + __entry->order, > __entry->write_fault) > ) > > >