From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35156)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peterx@redhat.com>) id 1akMaz-00071D-NX
	for qemu-devel@nongnu.org; Sun, 27 Mar 2016 22:07:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peterx@redhat.com>) id 1akMaw-00074d-Go
	for qemu-devel@nongnu.org; Sun, 27 Mar 2016 22:07:57 -0400
Received: from mx1.redhat.com ([209.132.183.28]:36246)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peterx@redhat.com>) id 1akMaw-00074Z-Bb
	for qemu-devel@nongnu.org; Sun, 27 Mar 2016 22:07:54 -0400
Date: Mon, 28 Mar 2016 10:07:48 +0800
From: Peter Xu <peterx@redhat.com>
Message-ID: <20160328020748.GI28183@pxdev.xzpeter.org>
References: <1458872009-13342-1-git-send-email-jasowang@redhat.com>
	<1458872009-13342-4-git-send-email-jasowang@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <1458872009-13342-4-git-send-email-jasowang@redhat.com>
Subject: Re: [Qemu-devel] [RFC PATCH 3/8] intel_iommu: allocate new key when
 creating new address space
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jason Wang <jasowang@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>, mst@redhat.com, qemu-devel@nongnu.org, cornelia.huck@de.ibm.com, pbonzini@redhat.com, Richard Henderson <rth@twiddle.net>

On Fri, Mar 25, 2016 at 10:13:24AM +0800, Jason Wang wrote:
> We use the pointer to stack for key for new address space, this will break hash
> table searching, fixing by g_malloc() a new key instead.
> 
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Acked-by: Peter Xu <peterx@redhat.com>

> ---
>  hw/i386/intel_iommu.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index d647b42..36b2072 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -1904,11 +1904,12 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn)
>      char name[128];
>  
>      if (!vtd_bus) {
> +        uintptr_t *new_key = g_malloc(sizeof(*new_key));
> +        *new_key = (uintptr_t)bus;
>          /* No corresponding free() */
>          vtd_bus = g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) * VTD_PCI_DEVFN_MAX);
>          vtd_bus->bus = bus;
> -        key = (uintptr_t)bus;
> -        g_hash_table_insert(s->vtd_as_by_busptr, &key, vtd_bus);
> +        g_hash_table_insert(s->vtd_as_by_busptr, new_key, vtd_bus);
>      }
>  
>      vtd_dev_as = vtd_bus->dev_as[devfn];
> -- 
> 2.5.0
>