From patchwork Tue Jul 12 16:08:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 1655505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=bukZBvKk; dkim-atps=neutral Authentication-Results: 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=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lj5K30dVvz9sGQ for ; Wed, 13 Jul 2022 02:08:38 +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 1oBIR0-0005D0-NA; Tue, 12 Jul 2022 16:08:26 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oBIQx-00059q-De for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 16:08:23 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (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-1.canonical.com (Postfix) with ESMTPS id 12D3240274 for ; Tue, 12 Jul 2022 16:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657642102; bh=IRwkHPj3Mj4XZE6oBcIci00QsBqUZcT9DjCx1+3ktXA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bukZBvKkKInDJPQ9LLZW8tITiCnNj7ObcUwYbo/xuNj5jOIzBV3O6M38nlVnFHB6n 4QTMlUY8Areo7GIu6/YkwPWg/qBQi2cJgLpURV05ydWVvESzbsQO8jGNQ6GLAqEYWH mm7G7Ew19dzTfnHQfI6qFPgE2U/9taaqmFg8vOn4SZkkEGUqV9hb+Tmai6PTJOxcD0 ZahdCICXpLJr7ZvU/LBe0XNjRnJ2Q9pPHDEHtxFdU/RMjUOiy/GiXbmjfRiYOHEUkZ YDzOW6BlJJx7V78lcZci3pn5nB9AcTxryAXTyWHcj2Bdy43Wd9F6D7S2StA4OkYbd9 7tBQNw3lhwc5g== Received: by mail-wr1-f72.google.com with SMTP id l5-20020adfa385000000b0021db73f5818so338268wrb.20 for ; Tue, 12 Jul 2022 09:08:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IRwkHPj3Mj4XZE6oBcIci00QsBqUZcT9DjCx1+3ktXA=; b=J6M9Y951fStM6GeFtQOmw4XA5H3Pdjbc6qysm+wTBZAjf496wb8At/v8o7yfTG4LLk vOEsdnqRmvFblnhcsSq9LAnGkzfK6X8NCfUcq87DmTWIXqL5IVZdMV17Dzcw1jFrU0+8 T4G+8GaD83F96R5/dCIQejLlN50SubXpt1sasPYT1M3KjEouBm4Qmh2gMnghZ6yfXzmt 1xw+n9fwlmCnGzl/S+DGtoky908aWLFbJVbyCsgbfngTCrtsN5pacNJCLY5B/Vrf+OSD a0vwVb3xI+I6ryDbsJxkckWZ8ezjwrCEagpeHqxuAbG0vuNH/VK1W5+zqGgds9zVDe8e mIDg== X-Gm-Message-State: AJIora/zGdH9Y9Q58e7vTrTciMcUd7WrUF9fEKprEawfkUnLrAiekstC GYmRr1pGqfNadWS4LUVDHwVmAziUBimn9b64AnwqrZpA+m6dNbYfJzxIaM192IMwFfohUBWk0zf 7Obvj/cqOzclbZXAupKByheEeziTtzhQyK3iifjoGvg== X-Received: by 2002:a05:6000:81e:b0:21d:8811:777b with SMTP id bt30-20020a056000081e00b0021d8811777bmr22977517wrb.647.1657642100600; Tue, 12 Jul 2022 09:08:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vKPoR7dmUVG5Y0aHt5iEJFH+izVMNMybO5pCZXdR9QsVGpS0/0ziAXNxZTYq5A8DN1PeQTSw== X-Received: by 2002:a05:6000:81e:b0:21d:8811:777b with SMTP id bt30-20020a056000081e00b0021d8811777bmr22977485wrb.647.1657642100367; Tue, 12 Jul 2022 09:08:20 -0700 (PDT) Received: from stitch.. (80.71.140.73.ipv4.parknet.dk. [80.71.140.73]) by smtp.gmail.com with ESMTPSA id q1-20020a056000136100b00210320d9fbfsm10529029wrz.18.2022.07.12.09.08.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 09:08:19 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 7/7] UBUNTU: [Config] Set CONFIG_KFENCE_SAMPLE_INTERVAL=0 on riscv64 Date: Tue, 12 Jul 2022 18:08:12 +0200 Message-Id: <20220712160812.435824-8-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220712160812.435824-1-emil.renner.berthing@canonical.com> References: <20220712160812.435824-1-emil.renner.berthing@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/1981437 Disable KFENCE by default like all other architectures. Signed-off-by: Emil Renner Berthing --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 2 +- debian.master/config/arm64/config.common.arm64 | 1 - debian.master/config/armhf/config.common.armhf | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/riscv64/config.common.riscv64 | 1 - debian.master/config/s390x/config.common.s390x | 1 - 7 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 5689cddc6654..7996b9fb2a37 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -297,7 +297,6 @@ CONFIG_JUMP_LABEL=y CONFIG_KARMA_PARTITION=y # CONFIG_KERNEL_GZIP is not set CONFIG_KEXEC_FILE=y -CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KVM=m CONFIG_LAPB=m CONFIG_LCD_CLASS_DEVICE=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index c84bc3f218dc..e935700c3be7 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11824,7 +11824,7 @@ CONFIG_KASAN policy<{'amd64': 'n', 'arm64': ' CONFIG_KFENCE policy<{'amd64': 'y', 'arm64': 'y', 'riscv64': 'y', 's390x': 'y', 'armhf': 'y'}> CONFIG_KFENCE_STATIC_KEYS policy<{'amd64': 'n', 'arm64': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_KFENCE_DEFERRABLE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'riscv64': 'n', 's390x': 'n'}> -CONFIG_KFENCE_SAMPLE_INTERVAL policy<{'amd64': '0', 'arm64': '0', 'riscv64': '100', 's390x': '0', 'armhf': '0'}> +CONFIG_KFENCE_SAMPLE_INTERVAL policy<{'amd64': '0', 'arm64': '0', 'riscv64': '0', 's390x': '0', 'armhf': '0'}> CONFIG_KFENCE_NUM_OBJECTS policy<{'amd64': '255', 'arm64': '255', 'riscv64': '255', 's390x': '255', 'armhf': '255'}> CONFIG_KFENCE_STRESS_TEST_FAULTS policy<{'amd64': '0', 'arm64': '0', 'riscv64': '0', 's390x': '0', 'armhf': '0'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 0ff49b1344fc..688b271f6c6e 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -312,7 +312,6 @@ CONFIG_JME=m CONFIG_JUMP_LABEL=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC_FILE=y -CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KVM=y CONFIG_LAPB=m CONFIG_LCD_CLASS_DEVICE=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 1b4c87609c7f..d28529e32219 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -301,7 +301,6 @@ CONFIG_JME=m # CONFIG_JUMP_LABEL is not set CONFIG_KARMA_PARTITION=y CONFIG_KERNEL_GZIP=y -CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_LAPB=m CONFIG_LCD_CLASS_DEVICE=m CONFIG_LDM_PARTITION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 9ea00db7da9e..8915270c9a27 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5741,6 +5741,7 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KFENCE=y # CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=0 # CONFIG_KFENCE_STATIC_KEYS is not set CONFIG_KFENCE_STRESS_TEST_FAULTS=0 CONFIG_KGDB=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index d98a1ff41441..506adb2d512b 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -296,7 +296,6 @@ CONFIG_JME=m CONFIG_JUMP_LABEL=y CONFIG_KARMA_PARTITION=y CONFIG_KEXEC_FILE=y -CONFIG_KFENCE_SAMPLE_INTERVAL=100 CONFIG_KVM=m CONFIG_LAPB=m CONFIG_LCD_CLASS_DEVICE=m diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index ce3886f01a27..17a03f998477 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -278,7 +278,6 @@ CONFIG_JUMP_LABEL=y # CONFIG_KARMA_PARTITION is not set # CONFIG_KERNEL_GZIP is not set # CONFIG_KEXEC_FILE is not set -CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KVM=y # CONFIG_LAPB is not set # CONFIG_LCD_CLASS_DEVICE is not set