From patchwork Tue Jul 12 16:08:06 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: 1655504 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=L17+yAB3; 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 4Lj5K26SbVz9ryY for ; Wed, 13 Jul 2022 02:08:37 +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 1oBIQu-00058m-RD; Tue, 12 Jul 2022 16:08:20 +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 1oBIQs-00058D-BB for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 16:08:18 +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-0.canonical.com (Postfix) with ESMTPS id DB29C3F8D6 for ; Tue, 12 Jul 2022 16:08:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657642095; bh=JsntLZV/0cS87dAWh6jQ/FXP1pfHkbTqiomDH2qxbFU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=L17+yAB3ZgsuIZ+6bvOoHhjn1OAMk5gIA67hwSWLKZLH65QEUc+sBIrovSHajLf6U 2NpdQHqKiMNj0XcRWqcLih70OWP/rhICZQzDCt3W7Y8Aj+Oj9+hLRgPin5iL2/CwVG rkTYtMIGsknh7oBGcKXtaEgVCFYiyoSfJ7oTC1VMHpaF/NUTIcxlTSF/UEuYfKxbfD O+DODdD3J3o8Elc4ubj2EgYImrnQ92vX+DTr28lP3zzvDBNwQK4AW57TR/oCgXCRVT s6duHNLVpS/w6cwmM0/L86Tjf9raY0fgusZMR6e3BuWJm6RDvkMabhsrgibTtb27Nz H2vknm9/FzK9Q== Received: by mail-wr1-f72.google.com with SMTP id j23-20020adfb317000000b0021d7986c07eso1546830wrd.2 for ; Tue, 12 Jul 2022 09:08:15 -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=JsntLZV/0cS87dAWh6jQ/FXP1pfHkbTqiomDH2qxbFU=; b=BK6RCppkhcI8ub+H+NLD858iBOlkmib5KPqREN7QDf1aS7neGdV48n0Tw5g8aPKN0q B8eALHewY/qBCkHFR4EjImU2bVi0glzfMkfK05eT/BACe+eJushk1sO9LZD5TJ6JHwvf ApDpKLqDNuyARjDACrVq5i+jT3dOBB5l0ydp4BxNQ7iyKqosLgUAWkNyBTLOcnGRXvVB Cdq0KSONGhYrS8sknI1LvzsmhOIeOO3ZlaBITaO0kAqVWI5X5WGgxL+DMPgRq8Iw1m88 SJkNBVvCvwdZJ3TMX9NApVhtpgjcFm5E+q1/XOYp5QZRZ8xt0HMCkRVssYLv1z7KYk/W 8aqQ== X-Gm-Message-State: AJIora9Pn0HIiF0O15qi8YmoeeY3SlJ+hUFjgp0z/+tJpdh1gYq1775i suKJdXgv7KXDvxPnC35lA8PmMByCwmo20lx2VO0GiVNFBqUZrllpYgLgPK9ph3ZPrJugnJVoGdt 1z8aayo+OOFbtiOzmDHTHtfHhA5VGuvPPberVVpub9g== X-Received: by 2002:adf:9cc7:0:b0:21d:642b:85f2 with SMTP id h7-20020adf9cc7000000b0021d642b85f2mr22293359wre.21.1657642095375; Tue, 12 Jul 2022 09:08:15 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sRzgOSOtmWHozAgrkChEFPUotrKh4hpyjda29jjC4Qd6eoEqBENU1n08zLClKp37F0yN/ztA== X-Received: by 2002:adf:9cc7:0:b0:21d:642b:85f2 with SMTP id h7-20020adf9cc7000000b0021d642b85f2mr22293333wre.21.1657642095089; Tue, 12 Jul 2022 09:08:15 -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.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 09:08:14 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 1/7] UBUNTU: [Config] Enable CONFIG_EFIVAR_FS on riscv64 Date: Tue, 12 Jul 2022 18:08:06 +0200 Message-Id: <20220712160812.435824-2-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 All other EFI supporting architectures builds this in, so let's do the same on riscv64. 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 - 6 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 7871708f6b2b..6787b3f7d612 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -118,7 +118,6 @@ CONFIG_EEPROM_EE1004=m CONFIG_EEPROM_IDT_89HPESX=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m -CONFIG_EFIVAR_FS=y CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ETHOC=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 0eacc7a4bfe6..1ccaf033dda8 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11022,7 +11022,7 @@ CONFIG_PROC_CHILDREN policy<{'amd64': 'y', 'arm64': ' CONFIG_SYSFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_HUGETLBFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_CONFIGFS_FS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_EFIVAR_FS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': 'm'}> +CONFIG_EFIVAR_FS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': 'y'}> # CONFIG_CONFIGFS_FS flag CONFIG_EFIVAR_FS note diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index c1a8058b4819..f4efcf61fea9 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -129,7 +129,6 @@ CONFIG_EEPROM_EE1004=m CONFIG_EEPROM_IDT_89HPESX=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m -CONFIG_EFIVAR_FS=y CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ETHOC=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 9d2ad7fbd5d2..cbd6e7625ae7 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -122,7 +122,6 @@ CONFIG_EEPROM_EE1004=m CONFIG_EEPROM_IDT_89HPESX=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m -CONFIG_EFIVAR_FS=y CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ETHOC=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 2c90ea5f2280..fcb2b70b2499 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3523,6 +3523,7 @@ CONFIG_EEH=y CONFIG_EEPROM_93XX46=m CONFIG_EEPROM_AT25=m CONFIG_EFI=y +CONFIG_EFIVAR_FS=y # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set CONFIG_EFI_BOOTLOADER_CONTROL=m CONFIG_EFI_CAPSULE_LOADER=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 78711552b0ba..d32d91c71f03 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -119,7 +119,6 @@ CONFIG_EEPROM_EE1004=m CONFIG_EEPROM_IDT_89HPESX=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m -CONFIG_EFIVAR_FS=m CONFIG_EFS_FS=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ETHOC=m From patchwork Tue Jul 12 16:08:07 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: 1655501 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=h2L5hDAR; 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 4Lj5K26Zc1z9sFw for ; Wed, 13 Jul 2022 02:08:37 +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 1oBIQv-00058u-0H; Tue, 12 Jul 2022 16:08:21 +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 1oBIQs-00058J-Ad for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 16:08:18 +0000 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (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 1F0AA402C5 for ; Tue, 12 Jul 2022 16:08:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657642097; bh=C3UU1ooH4ZCtTIEpOAjBNpy6+hTpMt836fmnpSllxwQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h2L5hDARUxNjUxvojzqQ/NmjuB5EuakPO7tNf68b9DxWsk3c9ApsSiY7lJQ/dYGGe k4HFNnVsLaRhulKqov2Mib6smJcVWOyDjSKb1NA3ftvmHLooUSup7YHuq4NZA87W9e DwpNzc0X5szxHzOiwCkeKXsNYNyYhGMGDXvbF0lGoPi8jdvpNi0HVjf+27EO/5qbaj uPPyjSW+ElibaQNGG+Xy3lH9G1+HzSVkkuUAtUu8Gm55k+hcrkDtDM+nZJL7UlFt5a NqyHdm0uf9Kg4Ow002LLkgtoJBzB6ghSADNmpcUjBe34LM2I40aCqNT7Kg8IEKsyhU /remiIBnlv8iQ== Received: by mail-wr1-f71.google.com with SMTP id j16-20020adfa550000000b0021d63d200a8so1545776wrb.5 for ; Tue, 12 Jul 2022 09:08:17 -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=C3UU1ooH4ZCtTIEpOAjBNpy6+hTpMt836fmnpSllxwQ=; b=O6Rk9cfC7BXfSrHEcxAcoM1x0yhUEhgS/2+Ei0gnREdE2vbusYv3/y1ziZ4uC4bkoq jagFFf4vC7IASUeraHDnzAoswYzPl81E1NLrMnW7uXK+0rLURmxCHu3zgbf5OLcKBKjh zHK1pz3/oqZU+YW+xVbUzSdAKqawH0uVJ3cTFfTqoMd7Pvag+q8Ovjvm0UUMe7BaMkOf U+g8AjD9qA3/6bGH9dvB+BHcy2Bc2Hd+nIajgDBqVgvMcBowx/gbh+2NmN1Fpgh73LNE ia6vnEbXSk0EeLx8pK1YVNs6K0KhA4MSO9BtYgCAdRk9FdXeowErWvT3hcQtA4Woh8kj hsQg== X-Gm-Message-State: AJIora88FFSmXNxNab68i4b1wDQs032SP8T+Pk1+N3bbBhxwzkBulT5h SQDOq0uN/v3P5aHrKwU0hgGZF5MSzsKqw+FPiLWgee721BmXlWOEQuwV3Own0UwRmMa4ZukMO0B kWJ+UfK6Ix+7iQQs3kzHtirjNnwSPaM92DElwyn0eSA== X-Received: by 2002:a5d:6041:0:b0:21d:9785:db7c with SMTP id j1-20020a5d6041000000b0021d9785db7cmr17378276wrt.665.1657642096336; Tue, 12 Jul 2022 09:08:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uhzvpyiL8kmd0WlQrN2/UVXQrSk50w1j90I5EA1VXtF9/mj8eutkuVtCuRvIATYi8ft+awEg== X-Received: by 2002:a5d:6041:0:b0:21d:9785:db7c with SMTP id j1-20020a5d6041000000b0021d9785db7cmr17378245wrt.665.1657642096080; Tue, 12 Jul 2022 09:08:16 -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.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 09:08:15 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 2/7] UBUNTU: [Config] Enable CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES on riscv64 Date: Tue, 12 Jul 2022 18:08:07 +0200 Message-Id: <20220712160812.435824-3-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 This disables encryption types that were deprecated in Kerberos v5 as is done on all other architectures. No setup involving a RISC-V machine should use these encryption types. 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/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - debian.master/config/s390x/config.common.s390x | 1 - 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 6787b3f7d612..fa470c2b275e 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -632,7 +632,6 @@ CONFIG_SSB=m CONFIG_STAGING=y # CONFIG_STANDALONE is not set CONFIG_STRICT_DEVMEM=y -CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_SUN_PARTITION=y CONFIG_SURFACE_3_POWER_OPREGION=m CONFIG_SURFACE_PRO3_BUTTON=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 1ccaf033dda8..df95a02e1abb 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -10927,7 +10927,7 @@ CONFIG_NETWORK_FILESYSTEMS policy<{'amd64': 'y', 'arm64': ' CONFIG_NFSD policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_NFSD_V3_ACL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_RPCSEC_GSS_KRB5 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> -CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}> +CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_SUNRPC_DEBUG policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_SUNRPC_XPRT_RDMA policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_CODA_FS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index f4efcf61fea9..7872c36393f8 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -662,7 +662,6 @@ CONFIG_SSB=m CONFIG_STAGING=y CONFIG_STANDALONE=y CONFIG_STRICT_DEVMEM=y -CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_SUN_PARTITION=y # CONFIG_SURFACE_3_POWER_OPREGION is not set # CONFIG_SURFACE_PRO3_BUTTON is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index cbd6e7625ae7..5b76bc59006a 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -646,7 +646,6 @@ CONFIG_SSB=m CONFIG_STAGING=y CONFIG_STANDALONE=y CONFIG_STRICT_DEVMEM=y -CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_SUN_PARTITION=y CONFIG_SYSFB_SIMPLEFB=y CONFIG_SYSV68_PARTITION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index fcb2b70b2499..017915d72f1d 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -11279,6 +11279,7 @@ CONFIG_SUNGEM_PHY=m CONFIG_SUNRPC=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_SWAP=y CONFIG_SUNRPC_XPRT_RDMA=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 310ac136d3fc..3747e951ceb2 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -641,7 +641,6 @@ CONFIG_SSB=m CONFIG_STAGING=y CONFIG_STANDALONE=y CONFIG_STRICT_DEVMEM=y -CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_SUN_PARTITION=y CONFIG_SYSV68_PARTITION=y CONFIG_SYSV_FS=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index d32d91c71f03..6291ce6aa9d9 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -630,7 +630,6 @@ CONFIG_SSB=m CONFIG_STAGING=y CONFIG_STANDALONE=y # CONFIG_STRICT_DEVMEM is not set -# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set CONFIG_SUN_PARTITION=y # CONFIG_SYSFB_SIMPLEFB is not set CONFIG_SYSV68_PARTITION=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 2a2fcf69a943..2f9bd24159b7 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -565,7 +565,6 @@ CONFIG_SERIAL_CORE=m # CONFIG_STAGING is not set CONFIG_STANDALONE=y CONFIG_STRICT_DEVMEM=y -CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y # CONFIG_SUN_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set # CONFIG_SYSV_FS is not set From patchwork Tue Jul 12 16:08:08 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: 1655506 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=e33HSInz; 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 4Lj5K26XNMz9sFs for ; Wed, 13 Jul 2022 02:08:37 +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 1oBIQw-00059Y-De; Tue, 12 Jul 2022 16:08:22 +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 1oBIQs-00058V-HF for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 16:08:18 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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 251AD40274 for ; Tue, 12 Jul 2022 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657642098; bh=jf9WxgVI2quHmmjZc0H01iKWGp2R9XK96vYt+FD6poU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e33HSInzds+RnRdTAJEZQOiPdbNEcOLdF/ETMdY6CGnH8bsg5A1ggEog7+JIZWWJs U0gygXpgy0CjsHag0GEQQV70X1AmKo5oKxRUx4hd/IWWUj51Tl1xVS+XNwqkLeGuxT yKHChwtuVHoDOuXnEReh7geqjShAwgAS5q7I4/3UeOeDMcz55mGo+8T1yp79HCw8Dx NJwDZeW+MQS7SXGcABe42IkOvpNMWIpr+XUiL/TRI2nJ2UebtO6/yThSAhDY7OgKO/ ETQ0H3rf1/WSoL71C8uFeA/MvNsypYEmULGB1JiaRtQsxNU9b4AyoC3a+gXabbeXiA zSAALUpt4Hi4A== Received: by mail-wm1-f72.google.com with SMTP id i5-20020a1c3b05000000b003a2e8a77dd1so881057wma.1 for ; Tue, 12 Jul 2022 09:08:18 -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=jf9WxgVI2quHmmjZc0H01iKWGp2R9XK96vYt+FD6poU=; b=HrWrizxWyzv9yhq0+CmYVvn5iNDjYGfHFtbP+Lr1g+JKr0BD8xQWCPHAgy0l4zH5v3 bdqwnv52gDaTWZabPphOqGWJ1ETKZZkycr9YznG4t0ZGoLUV/x9/UFL+dt5YHDMasibn 1AcyNBW+rN7ddSGrpwMz+fnIenrTQ9WHNI5URJqIFgwRbrmAN3kB73HUAiMzluJIsmkK GA7S29QUNvfc0OVkmh4K7cvcthPEDTN1paxpHFdIPzCsLTHszw+9s7TiNM3PbuemdtX+ koLd239nDSvv4+90KoYh21KSGoO3I44h7AhsusNntpKEIKJ56VRzurBGib4lAu3UPCRg pDJw== X-Gm-Message-State: AJIora+lIH1+IsNB6AtxZ6P1vL7Jbk+2pMG5I/XyUOIojeZ1kTzQ6Fvl Y5nPr5/FZfjZV7SUcXD7QWqSDlnIl00LJ0QVT7wbzjYxz/Old7zOC85+YoCH/V2Aoon5Ne+Xebb CqFnTqb9onRbGTk3CbCkVelKaOsCPUD53S9BGEcXYAg== X-Received: by 2002:adf:ea50:0:b0:21d:6547:1154 with SMTP id j16-20020adfea50000000b0021d65471154mr21935291wrn.186.1657642097016; Tue, 12 Jul 2022 09:08:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tCJ8nomhX7kaQa9l1uIDGBNkJkQATOGkF6Mw11wZqRcKL3bFdRvTUk2YvlCmts9VDzoby/FA== X-Received: by 2002:adf:ea50:0:b0:21d:6547:1154 with SMTP id j16-20020adfea50000000b0021d65471154mr21935267wrn.186.1657642096755; Tue, 12 Jul 2022 09:08:16 -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.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 09:08:16 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 3/7] UBUNTU: [Config] Enable CONFIG_STRICT_DEVMEM on riscv64 Date: Tue, 12 Jul 2022 18:08:08 +0200 Message-Id: <20220712160812.435824-4-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 Filter access to /dev/mem like is done on all other architectures. There is even a mark annotation on this option and yet it is still disabled on riscv64. Let's fix that. Signed-off-by: Emil Renner Berthing --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/annotations | 4 ++-- 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/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 1 - debian.master/config/s390x/config.common.s390x | 1 - 8 files changed, 3 insertions(+), 8 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index fa470c2b275e..d91f7386eaaf 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -631,7 +631,6 @@ CONFIG_SRAM=y CONFIG_SSB=m CONFIG_STAGING=y # CONFIG_STANDALONE is not set -CONFIG_STRICT_DEVMEM=y CONFIG_SUN_PARTITION=y CONFIG_SURFACE_3_POWER_OPREGION=m CONFIG_SURFACE_PRO3_BUTTON=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index df95a02e1abb..2aeb5317ff9a 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11454,8 +11454,8 @@ CONFIG_DEBUG_IRQFLAGS policy<{'amd64': 'n', 'arm64': ' CONFIG_STACKTRACE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_WARN_ALL_UNSEEDED_RANDOM policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_PROVIDE_OHCI1394_DMA_INIT policy<{'amd64': 'n'}> -CONFIG_STRICT_DEVMEM policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}> -CONFIG_IO_STRICT_DEVMEM policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_STRICT_DEVMEM policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> +CONFIG_IO_STRICT_DEVMEM policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> # CONFIG_STRICT_DEVMEM mark diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 7872c36393f8..d16f756ae2b4 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -661,7 +661,6 @@ CONFIG_SRAM=y CONFIG_SSB=m CONFIG_STAGING=y CONFIG_STANDALONE=y -CONFIG_STRICT_DEVMEM=y CONFIG_SUN_PARTITION=y # CONFIG_SURFACE_3_POWER_OPREGION is not set # CONFIG_SURFACE_PRO3_BUTTON is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 5b76bc59006a..5d83b8c88699 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -645,7 +645,6 @@ CONFIG_SRAM=y CONFIG_SSB=m CONFIG_STAGING=y CONFIG_STANDALONE=y -CONFIG_STRICT_DEVMEM=y CONFIG_SUN_PARTITION=y CONFIG_SYSFB_SIMPLEFB=y CONFIG_SYSV68_PARTITION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 017915d72f1d..779ebf3ab610 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -11242,6 +11242,7 @@ CONFIG_STM_SOURCE_HEARTBEAT=m CONFIG_STP=m CONFIG_STPMIC1_WATCHDOG=m CONFIG_STREAM_PARSER=y +CONFIG_STRICT_DEVMEM=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_STRICT_MODULE_RWX=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index 3747e951ceb2..fd2af4f363dc 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -640,7 +640,6 @@ CONFIG_SRAM=y CONFIG_SSB=m CONFIG_STAGING=y CONFIG_STANDALONE=y -CONFIG_STRICT_DEVMEM=y CONFIG_SUN_PARTITION=y CONFIG_SYSV68_PARTITION=y CONFIG_SYSV_FS=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 6291ce6aa9d9..11c4156b085f 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -629,7 +629,6 @@ CONFIG_SRAM=y CONFIG_SSB=m CONFIG_STAGING=y CONFIG_STANDALONE=y -# CONFIG_STRICT_DEVMEM is not set CONFIG_SUN_PARTITION=y # CONFIG_SYSFB_SIMPLEFB is not set CONFIG_SYSV68_PARTITION=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 2f9bd24159b7..4a64eaf15924 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -564,7 +564,6 @@ CONFIG_SERIAL_CORE=m # CONFIG_SSB is not set # CONFIG_STAGING is not set CONFIG_STANDALONE=y -CONFIG_STRICT_DEVMEM=y # CONFIG_SUN_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set # CONFIG_SYSV_FS is not set From patchwork Tue Jul 12 16:08:09 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: 1655503 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=r2fl6hbx; 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 4Lj5K30sG3z9sGV for ; Wed, 13 Jul 2022 02:08:37 +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 1oBIQx-0005AA-JB; Tue, 12 Jul 2022 16:08:23 +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 1oBIQt-00058e-NZ for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 16:08:19 +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-0.canonical.com (Postfix) with ESMTPS id 895023F8D6 for ; Tue, 12 Jul 2022 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657642098; bh=r/qW9t9/L2Pa47krSxxOodXrR1BYJgz+Fufm64ZrYf0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r2fl6hbxJBImUqGieMvlvbZEoDpPMIs2lP+2Pg310I8Hn6ZhVuYchThb0H9zMuGXz /pGU98l3rveB1izT9RLdv2/y1c6MRXun5dE/zsm4bYCPG1WtlRwAiVrHMAX6adLgc+ SEtKVE6eQblpuumuzUQTYe9Xs+mqmYEwqdByCLxiXzilrAes8NKa/XQDBTHZCIf6Sp m1ks9Pq2Dnl5JVPeoDYWsUI4qPiiVEz/9C0Bv2ZSK3iYAVGh5oZZfdflM56NJjOvtJ oGlktXcHlEj0XUJ7vPA6BGDdF/G/ziM2Rju2bZCVeWDenN+XbtDeGU4i+RG9lfWor/ hItBLt/hieQVg== Received: by mail-wr1-f72.google.com with SMTP id j23-20020adfb317000000b0021d7986c07eso1546878wrd.2 for ; Tue, 12 Jul 2022 09:08:18 -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=r/qW9t9/L2Pa47krSxxOodXrR1BYJgz+Fufm64ZrYf0=; b=yrhk1u+AV8zGd9ZT801BQaqwRydvwDgG3JPZQrpuVAhvIUqCEJ4+wsEclXp5sIN/Fk f/UGOW7g3gzGDFm68ajhNQ7M9YpmeSsvsanAPCHsbMja/x7qfJdTLi9NPPkEwS35XJ2h 9ji72XxYE6LocIF24U+srR1ulOJpFYzPkYKnydVwHnyvAe8OzL4mrIP6RBCIUg+J/voB TxduSLJbSsQffb+0MDB4sEyIwp411wD1Y7DPkIoT18+s5Sb6sTJScyEZnXzns2ugjzwl GjNJxK6CZhSSWv3tEvKoCmWbocLZoNP7SXKl8kUTA4dybqrXC4e7bP7Uyf8QOEXPL69Y IIww== X-Gm-Message-State: AJIora+uHvBaZZM3d3LbjOOIuMBbXmusnz52+8FeFtPaKnFQVKsHebzi mUuT4IaG5sjFwkLGWe5JiAcB5H9v4J3hvElP+7r10UL0QO7xedNx5sy71IoLjpnwfetNd2oDtlk fR7iy+Y6CdApGB8IvtkWZnbNQP6smoCNRKQ2mN4N+jw== X-Received: by 2002:a5d:6112:0:b0:21d:774e:df1c with SMTP id v18-20020a5d6112000000b0021d774edf1cmr21760948wrt.109.1657642098015; Tue, 12 Jul 2022 09:08:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t2nqVQOd1KfwtLmuH6xEh2Z4pdt8BkFln8AIUtNho4ZGmMuQ6cPWH/g9hEIeuzI1dM+JljFg== X-Received: by 2002:a5d:6112:0:b0:21d:774e:df1c with SMTP id v18-20020a5d6112000000b0021d774edf1cmr21760937wrt.109.1657642097774; Tue, 12 Jul 2022 09:08:17 -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.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 09:08:17 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 4/7] UBUNTU: [Config] Enable CONFIG_VMAP_STACK on riscv64 Date: Tue, 12 Jul 2022 18:08:09 +0200 Message-Id: <20220712160812.435824-5-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 Enable virtually-mapped kernel stacks like all other architectures. This creates guard pages which will cause kernel stack overflows to be caught immediately. 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 d91f7386eaaf..d8351c90c394 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -678,7 +678,6 @@ CONFIG_VFIO_PCI=y CONFIG_VFIO_PCI_CORE=y CONFIG_VFIO_VIRQFD=y CONFIG_VIRTIO_MMIO=y -CONFIG_VMAP_STACK=y CONFIG_VME_BUS=y CONFIG_VMXNET3=m CONFIG_VXFS_FS=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 2aeb5317ff9a..19a46a640833 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11167,7 +11167,7 @@ CONFIG_STACKPROTECTOR_STRONG policy<{'amd64': 'y', 'arm64': ' CONFIG_ARCH_MMAP_RND_BITS policy<{'amd64': '28', 'arm64': '18', 'armhf': '8', 'ppc64el': '28', 'riscv64': '18'}> CONFIG_ARCH_MMAP_RND_COMPAT_BITS policy<{'amd64': '8', 'arm64': '11', 'ppc64el': '8'}> CONFIG_COMPAT_32BIT_TIME policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_VMAP_STACK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': 'n', 's390x': 'y'}> +CONFIG_VMAP_STACK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_RANDOMIZE_KSTACK_OFFSET policy<{'amd64': 'y', 'arm64': 'y', 's390x': 'y'}> CONFIG_STRICT_KERNEL_RWX policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_STRICT_MODULE_RWX policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index d16f756ae2b4..dd941e4c5fba 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -710,7 +710,6 @@ CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_VIRQFD=m CONFIG_VIDEO_TI_CAL_MC=y CONFIG_VIRTIO_MMIO=y -CONFIG_VMAP_STACK=y CONFIG_VME_BUS=y CONFIG_VMXNET3=m CONFIG_VXFS_FS=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 5d83b8c88699..44b18eef92c6 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -691,7 +691,6 @@ CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_VIRQFD=m CONFIG_VIRTIO_MMIO=y -CONFIG_VMAP_STACK=y CONFIG_VME_BUS=y CONFIG_VMXNET3=m CONFIG_VXFS_FS=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 779ebf3ab610..4e66b04b9a94 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -12848,6 +12848,7 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMAP_PFN=y +CONFIG_VMAP_STACK=y CONFIG_VMCP=y CONFIG_VMCP_CMA_SIZE=4 CONFIG_VMD=m diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 11c4156b085f..fff08c23c88c 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -673,7 +673,6 @@ CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_VIRQFD=m CONFIG_VIRTIO_MMIO=y -# CONFIG_VMAP_STACK is not set CONFIG_VME_BUS=y CONFIG_VMXNET3=m CONFIG_VXFS_FS=m diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 4a64eaf15924..ce3886f01a27 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -604,7 +604,6 @@ CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_VIRQFD=m # CONFIG_VIRTIO_MMIO is not set CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y -CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set # CONFIG_VMXNET3 is not set # CONFIG_VXFS_FS is not set From patchwork Tue Jul 12 16:08:10 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: 1655507 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=faEDRZQF; 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 4Lj5K26k3vz9sGD for ; Wed, 13 Jul 2022 02:08:37 +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 1oBIQx-0005AR-Qk; Tue, 12 Jul 2022 16:08:23 +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 1oBIQw-00058l-0x for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 16:08:22 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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 3E0F740274 for ; Tue, 12 Jul 2022 16:08:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657642099; bh=O+JmXidjjj5ihMJ1g/OUV7Rd4V0+rkTwam0xB4LI0Tk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=faEDRZQF90QFRnebIGlVqZ1zSo6eK3WU7ydJ59mkMuyQnvsEiuGWD2URJJfjv8cfg 1qhUF/9RiaBPDrLTRUFjdg/QldpfZUmZquwOeR2y+TgVyF7w0y8o0WSQfgnrtglXPG EIU8KH7iCnugYn+xdt2S2TcY6kS/M3T2HR8MkfczKXvFJA4t3tsaXnhEzwMB0lmEDY tazq1VLMzEOnnIoKOapcQuPXyKiV7dVgOkMl+e/4SwjAJqjiEQb6CuCnhtPpkq2ZQR ue+O0TMCb01ZOj25NlrxU0qrFONdRUsmrx6rT2/UtDBxD0KY9RowBkE/1VQ4SMIVVr aAmJEb+ysYExg== Received: by mail-wm1-f72.google.com with SMTP id c187-20020a1c35c4000000b003a19b3b9e6cso6882514wma.5 for ; Tue, 12 Jul 2022 09:08:19 -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=O+JmXidjjj5ihMJ1g/OUV7Rd4V0+rkTwam0xB4LI0Tk=; b=k7r4s4xVyQjDcYH2VhdJ2aDM11qh3WCCTDNyF/+heZyxtflukuQzCaxyrHNvigf4fq g05+lBa8CJyhil8dXUCtUNhaEupBRKU59BuYY2dAXhpKFcrVgvWwv1uMvLk8j7zhL6By 6u82g4rPRx8877QiqPhzipAw/T6w552+aj401Wszas0iIKtXyU1ZY5S7xs34siMVhrge +qhWu9/PBxZLj9iczZosVxeXiRv3uW6tylD7siLil5XQogUhznlLypapeX9rQmdTAPDL dQkVYEhy57tMw42EH/8rE/PXSLg9bO3BFs1CAO3rm10JxHfX+B6FLzazrGEWBFSXURwN wT0w== X-Gm-Message-State: AJIora+lOXKdgcE6JeCr9YAIJdmzqupGozlosuWvWVJhoy4DdOnSU4nU gudU5Nqup7K4qgX36O6aIutM6gmWdEzPeujDxdJ9VuBcvgbKnf4VEYycK94bRuAGr4+HlqkKrw5 JS5qBbedbzc9eXV2R4dh8FmqMrMe5RWrBSiN02K3AzA== X-Received: by 2002:a1c:7517:0:b0:3a0:2d36:4dcc with SMTP id o23-20020a1c7517000000b003a02d364dccmr4744630wmc.21.1657642098740; Tue, 12 Jul 2022 09:08:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sQLO6dBaDcjqfzjLpAOjPnLLhAJEdCIgyJVUPLdqyB6fEfEBMWo/hmZ4S7vaNYQMqP4/4smQ== X-Received: by 2002:a1c:7517:0:b0:3a0:2d36:4dcc with SMTP id o23-20020a1c7517000000b003a02d364dccmr4744601wmc.21.1657642098470; Tue, 12 Jul 2022 09:08:18 -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.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 09:08:18 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 5/7] UBUNTU: [Config] Enable CONFIG_KEXEC_FILE on riscv64 Date: Tue, 12 Jul 2022 18:08:10 +0200 Message-Id: <20220712160812.435824-6-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 This is enabled on all architectures but s390x and was added to RISC-V in v5.19-rc1, so let's enable it until we have a reason not to. Signed-off-by: Emil Renner Berthing --- debian.master/config/annotations | 4 ++-- debian.master/config/riscv64/config.common.riscv64 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 19a46a640833..cb135b7fa32c 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -13413,7 +13413,7 @@ CONFIG_PPC_BOOK3E_64 policy<{'ppc64el': 'n'}> # Menu: Processor type and features CONFIG_NUMA policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_KEXEC_FILE policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'n'}> +CONFIG_KEXEC_FILE policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'n'}> CONFIG_KEXEC_SIG policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_ARCH_RANDOM policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_RELOCATABLE policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 's390x': 'y'}> @@ -13906,7 +13906,7 @@ CONFIG_LOAD_PPC_KEYS mark note # Menu: Security options >> Enable different security models >> Integrity subsystem >> Integrity Measurement Architecture(IMA) CONFIG_IMA policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> -CONFIG_IMA_KEXEC policy<{'arm64': 'y', 'ppc64el': 'y'}> +CONFIG_IMA_KEXEC policy<{'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_IMA_WRITE_POLICY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_IMA_READ_POLICY policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'n'}> CONFIG_IMA_DISABLE_HTABLE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index fff08c23c88c..47234f373f89 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -295,7 +295,7 @@ CONFIG_JFS_FS=m CONFIG_JME=m CONFIG_JUMP_LABEL=y CONFIG_KARMA_PARTITION=y -# CONFIG_KEXEC_FILE is not set +CONFIG_KEXEC_FILE=y CONFIG_KFENCE_SAMPLE_INTERVAL=100 CONFIG_KVM=m CONFIG_LAPB=m From patchwork Tue Jul 12 16:08:11 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: 1655500 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=cSt1prPl; 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 4Lj5K26lgSz9sGG for ; Wed, 13 Jul 2022 02:08:37 +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 1oBIQz-0005BW-05; Tue, 12 Jul 2022 16:08:25 +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 1oBIQw-00059F-Ne for kernel-team@lists.ubuntu.com; Tue, 12 Jul 2022 16:08:22 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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 7902C402C5 for ; Tue, 12 Jul 2022 16:08:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657642100; bh=IOG5wzoUZ9qwsVNi5bfedOSPQfs9Z2g/52qi25rWD6A=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cSt1prPlDNu57hObnv1FDx5sBug03kp8/cXHEj1TKvqLhTL42ts6HtqESV8StnOJK mxEvIYwgjuD1ipODrNTFONJVZZvEwcsTNAEXXJd9e9SyQkrQ3G8IfoDME8A2+nTggF 6S9eGdnFzJPHVOv0dSalrfPZdKQfmwoF/TqhsDQzAifR4QLxTK5ogt8KaJaBcSL57z rIIN26d+AqbhkOhUHmddlRtBNlaiTgbJ8j+7aBN18CiOWO66Njzqc8eMg7lIFr0s/B T89mR1OOgdDTKGR4gFnngcicDfD/eZBPY1ajtluBsRwG30X0VtwiMiMrWKDDdPmYrt YddPVlmdmIHYw== Received: by mail-wm1-f72.google.com with SMTP id m20-20020a05600c4f5400b003a03aad6bdfso4245666wmq.6 for ; Tue, 12 Jul 2022 09:08:20 -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=IOG5wzoUZ9qwsVNi5bfedOSPQfs9Z2g/52qi25rWD6A=; b=ZPu6/DcFAqEytQ+RIMCiBNCozAUCU4i734u/a6YXjA+Q0ZGA3fODbitPqmnv1ZJEpP Wk3d1nWVczBbKjmCEwUpE8OBxawPvQrk2ngiVJ4WV6yNaTWrdckj0AYr1A6inzUThYiD Ii6beNaTjyMvf3pz/quaSw+inh+dLbrvsWGW0j4TkSMQfFhcxIu1Tm0Q0eEQ7GSxFf9C ZgdmNdnaSkTSlG92V4N31n5DJtrxrzCmfEskuDOF0SHe0khRZPAC9Hx76yyGUHyBuSLJ i7Z/tMV3wv2prB35gLIAxygnc0qz69VF6FOcB8RgV2uJFYZlSrqTI7fNRGBoEWe4LUom qKEQ== X-Gm-Message-State: AJIora8E3YTIGsBznSWV/iN28AWUGqGdQb9l3gWjVIH56vM6pRxhYUpp RmHo6+wx5fHgqZ0MFUCqBWQevHUDFA4wj61GPdRdDVr2B+WtmI81ZENpDGR1xAp2h8lLMHwp/Wn AhjSpQ2C4KRPrasXdDFNhf+3Qgeud3FQWGBqAUMOn0w== X-Received: by 2002:a05:6000:1205:b0:21d:aa9b:9993 with SMTP id e5-20020a056000120500b0021daa9b9993mr8910676wrx.476.1657642099622; Tue, 12 Jul 2022 09:08:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tNE0FHpHIH8oy2TVIfjh1ZrJEH0wmb8eKmY4drH55vF8+ojHCEUeNNyl73/Gu6vN2iEHFv4g== X-Received: by 2002:a05:6000:1205:b0:21d:aa9b:9993 with SMTP id e5-20020a056000120500b0021daa9b9993mr8910654wrx.476.1657642099351; Tue, 12 Jul 2022 09:08:19 -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.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 09:08:18 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K][PATCH 6/7] UBUNTU: [Config] Set CONFIG_MTD_PSTORE=m on riscv64 Date: Tue, 12 Jul 2022 18:08:11 +0200 Message-Id: <20220712160812.435824-7-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 This enables the module to log panic/oops to a circular buffer in an MTD flash partition. All other architectures enables this module, so let's enable it on riscv64 too. 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/ppc64el/config.common.ppc64el | 1 - debian.master/config/riscv64/config.common.riscv64 | 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 d8351c90c394..5689cddc6654 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -397,7 +397,6 @@ CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_NAND_CORE=m -CONFIG_MTD_PSTORE=m CONFIG_MTD_RAW_NAND=m CONFIG_NET_DSA=m # CONFIG_NET_DSA_REALTEK_MDIO is not set diff --git a/debian.master/config/annotations b/debian.master/config/annotations index cb135b7fa32c..c84bc3f218dc 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -4483,7 +4483,7 @@ CONFIG_RFD_FTL policy<{'amd64': 'm', 'arm64': ' CONFIG_SSFDC policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_SM_FTL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MTD_OOPS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> -CONFIG_MTD_PSTORE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'n'}> +CONFIG_MTD_PSTORE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MTD_SWAP policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MTD_PARTITIONED_MASTER policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': '-'}> # diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index dd941e4c5fba..0ff49b1344fc 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -419,7 +419,6 @@ CONFIG_MTD_NAND_OMAP_BCH_BUILD=m CONFIG_MTD_OF_PARTS=m CONFIG_MTD_PHYSMAP_GEMINI=y CONFIG_MTD_PHYSMAP_VERSATILE=y -CONFIG_MTD_PSTORE=m CONFIG_MTD_RAW_NAND=m CONFIG_NET_DSA=m CONFIG_NET_DSA_MSCC_FELIX=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 44b18eef92c6..1b4c87609c7f 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -405,7 +405,6 @@ CONFIG_MTD_NAND_OMAP_BCH_BUILD=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_PHYSMAP_GEMINI=y CONFIG_MTD_PHYSMAP_VERSATILE=y -CONFIG_MTD_PSTORE=m CONFIG_MTD_RAW_NAND=y CONFIG_NET_DSA=m CONFIG_NET_DSA_MSCC_FELIX=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 4e66b04b9a94..9ea00db7da9e 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6840,6 +6840,7 @@ CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set CONFIG_MTD_POWERNV_FLASH=m +CONFIG_MTD_PSTORE=m CONFIG_MTD_QCOMSMEM_PARTS=m CONFIG_MTD_QINFO_PROBE=m CONFIG_MTD_RAM=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index fd2af4f363dc..6e16a8b130d0 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -407,7 +407,6 @@ CONFIG_MTD_NAND_CORE=m CONFIG_MTD_OF_PARTS=m # CONFIG_MTD_PHYSMAP_GEMINI is not set # CONFIG_MTD_PHYSMAP_VERSATILE is not set -CONFIG_MTD_PSTORE=m CONFIG_MTD_RAW_NAND=m CONFIG_NET_DSA=m # CONFIG_NET_DSA_MSCC_FELIX is not set diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index 47234f373f89..d98a1ff41441 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -399,7 +399,6 @@ CONFIG_MTD_NAND_CORE=m CONFIG_MTD_OF_PARTS=m # CONFIG_MTD_PHYSMAP_GEMINI is not set # CONFIG_MTD_PHYSMAP_VERSATILE is not set -# CONFIG_MTD_PSTORE is not set # CONFIG_MTD_RAW_NAND is not set CONFIG_NET_DSA=m CONFIG_NET_DSA_REALTEK_MDIO=m 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