From patchwork Mon Oct 23 19:15:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 157048 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1501092vqx; Mon, 23 Oct 2023 12:16:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfRUHTDD1CvUM6cIzIrjLgKFRdJPpsw0/MiyJZ+xaRZAeYxD+BQ3nQjozVHNov5yoYNFzS X-Received: by 2002:a05:6300:8005:b0:133:f0b9:856d with SMTP id an5-20020a056300800500b00133f0b9856dmr473238pzc.17.1698088573151; Mon, 23 Oct 2023 12:16:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698088573; cv=none; d=google.com; s=arc-20160816; b=CpGAOutmDn+WTOIKMvefFSh+xb8hojavWVd9fJ4pEIg270EeIVRAt9bqEoSwUmeT8F 4lCZ/hiCf+vQ6iWacH5x5QeqRRKHAfw/jLA1uyRoQEUzCR+8eDeV23578DmN963WIqix gsbI1e+FCa1YPz5XmmXXv+MTFjoSNyJK/gXvg3QGJsb80TuKJwYVKrFjBde/zjFdFTqN BvCndCq/KJkeojETOyvJ1+dyqcXaoUJzvIhbazROI5E5D/+mLGWYOjGL6EJ1zb4Lnd8l nuTyoMUBgherc98kjovo7+3bpkuEaQO3qMCjhM+1VmOrczX3m8zzimn6Xb4CsNSYslBa ZzUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=Fgbudwquptx3kxGF2Rx/jDbv8sQ1FkhX6MwfxQpq3LQ=; fh=2IGrByZwJJHppcQOSnWVEv1kEE7zhmjxO9HROc9niOY=; b=Bn7FemQtkxtF9fpAVpWKFw+M74kUEqgDf3w3EwFswYdNtzTMkIJ9lbfObwLbjpURWU i2NJZF0gDIagWDyA5rFU5j5kk34FX9xfBvE+LGo+DWqyrQcy47azcKgJoCbH6D0by4RO J1tWpzF7xq/U97dJOVcF50O6MO46LZQ/6rK5UNeR0yyBqjCi+RSTzKXn6I/g3WHc/E+b RXB9s6EcWc2wwftRq1d23D1UcFNn3qfU3Y7j0QAXQKxlIIFlj8aWH8bT3N+zV5JgX3Sj b/YcYsB0eWLbKX6R3D1Krlx88g4vJolekrZy5w8nkXoFhFEMSoDP6tJWi0yN6Jkt9EBv df0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="Jyt0/uLO"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id h62-20020a638341000000b005a9fde46fa0si6732686pge.130.2023.10.23.12.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 12:16:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b="Jyt0/uLO"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E60D1809AFA3; Mon, 23 Oct 2023 12:16:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231917AbjJWTPq (ORCPT + 27 others); Mon, 23 Oct 2023 15:15:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbjJWTPl (ORCPT ); Mon, 23 Oct 2023 15:15:41 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01C8694 for ; Mon, 23 Oct 2023 12:15:39 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5a8ee6a1801so49026597b3.3 for ; Mon, 23 Oct 2023 12:15:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698088539; x=1698693339; darn=vger.kernel.org; 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=Fgbudwquptx3kxGF2Rx/jDbv8sQ1FkhX6MwfxQpq3LQ=; b=Jyt0/uLO9cpaOM5TuA8al91OF2xAYoGUDUZDSSBAyxeu7pjDhEfZnxhMpOE9L6GRHH CT0V4Ikd/IkpVXszW5k0EzyNFWcerRFEoYsPISXXs3YqSExFIpI7P9PvEZSl8tPc9DS6 hafeTTJncrdo8HYY3zmxQh4FRJnmEmD4GPgb40Yaib4dTp92X3T8swvhQt3HAUCP+X+J iqM0zRn+oTmkG/U1yYtpGL/TJ9aLZGKlPFjRw+fPBU6JzImK/F3UpfBws7UAAuqzBSwq 5I4rb5UGOGIuUiATt8fkyZNtQsi223GV9uXhZiV28dlMEY2P3oHklcRoyrDGWbec3rw0 WfHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698088539; x=1698693339; 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=Fgbudwquptx3kxGF2Rx/jDbv8sQ1FkhX6MwfxQpq3LQ=; b=U7hR1A0LIPFpxl7cFWPdgjB/JodBy/TUEnYuwzNqfbSuH2SsXIa80z4xSq0jF2mb45 LiNi1Lnpyt0Ct8uBpaY5Fw9qN+bmyceQ0udXnDbm8qD2OfSHd5tKoJQLNqlRWlSxHkrP tJTF/akNv5jjWDOTLBDv0HXJ1qZYczOm2ckT+TAoQKrzxjPBFkTpX8HZoqZ3Kbz/2Tgg /UGfWvQ+imbGmK8b+fI4XsapLhJCN6GBmMWrSOfpWAdHurdAfYBydgdkEqMPZmgLhvZh NzS+VZFBkTfdzA9OBz4lxNInTNRvT1Lr6FgkoJ2t6vtzazNSRAMPWsGv7LJB9nKDwBXf p6Ew== X-Gm-Message-State: AOJu0YxV4UzgvlmuZZWZJAr2tfb5JkQOpnkbXLCkdSUXCs/o49abHr1M kHlUVgpCM53eyZs7QbrdSt3uUzqxqY4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a0d:db43:0:b0:5a7:ccf3:3f28 with SMTP id d64-20020a0ddb43000000b005a7ccf33f28mr200781ywe.0.1698088539262; Mon, 23 Oct 2023 12:15:39 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 23 Oct 2023 12:15:29 -0700 In-Reply-To: <20231023191532.2405326-1-seanjc@google.com> Mime-Version: 1.0 References: <20231023191532.2405326-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.758.gaed0368e0e-goog Message-ID: <20231023191532.2405326-3-seanjc@google.com> Subject: [PATCH gmem 2/5] KVM: selftests: Handle memslot splits in private mem conversions test From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Roth X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 23 Oct 2023 12:16:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780574923916177849 X-GMAIL-MSGID: 1780574923916177849 Rework the SYNC_{SHARED,PRIVATE} handling in the private memory conversion test to play nice with ranges that are covered by multiple memslots. This will allow letting the user specify the number of memslots, and more importantly allow testing KVM_SET_MEMORY_ATTRIBUTES calls that also split across memslots. Opportunistically update the error messages to clarify whether the assert fired in the guest vs. host. Signed-off-by: Sean Christopherson --- .../kvm/x86_64/private_mem_conversions_test.c | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c b/tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c index c04e7d61a585..c3992a295b5a 100644 --- a/tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c +++ b/tools/testing/selftests/kvm/x86_64/private_mem_conversions_test.c @@ -28,25 +28,25 @@ #define PER_CPU_DATA_SIZE ((uint64_t)(SZ_2M + PAGE_SIZE)) /* Horrific macro so that the line info is captured accurately :-( */ -#define memcmp_g(gpa, pattern, size) \ -do { \ - uint8_t *mem = (uint8_t *)gpa; \ - size_t i; \ - \ - for (i = 0; i < size; i++) \ - __GUEST_ASSERT(mem[i] == pattern, \ - "Expected 0x%x at offset %lu (gpa 0x%llx), got 0x%x", \ - pattern, i, gpa + i, mem[i]); \ +#define memcmp_g(gpa, pattern, size) \ +do { \ + uint8_t *mem = (uint8_t *)gpa; \ + size_t i; \ + \ + for (i = 0; i < size; i++) \ + __GUEST_ASSERT(mem[i] == pattern, \ + "Guest expected 0x%x at offset %lu (gpa 0x%llx), got 0x%x", \ + pattern, i, gpa + i, mem[i]); \ } while (0) -static void memcmp_h(uint8_t *mem, uint8_t pattern, size_t size) +static void memcmp_h(uint8_t *mem, uint64_t gpa, uint8_t pattern, size_t size) { size_t i; for (i = 0; i < size; i++) TEST_ASSERT(mem[i] == pattern, - "Expected 0x%x at offset %lu, got 0x%x", - pattern, i, mem[i]); + "Host expected 0x%x at gpa 0x%lx, got 0x%x", + pattern, gpa + i, mem[i]); } /* @@ -335,19 +335,25 @@ static void *__test_mem_conversions(void *__vcpu) case UCALL_ABORT: REPORT_GUEST_ASSERT(uc); case UCALL_SYNC: { - uint8_t *hva = addr_gpa2hva(vm, uc.args[1]); - uint64_t size = uc.args[2]; + uint64_t gpa = uc.args[1]; + size_t size = uc.args[2]; + size_t i; TEST_ASSERT(uc.args[0] == SYNC_SHARED || uc.args[0] == SYNC_PRIVATE, "Unknown sync command '%ld'", uc.args[0]); - /* In all cases, the host should observe the shared data. */ - memcmp_h(hva, uc.args[3], size); + for (i = 0; i < size; i += vm->page_size) { + size_t nr_bytes = min_t(size_t, vm->page_size, size - i); + uint8_t *hva = addr_gpa2hva(vm, gpa + i); - /* For shared, write the new pattern to guest memory. */ - if (uc.args[0] == SYNC_SHARED) - memset(hva, uc.args[4], size); + /* In all cases, the host should observe the shared data. */ + memcmp_h(hva, gpa + i, uc.args[3], nr_bytes); + + /* For shared, write the new pattern to guest memory. */ + if (uc.args[0] == SYNC_SHARED) + memset(hva, uc.args[4], nr_bytes); + } break; } case UCALL_DONE: