From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) (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 498CA205E0B for ; Thu, 9 Jan 2025 20:50:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736455805; cv=none; b=emdNy1MfMQvo/refSxFP0ood69FFcC4MwbtZtbLkVTxBdzHduy9QrXuNCyDj9xg2CDjvggO07NwUDKd1ZOvHxxLQ5oDwCXiWRer/qz13hhOFDg/eQbn3FL5VmMn1ERghBUHuNr1O4M+VaFqhFELtyvwtaLfO/b319bG+wLF3nyE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736455805; c=relaxed/simple; bh=wX30xj9sJm8y6Ulhl1IoKeVlsOrKZuVPq174Ef2/lmg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ogXiuK0z06bVVBTdYrpPpFm7D2/Bgbk+Zd4tx0e+mZZJ4sJwIsUw8nQdRhZl23RN9eYVFSeUbNCwFY3WaXHJm5A6Rm5FcIQwlY+kAgheygAvgbQq3JRX6W8Z8cT4a/QC6whUpwWT3b1G7p6Yc3fu0/C9bdOzbYfUooYERBDPMpM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jthoughton.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Nqheqdbp; arc=none smtp.client-ip=209.85.219.74 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--jthoughton.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Nqheqdbp" Received: by mail-qv1-f74.google.com with SMTP id 6a1803df08f44-6d8edc021f9so20742766d6.3 for ; Thu, 09 Jan 2025 12:50:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736455802; x=1737060602; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=O767jE59AeAMsTglDWemPeR1CkI5EMgHAt7K2sI2JAg=; b=NqheqdbpRHbyAS4K/VzM23lNgc5uC6cBGeig3RyKX0a6fiu6z3TkzOc0OnIMb1Ukfu GH7e/eG350wKV6hfkAZObFBCkavtG6DNj06OTsbX1YgYjM+XHwEuRSWL2WZRgeu2UFpF VKVh7x0P/NwiqcsakmcFm0k4Jx3BVgR9EvyfzKxyOg0qHkdDWwmychK3cKrKhE8heT9v Bgj3zhlFnLIVTg2xWzhjEozvW2BF3DoIGtiZxTHPfH0cWaLe8JhFI7fns+Gt12Fp2I1p EAdT37zihifyH9L1Os+nVlwDpB+uMSZ75iIuyZxxCMaXtgP7oPcyseosVW+wc/1blysO aBfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736455802; x=1737060602; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O767jE59AeAMsTglDWemPeR1CkI5EMgHAt7K2sI2JAg=; b=hJnIEFt+5Z2z/COU0E6z0eYOqOwhxwNb1K4aPc5FGAMkIMc5kG0l/HNCS1GpHvqYUi n9amCRYyg4qkjRSuGmPj2WNsKzYqFBmlVcfnW+QNwh5LyqgSOmBwPnCRxKnsv6JjpuiB PWwhGAOBsPBFt96NaENAuiR5Md6tTI8NuSeDiBgw2L4Uc7FOQazxxpn3LVgv9H3Mj/ay p7jhRZ/vGKZCaweXGphFsCRsY91JXiIc7sveeKYAJ8qjsnPsulxKEZAQtvf1YPa2nS4w MHsCNPpIvomR/GhAwk0NiICE6xJL1MeH8UYW5zwwTQEhdGN8EgtnkqmEIF3W4KO351IO eTIQ== X-Forwarded-Encrypted: i=1; AJvYcCXwU/VsxSqI3mUCp/LRfq71DEzYdldQBKgtq48qXJmMX0OB551OQL72/TF6mpGrGzS4IqxVwhs=@lists.linux.dev X-Gm-Message-State: AOJu0Yzx+jregTrwKJ03samR2nrrCeK5N+W2ZhkMuxGHjgX/98nLY/dS 9Z/W+EdY3IDnweRnGTSq8WBjMHmH4kVChFcPQDrjNYzpErd/z+3fJFq8MBgivnvl0SlEBzrAg48 kzyt2070qq1WhZZbuww== X-Google-Smtp-Source: AGHT+IFgx6gAPenNPcGigBK2pqFto4Hhpu9WmCDI55SJzVOesvWzc1cj0nZb4kbFOEWQTb6nHd4wPYt7OTvCG9XJ X-Received: from qvboq1.prod.google.com ([2002:a05:6214:4601:b0:6d8:f326:1f33]) (user=jthoughton job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6214:2688:b0:6d4:1c9d:4f47 with SMTP id 6a1803df08f44-6df9b238643mr125150226d6.13.1736455802071; Thu, 09 Jan 2025 12:50:02 -0800 (PST) Date: Thu, 9 Jan 2025 20:49:24 +0000 In-Reply-To: <20250109204929.1106563-1-jthoughton@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250109204929.1106563-1-jthoughton@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20250109204929.1106563-9-jthoughton@google.com> Subject: [PATCH v2 08/13] KVM: selftests: Fix prefault_mem logic From: James Houghton To: Paolo Bonzini , Sean Christopherson Cc: Jonathan Corbet , Marc Zyngier , Oliver Upton , Yan Zhao , James Houghton , Nikita Kalyazin , Anish Moorthy , Peter Gonda , Peter Xu , David Matlack , wei.w.wang@intel.com, kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" The previous logic didn't handle the case where memory was partitioned AND we were using a single userfaultfd. It would only prefault the first vCPU's memory and not the rest. Signed-off-by: James Houghton --- tools/testing/selftests/kvm/demand_paging_test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c index 0202b78f8680..315f5c9037b4 100644 --- a/tools/testing/selftests/kvm/demand_paging_test.c +++ b/tools/testing/selftests/kvm/demand_paging_test.c @@ -172,11 +172,13 @@ static void run_test(enum vm_guest_mode mode, void *arg) memset(guest_data_prototype, 0xAB, demand_paging_size); if (p->uffd_mode == UFFDIO_REGISTER_MODE_MINOR) { - num_uffds = p->single_uffd ? 1 : nr_vcpus; - for (i = 0; i < num_uffds; i++) { + for (i = 0; i < nr_vcpus; i++) { vcpu_args = &memstress_args.vcpu_args[i]; prefault_mem(addr_gpa2alias(vm, vcpu_args->gpa), vcpu_args->pages * memstress_args.guest_page_size); + if (!p->partition_vcpu_memory_access) + /* We prefaulted everything */ + break; } } -- 2.47.1.613.gc27f4b7a9f-goog