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 BFC64250C0A for ; Tue, 11 Feb 2025 14:39:21 +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=1739284763; cv=none; b=GNRmZZ1yGwVdv77JCZNaMUnjWzknHsgNm2Wv8oBOaePooOyq8usrpmr5Wz1jGkyJVMTBS+JZPBJfFYvGSqqU4gQlajozrFD3qk1c7slUvRNj1ULuM8fdULWldO2QgPaKHNTVoRM3dEUK+cRq1kxv2ihmIdZCbTtccXsOqV8/1kg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739284763; c=relaxed/simple; bh=48SNocFIEyTD401Bn7uEPWmyPGgbFKE7acbIYbRpQLE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=KH/yQiaDsqTrbCmuR5tupZQZVzFcuace8xVEj46XlICrht8CcY30uuYMjfP6jTsOsCQmgX6PDU5QW0ss4VJtJE+bxDRnO4UInBkDaO7ySkeX8Z/q5TT3x3o/n3e7E0RQ2a8ltNEXbVkh5xs11pgM3aovLRY3kAxa94z/Pc4OCyM= 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=fCaj9jyU; 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="fCaj9jyU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739284760; 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=RdghYHu234rwHRoSlAkfrkrUKfnT4YJfki186RS5/GU=; b=fCaj9jyUZN5lXpUm3DBY+R/LxdTx7XBoTw9fj7BLaYn9aJek+4Hsq2C+s4u2sNWhSbxrsg bX2RJs7atVkMbtb3u9GQXc8khxjN6KHQahnXNTShGiQbNaDhXdApeQBB0kcXMKBo15gL2J pZygIREgdrqRzNDzFVohBWyOU36V4TA= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-138-O1ieUIqRPXi4vPlHauTY9Q-1; Tue, 11 Feb 2025 09:39:19 -0500 X-MC-Unique: O1ieUIqRPXi4vPlHauTY9Q-1 X-Mimecast-MFC-AGG-ID: O1ieUIqRPXi4vPlHauTY9Q Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38dc6aad9f8so2232502f8f.1 for ; Tue, 11 Feb 2025 06:39:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739284757; x=1739889557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RdghYHu234rwHRoSlAkfrkrUKfnT4YJfki186RS5/GU=; b=m6Dhg81f4BS4XNs7G/cyU01DZtnV0DMhFjqgC1GcaPL80+WcxS/57VRpfI3TWfNUpZ 0sQrtz5jtGSNQGyOHc4/PeAP0061pzS16fYL5ZyI3scQFkJsr1fUKuNVITvcZgGGLC/E EaSChan5tE7f7XNyFeLtieuxKjcCIYJq+rkv4AuKfUCkgaXqRsAXfZ44xxu/2AIdGHpQ YTAX6sIn9YlA36amowpIOwj5gQ1/EH6MFsEPKzkR/UgMW7YXMJ5q4I/LM2+FwDUdpDyb EeNkiWhfHFTSRnRFbTpq+zePMWFfZopqVNyS8J+T+IbRVymACgbn6jXMCGhpd5tGXflz IJSQ== X-Forwarded-Encrypted: i=1; AJvYcCVk91d3+Ut2gsKdr4g+c2xO9B1fDJImphVWkInqjzPO3sIucHDq0BhaRSCBXFVvh+qx8oxgBLM=@lists.linux.dev X-Gm-Message-State: AOJu0Yx0WGAHyg5fgeyFRBCBowKnEdirQd23FvVRzvsI/0cPYwlGTWAj EMfL40iDn1t7EK9rTebtWeH06OZNh4r+5hyJuu3gN57G9nVlxZwH67RTBuxTlSDca1iVaE2B0NM vae6z6BIDIbqKHHucg7KXlfRPtBxBrRkql3K/wArOlHU530P39L/eiA== X-Gm-Gg: ASbGncuUfczc8HmOgHzVjKY223XiFXDtp/nnhGorCtpTmzpXWWvEblYEF+0D5imYUN5 iB9h0suHuKb9Ys98mRZc6kiXh15drulNc1Zc+TBZNEewe35rEsagw8W1vEXx0H1QoXoPmgZ2fEl 5duFY21DU9kfa+2TJkmKI25KUOtn366UEoE5F+jC8DtdyYW9Q5wPtG51DubPVms3lNg4++WCJJU nIzitPcvKUOUOzz/EPTE+j5vuD7fxw+1rz3Jnbd0jzwStSjgRscx0kd6iBzj/7fi0bRzToj+Txl G6qwvLTU7ou4dlZr8sX1cEQ854gftmZxq5W9fnllC/LDH/Wu6ODqgmq+w0uYkwQCmI4= X-Received: by 2002:a5d:648b:0:b0:38d:e259:4d10 with SMTP id ffacd0b85a97d-38de43aa5cfmr3602444f8f.13.1739284757114; Tue, 11 Feb 2025 06:39:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGRoa6TpHpYjazCGXAA0zdDPm62ZyWpFuSI/jEW82VolHbg/Poh9pR7FaZIHb0wfaUNxzC+rg== X-Received: by 2002:a5d:648b:0:b0:38d:e259:4d10 with SMTP id ffacd0b85a97d-38de43aa5cfmr3602425f8f.13.1739284756792; Tue, 11 Feb 2025 06:39:16 -0800 (PST) Received: from rh.fritz.box (p200300f6af0e4d00dda53016e366575f.dip0.t-ipconnect.de. [2003:f6:af0e:4d00:dda5:3016:e366:575f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dcc9bd251sm11745833f8f.9.2025.02.11.06.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 06:39:16 -0800 (PST) From: Sebastian Ott To: Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Shameer Kolothum Cc: Cornelia Huck , Eric Auger , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] KVM: selftests: arm64: Test writes to MIDR,REVIDR,AIDR Date: Tue, 11 Feb 2025 15:39:10 +0100 Message-ID: <20250211143910.16775-5-sebott@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211143910.16775-1-sebott@redhat.com> References: <20250211143910.16775-1-sebott@redhat.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: M6Mdmk_ffDrUdCsu96Me22bYM-974vmwNBrD6qp-Zlk_1739284757 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Assert that MIDR_EL1, REVIDR_EL1, AIDR_EL1 are writable from userspace, that the changed values are visible to guests, and that they are preserved across a vCPU reset. Signed-off-by: Sebastian Ott --- .../testing/selftests/kvm/arm64/set_id_regs.c | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/arm64/set_id_regs.c b/tools/testing/selftests/kvm/arm64/set_id_regs.c index 217541fe6536..d719c2ab1e31 100644 --- a/tools/testing/selftests/kvm/arm64/set_id_regs.c +++ b/tools/testing/selftests/kvm/arm64/set_id_regs.c @@ -230,6 +230,9 @@ static void guest_code(void) GUEST_REG_SYNC(SYS_ID_AA64MMFR2_EL1); GUEST_REG_SYNC(SYS_ID_AA64ZFR0_EL1); GUEST_REG_SYNC(SYS_CTR_EL0); + GUEST_REG_SYNC(SYS_MIDR_EL1); + GUEST_REG_SYNC(SYS_REVIDR_EL1); + GUEST_REG_SYNC(SYS_AIDR_EL1); GUEST_DONE(); } @@ -609,18 +612,31 @@ static void test_ctr(struct kvm_vcpu *vcpu) test_reg_vals[encoding_to_range_idx(SYS_CTR_EL0)] = ctr; } -static void test_vcpu_ftr_id_regs(struct kvm_vcpu *vcpu) +static void test_id_reg(struct kvm_vcpu *vcpu, u32 id) { u64 val; + val = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(id)); + val++; + vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(id), val); + test_reg_vals[encoding_to_range_idx(id)] = val; +} + +static void test_vcpu_ftr_id_regs(struct kvm_vcpu *vcpu) +{ test_clidr(vcpu); test_ctr(vcpu); - val = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1)); - val++; - vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), val); + test_id_reg(vcpu, SYS_MPIDR_EL1); + ksft_test_result_pass("%s\n", __func__); +} + +static void test_vcpu_non_ftr_id_regs(struct kvm_vcpu *vcpu) +{ + test_id_reg(vcpu, SYS_MIDR_EL1); + test_id_reg(vcpu, SYS_REVIDR_EL1); + test_id_reg(vcpu, SYS_AIDR_EL1); - test_reg_vals[encoding_to_range_idx(SYS_MPIDR_EL1)] = val; ksft_test_result_pass("%s\n", __func__); } @@ -647,6 +663,9 @@ static void test_reset_preserves_id_regs(struct kvm_vcpu *vcpu) test_assert_id_reg_unchanged(vcpu, SYS_MPIDR_EL1); test_assert_id_reg_unchanged(vcpu, SYS_CLIDR_EL1); test_assert_id_reg_unchanged(vcpu, SYS_CTR_EL0); + test_assert_id_reg_unchanged(vcpu, SYS_MIDR_EL1); + test_assert_id_reg_unchanged(vcpu, SYS_REVIDR_EL1); + test_assert_id_reg_unchanged(vcpu, SYS_AIDR_EL1); ksft_test_result_pass("%s\n", __func__); } @@ -675,13 +694,14 @@ int main(void) ARRAY_SIZE(ftr_id_aa64isar2_el1) + ARRAY_SIZE(ftr_id_aa64pfr0_el1) + ARRAY_SIZE(ftr_id_aa64pfr1_el1) + ARRAY_SIZE(ftr_id_aa64mmfr0_el1) + ARRAY_SIZE(ftr_id_aa64mmfr1_el1) + ARRAY_SIZE(ftr_id_aa64mmfr2_el1) + - ARRAY_SIZE(ftr_id_aa64zfr0_el1) - ARRAY_SIZE(test_regs) + 2 + + ARRAY_SIZE(ftr_id_aa64zfr0_el1) - ARRAY_SIZE(test_regs) + 3 + MPAM_IDREG_TEST; ksft_set_plan(test_cnt); test_vm_ftr_id_regs(vcpu, aarch64_only); test_vcpu_ftr_id_regs(vcpu); + test_vcpu_non_ftr_id_regs(vcpu); test_user_set_mpam_reg(vcpu); test_guest_reg_read(vcpu); -- 2.42.0