From patchwork Tue Jan 14 20:03:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13939435 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9533314A60C for ; Tue, 14 Jan 2025 20:03:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736885034; cv=none; b=FlZSPB4DnIXqW2I4akMkXM9idRRNI8FsLP1EjR9n8xkOKF9Ite9TkFelsYx34VChWlaGzmJUAm91HGFXf/saR3GbEmCeBsKQVKgpWErWzMszI1hbAduu0tOM5Od2/5+n6813pcjRlndq8zm8OCMl9f4b9LFJlHRtg9FQvmAI9NY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736885034; c=relaxed/simple; bh=98O9Cb3Bhcg0VjqfJRPeiHgS86aFNnt0NLLRA/eb6NU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wlg+p7tSEyyNc7eW4VPWuaCOCdPMpcuS7QEqCD6WazOddlcBSlx+cMpH9SYyes1sV43oiX5gayqTksZC03V8z/+7MhrxQfmGXqrW9KyuJeIvt0jsPvYYuhbZa7hlmSm5l7buJ002BE2a1+l0xuDEa8c5WjVdkdQNuOBKcOl8JCY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gLgnlKf8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gLgnlKf8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32DC4C4AF0B; Tue, 14 Jan 2025 20:03:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736885034; bh=98O9Cb3Bhcg0VjqfJRPeiHgS86aFNnt0NLLRA/eb6NU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gLgnlKf8Zhf3TjoQVRB82a+thYWk0eSYPpTdgp98KUT4Giv31oOSx01ZrUEipR56g pr1JScRfgtWX7rJA95QPbBMHiIbyzK31rTk9Zo28X/CFOlQZ8koImtiuiOFJta9cxY KQCOykkojVvhDjLzwoI6LF9MeanzcIBuma3ae/cdxrx16Gnq2sPL579v+WPyvuNE55 RQqTkU5eV5VS0eGi4kKH7z5cnny+uDcdEMmV9/+2ysZVxVcu3UXhSZCBpso7r+drWp 5mzyMU6gAjth1wVtmeugJD/4eIXGFEwUDWQ+H5Sgo2U5sUkGQemPR7MtxdY4X0MeXQ HsUdnxu7QQbRQ== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH v1 7/9] terraform/aws: Add a couple more instance types Date: Tue, 14 Jan 2025 15:03:46 -0500 Message-ID: <20250114200348.1706018-8-cel@kernel.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250114200348.1706018-1-cel@kernel.org> References: <20250114200348.1706018-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever The existing m5ad selections are still more than is needed for some workflows, so introduce a couple of smaller ones. Update the help text for these types to better reflect their current provisions. Signed-off-by: Chuck Lever --- kconfigs/workflows/Kconfig.shared | 2 ++ terraform/aws/Kconfig | 44 ++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/kconfigs/workflows/Kconfig.shared b/kconfigs/workflows/Kconfig.shared index 91f86cf77af4..d05f31964684 100644 --- a/kconfigs/workflows/Kconfig.shared +++ b/kconfigs/workflows/Kconfig.shared @@ -35,6 +35,8 @@ if WORKFLOW_MAKE_CMD_OVERRIDE config WORKFLOW_MAKE_CMD string "The make command to use when building" + default "make -j 2" if TERRAFORM_AWS_INSTANCE_M5AD_LARGE + default "make -j 4" if TERRAFORM_AWS_INSTANCE_M5AD_XLARGE default "make -j 8" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE default "make -j 16" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE default "make -j 1" if TERRAFORM_AZURE_VM_SIZE_STANDARD_DS1_V2 diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig index cb84b3d89ea4..42703ab2bec2 100644 --- a/terraform/aws/Kconfig +++ b/terraform/aws/Kconfig @@ -294,19 +294,53 @@ choice default TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE if TARGET_ARCH_X86_64 default TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM if TARGET_ARCH_ARM64 +config TERRAFORM_AWS_INSTANCE_M5AD_LARGE + bool "m5ad.large" + depends on TARGET_ARCH_X86_64 + help + 8 GiB RAM, 2 AMD vcpus, 1 10 GiB main drive, up to 10 Gbps + network speed, and one 75 GiB NVMe drive. + + Add more storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m5/ for details. + +config TERRAFORM_AWS_INSTANCE_M5AD_XLARGE + bool "m5ad.xlarge" + depends on TARGET_ARCH_X86_64 + help + 16 GiB RAM, 4 AMD vcpus, 1 10 GiB main drive, up to 10 Gbps + network speed, and one 150 GiB NVMe drive. + + Add more storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m5/ for details. + config TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE bool "m5ad.2xlarge" depends on TARGET_ARCH_X86_64 help - 32 GiB RAM, 8 vcpus, 1 10 GiB main drive, and one additional - 300 GiB NVMe drive. + 32 GiB RAM, 8 AMD vcpus, 1 10 GiB main drive, up to 10 Gbps + network speed, and one 300 GiB NVMe drive. + + Add more storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m5/ for details. config TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE bool "m5ad.4xlarge" depends on TARGET_ARCH_X86_64 help - 64 GiB RAM, 16 vcpus, 1 10 GiB main drive, and two additional - 300 GiB NVMe drives. + 64 GiB RAM, 16 AMD vcpus, 1 10 GiB main drive, up to 10 Gbps + and two 300 GiB NVMe drives. + + Add more storage by selecting the TERRAFORM_AWS_ENABLE_EBS_VOLUMES + option and adjusting the size and number of additional devices. + + See https://aws.amazon.com/ec2/instance-types/m5/ for details. config TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM bool "is4gen.medium" @@ -376,6 +410,8 @@ endchoice config TERRAFORM_AWS_INSTANCE_TYPE string + default "m5ad.large" if TERRAFORM_AWS_INSTANCE_M5AD_LARGE + default "m5ad.xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_XLARGE default "m5ad.2xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE default "m5ad.4xlarge" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE default "is4gen.medium" if TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM