From nobody Wed Nov 12 21:48:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574671585; cv=none; d=zohomail.com; s=zohoarc; b=ZKs2dgoL3vRfQWBDj274ypQ6LczGhlbb8BF89uNFog+nnvG8OdFSSpcZXwFvt4nu7tQ2F9GnkvSFAAwXg0bVM+OXOn3gOiMuPThC8hVBq7QV+xLq2pKVmYiur5/ArZPIkBgGKEoa95nsliYez+BJXIoN8GUOWgb/sk/Uhu9ZGFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574671585; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D69oNG7b0azwE9NFjTWHIQsylubZZHajetVSBheyyWc=; b=hx+E/s/gMpFtIM+8qqavaiGSOtdFwNTqVU2ByekxLx8GkehrzWnPI6WndCuc9faZQCR8+fdS/bqNQKSbMbZ39/CBXbOqzymYeI20/7V1U6TFX1atPM/AMIOqUqGdOVOuG1tP2NBCSgSKwjM01DcXUGpdH9P4+ty42yM9NL6Jcog= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574671585481194.34474605391938; Mon, 25 Nov 2019 00:46:25 -0800 (PST) Received: from localhost ([::1]:41395 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZA0m-0007VX-1i for importer@patchew.org; Mon, 25 Nov 2019 03:46:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52780) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZ9z8-00064B-S0 for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZ9z7-0004nT-Uc for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:42 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58126 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZ9z6-0004mQ-0t for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:40 -0500 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-186-NCLrlL27NnyF4sVbR3-5Lw-1; Mon, 25 Nov 2019 03:44:37 -0500 Received: by mail-qt1-f198.google.com with SMTP id x8so7998946qtq.14 for ; Mon, 25 Nov 2019 00:44:37 -0800 (PST) Received: from redhat.com (bzq-79-176-6-42.red.bezeqint.net. [79.176.6.42]) by smtp.gmail.com with ESMTPSA id d15sm3001307qke.55.2019.11.25.00.44.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 00:44:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574671478; 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=D69oNG7b0azwE9NFjTWHIQsylubZZHajetVSBheyyWc=; b=AbqDpJHYzLU0geamFXW0vJXLampvnkI/PoE/pYgOlvOYSmbPDlChk+muzRGv6oEb+rLPes P9WymTcllhEOO+pX9pc2CrhGqp65lF1S3jV31Ow9B08+gG7DKDS6GQ8+lVt//SebR2S8f0 0vV3MfKP7KZ5Lpll41944B5sXlmfPUc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=LqCPiJ37mcVI0DJ8LVWFFDKGbwhqfFvRE/VI24d69sc=; b=gIxC7hJpmpeAg99f4y7kWI/Uj/ndLKrJrTuVHG4IBKJZGe7SwQQMgpNrUi41oBRJ5X 0wGTxU38SlyDL7BK3Itpb05zsn9pFgxU8/qtQ0/5Ym27JmIsC2t6x0iyqnMKTWB+C57D 6Msd5+8PKuj/Qww7MgpiqOLZPweFYjNWaSS+KfAhMmzh87YHMS7qeRYyZqnCcenLeQ/R JImhygyUVkn5DjxLi9nOIBinYZ99lkqAZsDmmnsSJr/PkaWNi7/H8HUhon3Hhd+bKvnV EWwQlJ0evFv7KbxtBzNzXaN+Vvv/rfic7UnkW2X+YlXKRrLx8meLYw0XJlazwp3SDXcO Plhw== X-Gm-Message-State: APjAAAX/vSWenrn8fjsY98Fu6bMn3Bm8ajzYp1V/D22zy+4xr0ydwLY0 zo9n6+eFtkagubgChtbB4HXX7EXQYuKVR2tOGOjuMUmMHzXkvEpHgb+qn0s3EGKREcJ3a1v2vwj +dZYPDWf1WVq/Lw0= X-Received: by 2002:ac8:27e2:: with SMTP id x31mr16941068qtx.342.1574671476444; Mon, 25 Nov 2019 00:44:36 -0800 (PST) X-Google-Smtp-Source: APXvYqy7m1s+m0U63qWc/BKyrL88SxlZHAGjfu6aL398l73BeryZSE7oLx9pdAQvmShVSaMi5T+ONg== X-Received: by 2002:ac8:27e2:: with SMTP id x31mr16941057qtx.342.1574671476282; Mon, 25 Nov 2019 00:44:36 -0800 (PST) Date: Mon, 25 Nov 2019 03:44:32 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 1/3] virtio-input: fix memory leak on unrealize Message-ID: <20191125084403.324866-2-mst@redhat.com> References: <20191125084403.324866-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191125084403.324866-1-mst@redhat.com> X-Mailer: git-send-email 2.22.0.678.g13338e74b8 X-Mutt-Fcc: =sent X-MC-Unique: NCLrlL27NnyF4sVbR3-5Lw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Gerd Hoffmann , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau Spotted by ASAN + minor stylistic change. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael S. Tsirkin Message-Id: <20191121095649.25453-1-marcandre.lureau@redhat.com> Signed-off-by: Michael S. Tsirkin Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael S. Tsirkin --- hw/input/virtio-input.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c index 51617a5885..ec54e46ad6 100644 --- a/hw/input/virtio-input.c +++ b/hw/input/virtio-input.c @@ -275,6 +275,7 @@ static void virtio_input_finalize(Object *obj) =20 g_free(vinput->queue); } + static void virtio_input_device_unrealize(DeviceState *dev, Error **errp) { VirtIOInputClass *vic =3D VIRTIO_INPUT_GET_CLASS(dev); @@ -288,6 +289,8 @@ static void virtio_input_device_unrealize(DeviceState *= dev, Error **errp) return; } } + virtio_del_queue(vdev, 0); + virtio_del_queue(vdev, 1); virtio_cleanup(vdev); } =20 --=20 MST From nobody Wed Nov 12 21:48:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574671600; cv=none; d=zohomail.com; s=zohoarc; b=jjjlXB/8ne7wXeTmcB+dJqRZ2E8ENSQjk62ML9dhvm/N0CeJwiJGav2U0mjjwXI8LWcdMqfC9nEzQ7+RA/ikOJGqXvtJwb+FIAvFtwjudjIMJ6pdaLI/Nw2yNBYNn/X8SLX6ujXg994dhBeNqDLDb68Xr73hZZAQsNxgaJ6+6rw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574671600; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4dBhjT1uWH0VCqhFFsGJaKzc2J6PSyGnEtdphUAkNnQ=; b=OY9Zf4Y8mpLftTjeW1PVb0ktgLGu6p35CVSKJqwOmYPDqLiwsz3rACCCYRFSp3q+F8vAyobKaE+ZXr9rkgh3+kBLe5mp8FOKE8nwSC6Q2sd+7US1n1ibKgQefvnJshUinw6yIKba4XsTSzpInwC36tN2tqcrHw9YIFgNoTRYBsY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574671600360387.3584231833719; Mon, 25 Nov 2019 00:46:40 -0800 (PST) Received: from localhost ([::1]:41396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZA10-0007dr-Pw for importer@patchew.org; Mon, 25 Nov 2019 03:46:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52794) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZ9zC-00066Y-0j for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZ9zA-0004oY-SB for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:45 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:40505 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZ9zA-0004oJ-O8 for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:44 -0500 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-359-3f5LAVnTMUiiXUTlIJ0aJg-1; Mon, 25 Nov 2019 03:44:43 -0500 Received: by mail-qk1-f200.google.com with SMTP id d26so3576644qkk.8 for ; Mon, 25 Nov 2019 00:44:43 -0800 (PST) Received: from redhat.com (bzq-79-176-6-42.red.bezeqint.net. [79.176.6.42]) by smtp.gmail.com with ESMTPSA id b81sm3049527qkc.135.2019.11.25.00.44.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 00:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574671484; 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=4dBhjT1uWH0VCqhFFsGJaKzc2J6PSyGnEtdphUAkNnQ=; b=U8S5/jl6pjBQC4ftps5eJqbkY+2ySy87+UFcLYp+gnaNorCIi8YOEKpfcrlrwdI2iu28EP IMiMJoLWv1scIhM0HkMm8HTZ832Ph52J7yFZfc74y7Ciiy04YOH3MwNgJbm6Uflqne8wKQ KtwC7ZM/2OLaP+hW106VH9ECjO9hJ0M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=agD97voKPsUwFE0u9W1wgFfuitVi4B3xHtAAj/HEuKg=; b=uIeajLO6DzLyhv2lWtKl6SohhcCMyr06gZKmsOlQ1wKQhFM2YT0zxxFo+qfS8RR8t4 ZMPV/eQCNORtmYMheI0gbtDM5hK+0PYyboRDcqjD6nuzcY2j2yPIwm+95mbg47W7xzU/ A/MokjjzCgjHpv3ateR5XYJKhr5AyZEMBCHZZ810AmHbOR1Jly8YZ212zjCUR6Awjx6t auVcDbPbOR25wWrGEBR84NRn7otqVcsS5KSyWGrZxzmf9tfEq2BAZ7Cu4+pSm43KGPLQ SFcxwNFTf/Zm7PBLpXfHi0hf8iwlV0pGuic/Srufqv29R/13cnXlIT87fxPd7ggWfSTk 3vVQ== X-Gm-Message-State: APjAAAUx/FMdf0MxTARK+Nh3JQhwKRRbtJpoXgYV6kQS6RulqWK0kZh4 bI+N3pD1IYpvlS+tP/1J0bkSXpo1DFEgUFbITG0C1tYKufBDOf1MadRGm9RbZv3QrO2LMnQgXDi xlmr9hGBvBh7nvy0= X-Received: by 2002:a37:a51:: with SMTP id 78mr16380819qkk.112.1574671482294; Mon, 25 Nov 2019 00:44:42 -0800 (PST) X-Google-Smtp-Source: APXvYqyM1dvRg2QfyFA3tcKTC3p4KmrZnfzUmKrZ0o2YtDvh0olwUyI1bAP1i+55r6KCiJ8FvvT3fw== X-Received: by 2002:a37:a51:: with SMTP id 78mr16380803qkk.112.1574671482033; Mon, 25 Nov 2019 00:44:42 -0800 (PST) Date: Mon, 25 Nov 2019 03:44:36 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 2/3] intel_iommu: refine SL-PEs reserved fields checking Message-ID: <20191125084403.324866-3-mst@redhat.com> References: <20191125084403.324866-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191125084403.324866-1-mst@redhat.com> X-Mailer: git-send-email 2.22.0.678.g13338e74b8 X-Mutt-Fcc: =sent X-MC-Unique: 3f5LAVnTMUiiXUTlIJ0aJg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Qi , Qi@redhat.com, Peter Xu , Zhang@redhat.com, Paolo Bonzini , "Qi, Yadong" , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: "Qi, Yadong" 1. split the resevred fields arrays into two ones, 2. large page only effect for L2(2M) and L3(1G), so remove checking of L1 and L4 for large page. Signed-off-by: Zhang, Qi Signed-off-by: Qi, Yadong Message-Id: <20191125003321.5669-2-yadong.qi@intel.com> Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 37 ++++++++++++++++++---------------- hw/i386/intel_iommu_internal.h | 5 +---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 14e4e6ad62..feb9e55f87 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -910,19 +910,23 @@ static dma_addr_t vtd_get_iova_pgtbl_base(IntelIOMMUS= tate *s, =20 /* * Rsvd field masks for spte: - * Index [1] to [4] 4k pages - * Index [5] to [8] large pages + * vtd_spte_rsvd 4k pages + * vtd_spte_rsvd_large large pages */ -static uint64_t vtd_paging_entry_rsvd_field[9]; +static uint64_t vtd_spte_rsvd[5]; +static uint64_t vtd_spte_rsvd_large[5]; =20 static bool vtd_slpte_nonzero_rsvd(uint64_t slpte, uint32_t level) { - if (slpte & VTD_SL_PT_PAGE_SIZE_MASK) { - /* Maybe large page */ - return slpte & vtd_paging_entry_rsvd_field[level + 4]; - } else { - return slpte & vtd_paging_entry_rsvd_field[level]; + uint64_t rsvd_mask =3D vtd_spte_rsvd[level]; + + if ((level =3D=3D VTD_SL_PD_LEVEL || level =3D=3D VTD_SL_PDP_LEVEL) && + (slpte & VTD_SL_PT_PAGE_SIZE_MASK)) { + /* large page */ + rsvd_mask =3D vtd_spte_rsvd_large[level]; } + + return slpte & rsvd_mask; } =20 /* Find the VTD address space associated with a given bus number */ @@ -3549,15 +3553,14 @@ static void vtd_init(IntelIOMMUState *s) /* * Rsvd field masks for spte */ - vtd_paging_entry_rsvd_field[0] =3D ~0ULL; - vtd_paging_entry_rsvd_field[1] =3D VTD_SPTE_PAGE_L1_RSVD_MASK(s->aw_bi= ts); - vtd_paging_entry_rsvd_field[2] =3D VTD_SPTE_PAGE_L2_RSVD_MASK(s->aw_bi= ts); - vtd_paging_entry_rsvd_field[3] =3D VTD_SPTE_PAGE_L3_RSVD_MASK(s->aw_bi= ts); - vtd_paging_entry_rsvd_field[4] =3D VTD_SPTE_PAGE_L4_RSVD_MASK(s->aw_bi= ts); - vtd_paging_entry_rsvd_field[5] =3D VTD_SPTE_LPAGE_L1_RSVD_MASK(s->aw_b= its); - vtd_paging_entry_rsvd_field[6] =3D VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_b= its); - vtd_paging_entry_rsvd_field[7] =3D VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_b= its); - vtd_paging_entry_rsvd_field[8] =3D VTD_SPTE_LPAGE_L4_RSVD_MASK(s->aw_b= its); + vtd_spte_rsvd[0] =3D ~0ULL; + vtd_spte_rsvd[1] =3D VTD_SPTE_PAGE_L1_RSVD_MASK(s->aw_bits); + vtd_spte_rsvd[2] =3D VTD_SPTE_PAGE_L2_RSVD_MASK(s->aw_bits); + vtd_spte_rsvd[3] =3D VTD_SPTE_PAGE_L3_RSVD_MASK(s->aw_bits); + vtd_spte_rsvd[4] =3D VTD_SPTE_PAGE_L4_RSVD_MASK(s->aw_bits); + + vtd_spte_rsvd_large[2] =3D VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits); + vtd_spte_rsvd_large[3] =3D VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits); =20 if (x86_iommu_ir_supported(x86_iommu)) { s->ecap |=3D VTD_ECAP_IR | VTD_ECAP_MHMV; diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index c1235a7063..1654f746bc 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -395,14 +395,11 @@ typedef union VTDInvDesc VTDInvDesc; (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) #define VTD_SPTE_PAGE_L4_RSVD_MASK(aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L1_RSVD_MASK(aw) \ - (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) + #define VTD_SPTE_LPAGE_L2_RSVD_MASK(aw) \ (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) #define VTD_SPTE_LPAGE_L3_RSVD_MASK(aw) \ (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L4_RSVD_MASK(aw) \ - (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) =20 /* Information about page-selective IOTLB invalidate */ struct VTDIOTLBPageInvInfo { --=20 MST From nobody Wed Nov 12 21:48:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574671712; cv=none; d=zohomail.com; s=zohoarc; b=Sk3QD1cbl967xBumRkdNNcJEMzXrPUabGPR7wkOimkbnqZU1ubLZfIj15ubQFLO8/IPKAFbS5LuPGhnxsvx31WHKfd0ypIgqJWhBOSFZnw/bWhA2DKz8bdpsoThEmkRyIk5iYLvYp9O+oqwbdw2ZlmISX0oVfXafqTttYOG5lgs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574671712; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=45c5KCczi1tP3fiyHcZsacUONdbQ9bDohml2FobiC7Y=; b=czgcUShJ3hYq+wl3nrbTuz7A9o2txHZhaSSVhGGlD/szzuztXElpM3mbqyAqBvdWMCfEuSZ+wLMC3NdgAAJ6cLekjzs0kQthCw5erJ7cn0N4Xp8m68BC3nWacKMHR6Mi4MrEEBzf9MfTESi7w2Ff0gv/OmIz4VetGspMGjE6X4M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574671711996361.73909577388235; Mon, 25 Nov 2019 00:48:31 -0800 (PST) Received: from localhost ([::1]:41412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZA2o-0001rQ-Pw for importer@patchew.org; Mon, 25 Nov 2019 03:48:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52813) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZ9zI-0006Ha-5j for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZ9zG-0004sG-Tq for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:52 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41581 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZ9zG-0004rn-Pj for qemu-devel@nongnu.org; Mon, 25 Nov 2019 03:44:50 -0500 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-155-QNAo_V4nOse9nqTRLey8zA-1; Mon, 25 Nov 2019 03:44:49 -0500 Received: by mail-qk1-f198.google.com with SMTP id e23so4912435qka.23 for ; Mon, 25 Nov 2019 00:44:49 -0800 (PST) Received: from redhat.com (bzq-79-176-6-42.red.bezeqint.net. [79.176.6.42]) by smtp.gmail.com with ESMTPSA id k7sm3031437qkf.40.2019.11.25.00.44.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 00:44:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574671490; 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=45c5KCczi1tP3fiyHcZsacUONdbQ9bDohml2FobiC7Y=; b=JU4GzM659mmM/Qs96ESNgNBKwImU1dK/Vh4gtwXTYVZ6/sbOfScBWeeIyltTVbzl/rxBdk WiqGuPKS6mUnZp/P1Dqor6l11CkAiSjJAn2NfZIWRNqYuA2bxXBNGLQFmf4NbnQrkiovGd Rrj55bpFw/0WWWI8R4VgzrSg5uJjm+A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=1895WEugstjfjj7PAHfEW6CWz8RPn3MsU9+lve0kccY=; b=acHhyk1kRUqorQE/5pp4ZR2rjwWkKMVSRKCdR0HZBjqiYYeD8HCnsJS3p/UD6Kjk9b IhwfELks90bOteOfa6i2XuE5IKyJ47RBMMQ5wLKK/1d0bdwGHGXnfbhKPWt283UKQ7+w q4573lk514JGlWxx4xuaxlPOJ56/ngtRUsC+FDcD/yuIJnvIpNOKOHWylj1hSwQ64fzZ EYOshYi1dmpaPr6P4mug2MSO+rZKgfz0S1Ws/NZ7kNFuuzVnFcsOt2NkmD5Bl5wM1eKl g6qeF0BBzpnGzHufwqw4QugxbfoNzPkr7XvJW6ofWOvN8kxQTv/5KdvX9g4Clce/FXQh qJNQ== X-Gm-Message-State: APjAAAV3y7duAqbp/xyNfBlU7/uE/QtqDli1iNmYe4upRLrF0XShhVJX 6dTSgEHJluvjg5YD8vTilAu9dfBz514YoribLh5S0uSlR30/TqMH4wzLyFSKA4LahrkidBY3g0o IIVMxf7twi7E14t0= X-Received: by 2002:a0c:ba9e:: with SMTP id x30mr26357879qvf.187.1574671488117; Mon, 25 Nov 2019 00:44:48 -0800 (PST) X-Google-Smtp-Source: APXvYqyktovf/NwCLn8LmNLHyCySE6hFAkyGUpbFeV2BpAth+0vxFJHXlf7TgEGZ690OGmvr5irwQA== X-Received: by 2002:a0c:ba9e:: with SMTP id x30mr26357866qvf.187.1574671487848; Mon, 25 Nov 2019 00:44:47 -0800 (PST) Date: Mon, 25 Nov 2019 03:44:42 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 3/3] intel_iommu: TM field should not be in reserved bits Message-ID: <20191125084403.324866-4-mst@redhat.com> References: <20191125084403.324866-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191125084403.324866-1-mst@redhat.com> X-Mailer: git-send-email 2.22.0.678.g13338e74b8 X-Mutt-Fcc: =sent X-MC-Unique: QNAo_V4nOse9nqTRLey8zA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Qi , Qi@redhat.com, Peter Xu , Zhang@redhat.com, Paolo Bonzini , "Qi, Yadong" , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: "Qi, Yadong" When dt is supported, TM field should not be Reserved(0). Refer to VT-d Spec 9.8 Signed-off-by: Zhang, Qi Signed-off-by: Qi, Yadong Message-Id: <20191125003321.5669-3-yadong.qi@intel.com> Reviewed-by: Peter Xu Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/intel_iommu.c | 9 ++++++--- hw/i386/intel_iommu_internal.h | 13 ++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index feb9e55f87..43c94b993b 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3554,13 +3554,16 @@ static void vtd_init(IntelIOMMUState *s) * Rsvd field masks for spte */ vtd_spte_rsvd[0] =3D ~0ULL; - vtd_spte_rsvd[1] =3D VTD_SPTE_PAGE_L1_RSVD_MASK(s->aw_bits); + vtd_spte_rsvd[1] =3D VTD_SPTE_PAGE_L1_RSVD_MASK(s->aw_bits, + x86_iommu->dt_supported); vtd_spte_rsvd[2] =3D VTD_SPTE_PAGE_L2_RSVD_MASK(s->aw_bits); vtd_spte_rsvd[3] =3D VTD_SPTE_PAGE_L3_RSVD_MASK(s->aw_bits); vtd_spte_rsvd[4] =3D VTD_SPTE_PAGE_L4_RSVD_MASK(s->aw_bits); =20 - vtd_spte_rsvd_large[2] =3D VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits); - vtd_spte_rsvd_large[3] =3D VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits); + vtd_spte_rsvd_large[2] =3D VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits, + x86_iommu->dt_sup= ported); + vtd_spte_rsvd_large[3] =3D VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits, + x86_iommu->dt_sup= ported); =20 if (x86_iommu_ir_supported(x86_iommu)) { s->ecap |=3D VTD_ECAP_IR | VTD_ECAP_MHMV; diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index 1654f746bc..edcf9fc9bb 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -387,7 +387,9 @@ typedef union VTDInvDesc VTDInvDesc; #define VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO 0xffff0000ffe0fff8 =20 /* Rsvd field masks for spte */ -#define VTD_SPTE_PAGE_L1_RSVD_MASK(aw) \ +#define VTD_SPTE_PAGE_L1_RSVD_MASK(aw, dt_supported) \ + dt_supported ? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) #define VTD_SPTE_PAGE_L2_RSVD_MASK(aw) \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) @@ -396,9 +398,13 @@ typedef union VTDInvDesc VTDInvDesc; #define VTD_SPTE_PAGE_L4_RSVD_MASK(aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) =20 -#define VTD_SPTE_LPAGE_L2_RSVD_MASK(aw) \ +#define VTD_SPTE_LPAGE_L2_RSVD_MASK(aw, dt_supported) \ + dt_supported ? \ + (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) := \ (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L3_RSVD_MASK(aw) \ +#define VTD_SPTE_LPAGE_L3_RSVD_MASK(aw, dt_supported) \ + dt_supported ? \ + (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM))= : \ (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) =20 /* Information about page-selective IOTLB invalidate */ @@ -503,5 +509,6 @@ typedef struct VTDRootEntry VTDRootEntry; #define VTD_SL_W (1ULL << 1) #define VTD_SL_PT_BASE_ADDR_MASK(aw) (~(VTD_PAGE_SIZE - 1) & VTD_HAW_MASK(= aw)) #define VTD_SL_IGN_COM 0xbff0000000000000ULL +#define VTD_SL_TM (1ULL << 62) =20 #endif --=20 MST