From patchwork Wed Nov 3 18:08:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Tintel X-Patchwork-Id: 1550490 X-Patchwork-Delegate: stijn@linux-ipv6.be Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=c2y800q5; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linux-ipv6.be header.i=@linux-ipv6.be header.a=rsa-sha256 header.s=502B7754-045F-11E5-BBC5-64595FD46BE8 header.b=IZecZEJa; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkvwq5wKMz9sPf for ; Thu, 4 Nov 2021 05:11:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=247f9fRPvx+BwQxqrx1DAqRUCBb68DkpQ0eBlaNtGH0=; b=c2y800q5u3l9V5 vFtWkOKQoXwApgtvLM1RfPS5AKXmcg12AvOmy9PN/gCF6+35qZxjJ2vsUwd08hxUXONwI/fISCuoS /ElHdIuTI9NnpAdTXf0FvFFOkdiU1sCStZ2XZ+U7yL7auvJeKy37Y5l5Jy2wM4CRVXYz5OjMMxDuP p5C+WED7WXEnM9a8X7wlD9o3zUEPuL7PCJ+VhYRhId0Lq5kFfDgv/yRb6XKoeVw0lDHaX8iYPiw0x pswz2k/Ox8MdXvKWeieAxPLgHUYDQTVvLi1TV+0d3/NU9Fr93XeBu8d4lbSdhZWYuXG2mbeyJleFh aWxjmZvY7oHG+drMCjqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1miKhG-0067Lp-Nj; Wed, 03 Nov 2021 18:09:14 +0000 Received: from mail.tintel.eu ([51.83.127.189]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1miKgw-0067HN-9O for openwrt-devel@lists.openwrt.org; Wed, 03 Nov 2021 18:08:55 +0000 Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 80F47447C0F3; Wed, 3 Nov 2021 19:08:32 +0100 (CET) Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id zhW8ak5zxR6T; Wed, 3 Nov 2021 19:08:32 +0100 (CET) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 2C50D4480CA1; Wed, 3 Nov 2021 19:08:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.tintel.eu 2C50D4480CA1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-ipv6.be; s=502B7754-045F-11E5-BBC5-64595FD46BE8; t=1635962912; bh=ZLmpQ1uXi5GECHI87kLNO9g4x3IEzZvN25moHUR1SWk=; h=From:To:Date:Message-Id:MIME-Version; b=IZecZEJaaPVurq8SAD4ei2PHzjMDrc5BbcFjTHpjCQQOJTx6BdK1XaXGXnsw4Z3FX gBRowqujDNI8slg5jQcnZ2f4m9ubAPtCqIfEdMUA4jzqAZP0SSzqVqHHstIIuwpQy1 bW5828fC6UJQRY/2PDqehjxf3NnlR8s9CEgCfwhc= X-Virus-Scanned: amavisd-new at mail.tintel.eu Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id rdQIOpQrzAlM; Wed, 3 Nov 2021 19:08:32 +0100 (CET) Received: from taz.sof.bg.adlevio.net (unknown [IPv6:2001:67c:21bc:20::10]) by mail.tintel.eu (Postfix) with ESMTPS id DA73E447C0F3; Wed, 3 Nov 2021 19:08:31 +0100 (CET) From: Stijn Tintel To: openwrt-devel@lists.openwrt.org Cc: hauke@hauke-m.de Subject: [PATCH 2/2] kernel: add missing KASAN config symbols Date: Wed, 3 Nov 2021 20:08:23 +0200 Message-Id: <20211103180823.132040-2-stijn@linux-ipv6.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211103180823.132040-1-stijn@linux-ipv6.be> References: <20211103180823.132040-1-stijn@linux-ipv6.be> MIME-Version: 1.0 X-Rspamd-Pre-Result: action=no action; module=multimap; Matched map: IP_WHITELIST X-Rspamd-Queue-Id: DA73E447C0F3 X-Rspamd-Pre-Result: action=no action; module=multimap; Matched map: IP_WHITELIST X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:200533, ipnet:2001:67c:21bc::/48, country:BG]; IP_WHITELIST(0.00)[2001:67c:21bc:20::10] X-Rspamd-Server: skulls X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211103_110854_486447_1786B371 X-CRM114-Status: UNSURE ( 8.41 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Enabling KERNEL_KASAN exposes several missing symbols. As KASAN_SW_TAGS is only implemented for arm64 CPUs and requires clang, it doesn't make sense to make this a build option so just default to KASA [...] Content analysis details: (0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.1 DKIM_INVALID DKIM or DK signature exists, but is not valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Enabling KERNEL_KASAN exposes several missing symbols. As KASAN_SW_TAGS is only implemented for arm64 CPUs and requires clang, it doesn't make sense to make this a build option so just default to KASAN_GENERIC and disable KASAN_SW_TAGS. While at it, disable TEST_KASAN_MODULE in the generic 5.10 config. Fixes build failures with KERNEL_KASAN enabled. Signed-off-by: Stijn Tintel Acked-by: Hauke Mehrtens --- config/Config-kernel.in | 7 +++++++ target/linux/generic/config-5.10 | 1 + 2 files changed, 8 insertions(+) diff --git a/config/Config-kernel.in b/config/Config-kernel.in index 6758d278e7..902e211ea1 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -170,6 +170,13 @@ config KERNEL_KASAN_EXTRA compile time. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81715 has more +if KERNEL_KASAN + config KERNEL_KASAN_GENERIC + def_bool y + + config KERNEL_KASAN_SW_TAGS + def_bool n +endif choice prompt "Instrumentation type" diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index 83004d0879..ddcf083a7d 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -6064,6 +6064,7 @@ CONFIG_TCP_CONG_CUBIC=y # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_IDA is not set +# CONFIG_TEST_KASAN_MODULE is not set # CONFIG_TEST_KMOD is not set # CONFIG_TEST_KSTRTOX is not set # CONFIG_TEST_LIST_SORT is not set