From patchwork Wed May 15 07:14:14 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: 13664737 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 DFECFC41513 for ; Wed, 15 May 2024 07:15:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s78qJ-0004XU-99; Wed, 15 May 2024 03:14:27 -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 1s78qI-0004XB-0k for qemu-devel@nongnu.org; Wed, 15 May 2024 03:14:26 -0400 Received: from smarthost3.eviden.com ([80.78.11.84]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s78qD-0000oi-No for qemu-devel@nongnu.org; Wed, 15 May 2024 03:14:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eviden.com; i=@eviden.com; q=dns/txt; s=mail; t=1715757261; x=1747293261; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=PMN2/YZ4hr8ioAnlB9SWX5lZ5wPmzGuhK2ljrPklk+8=; b=r5YSsRb1lCSbps2z+B5VHHz3rxYO8sC1Ko5+oPUDbvlcbyCxglJlIdZW +/yZTneWOx1dDofl/6LN7JqgmOeKz9GDDq38SqyCDf1VeN9+DBsXLu2OV vq7f+axdL4aoo2OJ2Rdxc6e5Pl2S60vRzvKkkJAuHGFs2ZoPpJZLUO9Fd IVW1dvG0zxkGghpziEpI20GD/NzVUuYSiOH3JYTd9PNXOFNPBho284eO0 cFDHmLb0eigz69Yqv97vrZkKT8nyxyb1Q2N1AHh6iDXZjveUNUQXYpTeD votmfgmE6E3FVkGnuKR1b6wtnZf1fE90tiy+w+OZiOZrN22Si4KWFRpty Q==; X-IronPort-AV: E=Sophos;i="6.08,161,1712613600"; d="scan'208";a="12581793" X-MGA-submission: MDEY7VqxBRDW9HoLGQwG05wxTjZBoaUi6o/VJvrEfLtbZqreNFW4x+bhF/jv25gH6yUkhj2lFC3gf4HnG/fMNyUHFrerWeyLBB9f9ZhxE309iNHzz7QIB35xvKDWLgY6/tc2zyUsHOP8J2fCvTIJWC2xfpUUyo6IcskqKDz+oq+oSA== Received: from mail-db8eur05lp2104.outbound.protection.outlook.com (HELO EUR05-DB8-obe.outbound.protection.outlook.com) ([104.47.17.104]) by smarthost3.eviden.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 09:14:16 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZB7Gdo6sD525RSSwdyJ9Hxkixzj+sGTwPZYTkWuv10zY8CLdaWwp+fhMW/l39gChx+vZ2xpq+4x7bqAPG3qJaxEGpTcCSfOEiiidLVzMhfsEA+VCtuKciIExxE5XAWGWmy0a7/p7+IDxm63ogugXDud1L6aaGkEE+U6b5MTegE1tkN3xS824MhX+rs3tUtN5xU79nSroFmosW/r4eyT8SeCPjCAzedDACqATfGMNBiKm2gV8d+05xlFckLhmVkFsPI7e3DSnUiN5/Kkh8SUu9r024Nnk9hakIs2Cveiusc772AtKgpSCq9kIhM0MtT46LkVmBCAH+OKiKP/LNwXPFQ== 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=j85GBVGhbgZoZ5OSZyPl0kmnopmIpNe9aiGer3vUvrX9kScEsvZvccyh6B65i07thxzJzi24+zV1ECyBwlsom4x6ONecTL1lKUl0Rk7RRc2oDbs9MVmE9zFJ02gyyVg1LiLr+GVcaC8W3sx8uowcUjOSoQAq7N67wrSLLkq54kHPDlihHwgTWnC5KbD6bg4GpO9mnzPIjsR7YOk98kZiVyG1bgt7CqHGHN6OvHYH/AnzYoRk6c8AFCLwRuAI3KAY9QsTBjK+v0aZA2Fhg6IttgjjwK7PEaGFjbUL+6Od3gSUs7F05WUpFDlEel2jpL9aSaeUZEft73t+W278GASxAA== 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 AS5PR07MB9896.eurprd07.prod.outlook.com (2603:10a6:20b:676::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Wed, 15 May 2024 07:14:14 +0000 Received: from AM8PR07MB7602.eurprd07.prod.outlook.com ([fe80::fbd7:ca71:b636:6f9d]) by AM8PR07MB7602.eurprd07.prod.outlook.com ([fe80::fbd7:ca71:b636:6f9d%5]) with mapi id 15.20.7544.056; Wed, 15 May 2024 07:14:14 +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 v2 02/25] intel_iommu: make types match Thread-Topic: [PATCH ats_vtd v2 02/25] intel_iommu: make types match Thread-Index: AQHappd9882RJ9fKeUKo9Sr4V6SJrw== Date: Wed, 15 May 2024 07:14:14 +0000 Message-ID: <20240515071057.33990-3-clement.mathieu--drif@eviden.com> References: <20240515071057.33990-1-clement.mathieu--drif@eviden.com> In-Reply-To: <20240515071057.33990-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_|AS5PR07MB9896:EE_ x-ms-office365-filtering-correlation-id: 3b4cfcaa-542a-499e-fd00-08dc74aea07b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230031|376005|366007|1800799015|38070700009; x-microsoft-antispam-message-info: =?utf-8?q?ZJ3zN9sP+tGTAaiHd/F5tfgU7LOaA5I?= =?utf-8?q?JZKp/9Vtb8rxzoeTXRbs2Bo3bER9Fj3crxWKUFrEY3v+kCPPZknzQhgYm9/95j89e?= =?utf-8?q?29EBshjIiFA5GIN3tVAs9pP3mgdQ8uQJNtdfsFd5ANgCKPwoA9AJeDvNmg7x4LUmD?= =?utf-8?q?mJPmhm1Z/pH+0m1FDFNNv96cmgk6A7NKcpHTSziHM8hXO3IVEeZJwm3FT79eE+brL?= =?utf-8?q?HyMcHxT0rXdimlAHqtfnSemW9DjPkBaPZ65tE/9s03SIdv/ViRswntcQieUNArQPX?= =?utf-8?q?vGl3JJ/YC2g3ANdI08aJKhZdQiPH1Z0d0NMQ5m5D/A4lBTlqrAtyaHS0f2SlOZAVE?= =?utf-8?q?Vjk9snP9li8WdaQyfUsbC4Qy/D4JIkVKqzvlRIXt40Howe3mdbOHeZBFZ8U4Jum51?= =?utf-8?q?c2oLNMsBUeO8WDogbFg/XMoTITJzDwblGy3H1EvkBUSwrIV2j6faB28AJ3kBDNUFS?= =?utf-8?q?87eLp2lns93S7XNnIcoVSPSm+cjDAKSpc/k8gpLaLir5UoYbVvLBajrGfMc7/4CWh?= =?utf-8?q?jemP1+lLlKPy2oKgxdgWxZVQSn+wB1HZGcRDSl4H518r4A5cEaN/n+6FRgE+msG9Y?= =?utf-8?q?RALNkTWJG1Qh2o6AeUI73QXa6ITVoUhM8cs422jedc1PO9JMMXdQXU5EDgkM9QH64?= =?utf-8?q?sBB+CryANsLgDkeAgOD/tSlOX/oVgUUfCSSuPm2wgOaweRh9sJTVGtNyz2gD/uikO?= =?utf-8?q?mtzlo6+z+FJDS97qKbYmrjXfwZwrcwPkQWa8qzUJ+O5lF81Q8xCombPJE9P8fWbho?= =?utf-8?q?/N6v7336Hen7XtAgORUAMwt5jManxTYF2OEx9sIaUP1+PErWdmQd3B4hQbW/e/ar1?= =?utf-8?q?uryMXOdOMfn9D1b3c+g9Mg/wpWksz871Ff8Rh2wB6wXQyzj3C7M8thKNs7BhEwxEM?= =?utf-8?q?EJ1oXh/Zgm0N8NsPp6U4UCa52GqEbTK330vqqtoDOHhtpbY50PBAWTPSXx6qJ8PIt?= =?utf-8?q?BlYdld71grO6PWFzklTI6XwA15EedPCYHVPPRpQLTG5AIsRLr4fXC7g0y0+824904?= =?utf-8?q?E8qiE0L6nhUvaveWjjFthv7TJBivR7jJG1dBZc2WxyBz1Qr86jm9lDKMU8oX1CroO?= =?utf-8?q?H+qs9TCAECUIZ9gN0VPY1HHQXACMJ/OdRGraBvL5BuL5um+eMip89MIzqFOip7oAA?= =?utf-8?q?q0kQVZuMFKP1cbZ9P7PhcJH78z9W/sUinUryxlr544Z5E9gDqklPkOOPc7z6teFss?= =?utf-8?q?Vqa4MmXdWopqspa3KXMJdD8dsjrkJOAKWBmZASo4JWpnjqs559Dym6r2bQQsaiTaa?= =?utf-8?q?VM8k2VyGVUbUeEUKA7lGmnq/O6vvDI2i0MQ=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)(376005)(366007)(1800799015)(38070700009); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?aD678b29DwIoFtKVupZhLyngSeWn?= =?utf-8?q?eTZQWkt2p/Rd2aFzJKNd6eOEL9u7Lt/FHfltezsbm2LRnTnQGGzdJsLprJIpikgGe?= =?utf-8?q?2zGWcQABjsvVVMZ/hSaTcrRgUENxunLoY6G756mVzsJr8Y6+zwABlq1Z3/19ZOqrd?= =?utf-8?q?HXRnDZvbkX0WORs5r1or0kjuWy8FQ8r5Zg8+rw0ZCmc/rPJcxjbiIZuiLIzxXaenK?= =?utf-8?q?tBWMiC26t0WYrf1oYaNVi67sFjtWoWJtVVLt+y0v3PqaRFZNrCPZUxEW9y+ZDTKGW?= =?utf-8?q?vOlM0Ic125FyFxPeKSF1J7fgzRoDErYP1iVNW2Rzs6rO31ZviT4b4umDZWlYe2eIh?= =?utf-8?q?WsIyEWAYPcx4y8Ae/v2J2Gz4IGQHpK0KG7R6p4Yx4tkxgqHSsmkNGUVKdtXkHk4Ag?= =?utf-8?q?vRG/B3X7vwPBYdTQASGCOR3JDGFvUssWprUGLtyk50OQS33VEVgFMv6Im+lohs1hP?= =?utf-8?q?kd3SAC7LecKyy5hhN6pa+406qrNBWN0m+81bSQQGE4LVxnRQv7IZQa8CDgrn7iPPd?= =?utf-8?q?k1HoHR/psZvn5qobHszdJ3+SFZwc9x0kr/FbiTnFgXkn+GjcWyioz1MlpBadfo8cv?= =?utf-8?q?rb8NZ9WKcfxyhGob2sT7DAYGY0EGeafDdk8IzguGbzEXb4d7BTpi59B1m3AqOJZDg?= =?utf-8?q?XHJJvJxgb/5SNZxdeiKJQCVwQbwpBewdv3of1a7Xg5N7F8TQYIOhq3ML62AIAZ9pd?= =?utf-8?q?klisIH2Cc8vWtTeuAMqHc1E22IknYFNQw/w/IbRxXW+iwAwcSUT5DQlkRc/JHPF8y?= =?utf-8?q?4yaxrmlZdyg1bdk9dqEn0WxdAsxJqcc73kvr7bEBbQ1Ea2ssiEmPgMz1gpEvLdnCI?= =?utf-8?q?kJ2x1DDJU5xyHrk/Rz2lPGkoAVae5tRpcW5AKf5B5aWzyXMv9L7fFUd8imBQqshtq?= =?utf-8?q?j4pj4nR1rbm0WQ6jQl6yuITO7T7/VrVjiFdlQrKIlIpg8PQk6Z076xxb5k9VIlEIL?= =?utf-8?q?2Rt2WA85mM5SvLc7B86+XbbAKw7m4HW+UmeLAxG1dNxkafcYTM8fn+0SeP4QPwf1Z?= =?utf-8?q?QUrcxHoqDU7ZKf3sTF7bk8xcJx8xp3V6F/o8eK8wr5s433QkZ4TTBd34XWuhNYb0v?= =?utf-8?q?p8SjUnOqr6M+P9Vu5XtNazzqmcW+nxKS7PLFoLQHfQ4Bzy5g8pJY+Ei//1mle8BRf?= =?utf-8?q?io9JOdsxWCSQ1bf1PQFDn5byOzTzS1uk3LJs8kOeJ67JXvk1M4SN6RNTMJraH8qyp?= =?utf-8?q?KtFnOMx+TUqyQngBJkZoY+cxKRSeeDyymRWTcnp22eTbpONpTyAGcvp7BQg5VziO2?= =?utf-8?q?AGRmP+wXrvzHkmI2+SNvRMSHYfeQIuREdve1G4qBvY59on5JFh5XkVfm3PlDF1sMx?= =?utf-8?q?kRv+hJTvuCQPexi9zt6DTqp5E0ZTTfNa6myZGoiRtmOPUpKoNcnGRj8bb99KrHOq0?= =?utf-8?q?SR5Yo4kqkGPhYSz9+gzJYd7Y9J4iVOt5cseT3Zcv1sLoFrCotwPXbf3iywa2nXQ8i?= =?utf-8?q?8p4whNPMy/pFGc/cWs5dCYezt1Uty2qndjuokN4EEyDrih/ufu5v2L+reh6/A9Kas?= =?utf-8?q?PMRZN4gArypHmzAFBw6Z28y51hhN1MdD0SeLEINSiNsi28AjmxR7QwE=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: 3b4cfcaa-542a-499e-fd00-08dc74aea07b X-MS-Exchange-CrossTenant-originalarrivaltime: 15 May 2024 07:14:14.4798 (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: gZyqvtyxkidNwvf8U00jvGQk1Gx62TVnrC+9j7nS5UvNuIcXWXeolFmoYBJBmX1sH+hatUhrjyl6bqJbpd6zeC0MxPWmZcmx9NYbkq6X2h0l3OZgo4hJ6RtTkdiMtzcz X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR07MB9896 Received-SPF: pass client-ip=80.78.11.84; envelope-from=clement.mathieu--drif@eviden.com; helo=smarthost3.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;