From patchwork Thu May 18 15:55:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1783374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=jamK332o; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QMZMP14GRz20dn for ; Fri, 19 May 2023 01:56:01 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pzfyq-0006jL-Cc; Thu, 18 May 2023 15:55:52 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pzfyp-0006j7-74 for kernel-team@lists.ubuntu.com; Thu, 18 May 2023 15:55:51 +0000 Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 530443F200 for ; Thu, 18 May 2023 15:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1684425350; bh=06I2PE0A+ciCM0H27wPOsyhUJKhZCLTI46zwBcWTRTU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jamK332o5mOvuqdh58A4cdXZsky9OXYG2UkMqg7F5HhHL+7X/iREcnyVjuZ1B2wLb d9Ycry/ZpykRzgxraqE5lV8nUQepa+dup2Nhz7mMso19inxzeI2EXRYYtauC0ZI3I3 9m8PC0wJukpoRC7sUQuNo5daK64Pfw8PI1A2SfpbP0tT9Lxkq3oJXr/Tz3CaID2joP 50Epj2xKrjAdeysQoQj8jlZVzbO8YcbmMDFv2oSbNpvLKMUI9lWQZ5sD+KA3rUPgiW fVDuxGpPX2gzwBL8jhhiE7c6RXcwSJnOEW/jEceoMIWQKdaWbb3CSRJZHJ/HfntwHs 2ht9tzfBPp7Xw== Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-55a42c22300so34657607b3.2 for ; Thu, 18 May 2023 08:55:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684425349; x=1687017349; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=06I2PE0A+ciCM0H27wPOsyhUJKhZCLTI46zwBcWTRTU=; b=mIs0SWDYUJ/VNOs74aOMTPKltcHO6L8Vxdvmhigpoe3nsx9d5n1NiHHoRenoT8VEIN A34NaiKo8KiUsIsmPou+8VI5XF1eO1UtrkQaaA8U53eOc78K5a3zt3QB75AySk7FuiGG yPYQqQ93+3eNyRaRR754RLlpBYDs2SdUi/MMto8XdxOa9smrI+7IBtD4jY4G14Uk942m u4xqMAP3ZbH1eN+vfI2/y62ZfpdfUn7f5DSoW+0jqwBBmw6Jk/NNzX0+SAToTkvE1Dxb 5MwYCDb5byu5yKA4F0Awy5uhtYK6Qzs2d7dF4R/ZqwQ4WAkcU9EbW7PCBvDkSAgqDkoL fJIA== X-Gm-Message-State: AC+VfDzlCVGxSKIkSuDxykGl4jU8lz226/AoD6FN/smNQPNlEH/x88+k YQxTqlULsCTJZZ9+0K1T5NY+YPWOdrGXf+fn4mc6W/Al0GqKmeJ0WkL8gt7Z6zJBO8g8CbkOe2Q VpMGxG+PEmGzSlx/+O70cbQDU8PQ8J8yVzcQI4fQR9Whwga7sLg== X-Received: by 2002:a0d:d453:0:b0:55a:77d:5630 with SMTP id w80-20020a0dd453000000b0055a077d5630mr1739745ywd.11.1684425349616; Thu, 18 May 2023 08:55:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4g3QYhMFmKeXIeuXtV+helV/OAvR+T4fff7iKaQ4hYJK+tGqk1Ngi14erActpKO11tfIAk/w== X-Received: by 2002:a0d:d453:0:b0:55a:77d:5630 with SMTP id w80-20020a0dd453000000b0055a077d5630mr1739729ywd.11.1684425349209; Thu, 18 May 2023 08:55:49 -0700 (PDT) Received: from smtp.gmail.com (h69-130-246-116.mdtnwi.broadband.dynamic.tds.net. [69.130.246.116]) by smtp.gmail.com with ESMTPSA id o16-20020a0dcc10000000b00562003f2297sm342302ywd.139.2023.05.18.08.55.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 08:55:48 -0700 (PDT) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][jammy:linux][PATCH 1/1] UBUNTU: [Config] s390x: Re-adding UBSAN to configuration Date: Thu, 18 May 2023 10:55:46 -0500 Message-Id: <20230518155546.168561-2-john.cabaj@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230518155546.168561-1-john.cabaj@canonical.com> References: <20230518155546.168561-1-john.cabaj@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2003374 kpatch-build previously had symbol lookup issues when UBSAN is enabled. This was resolved in kpatch-build 0.9.8. Re-enabling UBSAN for s390x architecture. Signed-off-by: John Cabaj --- debian.master/config/annotations | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index be67f2c2c751..cfd42b91763b 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -699,7 +699,7 @@ CONFIG_TMPFS_POSIX_ACL note<'some /dev nodes require PO CONFIG_TOUCHSCREEN_ELAN policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> CONFIG_TOUCHSCREEN_ELAN note<'LP #1630238'> -CONFIG_UBSAN policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'n'}> +CONFIG_UBSAN policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_UBSAN note<'LP#1942215'> CONFIG_UNWINDER_FRAME_POINTER policy<{'amd64': 'y', 'armhf': 'y'}> @@ -2391,7 +2391,7 @@ CONFIG_CC_HAS_SANCOV_TRACE_PC policy<{'amd64': 'y', 'arm64': ' CONFIG_CC_HAS_SANE_STACKPROTECTOR policy<{'amd64': 'y'}> CONFIG_CC_HAS_SIGN_RETURN_ADDRESS policy<{'arm64': 'y'}> CONFIG_CC_HAS_SLS policy<{'amd64': 'y'}> -CONFIG_CC_HAS_UBSAN_BOUNDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> +CONFIG_CC_HAS_UBSAN_BOUNDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CC_HAS_ZERO_CALL_USED_REGS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG policy<{'arm64': 'y'}> @@ -12368,7 +12368,7 @@ CONFIG_TEST_STATIC_KEYS policy<{'amd64': 'n', 'arm64': ' CONFIG_TEST_STRING_HELPERS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_TEST_STRSCPY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_TEST_SYSCTL policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> -CONFIG_TEST_UBSAN policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}> +CONFIG_TEST_UBSAN policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_TEST_UDELAY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_TEST_USER_COPY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_TEST_UUID policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> @@ -12729,16 +12729,16 @@ CONFIG_UBIFS_FS_SECURITY policy<{'amd64': 'y', 'arm64': ' CONFIG_UBIFS_FS_XATTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> CONFIG_UBIFS_FS_ZLIB policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> CONFIG_UBIFS_FS_ZSTD policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> -CONFIG_UBSAN_ALIGNMENT policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}> -CONFIG_UBSAN_BOOL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> -CONFIG_UBSAN_BOUNDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> -CONFIG_UBSAN_DIV_ZERO policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}> -CONFIG_UBSAN_ENUM policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> -CONFIG_UBSAN_ONLY_BOUNDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> -CONFIG_UBSAN_SANITIZE_ALL policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y'}> -CONFIG_UBSAN_SHIFT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}> -CONFIG_UBSAN_TRAP policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': '-'}> -CONFIG_UBSAN_UNREACHABLE policy<{'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}> +CONFIG_UBSAN_ALIGNMENT policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_UBSAN_BOOL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_UBSAN_BOUNDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_UBSAN_DIV_ZERO policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_UBSAN_ENUM policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_UBSAN_ONLY_BOUNDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_UBSAN_SANITIZE_ALL policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_UBSAN_SHIFT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_UBSAN_TRAP policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_UBSAN_UNREACHABLE policy<{'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> CONFIG_UBUNTU_HOST policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_UBUNTU_ODM_DRIVERS policy<{'amd64': 'y'}> CONFIG_UCB1400_CORE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>