From patchwork Fri Jan 21 13:41:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1582570 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=GmpcyvJD; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) 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 4JgLBs6fYQz9t3b for ; Sat, 22 Jan 2022 00:41:41 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nAuAb-00045d-BR; Fri, 21 Jan 2022 13:41:37 +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 1nAuAY-00044e-Jo for kernel-team@lists.ubuntu.com; Fri, 21 Jan 2022 13:41:34 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.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 5977340018 for ; Fri, 21 Jan 2022 13:41:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1642772494; bh=9nxByLnoQZ4gmnaf1cDUCrFyhg9KHAHhMiT5ui6pAHU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GmpcyvJDabAlBcI+mERPyYBy4BlQ2gKGaeBnfg3qqUvb4BLLXAhzcdO1M/2NPUllf wCj0anE1GLctOQ09d6LmotFyDjiI0MH2rUOQUKxik4vDCO/Xdeh59Ujzucos/C246J Br9orX+CWkr6ezMjF+jQyee2I9AkSxW9YZ8ZyhhKJXsrbFXyASGPISEa69enw0lXno mOsVRPqPIHbiAHlUPjjGcwFFsO4ACz3qkmd3QRmBpmei5TMuWuapthffKU3jvyG1Gh N3H0KzO4+oaKTbpK81+uShonb5OUaE1YLCQV7oCawll3f3bRAbsOsG5WhtIuxpGc2X SXPmBpIEJ+0MA== Received: by mail-wm1-f71.google.com with SMTP id bg32-20020a05600c3ca000b00349f2aca1beso6290247wmb.9 for ; Fri, 21 Jan 2022 05:41:33 -0800 (PST) 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=9nxByLnoQZ4gmnaf1cDUCrFyhg9KHAHhMiT5ui6pAHU=; b=WqhvYHvYO64Y1BguMWgfIJ+yvH0w7ioblK2xbGVQTMBkdd038dVDeutZxD22NM443a fcYb4jVDvtRkEewcy8Djpo3WWlikXXPrcRzjpyJ8am2R6tW1K/eB9sNvJPSYUV6QuQPY IWARMLKjFvz2Ss/JLvkoReoE2Aw+DUzo1v5W4Hj5oeqELY1exmfPwbn8OEfLp3HwTFuh EfG7uCSqgrjBsYEX5nmz/b/JtdWIK9ZHGanc8VR2sifCP7QxCN0hpPJcgZbH0Q69b5wM y85hJWlnXjJaDcsq6ch7bqYqXbXAdTfO3jbz4ddiNZBpq26nhAWWOTH3J/BE8zefr7Ea jNTg== X-Gm-Message-State: AOAM533Kz3qpo65Nyb1+JEuZWqR76oTJz61zqZ3yJJogQ7fKW8D6niSa GucGWWM3X2MUb1zRiOzg3wunCAmA14SwdIcqHH5mZsKDAPaDvS54EX/YJ1DdLtTvSA9tLuIM4NA hVVpRYQUvp8GByYNuOksKgTrtOhiy/YUBhu4gz/LiWw== X-Received: by 2002:a5d:588e:: with SMTP id n14mr3758075wrf.658.1642772490172; Fri, 21 Jan 2022 05:41:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJz52oSW7yzWaeR+L+ls2LPR9HGDIoepreDaKhB6lj5MoFNnBXPJN3B3xV5P2BOU/YiiNHalkw== X-Received: by 2002:a5d:588e:: with SMTP id n14mr3758065wrf.658.1642772489937; Fri, 21 Jan 2022 05:41:29 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id m6sm6740891wms.34.2022.01.21.05.41.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:41:29 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][F/raspi][PATCH 1/1] UBUNTU: [Config] raspi: Set HUGETLBFS=y and TRANSPARENT_HUGEPAGE=y Date: Fri, 21 Jan 2022 14:41:28 +0100 Message-Id: <20220121134128.79916-2-juergh@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121134128.79916-1-juergh@canonical.com> References: <20220121134128.79916-1-juergh@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/1933532 Enable HUGETLBFS and TRANSPARENT_HUGEPAGE to make full use of huge pages. Also enable the cgroups controller to match the master kernel. Signed-off-by: Juerg Haefliger --- debian.raspi/config/annotations | 8 ++++---- debian.raspi/config/config.common.ubuntu | 13 +++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations index e580fae6c16b..675f9bf8194b 100644 --- a/debian.raspi/config/annotations +++ b/debian.raspi/config/annotations @@ -8486,7 +8486,7 @@ CONFIG_SYSFS policy<{'amd64': 'y', 'arm64': ' CONFIG_TMPFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_TMPFS_POSIX_ACL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_TMPFS_XATTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_HUGETLBFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_HUGETLBFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> mark note CONFIG_CONFIGFS_FS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'y'}> CONFIG_EFIVAR_FS policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}> # @@ -8694,7 +8694,7 @@ CONFIG_DEBUG_BLK_CGROUP policy<{'amd64': 'n', 'arm64': ' CONFIG_CGROUP_PIDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CGROUP_RDMA policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CGROUP_FREEZER policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_CGROUP_HUGETLB policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> +CONFIG_CGROUP_HUGETLB policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> mark note CONFIG_CPUSETS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_PROC_PID_CPUSET policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_CGROUP_DEVICE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> @@ -10741,8 +10741,8 @@ CONFIG_HZ_200 policy<{'armhf': 'n'}> CONFIG_HZ_500 policy<{'armhf': 'n'}> # Menu: Processor type and features >> Transparent Hugepage Support sysfs defaults -CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE policy<{'amd64': 'n', 'arm64': 'n', 'armhf-generic-lpae': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}> +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'y', 's390x': 'n'}> mark note +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}> mark note # Menu: Processor type and features >> Tune code generation >> Architecture: s390 CONFIG_TUNE_DEFAULT policy<{'s390x': 'n'}> diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu index dd2d5cde2a11..b219551934ed 100644 --- a/debian.raspi/config/config.common.ubuntu +++ b/debian.raspi/config/config.common.ubuntu @@ -207,6 +207,7 @@ CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y # CONFIG_ARCH_DOVE is not set # CONFIG_ARCH_EBSA110 is not set +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y # CONFIG_ARCH_EP93XX is not set @@ -1096,6 +1097,7 @@ CONFIG_CGROUP_CPUACCT=y # CONFIG_CGROUP_DEBUG is not set CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_HUGETLB=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -1626,6 +1628,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEV_APPLETALK=m CONFIG_DEV_COREDUMP=y +CONFIG_DEV_DAX=m CONFIG_DHT11=m CONFIG_DIMLIB=y CONFIG_DLCI=m @@ -2817,7 +2820,8 @@ CONFIG_HTS221=m CONFIG_HTS221_I2C=m CONFIG_HTS221_SPI=m CONFIG_HTU21=m -# CONFIG_HUGETLBFS is not set +CONFIG_HUGETLBFS=y +CONFIG_HUGETLB_PAGE=y # CONFIG_HVC_DCC is not set CONFIG_HVC_DRIVER=y CONFIG_HWLAT_TRACER=y @@ -5467,6 +5471,7 @@ CONFIG_RD_LZMA=y CONFIG_RD_LZO=y CONFIG_RD_XZ=y # CONFIG_READABLE_ASM is not set +# CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m CONFIG_REBOOT_MODE=m @@ -7136,7 +7141,10 @@ CONFIG_TRACE_SINK=m CONFIG_TRACING=y CONFIG_TRACING_MAP=y CONFIG_TRACING_SUPPORT=y -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE=y +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGE_PAGECACHE=y CONFIG_TREE_SRCU=y CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_TRUSTED_KEYS=y @@ -8006,6 +8014,7 @@ CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y CONFIG_X25=m CONFIG_X25_ASY=m CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_XARRAY_MULTI=y CONFIG_XDP_SOCKETS=y CONFIG_XDP_SOCKETS_DIAG=m # CONFIG_XEN is not set