From patchwork Wed Oct 16 21:14:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Whitfield X-Patchwork-Id: 1998276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTNyn04GZz1xw7 for ; Thu, 17 Oct 2024 08:14:56 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t1BM0-0001th-R6; Wed, 16 Oct 2024 21:14:48 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t1BLz-0001t9-0t for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 21:14:47 +0000 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 75BEC3F2D4 for ; Wed, 16 Oct 2024 21:14:46 +0000 (UTC) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-20c45296b3fso4614925ad.0 for ; Wed, 16 Oct 2024 14:14:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729113285; x=1729718085; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z25rWanue0rHnHj5Qol+IF2ANUXD1wtIqm0k3hjyR6M=; b=HHxVyWpxB+Hi4kUrGE7kHUKgR8YTKFEmCoVy1kTuD5I4ALIxhuZnzNqx5lgJYZlWmR vCfl0Xa7bXuVQ93Lkg9U4T5sps8JtOSG4sb/SOZenp/m74JIsVBWFGsswjC97wMp0jVb aoCD2EMo/7zLMVTZfRsN58iJrxUCy7lQKAgSvEPReEDkOzrZxg4EntkT3UYQTlbg/nTz 9jTnsul+sN1c6GXOxiz2H5z7k+7Q9UXaQGmTUgcu9uZJVWM27dm8HIqiDPrprhMprQzB dz54iDoqAYlsDveldIVtBcrGEnNjXviW3Uw0TnkSBUAq+8uflutMSt18vtEdvNJ9npuI J7Zg== X-Gm-Message-State: AOJu0YzkirV9YW5dJ8CF6Fhbb2xqNYIUU1pL+bZKtr+/S8hf+bVkcqfV AQaCd3KwK6Hydr0Kl0JeAAG4sHMNF3Z2spIGXPJT/pGrzU5+EV/zrWYVy4DKLWGRXTVcHifsSCV +iVGqC/St143OQRlu124u+eiUEvDdG4ncP/wzPwdZOSpWfdhZJWCvK9UhAOrC4scTdeMhUooJSG hHnvjgzx6D3A== X-Received: by 2002:a17:902:db0d:b0:20c:7796:5e76 with SMTP id d9443c01a7336-20cbb19ab94mr249090545ad.18.1729113284883; Wed, 16 Oct 2024 14:14:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHo2mtSnWHkXWAw8HIEh8EUMdNEZ9eMZLK6x7AWjGMsWwvXy8TNFbPbFWq7qX39gf6wcAunLQ== X-Received: by 2002:a17:902:db0d:b0:20c:7796:5e76 with SMTP id d9443c01a7336-20cbb19ab94mr249090245ad.18.1729113284402; Wed, 16 Oct 2024 14:14:44 -0700 (PDT) Received: from localhost (172-10-233-79.lightspeed.sntcca.sbcglobal.net. [172.10.233.79]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20d17f87ccasm32697415ad.62.2024.10.16.14.14.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 14:14:44 -0700 (PDT) From: Ian Whitfield To: kernel-team@lists.ubuntu.com Subject: [SRU][N:linux-gke][PATCH 1/1] UBUNTU: gke: Disable Multi-Gen LRU Date: Wed, 16 Oct 2024 14:14:37 -0700 Message-ID: <20241016211437.39454-2-ian.whitfield@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016211437.39454-1-ian.whitfield@canonical.com> References: <20241016211437.39454-1-ian.whitfield@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/2084716 Due to upstream Kubernetes issue #127844, Multi-Gen LRU has been requested by Google to be disabled until a permanent fix is implemented. This feature unintentionally changed the output of kubelet's memory usage calculations in an unexpected way. Docs on Multi-Gen LRU: https://docs.kernel.org/admin-guide/mm/multigen_lru.html Signed-off-by: Ian Whitfield --- debian.gke/config/annotations | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian.gke/config/annotations b/debian.gke/config/annotations index acac42303da2..7f760e6f95ad 100644 --- a/debian.gke/config/annotations +++ b/debian.gke/config/annotations @@ -32,6 +32,12 @@ CONFIG_KERNEL_ZSTD note<'LP: #1931725'> CONFIG_LOOPBACK_TARGET policy<{'amd64': 'm', 'arm64': 'm'}> CONFIG_LOOPBACK_TARGET note<'Specifically requested by GKE. Must ensure tcm_loop.ko is in default module list'> +CONFIG_LRU_GEN policy<{'amd64': 'n', 'arm64': 'n'}> +CONFIG_LRU_GEN note<'Requested by GKE, LP: #2084716'> + +CONFIG_LRU_GEN_ENABLED policy<{'amd64': '-', 'arm64': '-'}> +CONFIG_LRU_GEN_ENABLED note<'Requested by GKE, LP: #2084716'> + CONFIG_NETFILTER_NETLINK_LOG policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_NETFILTER_NETLINK_LOG note<'initial packaging'> @@ -211,6 +217,8 @@ CONFIG_KERNEL_GZIP policy<{'amd64': 'n', 'arm64': ' CONFIG_LEDS_AAEON policy<{'amd64': '-'}> CONFIG_LEDS_BCM63138 policy<{'arm64': 'm'}> CONFIG_LIBCRC32C policy<{'amd64': 'y', 'arm64': 'y'}> +CONFIG_LRU_GEN_STATS policy<{'amd64': '-', 'arm64': '-'}> +CONFIG_LRU_GEN_WALKS_MMU policy<{'amd64': '-', 'arm64': '-'}> CONFIG_LSM policy<{'amd64': '"landlock,lockdown,yama,integrity,apparmor,bpf"', 'arm64': '"landlock,lockdown,yama,integrity,apparmor,bpf"'}> CONFIG_MARVELL_GTI_WDT policy<{'arm64': 'm'}> CONFIG_MDIO_BCM_IPROC policy<{'arm64': 'n'}>