From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 ABB723E47B for ; Wed, 18 Dec 2024 00:01:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734480107; cv=none; b=AZIL2NJnQRyiZHm/X8IGThkchfOT9SKS7kMS9PSlAnPpg3s0qB3Ue4mfF9NkyRIIfkaJkUaW5O9puTzQGVhS7w54l0ReOue4YtlDaOrN517uPKWICPkGM1VHx/cg3jiSfcwYBhWYDcmgJIeLWKWUjsWtPlXOW+hJhwvGEgCNymY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734480107; c=relaxed/simple; bh=JiXlXiUjE1IBrDYN/SUtdzXJkxACykOuXaw93Gy2l9Y=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=vGv2JY1FxuFBsH/t++xlUbsv9WxMsPNd9evp8PPSnwyUm+eW1KfqtkKo+zsa5HtTvosd2rkdvkoLoxpaOYUaNVm1kh1UIGoqa9BlV7E0/wPNBOpyH5QY5ysaqZsOKDN9LlUzy6Z/N9QkosIVfrTTgdl/q0wV9s7VDsvHdb6xHH0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=IvET52l1; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IvET52l1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734480104; 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=UsNVKjOASwq4KE2b1hXrv9KRHdzcUQ3w6sF0EtrACnM=; b=IvET52l10EyNrVMRgeAuvgbzeJ3H5/gWyrjRQLaOH40pdwZcREFqW9cW0X5sAJEhf2lla+ iSvmA5UuyLYquXHbngag0CsEMQrDUmzNHIQTHktVFbNQyv1PEzkyrZvsUiqJWtvEIxBxXu ClC/alvK1Y89sMsF8ClpYLXNdKOwiFE= Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-168-1AuVp8JnO82nyaJcwybLnQ-1; Tue, 17 Dec 2024 19:01:43 -0500 X-MC-Unique: 1AuVp8JnO82nyaJcwybLnQ-1 X-Mimecast-MFC-AGG-ID: 1AuVp8JnO82nyaJcwybLnQ Received: by mail-il1-f198.google.com with SMTP id e9e14a558f8ab-3a7e0d7b804so60124875ab.0 for ; Tue, 17 Dec 2024 16:01:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734480102; x=1735084902; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UsNVKjOASwq4KE2b1hXrv9KRHdzcUQ3w6sF0EtrACnM=; b=DNbaIZO2NPwirt+OoRf8ipQZet4+9WBL9BP9b5K8zgXPDHfkk+nQxfyugttWZpaeeK jVIhD11oujXjABB0rudAnpyG+L0kwObkdLJI5LC3POfrOLBSHmAwPFg1ut54EQW7zlGz YpG7cTticpiFfRX98QE/Xr936+yd8f29WvuMmy571DDAkZfQcOKh0hnawv+epDnLmvjQ IKLeoqDBarzwks0M+e4Gvk0HV3RCEWvFv7KYrUJ9arhbRlfnzM9W0n5pKngMv5pWRgpD V1Xx5le7cZ6/z9BdQHdvAGUiV14cblLoCqJaW36j9KX0Hweya+FyF9YgtrFj2M+uqnYw RSIQ== X-Forwarded-Encrypted: i=1; AJvYcCUbYIUZfNUjz8VSCzdIurpzK8j0wOO2b8cfcQcAbC5gJVkdDXVYs+H9GozoMRw3Qd1H2v2r6LKgGceHoD8=@vger.kernel.org X-Gm-Message-State: AOJu0YyNHUbxjSTGwC/wtJf6k9YLkbHGK9PgkfnDW397oA9T526dLKZ4 JmcP3+G1Or8P+sgHm8YlSGau6yAnG2IWIHS6MgCMME44o9EHD6ZwakY346JF64xyaXat0e0RjwR lLoK8DjCPXe9gAhPYpoEorBDYwuASdEh/bpSHpJjmXoE0loIyY5B97VFN5SZ4oNHhr3asNg== X-Gm-Gg: ASbGncs7d+sFy2Hy5K9xz/YCA9zDWpyGunphbMPy67EyjMPolkPikyzdDtuxDDZfA67 lNyEkpgpIayrI/c7AgsL6LLsW9e0npspptmNSM1gcySRumPk+NR8onLyaTOjDf467xKzX9T1t6b 8b5z6zn2hiQ3E/H6/xfzkZKYIN+Ya0YoAUH7VwDBtKmKnJkQgpVGtDBjSlBwOHa2hQmL146ZL16 ivHnK5GxCjU2SotUxxNDEk+EXqgUAX6nd6SBTu7CF/UetPPstIH1QAV X-Received: by 2002:a05:6e02:1fc9:b0:3a7:a29b:c181 with SMTP id e9e14a558f8ab-3bdc174e846mr8418915ab.13.1734480102330; Tue, 17 Dec 2024 16:01:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8jQmSd1gG/4Nn/wyVkdbfoq9bmQI4O7K4i7SmgMIXP2ob4+QZ7XfyCxcc/tjBWRqzF/FwAQ== X-Received: by 2002:a05:6e02:1fc9:b0:3a7:a29b:c181 with SMTP id e9e14a558f8ab-3bdc174e846mr8418615ab.13.1734480101878; Tue, 17 Dec 2024 16:01:41 -0800 (PST) Received: from starship ([2607:fea8:fc01:8d8d:6adb:55ff:feaa:b156]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3b248132048sm23388435ab.17.2024.12.17.16.01.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 16:01:41 -0800 (PST) Message-ID: <44e222665405cd334e3da170c076de704084054e.camel@redhat.com> Subject: Re: [PATCH 12/20] KVM: selftests: Use continue to handle all "pass" scenarios in dirty_log_test From: Maxim Levitsky To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Xu Date: Tue, 17 Dec 2024 19:01:40 -0500 In-Reply-To: <20241214010721.2356923-13-seanjc@google.com> References: <20241214010721.2356923-1-seanjc@google.com> <20241214010721.2356923-13-seanjc@google.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7bit On Fri, 2024-12-13 at 17:07 -0800, Sean Christopherson wrote: > When verifying pages in dirty_log_test, immediately continue on all "pass" > scenarios to make the logic consistent in how it handles pass vs. fail. > > No functional change intended. > > Signed-off-by: Sean Christopherson > --- > tools/testing/selftests/kvm/dirty_log_test.c | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c > index 8544e8425f9c..d7cf1840bd80 100644 > --- a/tools/testing/selftests/kvm/dirty_log_test.c > +++ b/tools/testing/selftests/kvm/dirty_log_test.c > @@ -510,8 +510,6 @@ static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap) > } > > if (__test_and_clear_bit_le(page, bmap)) { > - bool matched; > - > nr_dirty_pages++; > > /* > @@ -519,9 +517,10 @@ static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap) > * the corresponding page should be either the > * previous iteration number or the current one. > */ > - matched = (val == iteration || val == iteration - 1); > + if (val == iteration || val == iteration - 1) > + continue; > > - if (host_log_mode == LOG_MODE_DIRTY_RING && !matched) { > + if (host_log_mode == LOG_MODE_DIRTY_RING) { > if (val == iteration - 2 && min_iter <= iteration - 2) { > /* > * Short answer: this case is special > @@ -567,10 +566,8 @@ static void vm_dirty_log_verify(enum vm_guest_mode mode, unsigned long *bmap) > } > } > > - TEST_ASSERT(matched, > - "Set page %"PRIu64" value %"PRIu64 > - " incorrect (iteration=%"PRIu64")", > - page, val, iteration); > + TEST_FAIL("Dirty page %lu value (%lu) != iteration (%lu)", > + page, val, iteration); > } else { > nr_clean_pages++; > /* Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky