From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D390F2038CD for ; Wed, 9 Oct 2024 15:50:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728489014; cv=none; b=g8QE2WdT21T3OaU4zhTiNptP765JB/rTSkMEOHTYyhbxh/881gFyGxZYTi2ghjlolQbMqYwSiK+aJLKdfL090kEsdRCg8PE6aAgjNq0U1AwO87Hx9FLPxkGAk6hnRsgGgLyW5JFOeW9V7LGKNe0S+T9IhwLVg8+uEws+3o3w3vM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728489014; c=relaxed/simple; bh=go2nSUoOu7DLGf2G03lp2uqdBfC+a2fqniLkbFG5GlI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=g5NtKlcyFQKmdq5fQGe7/S25tDFQd10SPuBfsEzmWE07Nk5h9bEdGpqDqHbZ5rT7HRUXnap4ch76JRLIgpsg69kdhFwI3DeC3cfO/tT2Fsfben6fcMHEyUIaB4ywmkyNUpjpF8qH9w/sULN7IGGHvUM3lFWzkofsnkQL5XWun3k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=d+jQkct7; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="d+jQkct7" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e28c3fb4c84so5475466276.3 for ; Wed, 09 Oct 2024 08:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1728489012; x=1729093812; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=BR1gG58gw5F7E+LpSzoPu+wX+wiyja7ptJ1fl5K+zYE=; b=d+jQkct7vpTlsWsKB5T7PiGvv9iqEE8UlA3dwqv+K5GTR9w/hKbTRCTFSo5G0gmRXb K5vjaPTRZghOdUO6OJRn0eJ31RWXaqXVJYJCH8zUQxUMF54ayxvXIeYzuGhBNhg23CNS 4LhV+W6ynKyWJBIGF2HcXbo3w+jcE3DM9BwOLC8Uwv5qzJf4MR8yDPFEZ2n18VD6bSRx XSwXuigcIkn8BDFP/+WSbyzDFKfJegMuh7wESS0FKS/qEfFsoipjllR+TED3dFbVtxPi Hc2rkeUXUhHOzbmhSPc8ZkRAvricWYztNuDR6zbZc8V6jYTkubqkcFyaCQ5jJIxDE95y AlEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728489012; x=1729093812; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BR1gG58gw5F7E+LpSzoPu+wX+wiyja7ptJ1fl5K+zYE=; b=bVOJ/b/R/KiLFy+ZgV7li5F2KExIdsvvTVYdyZvkxXnpAWBFUGU7p1zmzGZUQLUrLz klrRmlnnE1XnzJcpS/03vrtHZ7/kJBGIcuUtUUURCi+IBgfkFiCG2Gf3pfFDplC2nJ2k KqH8o1/iGqjTOKhucUlTUP5dOEzOiJ+9r6T5UTpIjWcjQFVb4J3TdY/Sifqwt1DP4FMH 8XpN4YeIhKRclX/UqgFOk+JYz2WP5+ahJrckCGvU+3+pKfZt+ehz5QMkUTlhimjIKqkN AKr+SMxnbIZ+Zyhx6ZoKeL7Wc/YrSl9rJKX6lXbmLZxF58UGfj5q1Vpj6TQKws/qFFuI E0+g== X-Forwarded-Encrypted: i=1; AJvYcCWwdboJjDnjHF5fy/7EBnHWOvtW/u0u4fa/KGQZb1eL8bvbYg0JsK6JNRHFkYDFiFFHgqImx9E=@lists.linux.dev X-Gm-Message-State: AOJu0Ywxt+mVS3UjkbUdK8rmvzSTnlrb9A2FJwc+3tmN4C8e1jqWOXmB IfmB/8pKIjQNEeoUyF+PvEuAKSV67HA1GgAJxQ3ql6nbsaZBztLeQtkAxmHsdtu3N9fnPyemAvg Aig== X-Google-Smtp-Source: AGHT+IHLwQuTuSKn2K83jzMORxhmnJG2QJIDSetKispH+vrqgQjqJfiOQ3+gOO6ZQgZWYqSyd9aEi5B6J6c= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:9d:3983:ac13:c240]) (user=seanjc job=sendgmr) by 2002:a25:6948:0:b0:e29:6a6:ed83 with SMTP id 3f1490d57ef6-e2906a6f043mr903276.11.1728489011277; Wed, 09 Oct 2024 08:50:11 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 9 Oct 2024 08:49:47 -0700 In-Reply-To: <20241009154953.1073471-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241009154953.1073471-1-seanjc@google.com> X-Mailer: git-send-email 2.47.0.rc0.187.ge670bccf7e-goog Message-ID: <20241009154953.1073471-9-seanjc@google.com> Subject: [PATCH v3 08/14] KVM: selftests: Compute number of extra pages needed in mmu_stress_test From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Paolo Bonzini , Christian Borntraeger , Janosch Frank , Claudio Imbrenda Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Sean Christopherson , Andrew Jones , James Houghton Content-Type: text/plain; charset="UTF-8" Create mmu_stress_tests's VM with the correct number of extra pages needed to map all of memory in the guest. The bug hasn't been noticed before as the test currently runs only on x86, which maps guest memory with 1GiB pages, i.e. doesn't need much memory in the guest for page tables. Reviewed-by: James Houghton Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/mmu_stress_test.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/mmu_stress_test.c b/tools/testing/selftests/kvm/mmu_stress_test.c index 847da23ec1b1..5467b12f5903 100644 --- a/tools/testing/selftests/kvm/mmu_stress_test.c +++ b/tools/testing/selftests/kvm/mmu_stress_test.c @@ -209,7 +209,13 @@ int main(int argc, char *argv[]) vcpus = malloc(nr_vcpus * sizeof(*vcpus)); TEST_ASSERT(vcpus, "Failed to allocate vCPU array"); - vm = vm_create_with_vcpus(nr_vcpus, guest_code, vcpus); + vm = __vm_create_with_vcpus(VM_SHAPE_DEFAULT, nr_vcpus, +#ifdef __x86_64__ + max_mem / SZ_1G, +#else + max_mem / vm_guest_mode_params[VM_MODE_DEFAULT].page_size, +#endif + guest_code, vcpus); max_gpa = vm->max_gfn << vm->page_shift; TEST_ASSERT(max_gpa > (4 * slot_size), "MAXPHYADDR <4gb "); -- 2.47.0.rc0.187.ge670bccf7e-goog