From patchwork Tue Jun 28 08:00:15 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: 1649353 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=m23/AeAC; 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 4LXH8H2tbpz9sGC for ; Tue, 28 Jun 2022 18:00:31 +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 1o6692-0001aW-Gh; Tue, 28 Jun 2022 08:00:24 +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 1o668z-0001ZM-FV for kernel-team@lists.ubuntu.com; Tue, 28 Jun 2022 08:00:21 +0000 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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 41D313F1C8 for ; Tue, 28 Jun 2022 08:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1656403220; bh=oVrKWi8H1a9IoIgUNGY37NJPXfMMR0DiCsKTJmZXu/4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m23/AeACKVVzbBwpJIv0nU02udzZLwDRUzf0w3wuqr8lSEQDroAHPSvsSK5dO/DdK KmQha63BKJ0nbyU3hsXO3IphIHfTy3VPAYEJV4YO43SIESEAFuNJw+64EvyQzcWd13 25b4W0nN1iJSNDlN2++f2Ay+s9NgHTGGiunPgcZwQ4VlhKN2QMy46vcIawivCED+X9 lph8jeI1JysaeOx8bX8pFYFldAGYm1/qll1k2dqBaDuwBmongl8GWaXzzxHqJZ9POp KR1QsNNUTpb1Zd3Ahqb7yyPRJ8QmCeaA/poMoeB/l3ccG28Ibl0gi7yR8aqT5FEM2U fw9c180SXgF2g== Received: by mail-ed1-f70.google.com with SMTP id w22-20020a05640234d600b00435ba41dbaaso8983571edc.12 for ; Tue, 28 Jun 2022 01:00: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=oVrKWi8H1a9IoIgUNGY37NJPXfMMR0DiCsKTJmZXu/4=; b=ux4PflhPo5jxtEfdtP0NdlH7l5zIdcJlmpVvIeGONNIT8gpz3W/h7zcb/isIJE4axy +hJxXZbA562a/66RR4WHO3qyjzM7HzXSY1vY/V9ure861wCE8jLQCxyiiHskmiQR01m8 nAa8waoZeIrM1mIx8aYFjTYJioF74KEiNFbWFs26XEneW6Gizi/uwJnDQ1uA075oENOl QOX39iUzO4iBzo0/uNEpHhauiaGC0iLK2quGbLY4ovQ0cu0CkKbVGAFchMKOtQAyYROO Jl9hIrfXxXiofNQAOZBHbrNGXS4+u5SI2zDh0ZfLG3ROO6apWkS7BV4TNj1L3VV2m4gm 5KHw== X-Gm-Message-State: AJIora/WKNU/HdohFRL5mb/jGd3JIxJR2pkv5AsxTOadWQ4A+lsZ6JA/ d91mHtetk2ix03ITH+8cZifNmLPb2SAQnrBAPmRbBaz8sg8O5LkmEVRMInw7RGST9OVxIdowzQT 4HnshzRk7UoPuQhLjYBttywLOwAEKRXCLR3YsQ20YeA== X-Received: by 2002:a05:6402:26d5:b0:435:aba2:9495 with SMTP id x21-20020a05640226d500b00435aba29495mr21668093edd.133.1656403218665; Tue, 28 Jun 2022 01:00:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uS8xCad+SZqjhDCT7AJ7h+BgUwJHEvxJh4bkYSPxsmlBcQOliCclIRJL7D5GS1d/Ov8yX5gw== X-Received: by 2002:a05:6402:26d5:b0:435:aba2:9495 with SMTP id x21-20020a05640226d500b00435aba29495mr21668068edd.133.1656403218317; Tue, 28 Jun 2022 01:00:18 -0700 (PDT) Received: from stitch.. (80.71.140.73.ipv4.parknet.dk. [80.71.140.73]) by smtp.gmail.com with ESMTPSA id k10-20020a170906970a00b006fea59ef3a5sm6141118ejx.32.2022.06.28.01.00.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jun 2022 01:00:17 -0700 (PDT) From: Emil Renner Berthing To: kernel-team@lists.ubuntu.com Subject: [SRU][K/Unstable][PATCH 1/1] UBUNTU: [Config] Disable CONFIG_COMPAT on RISC-V Date: Tue, 28 Jun 2022 10:00:15 +0200 Message-Id: <20220628080015.1909398-2-emil.renner.berthing@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220628080015.1909398-1-emil.renner.berthing@canonical.com> References: <20220628080015.1909398-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/1980061 This sets CONFIG_COMPAT=n for riscv64 kernels. Enabling it allows 32bit binaries to be run on 64bit kernels, but requires hardware support. So far no chips have been released that support it and neither does upstream Qemu. Also Ubuntu doesn't ship 32bit RISC-V binaries, so disable this feature for now. Signed-off-by: Emil Renner Berthing Acked-By: Dimitri John Ledkov Acked-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/annotations | 6 +++--- debian.master/config/arm64/config.common.arm64 | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/ppc64el/config.common.ppc64el | 1 + debian.master/config/riscv64/config.common.riscv64 | 2 +- debian.master/config/s390x/config.common.s390x | 1 + 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index ae25cbc87c39..73abfdd0a295 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -67,6 +67,7 @@ CONFIG_CDROM_PKTCDVD=m CONFIG_CMDLINE_PARTITION=y CONFIG_COMEDI=m CONFIG_COMMON_CLK=y +CONFIG_COMPAT=y CONFIG_COUNTER=m CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CRAMFS=m diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 7cdb31fe4c31..0fdb2c6a89a9 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -9,7 +9,7 @@ CONFIG_DEBUG_KERNEL note # Menu: ROOT CONFIG_LIVEPATCH policy<{'amd64': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_COMPAT policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> +CONFIG_COMPAT policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'n', 's390x': 'y'}> CONFIG_ACPI_PRMT policy<{'amd64': 'y'}> # Menu: ACPI (Advanced Configuration and Power Interface) Support @@ -11164,7 +11164,7 @@ CONFIG_SECCOMP_CACHE_DEBUG policy<{'amd64': 'n', 'arm64': ' CONFIG_STACKPROTECTOR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_STACKPROTECTOR_STRONG policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> 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', 'riscv64': '8'}> +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_RANDOMIZE_KSTACK_OFFSET policy<{'amd64': 'y', 'arm64': 'y', 's390x': 'y'}> @@ -12437,7 +12437,7 @@ CONFIG_NF_FLOW_TABLE_INET policy<{'amd64': 'm', 'arm64': ' # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter Xtables support (required for ip_tables) CONFIG_NETFILTER_XTABLES policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> -CONFIG_NETFILTER_XTABLES_COMPAT policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> +CONFIG_NETFILTER_XTABLES_COMPAT policy<{'amd64': 'y', 'arm64': 'y', 'ppc64el': 'y', 'riscv64': '-', 's390x': 'y'}> CONFIG_NETFILTER_XT_MARK policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_NETFILTER_XT_CONNMARK policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_NETFILTER_XT_SET 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 999452da4665..ae43a5b2e7c4 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -72,6 +72,7 @@ CONFIG_COMEDI=m CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_AXG_AUDIO=m CONFIG_COMMON_CLK_XLNX_CLKWZRD=m +CONFIG_COMPAT=y CONFIG_COUNTER=m # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6148d9e8186a..d6b1957e57a0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2175,7 +2175,6 @@ CONFIG_COMMON_RESET_HI3660=m CONFIG_COMMON_RESET_HI6220=m CONFIG_COMPACTION=y CONFIG_COMPAL_LAPTOP=m -CONFIG_COMPAT=y CONFIG_COMPAT_32=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_COMPAT_BINFMT_ELF=y diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index f42478d06042..cc98a0a6930a 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -66,6 +66,7 @@ CONFIG_CMM=m CONFIG_COMEDI=m CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_XLNX_CLKWZRD=m +CONFIG_COMPAT=y CONFIG_COUNTER=m # CONFIG_CPU_BIG_ENDIAN is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index defd4cba83f2..8ed1cff72616 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -20,7 +20,6 @@ CONFIG_AQTION=m CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_ARCH_MMAP_RND_BITS_MAX=24 CONFIG_ARCH_MMAP_RND_BITS_MIN=18 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8 CONFIG_ARCNET=m @@ -65,6 +64,7 @@ CONFIG_CMDLINE_PARTITION=y CONFIG_COMEDI=m CONFIG_COMMON_CLK=y # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set +# CONFIG_COMPAT is not set # CONFIG_COUNTER is not set CONFIG_CRAMFS=m CONFIG_CRC7=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index f74d370fcc2f..242030babd09 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -54,6 +54,7 @@ CONFIG_CMA=y CONFIG_CMM=y # CONFIG_COMEDI is not set # CONFIG_COMMON_CLK is not set +CONFIG_COMPAT=y # CONFIG_COUNTER is not set CONFIG_CPU_BIG_ENDIAN=y # CONFIG_CRAMFS is not set