All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	kvmarm@lists.cs.columbia.edu, maz@kernel.org, drjones@redhat.com
Cc: pbonzini@redhat.com, shuah@kernel.org
Subject: [PATCH 1/9] KVM: arm64: vgic-v3: Fix some error codes when setting RDIST base
Date: Sat, 12 Dec 2020 19:50:02 +0100	[thread overview]
Message-ID: <20201212185010.26579-2-eric.auger@redhat.com> (raw)
In-Reply-To: <20201212185010.26579-1-eric.auger@redhat.com>

KVM_DEV_ARM_VGIC_GRP_ADDR group doc says we should return
-EEXIST in case the base address of the redist is already set.
We currently return -EINVAL.

However we need to return -EINVAL in case a legacy REDIST address
is attempted to be set while REDIST_REGIONS were set. This case
is discriminated by looking at the count field.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 arch/arm64/kvm/vgic/vgic-mmio-v3.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
index 15a6c98ee92f..8e8a862def76 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
@@ -792,8 +792,13 @@ static int vgic_v3_insert_redist_region(struct kvm *kvm, uint32_t index,
 	int ret;
 
 	/* single rdist region already set ?*/
-	if (!count && !list_empty(rd_regions))
-		return -EINVAL;
+	if (!count && !list_empty(rd_regions)) {
+		rdreg = list_last_entry(rd_regions,
+				       struct vgic_redist_region, list);
+		if (rdreg->count)
+			return -EINVAL; /* Mixing REDIST and REDIST_REGION API */
+		return -EEXIST;
+	}
 
 	/* cross the end of memory ? */
 	if (base + size < base)
-- 
2.21.3

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

WARNING: multiple messages have this Message-ID (diff)
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	kvmarm@lists.cs.columbia.edu, maz@kernel.org, drjones@redhat.com
Cc: alexandru.elisei@arm.com, james.morse@arm.com,
	julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com,
	shuah@kernel.org, pbonzini@redhat.com
Subject: [PATCH 1/9] KVM: arm64: vgic-v3: Fix some error codes when setting RDIST base
Date: Sat, 12 Dec 2020 19:50:02 +0100	[thread overview]
Message-ID: <20201212185010.26579-2-eric.auger@redhat.com> (raw)
In-Reply-To: <20201212185010.26579-1-eric.auger@redhat.com>

KVM_DEV_ARM_VGIC_GRP_ADDR group doc says we should return
-EEXIST in case the base address of the redist is already set.
We currently return -EINVAL.

However we need to return -EINVAL in case a legacy REDIST address
is attempted to be set while REDIST_REGIONS were set. This case
is discriminated by looking at the count field.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
 arch/arm64/kvm/vgic/vgic-mmio-v3.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
index 15a6c98ee92f..8e8a862def76 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
@@ -792,8 +792,13 @@ static int vgic_v3_insert_redist_region(struct kvm *kvm, uint32_t index,
 	int ret;
 
 	/* single rdist region already set ?*/
-	if (!count && !list_empty(rd_regions))
-		return -EINVAL;
+	if (!count && !list_empty(rd_regions)) {
+		rdreg = list_last_entry(rd_regions,
+				       struct vgic_redist_region, list);
+		if (rdreg->count)
+			return -EINVAL; /* Mixing REDIST and REDIST_REGION API */
+		return -EEXIST;
+	}
 
 	/* cross the end of memory ? */
 	if (base + size < base)
-- 
2.21.3


  reply	other threads:[~2020-12-12 18:50 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-12 18:50 [PATCH 0/9] KVM/ARM: Some vgic fixes and init sequence KVM selftests Eric Auger
2020-12-12 18:50 ` Eric Auger
2020-12-12 18:50 ` Eric Auger [this message]
2020-12-12 18:50   ` [PATCH 1/9] KVM: arm64: vgic-v3: Fix some error codes when setting RDIST base Eric Auger
2021-01-06 16:32   ` Alexandru Elisei
2021-01-06 16:32     ` Alexandru Elisei
2021-01-14 10:02     ` Auger Eric
2021-01-14 10:02       ` Auger Eric
2020-12-12 18:50 ` [PATCH 2/9] KVM: arm64: Fix KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION read Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-06 17:12   ` Alexandru Elisei
2021-01-06 17:12     ` Alexandru Elisei
2021-01-13 17:18     ` Auger Eric
2021-01-13 17:18       ` Auger Eric
2020-12-12 18:50 ` [PATCH 3/9] KVM: arm64: vgic-v3: Fix error handling in vgic_v3_set_redist_base() Eric Auger
2020-12-12 18:50   ` Eric Auger
2020-12-28 15:35   ` Marc Zyngier
2020-12-28 15:35     ` Marc Zyngier
2021-01-13 17:18     ` Auger Eric
2021-01-13 17:18       ` Auger Eric
2020-12-12 18:50 ` [PATCH 4/9] KVM: arm/arm64: vgic: Reset base address on kvm_vgic_dist_destroy() Eric Auger
2020-12-12 18:50   ` Eric Auger
2020-12-28 15:41   ` Marc Zyngier
2020-12-28 15:41     ` Marc Zyngier
2021-01-13 17:18     ` Auger Eric
2021-01-13 17:18       ` Auger Eric
2020-12-12 18:50 ` [PATCH 5/9] KVM: arm: move has_run_once after the map_resources Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-12 14:55   ` Alexandru Elisei
2021-01-12 14:55     ` Alexandru Elisei
2021-01-14 10:02     ` Auger Eric
2021-01-14 10:02       ` Auger Eric
2021-01-20 15:56       ` Alexandru Elisei
2021-01-20 15:56         ` Alexandru Elisei
2021-03-12 17:27         ` Auger Eric
2021-03-12 17:27           ` Auger Eric
2020-12-12 18:50 ` [PATCH 6/9] docs: kvm: devices/arm-vgic-v3: enhance KVM_DEV_ARM_VGIC_CTRL_INIT doc Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-12 15:39   ` Alexandru Elisei
2021-01-12 15:39     ` Alexandru Elisei
2021-01-13 17:18     ` Auger Eric
2021-01-13 17:18       ` Auger Eric
2020-12-12 18:50 ` [PATCH 7/9] KVM: arm64: Simplify argument passing to vgic_uaccess_[read|write] Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-12 16:04   ` Alexandru Elisei
2021-01-12 16:04     ` Alexandru Elisei
2021-01-12 16:16     ` Alexandru Elisei
2021-01-12 16:16       ` Alexandru Elisei
2021-01-13 17:18       ` Auger Eric
2021-01-13 17:18         ` Auger Eric
2020-12-12 18:50 ` [PATCH 8/9] KVM: arm64: vgic-v3: Expose GICR_TYPER.Last for userspace Eric Auger
2020-12-12 18:50   ` Eric Auger
2021-01-12 17:02   ` Alexandru Elisei
2021-01-12 17:02     ` Alexandru Elisei
2021-01-14 10:16     ` Auger Eric
2021-01-14 10:16       ` Auger Eric
2021-01-20 16:13       ` Alexandru Elisei
2021-01-20 16:13         ` Alexandru Elisei
2021-03-12 17:26         ` Auger Eric
2021-03-12 17:26           ` Auger Eric
2021-01-12 17:28   ` Alexandru Elisei
2021-01-12 17:28     ` Alexandru Elisei
2021-01-12 17:48     ` Marc Zyngier
2021-01-12 17:48       ` Marc Zyngier
2020-12-12 18:50 ` [PATCH 9/9] KVM: selftests: aarch64/vgic-v3 init sequence tests Eric Auger
2020-12-12 18:50   ` Eric Auger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201212185010.26579-2-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=drjones@redhat.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maz@kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.