From patchwork Thu May 2 15:29:17 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: 13651811 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 1A406C4345F for ; Thu, 2 May 2024 15:32:23 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2YNI-0003fG-Cy; Thu, 02 May 2024 11:29:32 -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 1s2YNG-0003db-0G for qemu-devel@nongnu.org; Thu, 02 May 2024 11:29:30 -0400 Received: from smarthost4.eviden.com ([80.78.11.85]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s2YNB-0005z0-Uk for qemu-devel@nongnu.org; Thu, 02 May 2024 11:29:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eviden.com; i=@eviden.com; q=dns/txt; s=mail; t=1714663766; x=1746199766; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=PMN2/YZ4hr8ioAnlB9SWX5lZ5wPmzGuhK2ljrPklk+8=; b=LfYj3qWUWMQfn8hDwFLQp5aoQFHb8qE3vpOoe1AFMwPIVcCrA37lW4NV +vvHXxZo6ZCY41hk1sKRTYX2jJ5OFhFyDEZCoSM9P36rRu90EqTLVwPW0 2+Hlqz6Mq9YYppWsKTFMI52mG8HouvrVmqzBqKLqJmnRIQ5tUyadBrKcM 4IWvN2dAIsu7ZXNgbcWHX91pOnBVeIywJcmSnB9GvNRzvIErfgXsVOaQX u8bOPFFYLRmu3Za3YX54xvhlYMpr5P59V0aim3KkiKnHFc5QYydBnpDfR AQBEBqzmQuCmA4O9mnt00Wul9jr5FInh2b3JgjJtQUDfsFehJuchHtS1O Q==; X-IronPort-AV: E=Sophos;i="6.07,247,1708383600"; d="scan'208";a="11785874" X-MGA-submission: MDEQ6+YV/wSmIPgAVcEG9NT8iFl5dXWIwJMnMkJaFz4GI8QYyM9c9bObEQSf9FRTGeGXQDn/IIPbzwCdfVmnqN20uyfcFxS1gJvR5ZMFJ4gfuPdip0Mub6zRJwPFx9MV03GTETU7e738+JSpGlgx9cdEt/0TjHWUFoPU3UabGmPF/Q== Received: from mail-db8eur05lp2104.outbound.protection.outlook.com (HELO EUR05-DB8-obe.outbound.protection.outlook.com) ([104.47.17.104]) by smarthost4.eviden.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 May 2024 17:29:18 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O0c5BYN+8d9hJ6wDwoLkxFFRZf+TcXqGypw4BxrGRDQrcEkyz5bn7H2xLysjghagX8U8I3Imm0XmnjxsOypprd5IA9aLAFhjsrtcxDhneytudKDPPj4CtfBYlDXUYIyyeCKP3mFR/KoJyNWcy6KLSJs2lwuSySrwp+qcB3IqPYKgjlUexd6BddYxbLhqOfQKBBU7ZGQ/x56iIC1Jmv1LwzmDJhncM4LxoXkZESFQOEwM1XSk62SQfY2SWfPPt29FI8H5pHOByabIiX+G0l8W+N6X+BQv4oAC+1LyqTscDecVV4gcoN8lNeHMnaQQqPMimYTTlRBE1ExAxi4KF/UBTw== 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=PMN2/YZ4hr8ioAnlB9SWX5lZ5wPmzGuhK2ljrPklk+8=; b=DKmf2fCSQtrm+A2eIxj0SNL/9oo4rszlMvSorqfgx/peaK28ZG98YK5gsFu9kjsfIqAZPXhHCrdxThNCOBfGoYwmkiG9M81gTqWBGOZ3B88OQ5+Z3BqzdatbN6Y+MVtFOd4HAC0tJ6rmiKgIvUMPjSEN4xXY7ngA3Xo6UcIZ488V3SCUJhuSyG8yHj2+Cri91z9L0m8j/ec2zhxVoSdTK2eqBm49kBsindgHbec2mjYJestvMUZvPK/Hr3WbwcX/kayPyIZDbBIOEsvrunfvp50u+mrVbhfTbMD6DxyTE/5bgnBMxpykDR7ONa3ooYG2OsNEeXdfeXkihAYkreNyIw== 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 Received: from AM8PR07MB7602.eurprd07.prod.outlook.com (2603:10a6:20b:24b::7) by PAWPR07MB9661.eurprd07.prod.outlook.com (2603:10a6:102:389::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.29; Thu, 2 May 2024 15:29:17 +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.7519.035; Thu, 2 May 2024 15:29:17 +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" , CLEMENT MATHIEU--DRIF Subject: [PATCH ats_vtd v1 02/24] intel_iommu: make types match Thread-Topic: [PATCH ats_vtd v1 02/24] intel_iommu: make types match Thread-Index: AQHanKV+D17/DXjLQk22A8eEISz9PA== Date: Thu, 2 May 2024 15:29:17 +0000 Message-ID: <20240502152810.187492-3-clement.mathieu--drif@eviden.com> References: <20240502152810.187492-1-clement.mathieu--drif@eviden.com> In-Reply-To: <20240502152810.187492-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_|PAWPR07MB9661:EE_ x-ms-office365-filtering-correlation-id: f2adef8a-e8a1-4d6b-8da2-08dc6abca13d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230031|366007|1800799015|376005|38070700009; x-microsoft-antispam-message-info: =?utf-8?q?G31HP6dDGmgsp4vj7PkQAN3L890DiFa?= =?utf-8?q?eEswocEIqnxoiO/rd3SQeuYAh6bSY8EwqlG0KSxPsxRw3UhgGM94ayy8L2uNFaZ5j?= =?utf-8?q?izgVB4yjjksVIcGHgukX4k98ii5CE/spLH8yw7Fh5oY09rUzoYFGiMYVI18mLt7Rs?= =?utf-8?q?PQNexTV83cctyYTKsPEiEkHvA89yAvBjAhmg+5dG6GHqT6bBSKc9sZ0GkjCeqANc5?= =?utf-8?q?SwbrsclDoVAK/rWtCrRzft1x369UF/hGxVJTc7nppmgFGLnntSK74SMi9mbm2AXWo?= =?utf-8?q?AIUQF/kafa3XIb3kooAHGw5jk7r9an1XVZ/qoPkxi153jcv7NUCWG3adwK3SJgyrv?= =?utf-8?q?U+csIJFjRZ1bNamaxmO1pTj+m7mlfd9dFd8WUflCUOr5R3e3RpLPn6XKF1exONOiz?= =?utf-8?q?qd0d8M57MeO4cV4tcFRuw+a4qasBQ9yYunJws7gmOemYNFzLF6Y6ZhfAdsnqJHkvR?= =?utf-8?q?5dvUjakMw5sPbAP8Feou+vsKgCI2ngjJ2ZT4qh/NjvUg1chUN0tHBrbdOGelwEc5b?= =?utf-8?q?gGVjDonYU2FBvY5eb136hyAd861yySlgmx/mLEXTnAtCy/ePVr4+y53csMRSURm7P?= =?utf-8?q?3tE/d0/oOCzfNKfVaoHJHJOTU8bZ235qh6/edWxfQoTpDEcIGVwcfTc0ty1HmN2kn?= =?utf-8?q?v9tdV+aawF3Y5WYsVNVhMyP9DzmyNxkJbSt1yOcduQ+YnCnaHzFJ5sihGUTiPgmRG?= =?utf-8?q?W2Bnqhb56q6oGL4uqneH0IeQ7IbnMvHC9cE5IStDb7vF0qEmGyydtR4EHGWj9I2Sx?= =?utf-8?q?W4S2ICrQVnqh71onuEHOOHwvdbxd8WjS5NOIu/SNiK0PCgM55F7n+21oNz2sNfy+u?= =?utf-8?q?0MovzMc0Q4GR4MkBtB+Gq0qHbGax0RmRSBlSBrokyTYHndi7tD1rYW9mNo8CY5iG4?= =?utf-8?q?KT8y9oIbDIVCu3rZ8shnftODTS0+2xg3W5PyFUYuv3lLZfcGh4txqd1hSELwntIHL?= =?utf-8?q?Xhk2tK4n7lR2T4Zgys9M3jZtJesAYdaOO319fogvm7QNkLMwerCDR6nFuQlVcZ5Bn?= =?utf-8?q?cEHIC8Dt/kHGVuR62JQTw3CA2+t1NHRXkSOoxfxuxzu2bV6W1pSSm2X1C20aEOFt7?= =?utf-8?q?zNqmcQ4dJVGVrx9mstgFMmXV8N+WhGWkgjSv4cmM46FUWUkNjPYlA9teH3vl8bgZn?= =?utf-8?q?dCuBPJaSGugDNsAqpgKxHfC4Ugzoc+W6kVMu40JB91Hcby40O7/TxCX5reTbKSZAd?= =?utf-8?q?lQUlJBqo6D9aLMuJ2G53LFJ8oMBGBcT2QdZcFFDL+JCDD2pwleebkT2lOxASkCmVI?= =?utf-8?q?de6ONCaYXz/ahOTkIvjAIxvqgejj5XsXnhg=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:(13230031)(366007)(1800799015)(376005)(38070700009); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?tKeqi73rcbz31nYWGazJJonGCjbA?= =?utf-8?q?gbemh3zxqo8hXhpp7R0zO+UAWiZJFa9RxdVHoCQKgw33nSRV1vWrHfdcRruaX662R?= =?utf-8?q?7LS5QS+EHwl2MLKYWY1H6ekNRY2WwR+j0jBSWl94A8BirXEwUTpfBlQX2OVSSJmca?= =?utf-8?q?/lCGmjCONj/jVHGL/+7XleCRef9hGuXlmfGJvodHW3/SaExX7gJQY1+h5l/6vyh0f?= =?utf-8?q?kqrDNYYX4+gSpyrmPskb+kdO8SVmzsKTrl91c2EbqA10WIXNdA8k0CMrCrCRtV1xS?= =?utf-8?q?YQw+4iUS2GivLb3/qIRKS6B/fNUQH9dnvm8/Le5rMHrgB/9eRTLwufvcJCdzhEh2d?= =?utf-8?q?obICs7F9NGG6s1ZnFi7WTzjMV89wDbSZ8vl1QSZ+LSXu3XG23df7iUU/YuA+pMFC8?= =?utf-8?q?evkw2d/MY1jX/6Phxu/e3UdhsJCX+G6fdSgynE7iUhCvrMAGcetii+G2fTwn0qGEe?= =?utf-8?q?dkSE+SvNhcWIl19e5edlDnM8IXy9pVzvi5SMSqaokGPeQRMEw/f3It+spAP4LOqqG?= =?utf-8?q?NS1SiVPrEKAG43o+hivGLJlhO3pxFKf8mtHRCW5Qfv0BS8eEYYn4Fv2oyYy0WJs8A?= =?utf-8?q?bOvnJ54w2H6sJYC7TnqwGoB0c2mHPoeGmDmPMi9un9CGTP3vZyeEkAy9pNWrYu9V2?= =?utf-8?q?QhwRR2aidALI/0gl5KITJT/6n4x/dw91x4MK/b/bM98yzDT83w02qheqBJ5inG9jT?= =?utf-8?q?kCfSKIwPhPI2SjL9nuYmsBJmVRtzoDASW8eazjn1UWfobfmlaZ1Z++tiZMFYJImyT?= =?utf-8?q?Hc6ZWiHEccXkIy5xXjaueN4Mp5xBxEahZ0czM831C/gxjzP38x5QCaqwt6miQpK4G?= =?utf-8?q?5a6OwzP1a2vrjU+uXi6f4y9ngYhNShUGirNn4ZYa9lMoTcUhgUxhJfV+j1eTcO36i?= =?utf-8?q?44AjIKc0mpWTDsaD1FPvuO68dZZuRhy+m9IsJbS0Zpesikpr/vgLHcCH/IN2m4k9V?= =?utf-8?q?CkIhFvwIH2oy88/U5z7y/9Su8dECZH21cnxIqxABR3zhObFcQz7MRzUAnhnxMZi2r?= =?utf-8?q?i3IoxrilFn37Vj7rN7oce8wnBDlGfd7vgBZugaPaY5NmY0spQVpE3VI4JaxxDDqdS?= =?utf-8?q?8KYcB+vhZi6Wr/xrtCouhRBOuV7pL8GIIRH44o1fWWEQvmBpVZxaLpcQOXNR4unh1?= =?utf-8?q?KA5vxCqOen9pcXOPpItFrW/hO27OD3i8ba3JTjiYF9v/wzxgvG6gPuOBMfvIndtm8?= =?utf-8?q?xKCE2w1hQGIWYjIdEK8fO9Wy+jIzEvL2sMqytzb85qfKOCl/mbFqi6qrX2API07A9?= =?utf-8?q?4yuEljvMyysqVax1rmX+ioP5I6obfVm3Ez7/7aEKz/AL0r7GPQJsXQgZ3fKVb3bDX?= =?utf-8?q?9AuQWtRshh/4njBu/zSqs86OKcp5oGRjvheZORAv+DWDHhNZ9TavJxHeEE1U6iCa0?= =?utf-8?q?zddpUDpQjGOLPK7/cB5f1Lm8RQLrOelAulRrz1olqXsItKQhUsesoPedkIkQKHjGl?= =?utf-8?q?N9TY1Vf208rkMsZv8GmJWwu6blhogEBn5Rdq64ktO6cgEnDzzkQGCSbRNnw+sqERJ?= =?utf-8?q?opK+ertxQfQ+1l3zbX4yjdQFSIN3ryqoNWNYJ3eAeKwcDaM/W/90gD0=3D?= Content-ID: 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: f2adef8a-e8a1-4d6b-8da2-08dc6abca13d X-MS-Exchange-CrossTenant-originalarrivaltime: 02 May 2024 15:29:17.1269 (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: jSadikAUYTBJLIvSy1THOxBI9pOmUHSQaVRcEjR9oFWNsvg6+Kv//QrvJ7c0qMFuLPQtABNMcXYOqki/+sdBbs2W6Jo2+f588TDVV27VOZeMRp3xBYugxL5aXFZGy+Zm X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR07MB9661 Received-SPF: pass client-ip=80.78.11.85; envelope-from=clement.mathieu--drif@eviden.com; helo=smarthost4.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 The 'level' field in vtd_iotlb_key is an uint8_t. We don't need to store level as an int in vtd_lookup_iotlb (avoids a 'loosing precision' warning). VTDIOTLBPageInvInfo.mask is used in binary operations with addresses. Signed-off-by: Clément Mathieu--Drif --- 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 70735e2379..80cdf37870 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -386,7 +386,7 @@ static VTDIOTLBEntry *vtd_lookup_iotlb(IntelIOMMUState *s, uint16_t source_id, { struct vtd_iotlb_key key; VTDIOTLBEntry *entry; - int level; + uint8_t level; for (level = VTD_SL_PT_LEVEL; level < VTD_SL_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 4f6b0154b5..901691afb9 100644 --- a/hw/i386/intel_iommu_internal.h +++ b/hw/i386/intel_iommu_internal.h @@ -473,7 +473,7 @@ struct VTDIOTLBPageInvInfo { uint16_t domain_id; uint32_t pasid; uint64_t addr; - uint8_t mask; + uint64_t mask; }; typedef struct VTDIOTLBPageInvInfo VTDIOTLBPageInvInfo;