From patchwork Tue Jul 2 05:52:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: CLEMENT MATHIEU--DRIF X-Patchwork-Id: 13718994 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 0AABCC3064D for ; Tue, 2 Jul 2024 05:55:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOWRf-00081b-QS; Tue, 02 Jul 2024 01:52:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOWRe-00080W-IO for qemu-devel@nongnu.org; Tue, 02 Jul 2024 01:52:50 -0400 Received: from smarthost2.eviden.com ([80.78.11.83]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOWRS-0006UB-Vj for qemu-devel@nongnu.org; Tue, 02 Jul 2024 01:52:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eviden.com; i=@eviden.com; q=dns/txt; s=mail; t=1719899559; x=1751435559; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=Z/2aj7kxHmZQngqgXS2PutUg5PHcoFHQ+gDj2SWJzVI=; b=g3IY6RjBzW6p7cC9pg1Il0PzfARZQX0nhFTNwKljI2tg0tYMBhPYZGvL GrjeljdAoscPs5s3q1AYLZqOREYJYzq59hGT96wCyEb4latDSURpVADG8 OXaGyuq+VjgVqfUxkgl2SU/dSvzCP8LsBSxbTQ/2KXr1bAm/upTGlvqWC 5JfiX0HYLmDuZwlV5tyBeOBKVJ33F+GI4EBtVLidCx5Ifd3rZicPUn3Fg MCYBA2sgAk6432y+0vNk5L3BXf5PD3zhOei4bDJrUhrGHVHB+PRFe/MSy mAJzY7bVy6WHC1vev9lSfvyq6vlFrdOLa3e4hY9BFkKxcrF9enSHfNaNx Q==; X-IronPort-AV: E=Sophos;i="6.09,178,1716242400"; d="scan'208";a="15721512" X-MGA-submission: MDEa/3R0jqSTVNu+oNnuIQyu4JL0tmnsW+0eYxA9LvvrHprt57e98mK9WuMor8PFqDBYmW02aqFrzIZUJSQxMB/6BHO7l5406K863MfLe8O/WvBGyJLnkPxEwfnIeIfxkCFl2BKdY4lHs0cAv9r6PW41BnwH5QIjRO3LV88sWYvZ6A== Received: from mail-am6eur05lp2105.outbound.protection.outlook.com (HELO EUR05-AM6-obe.outbound.protection.outlook.com) ([104.47.18.105]) by smarthost2.eviden.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2024 07:52:33 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lITTMH1pKVLI93ihmUugU3xH0XuNs+RUIwPL21ELBJx/cjY5lN7Zo2y/4rscntciWxK3rKX5lXiPsMrK3/pJgT+xxNAuDW8NOzZQE90RUy6r9+a1nmV9xdxMEyQBtOX0JDkVNtkM7K859mvxsJltTqJ18oDZYrwr1xnwGELP0F0B8ySaY/H6fRIhSQKNeTPFAPpWuOEQ3n38uwvXQqlM2QOhyBnFOZIUkwrWJQE4+BPasyh0yGMdKukwxkHb4TL+mUDqsvhkQcIzsavNg9HSzM7xCT5+pR1m5wlckJEYieXi6i6Uex08nLm8C5zxzedRxFPC+7OtSZrskGrjg8U5cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Z/2aj7kxHmZQngqgXS2PutUg5PHcoFHQ+gDj2SWJzVI=; b=ibLdZJsGVu4WGc6a2PWvy65oYOG50ylJcCruVtLqcYwGltrTuHQsLAUhrLuw7m/6prp+lHPZQ02gvmmTjW257mezaIrQrFsFo4F3CCQmk9qcD3mjZj4tD1kA/J8jZa9++KVN6z/f+i1it51kYy/8uLIIwkwxZjw7Org13Wmk3xPPCm4oQLqPT8IaOfMOmu7cajLvdmKABYRxr13apzkTmMwbGHpnzVj5HhUgag2My4Vi/TOwluvBpHbvi2KB1fh0HVj/L5Lh47KamWv62R2qTNoasHgM3RRMPKqc9lwKSeMR0ROO6uUs8TaJ2t8mNI55BN1B2w76d5+47phVvzamgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=eviden.com; dmarc=pass action=none header.from=eviden.com; dkim=pass header.d=eviden.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Eviden.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z/2aj7kxHmZQngqgXS2PutUg5PHcoFHQ+gDj2SWJzVI=; b=kzWM7HLZRnIMf+guXcVg93+1UlX+UsSxrRsAixLxh5oSs4bxRFB/kIkL6qxgBCdDhzzKZol9fvHzmvGdoy2mh6rXHT59FqEKZqUDgmwagxFXXNx2ADr2fAuN1SAWSwjYtF0v/+cJPolCADwswv1bpYBAePQixgOCuo0XvYVOJQxBMAtp0CLu5nnLremycxttcsrNFvQSCaaLOaHt+Q1kZ7mfobmxhEI1bUAbZjxRLr+6cAgRmbGF/0z6FOfXROXhEfNq06GAAcCvAGsoo0aWK9wsB94aJ4ixeXrV+Pu0LpouYl2RInGhDLojYyy3KryaLH/Iv7SFWhCroOOMliQPfA== Received: from AM8PR07MB7602.eurprd07.prod.outlook.com (2603:10a6:20b:24b::7) by AS8PR07MB7080.eurprd07.prod.outlook.com (2603:10a6:20b:239::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.21; Tue, 2 Jul 2024 05:52:32 +0000 Received: from AM8PR07MB7602.eurprd07.prod.outlook.com ([fe80::fbd7:ca71:b636:6f9d]) by AM8PR07MB7602.eurprd07.prod.outlook.com ([fe80::fbd7:ca71:b636:6f9d%4]) with mapi id 15.20.7741.017; Tue, 2 Jul 2024 05:52:32 +0000 From: CLEMENT MATHIEU--DRIF To: "qemu-devel@nongnu.org" CC: "jasowang@redhat.com" , "zhenzhong.duan@intel.com" , "kevin.tian@intel.com" , "yi.l.liu@intel.com" , "joao.m.martins@oracle.com" , "peterx@redhat.com" , "mst@redhat.com" , CLEMENT MATHIEU--DRIF Subject: [PATCH ats_vtd v5 02/22] intel_iommu: make types match Thread-Topic: [PATCH ats_vtd v5 02/22] intel_iommu: make types match Thread-Index: AQHazEQH6yt3QFkvykGEU3nY0I4A8A== Date: Tue, 2 Jul 2024 05:52:32 +0000 Message-ID: <20240702055221.1337035-3-clement.mathieu--drif@eviden.com> References: <20240702055221.1337035-1-clement.mathieu--drif@eviden.com> In-Reply-To: <20240702055221.1337035-1-clement.mathieu--drif@eviden.com> Accept-Language: en-GB, fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=eviden.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: AM8PR07MB7602:EE_|AS8PR07MB7080:EE_ x-ms-office365-filtering-correlation-id: 010aa57e-4704-4f45-6ecc-08dc9a5b2a77 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|1800799024|366016|376014|38070700018; x-microsoft-antispam-message-info: =?utf-8?q?0ggkV0kcJTF2E22uNP/GqLWBMrEnvb8?= =?utf-8?q?2vUD+fZ4l0hySSDQsRMzZX4nWsloqZWo/yOC/Qf4LWc7VFA5l0DQ3wpr0tUETzbws?= =?utf-8?q?SC+syqk4S6a+F3VweWiqERdTVi4AnVndpUjK1MI1ST4O2AdY5fYJiXv10Rhn8rptB?= =?utf-8?q?iY66n9sJmIizFdn7/VtWTzHvZOY267PHq/a4LIV2KOmWQxa7A3eiR6FhgVU04ga1e?= =?utf-8?q?U33kUl2r+G74bGr3HLLznhhV/rJeJITIbRuC5MSQ1KXF6icykE1fsiFEXkGp2bjN1?= =?utf-8?q?6tl47qpfO1yQN392X26EFkRZv7KB8BbcyJdRJuZVvB0FUAfxEPuu2FDq69XVLdQdJ?= =?utf-8?q?L5ohRb1vyDa0W/OC3Ii4szLI+bhLqzFxWgz3RjXLBLE8zjUbWs5hDkEyvYqvOlw3Q?= =?utf-8?q?OpJK3bADnILnqNH0ZPQbglx+gszKUrubEDU71lRiN18roZqsoEU+sfU8wt+fOeuhp?= =?utf-8?q?8VFm0sCiPwIfYN1Fu783u3CkNatxVCgMHBel5NdNdP4K1cRSbnDuyab8+bmDpJ1S4?= =?utf-8?q?5QGG7v/gHTLwo4+EsbR6TnIvQuGZ1Ihxia6zkL817Cty5AC8MexOykjV4ccfEGgUH?= =?utf-8?q?2m52x+3z8yNM7CN+uZcimC4k1PV+N9crnpTvUv5YXQkAX4YiUApphor1HyK52TjQS?= =?utf-8?q?YNg7a+Nd4RpQUF05qy7on7EoQNBB3ySLn2rdE3iZMP/02mbWt9G2lhNFnkyjckXi5?= =?utf-8?q?2ios/HxAq+PinhGfT8mQWihnsy9aR0pouMz1DyUdi1UQ7l0rrBGlSFugBIJEdMQx8?= =?utf-8?q?xGAauSmJgG2S183bpqpJvZT0+fXc4IiykN9NkY7dXr2M4wjHxBEjJwBXiAiXl+qtC?= =?utf-8?q?NTtF78ufaTxTclzR6Qjwr1m9cDNSSbSr+AOUy0k0EZ7I5nJ3wxwSFFLGiHMnTuU/U?= =?utf-8?q?iC01aRLdtSLz6WVu1rtHtlFnakCYRIIzqm3HHyKsFxbD8kNCE/V+VD7TtAW481EbM?= =?utf-8?q?FreE6OyKcvHfokdiTXgmXxyM/poQ7v1mDR+nguM+pwfoQgBrMAnYe6hnDXHXiJ5eo?= =?utf-8?q?YW1NXE6Yd70r2BtWdqptLv1tnMfZXasBXWn2U8jaHLkHLqv2321Hr5uZdnDIas6fl?= =?utf-8?q?e0s8mFk0qBFslzytJR+sDBBYS4GmNs+yPZGP8X0n9maKsuvNmdZMNehSmJ6PlUehf?= =?utf-8?q?8Cf5GGFlRsqT6oAcGLqbICoD3UZ97PTzK6jLyrdbxmrupNS8ESlS1Vfp3ogb735wG?= =?utf-8?q?iFnaUVBBTfbzAJKC+ucPfKkHHM9uwfInZZnw2ldv7GH9p73/Av600V8UcUwR4C+LP?= =?utf-8?q?ERtTSFMaM64+qDI3WQGDgV+uYNhmRJWbKn0oiI7MpKM2apO20in6YnESA/gGH/V3K?= =?utf-8?q?PFpvectQmqgtiE21WszBsC9HIb1FlQZiiw=3D=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR07MB7602.eurprd07.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(38070700018); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?mJfTAwmwtIGox4nNERPrHtXeVy0X?= =?utf-8?q?8tVmy2e7uwEWda/DtHsH33SfrnlD5oGaPaPcRRpBZiKHDxIH+eYEAlRZ4Y0WUZb6K?= =?utf-8?q?BDFePX+QBwXPj4J2t2K+4Tjh7MA6MKyutlwBNtW9ClrHLgUCHs2KzpEn1FeUuurTE?= =?utf-8?q?gT5jP2s9eZpP6dIc9wxjZswHDoO0ZljBmJWdbqYj4Ae4RdYwkzxwxlMq5ZCHuzXdM?= =?utf-8?q?1wPHN/nsKOduaDEAT3PY7BbxcWOFDeMMXF7QwFFqrW5qfcE1VEPSMo2PR4JX/gYYT?= =?utf-8?q?wHnnsZfOlNUrlTWGrbqZtnKvW0eVYJ7jyDaB2bXb6uPdbAi4ZuyfMofych4+ozU5o?= =?utf-8?q?qQ6DfnEIEt9J9Xi9UhqGU0BEOubgvjNVc8NvOufjAP/S2BxKqw4sLNQkcvT4oOWVo?= =?utf-8?q?VDNrYlhR5kO6c/0OPhI1GSXLlijxzg5tVAcKUaehL09tvYl57RJiPCklIYRZt1+o3?= =?utf-8?q?PNC/giBmGP7SC3LQQphBApuGT0nmpftGD6yuBII26yTumDdI4WYk2Mube5oXFRqfq?= =?utf-8?q?+PZD8F9+NxRgaKHJlFFkw752Q+v+yLZh+qIOzMfTR8iwPV7LYMP0tamJgf7WKNUxH?= =?utf-8?q?+Sr1vwuqXC6cd8wTJZ0JJrSjP+q+shT75Pn4SfwvXuqvJHaTeX/O27YHIyEW6MxIP?= =?utf-8?q?r0o8BxoaVurtADr2vxtpDySQQNzdjItNDhx5LDiTWHTmAnR2lGCfO8y/e2a6v9BCZ?= =?utf-8?q?3/ih1qeW+H+puX+0LQvqpLeYtn+NTk3ME73O1eTPUc5PkuWUpH+jCb8LgYkCbKaz/?= =?utf-8?q?MzFFU2qCjGDDRIN/zn5bx+kBcb5n6QMayRNTvLb/HH7YKSjfwlWy76Dd1JZPM9e5G?= =?utf-8?q?Jpy5vj8orDbDa18YzSemL7E7gQbvK4fGmq2/figIEwDWxhpXNCoUEiXqlSyre7Kv3?= =?utf-8?q?J4BJORMeFbfuEIKl4fQvPwJ8ThfI11NbZuzt1kpalqZjW8UNUdCTzd4UKC9Dduoy8?= =?utf-8?q?f1cFZTc25saxgMclbBEGevGqzeoFlSy19CSKOm9m8qj1qo86zk/N8r99JHB88AYdz?= =?utf-8?q?qOw17nrbpJZHn7BC2ebJqfb0/QfdgTU2Wdji3LtUXfh8FS/pMdVTjPDFx0eTfilYa?= =?utf-8?q?nSb0/KW8FeK3Xw59ht7oaiv7PmWdTBvkdXn7ptMI5nGC3q7ZhCwm9YC1w3Gywgy1A?= =?utf-8?q?N62PwQR4yG6de25Z0tbDMEjtuLrkXu+XLglMxZ3oGjbcT1u8nRxKm7NZXaDCw+uAY?= =?utf-8?q?5KYR66WFLWnSoz3RhW/VzEC32cl0ajx4yfHuNSlYVAYHeel3PqbXorVdA/l4uLzCJ?= =?utf-8?q?oGrh5DV3Ax5MDJALXsvTWt8Y+51Rt02q4L5A2fubRMKlIzLkFjUk+js7x+5Vyg4nd?= =?utf-8?q?rk2qk3JDRnvpBgjUdRhaLXfBwOBlIJNg7tfBl7x4ossJK4j3S/aPiNWNx/S0yznr+?= =?utf-8?q?koGFETGeNBlFODlpaKwA0IkG43LNi/xd/g00KFqY6YV5opQPzYF6XfiavQYXeXHpv?= =?utf-8?q?z0Hp5g0vS9MhkdkQyEa5FogPXiyqSqd0BCXggAhdPatMVbrsBxJaVD+jDIVdW6w2l?= =?utf-8?q?GNFLin6oA1KlrEiM7MGzBK/2XpiGrog0m80lBHhKzv/qVOovqKHZqrs=3D?= Content-ID: <923168C4B590A64787C729A3E86744AD@eurprd07.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: eviden.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM8PR07MB7602.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 010aa57e-4704-4f45-6ecc-08dc9a5b2a77 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jul 2024 05:52:32.4620 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7d1c7785-2d8a-437d-b842-1ed5d8fbe00a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: aoLbBv8h16nLbnIQ/a8QDrOK4AvcGBJIp7Qf3Aj+xKEl0alQaA0FzRGc/lwi2nsQrjvRj/HlIPsyUifQoqHsMEJ0vCd6oQfcNC+9go20XE5VtV7J7n0zrrestirUbAX3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7080 Received-SPF: pass client-ip=80.78.11.83; envelope-from=clement.mathieu--drif@eviden.com; helo=smarthost2.eviden.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Clément Mathieu--Drif The 'level' field in vtd_iotlb_key is an unsigned integer. We don't need to store level as an int in vtd_lookup_iotlb. VTDIOTLBPageInvInfo.mask is used in binary operations with addresses. Signed-off-by: Clément Mathieu--Drif Reviewed-by: Yi Liu --- hw/i386/intel_iommu.c | 2 +- hw/i386/intel_iommu_internal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index c3c0ecca71..c6474ae735 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -417,7 +417,7 @@ static VTDIOTLBEntry *vtd_lookup_iotlb(IntelIOMMUState *s, uint16_t source_id, { struct vtd_iotlb_key key; VTDIOTLBEntry *entry; - int level; + unsigned level; for (level = VTD_PT_LEVEL; level < VTD_PML4_LEVEL; level++) { key.gfn = vtd_get_iotlb_gfn(addr, level); diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h index b19f14ef63..bd20746318 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -506,7 +506,7 @@ struct VTDIOTLBPageInvInfo { uint16_t domain_id; uint32_t pasid; uint64_t addr; - uint8_t mask; + uint64_t mask; }; typedef struct VTDIOTLBPageInvInfo VTDIOTLBPageInvInfo;