From mboxrd@z Thu Jan 1 00:00:00 1970 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 EB73DC54E58 for ; Mon, 18 Mar 2024 11:18:54 +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=We3/s3HRZjQ6Rmi4djzOdOM/Xw26F23eF8i1+xHu+jk=; b=x2m4Ex6Klx6Agp wQQUJBenVTsKyqqt2iUSGDwGl0+dBIcHaG5oK6z8rsQ+l+2nEz4b6e77mL6mpTwC8TFPZg+47MMOD 15gBPY1tAtSE2vwzuW4do0qEZTaTupThGvhgNYStjClkHpGI/C1acidTGJJ2s8ONZsOE09MSF+oyq FyBtWH2hbjOsa8ibMVIUz7eG9FQVm+Wd7USu8hRDFsfBKnoQbOLE0so4sRxF1j8Bl+dK8sTmIp7H1 9NdY38nS6voR+svTT16tBHFiNMsMEqQ+2FzhoHIkYLkd0jIFAbwPQFGrtXTby9QVBZxL+4uDRBUf2 LHwVCjpQv+9jZU5BYsdw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rmB0t-00000008K41-1qP0; Mon, 18 Mar 2024 11:18:43 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rmB0f-00000008JyC-1UlQ for linux-arm-kernel@lists.infradead.org; Mon, 18 Mar 2024 11:18:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710760708; 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=pDSeD08V1fKg5vr75CVyaymIbYoVPFeEH7SUO7JKzSk=; b=Q8aHIVo/bvIuhpF5BhZl+h1ZhwKUU40ZbHA7dVd7DW+tDYhC32v4N6tJhUXafmusDwHMZe sCrp4TuMyfSRQd4/FtDS0+MM1I+x5rRgSNEcNa5s/ZzZO2Gh2CItYyKyzI5kUJOpdLGpCB TO3JwinbshQ6mzNCETQtBuwCxm9FsRk= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-541-r2FNRlQMPfu9Nxh2wiSGOw-1; Mon, 18 Mar 2024 07:16:48 -0400 X-MC-Unique: r2FNRlQMPfu9Nxh2wiSGOw-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-789ea18d175so308164585a.3 for ; Mon, 18 Mar 2024 04:16:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710760607; x=1711365407; 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=pDSeD08V1fKg5vr75CVyaymIbYoVPFeEH7SUO7JKzSk=; b=ws3mhEQoY/8VPGt80PYFQ3WhO9AMQ3l1nBLWAMhYVEG3JlYlDb162LpAssCd1qsLAT Ibv49huBCf2UazCiTykdC6UAske7GmJWV3iIolSSkPtnBwEg0ooPzD7IH95zt2zU/Oix aHMpuXZdvOpM9OjUKUjGgY8+H5CpGv1RQARJ/7XYNYnS7kTK9t4yYj3DDAVG7ZNncPnD 73KGWAVewof3C+XObBUnVrXPBUJFycZX9l/jCYoYjZJw9M1523dQnGziG6pW0kCRyz7y HQPq6HvW8bn5QTC437B3N1mgrcY4Bqdkm+kuEbu/1KjJ2jORsCcZJhLtk58hX+lPvUr4 fKfw== X-Gm-Message-State: AOJu0YzwkmlKFBW6vH7VuXbyFvJDVkZLwdGmf/NnGJg1GosZ21qPBUfW DCbCGRklOr45Sy2KMMQFGXJ5D5xM1GBcoNHRqgkyHY3LpaZw9hJyIBNw45+HEH7EX4PlPKEeHxD JUizDEonM/lf1BDsZanLIEoGnglEIWNuvlp/o+WNpK0DRcxcO6YHDw7nOTkhOfq7IW6xfDky+wH kXXZSm0c38LbaC24igeNQhNy7+hNuwMRFLVQfdFMAe2iHjh+MZijDHzg== X-Received: by 2002:a05:622a:178f:b0:42f:185f:4a8b with SMTP id s15-20020a05622a178f00b0042f185f4a8bmr13275606qtk.15.1710760606908; Mon, 18 Mar 2024 04:16:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHudG/6LMfVGXAsx0us6WdXSr3sPPnmBYgaTgvwH2AuA9+gc8VmqtIgPkes0do1dcRMNpI7Kg== X-Received: by 2002:a05:622a:178f:b0:42f:185f:4a8b with SMTP id s15-20020a05622a178f00b0042f185f4a8bmr13275588qtk.15.1710760606548; Mon, 18 Mar 2024 04:16:46 -0700 (PDT) Received: from rh.redhat.com (p200300c93f079e00cac8703672d98936.dip0.t-ipconnect.de. [2003:c9:3f07:9e00:cac8:7036:72d9:8936]) by smtp.gmail.com with ESMTPSA id ew5-20020a05622a514500b00430c8b87b46sm1832001qtb.6.2024.03.18.04.16.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 04:16:46 -0700 (PDT) From: Sebastian Ott To: linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier , Oliver Upton Subject: [PATCH 3/4] KVM: arm64: show writable masks for feature registers Date: Mon, 18 Mar 2024 12:16:35 +0100 Message-ID: <20240318111636.10613-4-sebott@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318111636.10613-1-sebott@redhat.com> References: <20240318111636.10613-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-20240318_041829_535192_5F67AD48 X-CRM114-Status: GOOD ( 15.11 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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. This changes the mask for the CTR_EL0 register. Signed-off-by: Sebastian Ott --- arch/arm64/kvm/sys_regs.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index b2019faa9d73..0f8fe7790c35 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -2489,12 +2489,12 @@ 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 }, { SYS_DESC(SYS_CTR_EL0), access_ctr, .reset = reset_ctr, - .get_user = get_ctr, .set_user = set_ctr}, + .get_user = get_ctr, .set_user = set_ctr, .val = CTR_EL0_DIC_MASK}, { SYS_DESC(SYS_SVCR), undef_access }, { PMU_SYS_REG(PMCR_EL0), .access = access_pmcr, .reset = reset_pmcr, @@ -3934,20 +3934,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; -- 2.42.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel