LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Christoffer Dall <christoffer.dall@arm.com>
To: Eric Auger <eric.auger@redhat.com>
Cc: eric.auger.pro@gmail.com, linux-kernel@vger.kernel.org,
	kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
	marc.zyngier@arm.com, cdall@kernel.org, peter.maydell@linaro.org,
	andre.przywara@arm.com
Subject: Re: [PATCH v4 06/12] KVM: arm/arm64: Adapt vgic_v3_check_base to multiple rdist regions
Date: Sun, 29 Apr 2018 14:35:01 +0200	[thread overview]
Message-ID: <20180429123500.GC7512@C02W217FHV2R.local> (raw)
In-Reply-To: <1524838505-3823-7-git-send-email-eric.auger@redhat.com>

On Fri, Apr 27, 2018 at 04:14:59PM +0200, Eric Auger wrote:
> vgic_v3_check_base() currently only handles the case of a unique
> legacy redistributor region whose size is not explicitly set but
> infered, instead, from the number of online vcpus.

nit: inferred

> 
> We adapt it to handle the case of multiple redistributor regions
> with explicitly defined size. We rely on two new helpers:
> - vgic_v3_rdist_overlap() is used to detect overlap with the dist
>   region if defined
> - vgic_v3_rd_region_size computes the size of the redist region,
>   would it be a legacy unique region or a new explicitly sized
>   region.
> 
> Signed-off-by: Eric Auger <eric.auger@redhat.com>
> 
> ---
> 
> v3 -> v4:
> - squash vgic_v3_check_base adaptation and vgic_v3_rdist_overlap
>   + vgic_v3_rd_region_size introduction  and put this patch
>   before v3 patch 6
> ---
>  virt/kvm/arm/vgic/vgic-v3.c | 49 +++++++++++++++++++++++++++++----------------
>  virt/kvm/arm/vgic/vgic.h    | 10 +++++++++
>  2 files changed, 42 insertions(+), 17 deletions(-)
> 
> diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
> index f81a63a..c4a2a46 100644
> --- a/virt/kvm/arm/vgic/vgic-v3.c
> +++ b/virt/kvm/arm/vgic/vgic-v3.c
> @@ -410,6 +410,29 @@ int vgic_v3_save_pending_tables(struct kvm *kvm)
>  	return 0;
>  }
>  
> +/**
> + * vgic_v3_rdist_overlap - check if a region overlaps with any
> + * existing redistributor region
> + *
> + * @kvm: kvm handle
> + * @base: base of the region
> + * @size: size of region
> + *
> + * Return: true if there is an overlap
> + */
> +bool vgic_v3_rdist_overlap(struct kvm *kvm, gpa_t base, size_t size)
> +{
> +	struct vgic_dist *d = &kvm->arch.vgic;
> +	struct vgic_redist_region *rdreg;
> +
> +	list_for_each_entry(rdreg, &d->rd_regions, list) {
> +		if ((base + size > rdreg->base) &&
> +			(base < rdreg->base + vgic_v3_rd_region_size(kvm, rdreg)))
> +			return true;
> +	}
> +	return false;
> +}
> +
>  /*
>   * Check for overlapping regions and for regions crossing the end of memory
>   * for base addresses which have already been set.
> @@ -417,31 +440,23 @@ int vgic_v3_save_pending_tables(struct kvm *kvm)
>  bool vgic_v3_check_base(struct kvm *kvm)
>  {
>  	struct vgic_dist *d = &kvm->arch.vgic;
> -	gpa_t redist_size = KVM_VGIC_V3_REDIST_SIZE;
> -	struct vgic_redist_region *rdreg =
> -		list_first_entry(&d->rd_regions,
> -				 struct vgic_redist_region, list);
> -
> -	redist_size *= atomic_read(&kvm->online_vcpus);
> +	struct vgic_redist_region *rdreg;
>  
>  	if (!IS_VGIC_ADDR_UNDEF(d->vgic_dist_base) &&
>  	    d->vgic_dist_base + KVM_VGIC_V3_DIST_SIZE < d->vgic_dist_base)
>  		return false;
>  
> -	if (rdreg && (rdreg->base + redist_size < rdreg->base))
> -		return false;
> +	list_for_each_entry(rdreg, &d->rd_regions, list) {
> +		if (rdreg->base + vgic_v3_rd_region_size(kvm, rdreg) <
> +			rdreg->base)
> +			return false;
> +	}
>  
> -	/* Both base addresses must be set to check if they overlap */
> -	if (IS_VGIC_ADDR_UNDEF(d->vgic_dist_base) || !rdreg)
> +	if (IS_VGIC_ADDR_UNDEF(d->vgic_dist_base))
>  		return true;
>  
> -	if (d->vgic_dist_base + KVM_VGIC_V3_DIST_SIZE <= rdreg->base)
> -		return true;
> -
> -	if (rdreg->base + redist_size <= d->vgic_dist_base)
> -		return true;
> -
> -	return false;
> +	return !vgic_v3_rdist_overlap(kvm, d->vgic_dist_base,
> +				      KVM_VGIC_V3_DIST_SIZE);
>  }
>  
>  /**
> diff --git a/virt/kvm/arm/vgic/vgic.h b/virt/kvm/arm/vgic/vgic.h
> index fea32cb..e6e3ae9 100644
> --- a/virt/kvm/arm/vgic/vgic.h
> +++ b/virt/kvm/arm/vgic/vgic.h
> @@ -262,6 +262,16 @@ vgic_v3_redist_region_full(struct vgic_redist_region *region)
>  
>  struct vgic_redist_region *vgic_v3_rdist_free_slot(struct list_head *rdregs);
>  
> +static inline size_t
> +vgic_v3_rd_region_size(struct kvm *kvm, struct vgic_redist_region *rdreg)
> +{
> +	if (!rdreg->count)
> +		return atomic_read(&kvm->online_vcpus) * KVM_VGIC_V3_REDIST_SIZE;
> +	else
> +		return rdreg->count * KVM_VGIC_V3_REDIST_SIZE;
> +}
> +bool vgic_v3_rdist_overlap(struct kvm *kvm, gpa_t base, size_t size);
> +
>  int vgic_its_resolve_lpi(struct kvm *kvm, struct vgic_its *its,
>  			 u32 devid, u32 eventid, struct vgic_irq **irq);
>  struct vgic_its *vgic_msi_to_its(struct kvm *kvm, struct kvm_msi *msi);
> -- 
> 2.5.5
> 

Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>

  reply	other threads:[~2018-04-29 12:35 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-27 14:14 [PATCH v4 00/12] KVM: arm/arm64: Allow multiple GICv3 redistributor regions Eric Auger
2018-04-27 14:14 ` [PATCH v4 01/12] KVM: arm/arm64: Set dist->spis to NULL after kfree Eric Auger
2018-04-27 14:14 ` [PATCH v4 02/12] KVM: arm/arm64: Document KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION Eric Auger
2018-04-27 19:15   ` Christoffer Dall
2018-04-27 14:14 ` [PATCH v4 03/12] KVM: arm/arm64: Replace the single rdist region by a list Eric Auger
2018-04-27 14:14 ` [PATCH v4 04/12] KVM: arm/arm64: Helper to locate free rdist index Eric Auger
2018-04-27 14:14 ` [PATCH v4 05/12] KVM: arm/arm64: Revisit Redistributor TYPER last bit computation Eric Auger
2018-04-27 14:14 ` [PATCH v4 06/12] KVM: arm/arm64: Adapt vgic_v3_check_base to multiple rdist regions Eric Auger
2018-04-29 12:35   ` Christoffer Dall [this message]
2018-04-27 14:15 ` [PATCH v4 07/12] KVM: arm/arm64: Helper to register a new redistributor region Eric Auger
2018-04-27 14:15 ` [PATCH v4 08/12] KVM: arm/arm64: Check vcpu redist base before registering an iodev Eric Auger
2018-04-29 12:35   ` Christoffer Dall
2018-04-27 14:15 ` [PATCH v4 09/12] KVM: arm/arm64: Check all vcpu redistributors are set on map_resources Eric Auger
2018-04-29 12:35   ` Christoffer Dall
2018-04-27 14:15 ` [PATCH v4 10/12] KVM: arm/arm64: Add KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION Eric Auger
2018-04-27 14:15 ` [PATCH v4 11/12] KVM: arm/arm64: Implement KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION Eric Auger
2018-04-27 19:17   ` Christoffer Dall
2018-04-27 14:15 ` [PATCH v4 12/12] KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512 Eric Auger
2018-04-29 12:35   ` Christoffer Dall

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=20180429123500.GC7512@C02W217FHV2R.local \
    --to=christoffer.dall@arm.com \
    --cc=andre.przywara@arm.com \
    --cc=cdall@kernel.org \
    --cc=eric.auger.pro@gmail.com \
    --cc=eric.auger@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=peter.maydell@linaro.org \
    --subject='Re: [PATCH v4 06/12] KVM: arm/arm64: Adapt vgic_v3_check_base to multiple rdist regions' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).