From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (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 ECF963C4B93 for ; Sat, 22 Aug 2026 09:54:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787392450; cv=none; b=s3A2xrPrBE8ftlGnrsfnkw6rh3FX3gsJE4F+ljty8vCXuX2mxo9x+Fpc6B06AMc1CQ8Bj2maiaeZ/g9poHQ8o9UqoGWdVW+GS7tzt6yN7lXB9wBTUL0Iu+4rcZmztINXdw/6VqF/lCRMsVG2VP9RNlj5tcdd/5O11sNezqeme2A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787392450; c=relaxed/simple; bh=rv7xXdolg6NQjjtjnJt7VT86OJEL0RCm3VxCHe4ILRc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tEotdv4w26OPIdPWLLtaYePpYl6TIM4D0bnR2B/RxOTjaixnBlIiGCUeMN/ThEv6vftV8nRfIBnet/tDBrJCEfru2Uiu8nT3T1qH+wyBMxBgofnDZ5uukdAHnc9CHGdVwq9xUT5biV0rGnWynaJyKjZpe57wqTD3XxiTX5B7bCY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qBZFXAV9; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qBZFXAV9" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-6a36982a875so2909559a12.0 for ; Sat, 22 Aug 2026 02:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787392446; x=1787997246; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1GYqiFSBk6xbMl7ANfKl+0h07k1nsbqa00/KuNdgbGU=; b=qBZFXAV9HTSYCJnfWizpOD7rUT4nbCHbFnOCqe9sz4zMi9gBse8w41rh6F++cwKbZM 942PO/Vy0S+EdfGPB99CaL1yuzxv9zYee/NP5umuYlIBQU1HtrlyY//PEpiXQp3r/D8i PhkOuHdeVBMZFK8zoZZ3zVNQ0lthZ2XcgziKJGxwqw2mRrzZgDsm77a+GPyqGF44rsit oD27aFwhINFbZtWtSbaBCLrmSyPiGC+LILEP2DNakC30gP5qFDfcaBn7Yl/OG1CEiZyr m9YoiNUf8zSlOhWFyTBr6KZTBz+S4/DVPoRSPjHJecpT5NGeMagkPmCmBK4c5TZ6CjrC VX3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787392446; x=1787997246; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=1GYqiFSBk6xbMl7ANfKl+0h07k1nsbqa00/KuNdgbGU=; b=bZ45tNFIgYypYxrw2B0ttTbsGSAA7EWkTYeOY338DvaSNskxPOriKMs2rkQZTF3zz1 oiYqj3OEvqyQgrpUe5FHAihZNq0nvoPJp9QrR98KaNf1lR2LfRwzCAthaceEfONBcnku 9TjCup9cyOiqq3teIEwGyg35tHj5ItoB6sggWezXbR/mgyI1v16Sv8kv5M5Gv21fW74f pqSfbJ7uW2CTnDG8ytNMQTbMGvwuqtQ9yL6GhVsZc/agX7M5tbMrJRV0J3n5t1MkSZ3/ EBs39SP+RRZcjtJbumkeO5138yDgnUnii358OCJTqUpDimC93tWP808tsYg4FnoLAeHp HMiw== X-Forwarded-Encrypted: i=1; AHgh+Ro3EXrV9U2++smDORWpsTsN8Sc0kM/nfwpU0etgd6YL2mRkJ7H7CMsdadgZY0aeohm/5FSlomgAVYb2XSI=@vger.kernel.org X-Gm-Message-State: AFuF++k3gIQJHrSeWe7JFzSeqfPO6m0MDcIPbWxlk+eD3FEPPEd2F+Ch wamI28PAUZbECaJA40RkBSjKy0VLCy3pOOE9K29wnLjTs7+hxBVgEYGLr3lKhk8E X-Gm-Gg: AR+sD13sxPgrLSYw2CsKe/OXqalkFyiuRIpHZydE6a6PCDD6c6qIf+kD8dGlY1RLvU5 6S0M53MkgFkcj3HR2yYoSFeSlngXGnFaDBg9wlh3JT0kx200hrlH8W/2VYvbEQvRFPooGKfiTF2 twvbKKwdQDZ/wp82K4uMRtvkMmIUQnRMKSTKXE8VHOiePm1EE+2yqkHicu/Fowz5ox08btbUkPm 2Y/YgQdtgG81J/nMF4YVoXBwTzmkYZWHp09aMCLTezpd6v96uvlsmlEHP8f23tiPNPFeGnngz15 xcDslIt56h80uzmpR7jocNjhXuTJbBT9KPeLkrI67RwVMHFooTSzDCEUZoDAeTLX9ZeBlI8Uxd4 kXtPREE7Ejuiogp9pBShOhsHkOuXdVBeWAA2XBIumKu1IZmvZn1QY42uR46dqIeEp0xaSTswmUJ tbgg12Zf2ObhKC4J/5tPAiTs3HU0mUQ6rtXRJeRtcHmZzQx5Qe3cefNi4lPle3Cd9OZbImQRSB9 VsGQuYatCTdx7BzVh79IJn26iVW5gsyUaX7PD8Mk3XKZo+A10UZSKNsz6P1fEzAqDtyZDT7goxY cJijTd6UCZledhFyD1msruAbDpdsruFhR1JrvIVW5ZUdARmifRyZVVL2+k3ZhGLFVXHb X-Received: by 2002:a05:6402:42c4:b0:6a3:e813:8457 with SMTP id 4fb4d7f45d1cf-6a42f1f9e90mr13698572a12.12.1787392446101; Sat, 22 Aug 2026 02:54:06 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-a0f5-8c01-3de3-cd62-aa6f-2fb0.310.pool.telefonica.de. [2a02:3100:a0f5:8c01:3de3:cd62:aa6f:2fb0]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6a3ff0c327asm11151586a12.8.2026.08.22.02.54.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 22 Aug 2026 02:54:05 -0700 (PDT) From: Karl Mehltretter To: Marc Zyngier , Oliver Upton , kvmarm@lists.linux.dev Cc: Karl Mehltretter , Fuad Tabba , Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Paolo Bonzini , Shuah Khan , Eric Auger , Christoffer Dall , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v3 5/5] KVM: arm64: selftests: Test VGICv3 redistributor region retry Date: Sat, 22 Aug 2026 11:53:46 +0200 Message-Id: <20260822095346.53882-6-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260822095346.53882-1-kmehltretter@gmail.com> References: <20260822095346.53882-1-kmehltretter@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A failed REDIST_REGION write can remove redistributor iodevs without clearing their cached vCPU assignments. A retry then skips those assignments and leaves the redistributors absent from the MMIO bus. Create two partial regions, reject a third region that overlaps the distributor, and retry at a valid address. After initializing the VGIC, have the guest read GICR_TYPER from all four redistributors and check their processor numbers. This verifies the final configuration without assuming that assignments survive the failed write. Keep the redistributor IPAs outside the guest RAM memslot and install only the stage-1 mappings needed for the MMIO accesses. If an iodev is missing, KVM_RUN therefore exits with KVM_EXIT_MMIO. Without the fix, the first redistributor access exits at 0x8030008. Assisted-by: Codex:gpt-5.6-sol Signed-off-by: Karl Mehltretter --- tools/testing/selftests/kvm/arm64/vgic_init.c | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/tools/testing/selftests/kvm/arm64/vgic_init.c b/tools/testing/selftests/kvm/arm64/vgic_init.c index 84aa97204b7f..5a30f3cb039b 100644 --- a/tools/testing/selftests/kvm/arm64/vgic_init.c +++ b/tools/testing/selftests/kvm/arm64/vgic_init.c @@ -5,6 +5,7 @@ * Copyright (C) 2020, Red Hat, Inc. */ #include +#include #include #include #include @@ -13,12 +14,21 @@ #include "test_util.h" #include "kvm_util.h" +#include "gic.h" #include "processor.h" #include "vgic.h" #include "gic_v3.h" #define NR_VCPUS 4 +#define REDIST_RETRY_REGION0_BASE GICR_BASE_GPA +#define REDIST_RETRY_REGION1_BASE \ + (REDIST_RETRY_REGION0_BASE + 2 * KVM_VGIC_V3_REDIST_SIZE) +#define REDIST_RETRY_DIST_BASE \ + (REDIST_RETRY_REGION1_BASE + KVM_VGIC_V3_REDIST_SIZE) +#define REDIST_RETRY_REGION2_BASE \ + (REDIST_RETRY_DIST_BASE + KVM_VGIC_V3_DIST_SIZE) + #define REG_OFFSET(vcpu, offset) (((u64)vcpu << 32) | offset) #define VGIC_DEV_IS_V2(_d) ((_d) == KVM_DEV_TYPE_ARM_VGIC_V2) @@ -65,6 +75,23 @@ static void guest_code(void) GUEST_DONE(); } +static void guest_check_redist_retry(void) +{ + unsigned int i; + + /* The first three redistributors span adjacent regions 0 and 1. */ + for (i = 0; i < NR_VCPUS; i++) { + u64 base = i < 3 ? REDIST_RETRY_REGION0_BASE + + i * KVM_VGIC_V3_REDIST_SIZE : + REDIST_RETRY_REGION2_BASE; + u64 typer = readq((void *)(unsigned long)(base + GICR_TYPER)); + + GUEST_ASSERT_EQ(GICR_TYPER_CPU_NUMBER(typer), i); + } + + GUEST_DONE(); +} + /* we don't want to assert on run execution, hence that helper */ static int run_vcpu(struct kvm_vcpu *vcpu) { @@ -462,6 +489,70 @@ static void test_v3_new_redist_regions(void) vm_gic_destroy(&v); } +static void test_v3_redist_region_retry(void) +{ + struct kvm_vcpu *vcpus[NR_VCPUS]; + struct vm_gic v; + struct ucall uc; + u64 addr; + int ret; + + v = vm_gic_create_with_vcpus(KVM_DEV_TYPE_ARM_VGIC_V3, NR_VCPUS, + guest_check_redist_retry, vcpus); + + addr = REDIST_REGION_ATTR_ADDR(2, REDIST_RETRY_REGION0_BASE, 0, 0); + kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr); + + addr = REDIST_REGION_ATTR_ADDR(1, REDIST_RETRY_REGION1_BASE, 0, 1); + kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr); + + addr = REDIST_RETRY_DIST_BASE; + kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_DIST, &addr); + + addr = REDIST_REGION_ATTR_ADDR(1, REDIST_RETRY_DIST_BASE, 0, 2); + ret = __kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, + &addr); + TEST_ASSERT(ret && errno == EINVAL, + "register redist region colliding with dist"); + + addr = REDIST_REGION_ATTR_ADDR(1, REDIST_RETRY_REGION2_BASE, 0, 2); + kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr); + + virt_map(v.vm, REDIST_RETRY_REGION0_BASE, REDIST_RETRY_REGION0_BASE, + vm_calc_num_guest_pages(v.vm->mode, + 3 * KVM_VGIC_V3_REDIST_SIZE)); + virt_map(v.vm, REDIST_RETRY_REGION2_BASE, REDIST_RETRY_REGION2_BASE, + vm_calc_num_guest_pages(v.vm->mode, + KVM_VGIC_V3_REDIST_SIZE)); + + kvm_device_attr_set(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, + KVM_DEV_ARM_VGIC_CTRL_INIT, NULL); + + vcpu_run(vcpus[0]); + switch (get_ucall(vcpus[0], &uc)) { + case UCALL_DONE: + break; + case UCALL_ABORT: + REPORT_GUEST_ASSERT(uc); + break; + case UCALL_NONE: + if (vcpus[0]->run->exit_reason == KVM_EXIT_MMIO) + TEST_FAIL("Unexpected MMIO exit at 0x%llx", + vcpus[0]->run->mmio.phys_addr); + fallthrough; + default: + TEST_FAIL("Unexpected ucall %lu, exit_reason %u", + uc.cmd, vcpus[0]->run->exit_reason); + } + + vm_gic_destroy(&v); +} + static void test_v3_typer_accesses(void) { struct vm_gic v; @@ -986,6 +1077,7 @@ void run_tests(u32 gic_dev_type) if (VGIC_DEV_IS_V3(gic_dev_type)) { test_v3_new_redist_regions(); + test_v3_redist_region_retry(); test_v3_typer_accesses(); test_v3_last_bit_redist_regions(); test_v3_last_bit_single_rdist(); -- 2.39.5 (Apple Git-154)