From patchwork Fri Nov 8 20:50:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13868968 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 8AAA417A5BE for ; Fri, 8 Nov 2024 20:50:45 +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=1731099045; cv=none; b=H4AWSo9b4cSRjFhKXYfsmVRxMyI3zfCHfJ4qyGb5ZBdiaRdOCeyLSyLTg1JPW4RGao7f5Wx+cRP/2Z6vDOPP+iRPsNjCzc2YhKlZ4SyIzGKPgv+3VUu30IG28xtkDGXqOqAMCkHhbiCNj1Ez2wFVb2iAIkrx1I6Cu4w88FgKOMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731099045; c=relaxed/simple; bh=D6+ILxTNqK3lEA75iLKrMb3899KIOQNplgZBYFDYMaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jm+MsyFpqOxy8X50iyZ67E+8Mt1PaUb8n4voAwG5itr/WoDOaEu09sIHXWGyJNirYzzAIgg7rM2jvaoZNn0qm9ViXaDs6fyYSNW/sFn1ChkYcXCK3Ura9w/88aCLRBnHAKeX28OOPtQ0KX2NINUcc8YLs1KRio7fE0AYZuHPBMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VWW7kgXE; 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="VWW7kgXE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7AC3C4CED2; Fri, 8 Nov 2024 20:50:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731099045; bh=D6+ILxTNqK3lEA75iLKrMb3899KIOQNplgZBYFDYMaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VWW7kgXEjo9U5x6oGwwRnFirIb8i8kccd1eUOoFwC7s020Ah6dwlUcwTZWQytE176 J04Nd9NMp5ULPsZFbHqEDvRo49kGbmXX/im1oBe6tCFzf4+bny5Xw/kYN3mxIWl/c2 p2mF9438ZRKLtO6I9gHzxOMtAykZFvtqaosXjIaT6zLvzkTY2PSq/5YFnCC6jlZNfm /hOTJ9Gh+nKN1O5OTddFzSEQTtANDCRxDuNnlWW5R3sQmLpVFs+5maTErUP9zKEsAz 0o4qI+er/r8pFsfro6qtCLeLo2FK7pjr4t6hBpOuUQlxdLpgovFwgNoQwb2gqOLJcF hqdFmg44UY7Hg== From: cel@kernel.org To: Cc: Chuck Lever Subject: [RFC PATCH 3/3] aws: Add "m5ad.2xlarge" instance type Date: Fri, 8 Nov 2024 15:50:40 -0500 Message-ID: <20241108205040.571326-4-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241108205040.571326-1-cel@kernel.org> References: <20241108205040.571326-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 "m5ad.4xlarge" instance type is almost a dollar an hour these days. For NFS testing, a smaller instance works just fine. Signed-off-by: Chuck Lever --- kconfigs/workflows/Kconfig.shared | 1 + terraform/aws/Kconfig | 8 ++++++++ workflows/gitr/btrfs/Kconfig | 1 + workflows/gitr/ext4/Kconfig | 1 + workflows/gitr/xfs/Kconfig | 1 + workflows/sysbench/Kconfig.fs | 1 + 6 files changed, 13 insertions(+) diff --git a/kconfigs/workflows/Kconfig.shared b/kconfigs/workflows/Kconfig.shared index 029eaa4383db..91f86cf77af4 100644 --- a/kconfigs/workflows/Kconfig.shared +++ b/kconfigs/workflows/Kconfig.shared @@ -35,6 +35,7 @@ if WORKFLOW_MAKE_CMD_OVERRIDE config WORKFLOW_MAKE_CMD string "The make command to use when building" + 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 default "make -j 4" if TERRAFORM_AZURE_VM_SIZE_STANDARD_DS3_V2 diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig index a7bf82640ae7..de02f4a3989e 100644 --- a/terraform/aws/Kconfig +++ b/terraform/aws/Kconfig @@ -280,6 +280,13 @@ 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_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. + config TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE bool "m5ad.4xlarge" depends on TARGET_ARCH_X86_64 @@ -355,6 +362,7 @@ endchoice config TERRAFORM_AWS_INSTANCE_TYPE string + 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 default "is4gen.8xlarge" if TERRAFORM_AWS_INSTANCE_IS4GEN_8XLARGE diff --git a/workflows/gitr/btrfs/Kconfig b/workflows/gitr/btrfs/Kconfig index 9498cfbf0286..50e009900b73 100644 --- a/workflows/gitr/btrfs/Kconfig +++ b/workflows/gitr/btrfs/Kconfig @@ -3,6 +3,7 @@ config GITR_BTRFS_DEVICE default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO default "/dev/disk/by-id/ide-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE + default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE default "/dev/nvme1n1" if TERRAFORM_GCE default "/dev/sdd" if TERRAFORM_AZURE diff --git a/workflows/gitr/ext4/Kconfig b/workflows/gitr/ext4/Kconfig index b1320e8686e6..2f8c7ed5e7fb 100644 --- a/workflows/gitr/ext4/Kconfig +++ b/workflows/gitr/ext4/Kconfig @@ -3,6 +3,7 @@ config GITR_EXT4_DEVICE default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO default "/dev/disk/by-id/ide-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE + default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE default "/dev/nvme1n1" if TERRAFORM_GCE default "/dev/sdd" if TERRAFORM_AZURE diff --git a/workflows/gitr/xfs/Kconfig b/workflows/gitr/xfs/Kconfig index 89daafe917ef..851ec13bb8fc 100644 --- a/workflows/gitr/xfs/Kconfig +++ b/workflows/gitr/xfs/Kconfig @@ -3,6 +3,7 @@ config GITR_XFS_DEVICE default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO default "/dev/disk/by-id/ide-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE + default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE default "/dev/nvme1n1" if TERRAFORM_GCE default "/dev/sdd" if TERRAFORM_AZURE diff --git a/workflows/sysbench/Kconfig.fs b/workflows/sysbench/Kconfig.fs index 5a911c68f122..c73c1fddf46b 100644 --- a/workflows/sysbench/Kconfig.fs +++ b/workflows/sysbench/Kconfig.fs @@ -177,6 +177,7 @@ config SYSBENCH_DEVICE default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME default "/dev/disk/by-id/virtio-kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO default "/dev/disk/by-id/ata-QEMU_HARDDISK_kdevops1" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE + default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_2XLARGE default "/dev/nvme2n1" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE default "/dev/nvme1n1" if TERRAFORM_GCE default "/dev/sdd" if TERRAFORM_AZURE