From patchwork Mon Nov 23 07:40:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1404662 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CffHT71rmz9sRR for ; Mon, 23 Nov 2020 18:41:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=hzTsKrVr; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4CffHT5lykzDqNg for ; Mon, 23 Nov 2020 18:41:57 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (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 4CffFY6mRzzDqMB for ; Mon, 23 Nov 2020 18:40:17 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=hzTsKrVr; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4CffFY0JXhz9sRR; Mon, 23 Nov 2020 18:40:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1606117217; bh=feBwx742S3KxPsGL6rDfJ09Kn4ZnORD8sGkRYwcY0Og=; h=Date:From:To:Cc:Subject:From; b=hzTsKrVrvVqhAY2PLgq/c9N58GEqXNEMyV4HI07riRoxZfNd+1h6YhPtIgsn3Hj4T JN1laq+Uz47M8OrV8y32cS3eGfcVSvWrNbRNqfiDPVywzeCDhI7KHmSINb+JoAAaKj ETZdHJNXiKrLjLcRLcRznTJ2EBH/neIGts6ANXl8PO34PL4cTu9B70Ntbfo6U62tGC +zepQJfIcBV3UfD9WuVwcSJ1NPY5l4/P7EaJJycyuaRPw22GR1pq1Co9oJEROM0Y8H syILem/9j4IhLBekDBVCJQWt8B1W53WoSvi0gY8+zT2Y7s1wJGKsYHGMyIJxFDxBrp 3Wws9tTZ4d6ZQ== Date: Mon, 23 Nov 2020 18:40:16 +1100 From: Stephen Rothwell To: Michael Ellerman , PowerPC Subject: linux-next: build failure in Linus' tree Message-ID: <20201123184016.693fe464@canb.auug.org.au> MIME-Version: 1.0 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: Linux Next Mailing List , Linux Kernel Mailing List , Nicholas Piggin , Daniel Axtens Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, After merging most of the trees, today's linux-next build (powerpc64 allnoconfig) failed like this: In file included from arch/powerpc/include/asm/kup.h:18, from arch/powerpc/include/asm/uaccess.h:9, from include/linux/uaccess.h:11, from include/linux/sched/task.h:11, from include/linux/sched/signal.h:9, from include/linux/rcuwait.h:6, from include/linux/percpu-rwsem.h:7, from include/linux/fs.h:33, from include/linux/compat.h:17, from arch/powerpc/kernel/asm-offsets.c:14: arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: warning: data definition has no type or storage class 66 | DECLARE_STATIC_KEY_FALSE(uaccess_flush_key); | ^~~~~~~~~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: error: type defaults to 'int' in declaration of 'DECLARE_STATIC_KEY_FALSE' [-Werror=implicit-int] arch/powerpc/include/asm/book3s/64/kup-radix.h:66:1: warning: parameter names (without types) in function declaration arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'prevent_user_access': arch/powerpc/include/asm/book3s/64/kup-radix.h:180:6: error: implicit declaration of function 'static_branch_unlikely' [-Werror=implicit-function-declaration] 180 | if (static_branch_unlikely(&uaccess_flush_key)) | ^~~~~~~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/book3s/64/kup-radix.h:180:30: error: 'uaccess_flush_key' undeclared (first use in this function) 180 | if (static_branch_unlikely(&uaccess_flush_key)) | ^~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/book3s/64/kup-radix.h:180:30: note: each undeclared identifier is reported only once for each function it appears in arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'prevent_user_access_return': arch/powerpc/include/asm/book3s/64/kup-radix.h:189:30: error: 'uaccess_flush_key' undeclared (first use in this function) 189 | if (static_branch_unlikely(&uaccess_flush_key)) | ^~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/book3s/64/kup-radix.h: In function 'restore_user_access': arch/powerpc/include/asm/book3s/64/kup-radix.h:198:30: error: 'uaccess_flush_key' undeclared (first use in this function) 198 | if (static_branch_unlikely(&uaccess_flush_key) && flags == AMR_KUAP_BLOCKED) | ^~~~~~~~~~~~~~~~~ Caused by commit 9a32a7e78bd0 ("powerpc/64s: flush L1D after user accesses") I have applied the following patch for today: From: Stephen Rothwell Date: Mon, 23 Nov 2020 18:35:02 +1100 Subject: [PATCH] powerpc/64s: using DECLARE_STATIC_KEY_FALSE needs linux/jump_table.h Fixes: 9a32a7e78bd0 ("powerpc/64s: flush L1D after user accesses") Signed-off-by: Stephen Rothwell --- arch/powerpc/include/asm/book3s/64/kup-radix.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/include/asm/book3s/64/kup-radix.h b/arch/powerpc/include/asm/book3s/64/kup-radix.h index 28716e2f13e3..a39e2d193fdc 100644 --- a/arch/powerpc/include/asm/book3s/64/kup-radix.h +++ b/arch/powerpc/include/asm/book3s/64/kup-radix.h @@ -63,6 +63,8 @@ #else /* !__ASSEMBLY__ */ +#include + DECLARE_STATIC_KEY_FALSE(uaccess_flush_key); #ifdef CONFIG_PPC_KUAP