From nobody Tue Apr 7 11:17:15 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA6A1C433FE for ; Fri, 14 Oct 2022 07:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229929AbiJNHUV (ORCPT ); Fri, 14 Oct 2022 03:20:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229863AbiJNHUG (ORCPT ); Fri, 14 Oct 2022 03:20:06 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 137C145053 for ; Fri, 14 Oct 2022 00:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665731997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9FjkKJ4RB0wBhJUFjtqAZ3VQdnrJF4akYRPmacZ3lG8=; b=P1XPkpzlb1v28g7EfnK041ADQwt3UVlUPA+4JgImZKYdy6eLyS/3L8tvB5fFOGD+V6bO5N ZdgPTCn+xVXAkCijlhaC2PLVzBPPDVSpWof1M3OKDl1Qkjovgix2cAyelyvh5KKEfuGAe0 lFOQuI1N+zTD4vLj0BhcTESWrJ2uNHk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-547-p7IZhB-gOPeyF-R__aZl2Q-1; Fri, 14 Oct 2022 03:19:54 -0400 X-MC-Unique: p7IZhB-gOPeyF-R__aZl2Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CA6A1185A7A9; Fri, 14 Oct 2022 07:19:53 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-52.bne.redhat.com [10.64.54.52]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 183ACC06224; Fri, 14 Oct 2022 07:19:48 +0000 (UTC) From: Gavin Shan To: kvmarm@lists.linux.dev Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, ajones@ventanamicro.com, pbonzini@redhat.com, maz@kernel.org, shuah@kernel.org, oliver.upton@linux.dev, seanjc@google.com, peterx@redhat.com, maciej.szmigiero@oracle.com, ricarkol@google.com, zhenyzha@redhat.com, shan.gavin@gmail.com Subject: [PATCH 2/6] KVM: selftests: memslot_perf_test: Consolidate loop conditions in prepare_vm() Date: Fri, 14 Oct 2022 15:19:10 +0800 Message-Id: <20221014071914.227134-3-gshan@redhat.com> In-Reply-To: <20221014071914.227134-1-gshan@redhat.com> References: <20221014071914.227134-1-gshan@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There are two loops in prepare_vm(), which have different conditions. 'slot' is treated as meory slot index in the first loop, but index of the host virtual address array in the second loop. It makes it a bit hard to understand the code. Change the usage of 'slot' in the second loop, to treat it as the memory slot index either. No functional change intended. Signed-off-by: Gavin Shan --- tools/testing/selftests/kvm/memslot_perf_test.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testin= g/selftests/kvm/memslot_perf_test.c index 231cc8449c2e..dcb492b3f27b 100644 --- a/tools/testing/selftests/kvm/memslot_perf_test.c +++ b/tools/testing/selftests/kvm/memslot_perf_test.c @@ -297,21 +297,20 @@ static bool prepare_vm(struct vm_data *data, int nslo= ts, uint64_t *maxslots, } *slot_runtime =3D timespec_elapsed(tstart); =20 - for (slot =3D 0, guest_addr =3D MEM_GPA; slot < data->nslots; slot++) { + for (slot =3D 1, guest_addr =3D MEM_GPA; slot <=3D data->nslots; slot++) { uint64_t npages; uint64_t gpa; =20 npages =3D data->pages_per_slot; - if (slot =3D=3D data->nslots - 1) + if (slot =3D=3D data->nslots) npages +=3D rempages; =20 - gpa =3D vm_phy_pages_alloc(data->vm, npages, guest_addr, - slot + 1); + gpa =3D vm_phy_pages_alloc(data->vm, npages, guest_addr, slot); TEST_ASSERT(gpa =3D=3D guest_addr, "vm_phy_pages_alloc() failed\n"); =20 - data->hva_slots[slot] =3D addr_gpa2hva(data->vm, guest_addr); - memset(data->hva_slots[slot], 0, npages * 4096); + data->hva_slots[slot - 1] =3D addr_gpa2hva(data->vm, guest_addr); + memset(data->hva_slots[slot - 1], 0, npages * 4096); =20 guest_addr +=3D npages * 4096; } --=20 2.23.0