From patchwork Fri Apr 5 12:01:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Ott X-Patchwork-Id: 13618966 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F6DECD11C2 for ; Fri, 5 Apr 2024 12:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YO4liLqtTaQ8Okt2NHNt0B48NQfjKh3oSNuOmigvnZs=; b=uDxNq3FnWSfg6i w1TIlPkr7PJXj86fpdr9NVHyoaZ/G61L/lomVL0/KM1Ecc0/5+ar5hetSGSyGYsSIlBZTeD1Vd9Aq aha9Ksz0WjVAfAilWjAyEKdYqBNSrgtsQfZfyfVPYVdqpILAwPIyx8Fb8E0iS66QUQGUN2qddPGSY ZQ3LV/vgr8yMebUsxfrut83uNy96XREyMT16khlg3BuPmQWjWNcnRVdDYNE3SwhC0bkFGB3lOPz0o C7F88sRY7TTbwppNFvcWxk0qw5lhlZBB094c2WbinM1P1epYCKgF+MvIb4L5aVmqiITJjxP1ijp+g 4JyTLiwCzvD67iocmIVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHk-00000006o82-0H7l; Fri, 05 Apr 2024 12:03:08 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rsiHf-00000006o69-0yU5 for linux-arm-kernel@lists.infradead.org; Fri, 05 Apr 2024 12:03:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712318582; 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=rn4BMv+SOP2Xe0y3A99nPyLC4GfuU+9ShaoCAlDA424=; b=iLjaFwBnSqnxaAnNQ7Laq+ugdRnlN/7cWJjZeXtrcjqSuyMvtCB6vJpcU7kFqR/NIn5CfM /X581PV6XSJTp9EW97G2reJIzHg3/1RpOy281Atsvev85i0L5dDynUOjObbqbrwdosxO0e aOVqK5T9PdaooNFp+jsctBp0bIrEgGE= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-611-C0rAdxBsO9esW2T4uYYGGg-1; Fri, 05 Apr 2024 08:01:28 -0400 X-MC-Unique: C0rAdxBsO9esW2T4uYYGGg-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-430d9e76fe8so19205871cf.3 for ; Fri, 05 Apr 2024 05:01:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712318487; x=1712923287; 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=rn4BMv+SOP2Xe0y3A99nPyLC4GfuU+9ShaoCAlDA424=; b=bL7SBUcQ3p1xzaaZKCQC9aCWeJpn3d8R8lM8OkkJ/o4cj7aXaYoVlkXfPKPTxGwMLl k1qstsmZvMdERgbqgccERzP/YhBi2Wevw8jkW7Ptc10XgBWIyTDzfINLPzqCXkVQqcgg 9Y7aucKnKqDt7MevVRyaDIwBW/LyGBf9NCQ71z0ogFMCMdQxDqjWnNunoocqObvmSgFv UiyuuxRilyNGph9iVpOEkwfewGILtcKaYCfuXi2UG/l+iTV7mQVX6uOPcowxuli+F2hr lLDAtpevWmMKFx/U3i5t86FVM/teR7ju/g9bJsLoYkUjSmhDKOcab44dIVQTBNlHIOpT FJfg== X-Gm-Message-State: AOJu0YzN4hrKNokoITCTX+BOeyzSiROLt41Szmv7Rl6n6a59i6WezRWl AyrCb8+wabYJ6QwPTTB/oCNeFRaNn+uTPMFq52AF+9RWBSzENp2iKNG+stiJtGumC+oKSgijvZx ldor3Qc/Ot5TEgdd8I8MevFRFBTwTAH8V6u79tk5E9DSf7GM2/7lPRRcNrI/98HtVudO1I62Xot LMcytSCV/aRr/46qy7X5oZS24T6LD8evbehaE8ZCQ4mApGXDqyVPqK9Q== X-Received: by 2002:ac8:7d0a:0:b0:431:5fad:ddbd with SMTP id g10-20020ac87d0a000000b004315fadddbdmr1508868qtb.29.1712318486675; Fri, 05 Apr 2024 05:01:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFJoGGlIt1CxA4rAZezuA7q+tZShCN/ywwM2H1k89TmnzVpNOpAzo4NVsKSoiRJE7N6sIm0dg== X-Received: by 2002:ac8:7d0a:0:b0:431:5fad:ddbd with SMTP id g10-20020ac87d0a000000b004315fadddbdmr1508823qtb.29.1712318486257; Fri, 05 Apr 2024 05:01:26 -0700 (PDT) Received: from rh.redhat.com (p200300c93f4c24001316a1e598258370.dip0.t-ipconnect.de. [2003:c9:3f4c:2400:1316:a1e5:9825:8370]) by smtp.gmail.com with ESMTPSA id fb17-20020a05622a481100b00434383f2518sm679808qtb.87.2024.04.05.05.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 05:01:25 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Catalin Marinas , Will Deacon Subject: [PATCH 4/4] KVM: arm64: show writable masks for feature registers Date: Fri, 5 Apr 2024 14:01:08 +0200 Message-ID: <20240405120108.11844-5-sebott@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405120108.11844-1-sebott@redhat.com> References: <20240405120108.11844-1-sebott@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240405_050303_628126_9BC2C5FF X-CRM114-Status: GOOD ( 14.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Instead of using ~0UL provide the actual writable mask for non-id feature registers in the output of the KVM_ARM_GET_REG_WRITABLE_MASKS ioctl. Explicitely set the mask for CLIDR_EL1 to make sure we present the same value to userspace than before. This changes the mask for the CTR_EL0 register in the output of the KVM_ARM_GET_REG_WRITABLE_MASKS ioctl. Signed-off-by: Sebastian Ott --- arch/arm64/kvm/sys_regs.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index b0ba292259f9..947aa9c0784f 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -2505,7 +2505,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_CCSIDR_EL1), access_ccsidr }, { SYS_DESC(SYS_CLIDR_EL1), access_clidr, reset_clidr, CLIDR_EL1, - .set_user = set_clidr }, + .set_user = set_clidr, .val = ~0UL }, { SYS_DESC(SYS_CCSIDR2_EL1), undef_access }, { SYS_DESC(SYS_SMIDR_EL1), undef_access }, { SYS_DESC(SYS_CSSELR_EL1), access_csselr, reset_unknown, CSSELR_EL1 }, @@ -4059,20 +4059,11 @@ int kvm_vm_ioctl_get_reg_writable_masks(struct kvm *kvm, struct reg_mask_range * if (!is_feature_id_reg(encoding) || !reg->set_user) continue; - /* - * For ID registers, we return the writable mask. Other feature - * registers return a full 64bit mask. That's not necessary - * compliant with a given revision of the architecture, but the - * RES0/RES1 definitions allow us to do that. - */ - if (is_id_reg(encoding)) { - if (!reg->val || - (is_aa32_id_reg(encoding) && !kvm_supports_32bit_el0())) - continue; - val = reg->val; - } else { - val = ~0UL; + if (!reg->val || + (is_aa32_id_reg(encoding) && !kvm_supports_32bit_el0())) { + continue; } + val = reg->val; if (put_user(val, (masks + KVM_ARM_FEATURE_ID_RANGE_INDEX(encoding)))) return -EFAULT;