From patchwork Fri Mar 14 13:34:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Poturai X-Patchwork-Id: 14016905 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 86C3FC35FF7 for ; Fri, 14 Mar 2025 13:35:08 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.914588.1320319 (Exim 4.92) (envelope-from ) id 1tt5Bi-000409-9R; Fri, 14 Mar 2025 13:34:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 914588.1320319; Fri, 14 Mar 2025 13:34:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt5Bi-000400-62; Fri, 14 Mar 2025 13:34:58 +0000 Received: by outflank-mailman (input) for mailman id 914588; Fri, 14 Mar 2025 13:34:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt5Bg-0003Jp-Ex for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 13:34:56 +0000 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazlp170120003.outbound.protection.outlook.com [2a01:111:f403:c200::3]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1d6a46df-00d9-11f0-9898-31a8f345e629; Fri, 14 Mar 2025 14:34:55 +0100 (CET) Received: from PAVPR03MB10102.eurprd03.prod.outlook.com (2603:10a6:102:30d::12) by PAXPR03MB7950.eurprd03.prod.outlook.com (2603:10a6:102:219::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.28; Fri, 14 Mar 2025 13:34:51 +0000 Received: from PAVPR03MB10102.eurprd03.prod.outlook.com ([fe80::35ac:8893:c31c:b971]) by PAVPR03MB10102.eurprd03.prod.outlook.com ([fe80::35ac:8893:c31c:b971%3]) with mapi id 15.20.8511.026; Fri, 14 Mar 2025 13:34:51 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1d6a46df-00d9-11f0-9898-31a8f345e629 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cuS0BskdvjXgNGmjlnKVEgcB3XzNFYBbyb0CxqlOcnzLReh+is3W+MI7TV5yx44IigNBfcU17XteQvYOB8niNVo++k+nc4tRu52A+4Md5b+9IzB0pi5mxRFit025O925F5izYlmvPN/gPuJiaubsIUcY1aRA9K8QN/8Ke9mqWoPoTmC4uRc4EJq3Chikjt0ZWfVxZE+pLnM9hIBM/FnB457P4vJU2WPlVHMa2XeFpAU8S9XSBAvLxm63WqZE3HH62Jwgs7DMjBvx6THWAJTR1PR4KRhl2hJCq/rhtfEnIh4P0Q+NMrZZwAKG91pCiiB51rYQcoD9Fuo3y07Vmipc+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=SMWq/RIZ8Sv+e5l/RmuzHBIUH1oPPE/Mvx8WzQabMZ4=; b=cMqTzBrwQRqJ9j7j59/+n8qp4fEYPqHCU+QSVVQBprhPrvf6ufM0imXJ6B+brw//oN9JSI2dVxJdI+kg2H7sCP9kj+cvArkz20RXSvzfnFTwJWfJxJmSERLGOle0ZPLFJ5TYyvFNU21XE8BgN7WkDvw/sNiIJMBp0r2EHGDfF1puTaHiNTMrh0uCi3u2tSIi5a5fZJgIynEB3bn3zeoAGAaFK4F/FRskS0I+f9MY/o7cbG8TVgCZ2kwtqJMUNOgJqZtmIKjvisKcGyEJ8e/GXWvBEcx2ap4Tvs+xijpBSAOQqsp+OvFVRW75Iv6vzXU+2+SUr3Ptbm4fvJCIm/wKnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=epam.com; dmarc=pass action=none header.from=epam.com; dkim=pass header.d=epam.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=epam.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SMWq/RIZ8Sv+e5l/RmuzHBIUH1oPPE/Mvx8WzQabMZ4=; b=uvpjKPtBU+rfGTLhwlEhZ1bID9nbKPE1vN6refCjdKaPsbKrKxrmw89xe5P3Bef91yP1h2fFTIInUY5lNEYDTniThApbFEt6kQQCqZL38K8wU7oIue6sjdrQ1v/1gwKGmNlQxSjAseYECLUGH+4XischsWbL3gMwtLE9dDeWtUhTJh/yyh2nXnpaY2Z4anbaFUiAFeml2/lUQXPEl6w/71g58mrqXJRwClRAObcKzDIiHtYmGncnMD0KI7hSlNskDhKhZUbheg511LygGLSz648OcY/tPDxXoZt4dwwRNJXgXxWxZtGDqbW//qFk3sWwUVZTVsj2iX5arB941v6sPw== From: Mykyta Poturai To: "xen-devel@lists.xenproject.org" CC: Stewart Hildebrand , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel Subject: [PATCH v9 3/8] iommu/arm: iommu_add_dt_pci_sideband_ids phantom handling Thread-Topic: [PATCH v9 3/8] iommu/arm: iommu_add_dt_pci_sideband_ids phantom handling Thread-Index: AQHblOXciFlCTG2d9UO3pZAlFjZPOg== Date: Fri, 14 Mar 2025 13:34:50 +0000 Message-ID: References: In-Reply-To: Accept-Language: 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=epam.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR03MB10102:EE_|PAXPR03MB7950:EE_ x-ms-office365-filtering-correlation-id: 5c33cf1c-0b4e-4ac6-9148-08dd62fcff39 x-ld-processed: b41b72d0-4e9f-4c26-8a69-f949f367c91d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230040|376014|366016|1800799024|38070700018; x-microsoft-antispam-message-info: =?iso-8859-1?q?nJbHMB7gLCW+0tg+z3a4MqjQvA?= =?iso-8859-1?q?+cgMlwh2w2fymm2cij+EZVxFlYvrhBkNSoY0I04YAC3yoY3cYE0dwvSIxGvt?= =?iso-8859-1?q?vsUM1wlfMuBOB9aLF4BE3AZTfdH1eZjZwBazXbaRunX+jTvs5sJD+yP7fpBD?= =?iso-8859-1?q?qCoc0g0Niew41vi+cFjsWLiW7CavA2id6pRad8tdxsRAxC9YhbXYgmFwhfNk?= =?iso-8859-1?q?HvUUUYzw1RO0Yi+N4LWpVOXGpPhYQat8oDAj/YYcd32uAisV0tc8Vjk30BvC?= =?iso-8859-1?q?w4G9biTrrUzcWblAHUu05RtXPYq65DS1frOTx10zv8TwFR5jZOqNnoSCRxtS?= =?iso-8859-1?q?Gc5/fM5ylUM3X35c4rNgYA1BauRLHf12pFLDWiqFwOgXGBMzmpES2x3VbqjB?= =?iso-8859-1?q?bzodo/gsfTq71fw1B58fR7o0uZxweg83nuQc4ebMX5OYNk7jlaWd1HwinvOF?= =?iso-8859-1?q?y71M65u5/P4GJjC9or//00jgGT2QEDu+Neql3qJTcPw+ohLbXC8SXqTR/Pfj?= =?iso-8859-1?q?iukjTTvegfnfDOOk+IL5XW0xW195lm8Q0T9p1jJsjk5WNo49p6x5S6MUg3NF?= =?iso-8859-1?q?Kd4msHgqRgplpk1nfkwOBe5TQ+8W42h43dt92INiwfXdOJ6n9hcDCJWHgSuy?= =?iso-8859-1?q?ro+YCozfUTZQDYS9pQPY+jAcUIzhmiCo5zKb4/KVJgX/sh/4SdmS5dUcXZNt?= =?iso-8859-1?q?JZkEHoMBcWdzg+dnXWnCDsi0Eb6DzRhGx4CEYjZw0wIHYvKQK8JiZMtfJSfX?= =?iso-8859-1?q?IYPAqqqnXnmXdJ+OmufsMV+Y63zD1hVfQcdaybLcQD+oxzFrdc3YJ70RjJ43?= =?iso-8859-1?q?2Buz58KmA7EN66pbsuzoZAtQkdrMZLzPnLGviUlxKGJgeVgINzue6y0XiyC6?= =?iso-8859-1?q?qIy3P/cD2YJgMfjCx6Aj549V6uU/ugl75x1uT334RwSxGJ+5LjZerv5zRRlq?= =?iso-8859-1?q?5qxSJmImWBnMJQCWPv8S07HTG7J/c3WJ7CTrNDLA3VvC6Nyzsq+Q4g5MxCK4?= =?iso-8859-1?q?tGBPtpfTIwgZ2xJZt1Q3zBjQxgtTc32aJkO7SkEFfb76+XglBoMgdy9ZEuvm?= =?iso-8859-1?q?iZyW3UmVfJnKAUKDgIWzMvflZm/P6Gm4fHCsFaV4f6RZr6rLal+ccKAH4oUn?= =?iso-8859-1?q?X7j6uAzF+TE2xZIo7OkyZfpvc9B/8P5u1ttxrUhBqeIOBOV5PoJ83MZ0Oy4m?= =?iso-8859-1?q?0fNQQguvlzr2IXis8d4tDM+z+B0BmmTy07cXWBjzBCAlhctd3HgdGeIkjDQm?= =?iso-8859-1?q?utzYdmYulzZlaMxYC11D1olvnMFpT9WJMQyjkVCE4Gq5vaROQk1emx750eHm?= =?iso-8859-1?q?0DsDTbl7NfZet1dSnc4veZDfkt4yHfZBjZaYBUkKNWB/ZYwB1jmj5diNE0q1?= =?iso-8859-1?q?+IAU5dZV5fPM4QgYnroA/Oh7cupSC4nzYY9rz0m6KBZai3o1RngKQ8VY+Pvd?= =?iso-8859-1?q?taBoOTYXOgEIRUef7YM8YnVyebS7t/3AY1bSVPjqg7yodMPB/2zRn0aebGJ5?= =?iso-8859-1?q?Bo/vMZ?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAVPR03MB10102.eurprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(38070700018);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?Bn3MjBRYhd+6cPCxa7Z6ajj?= =?iso-8859-1?q?+h+wsUxLMUYVkB9Eb0q2X1V1Nlzc0jtULNqNchPi7IGcvRKd64v8bZeepUU6?= =?iso-8859-1?q?2T2+qj7FCK64cT+u4dafPezsxL7yzgU6Zsl1aRqhlk9dL8aXzBC2mb0Wl1I5?= =?iso-8859-1?q?ifLhXE/O0KuwFlg0VamvungPPc2YXuvGE+uuPc+SttVtsXsW5HRn6MlNEt1N?= =?iso-8859-1?q?WRM7kYpJeSeBb4aKYw+AK4jOe1npoB1tB7g8v5wvMihSMdA73hAEqF9azPC5?= =?iso-8859-1?q?ud5moZFsj9S4K8wKAqNSmTJth5PwJeZOmLIQidYhxD+pAXb1Clx2Bwlx2SBW?= =?iso-8859-1?q?TgnIjTrOdY4taeO+4lk69LWQ/zPe6QdgPCf0BB37LcmE92EJby8ZpjVbso2y?= =?iso-8859-1?q?yBHzPk50wkAig1nPXQ+p2ydEAIYEb2EmVEV4+4JLRcegtezR+dRclHnfD7qC?= =?iso-8859-1?q?7Ml8TK3TTY2qNtpdq/5+aSAkK2A93NJgLA3KQVBH/IYxSkVCQ3Ht1kHvvfY5?= =?iso-8859-1?q?UcclmSpSXmCg4XkM/jdZiCkizjbE3vCG3H8aLyqp0yeUSXTn8lTMyPsDwmFX?= =?iso-8859-1?q?0pQ01Fe9HQS07Eo9wxjLrKa3cBsAnRWQgHGNXQwrilydBa5jQoI4Dga6hGCB?= =?iso-8859-1?q?ojiULmgeqo+BHyTzpu3TQ0Pv/ta/z7DgkDjFqkBIoEc5CraAMJKBwSIJAFIg?= =?iso-8859-1?q?aY3gi8PAjF7n5EhqcxvEtCG+0HLiS2vF3EscgDXzuvcMxkXJWup1I0gXKsA0?= =?iso-8859-1?q?HWcGGA58Ku3enL7wKtq6TsNt0Vzce4mPx8IlYSJoWLEm+LWZO4Oae/PxLx2c?= =?iso-8859-1?q?C3zQYuq5fnHPq+axBQSon62fJLiD6g2xHrn/pxEyMbcS4ZcRIxIqbJ5yyomk?= =?iso-8859-1?q?2uTlS5FGRVLEgddKYZCq/CqweOWdyjgjEa2ysKTQ310pE8K+YsyVdKcxJm20?= =?iso-8859-1?q?5fEo8Ksq9G3voBj60FjuoNwBcVhNskWKutQIhLIvCgbV6qSa0rlgWvUUPGb6?= =?iso-8859-1?q?EUOdShlrnC3UE/luOpnmFR9KwMjIKlVKfHw4DJxwzWvBTF4Surxm9isqyWY0?= =?iso-8859-1?q?D3Py2r4fY9+hex+QPfXd1OWfHcXD4m9UiWgkNKaANBmlgYl7Xgi2e7rFRyfg?= =?iso-8859-1?q?nmvFUdPiWZvv1WKufUUz3hBwOqM7LTi7BYzacWPlC/T1CiboeYLajCuc5ElI?= =?iso-8859-1?q?GaGCEbgR1eqH+i/+jSvfYwYJkiMHxOzP7EkzIi7zAqdCO0wtaudHmE3j5GlI?= =?iso-8859-1?q?HWHFG0X10Ej52OeGQpZX65qvTMiLM2qPNuUnjyP/NUzjesWroJRaq2lCuALR?= =?iso-8859-1?q?eh5ojdHlmR5xw5jpW+gGScH0xseCsyk5XQTfwG3Li4IppSm6Nb0aW3c4OJ4E?= =?iso-8859-1?q?FokanDkBek3O/hoIPVwtS81Qh9h3tC6KNdxZxIM97IZVjrDre31RowFhgwka?= =?iso-8859-1?q?VTF3aHR9DH+g5023mKw9zmgeCiBbXyDrzwKV2tbl8rP3i0JyioHMyfIAGBCe?= =?iso-8859-1?q?2O7c+4GHWaysQPJ3pytMxE3Ykg8cSP8U0Qh39m5sHVvf2fZ8eAEgfZvrivEZ?= =?iso-8859-1?q?S2GojpUBAJ4gTuVM8ZK9Fvz41nETawKU3oP+Jbg6Z/GVTxJm6ujYt9BRqyoi?= =?iso-8859-1?q?WlYG3SZKRdWLr0tE1yLuxIuRSq91VMYt4ENkvVw=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: epam.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PAVPR03MB10102.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c33cf1c-0b4e-4ac6-9148-08dd62fcff39 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Mar 2025 13:34:50.9215 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b41b72d0-4e9f-4c26-8a69-f949f367c91d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Fkxst15m7dLcDTeNQHQy5kJdRKgkiBf4hWrSP0FWl2sbKbBkqE6LHAJcnseSphPJBhdLOC2436S8p1bhQwJvJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR03MB7950 From: Stewart Hildebrand Handle phantom functions in iommu_add_dt_pci_sideband_ids(). Each phantom function will have a unique requestor ID (RID)/BDF. On ARM, we need to map/translate the RID/BDF to an AXI stream ID for each phantom function according to the pci-iommu device tree mapping [1]. The RID/BDF -> AXI stream ID mapping in DT could allow phantom devices (i.e. devices with phantom functions) to use different AXI stream IDs based on the (phantom) function. [1] https://www.kernel.org/doc/Documentation/devicetree/bindings/pci/pci-iommu.txt Signed-off-by: Stewart Hildebrand --- v8->v9: * replace DT_NO_IOMMU with 1 v7->v8: * no change v6->v7: * no change v5->v6: * no change v4->v5: * no change v3->v4: * s/iommu_dt_pci_map_id/dt_map_id/ v2->v3: * new patch title (was: iommu/arm: iommu_add_dt_pci_device phantom handling) * rework loop to reduce duplication * s/iommu_fwspec_free(pci_to_dev(pdev))/iommu_fwspec_free(dev)/ v1->v2: * new patch --- TODO: investigate Jan's comment [2] [2] https://lore.kernel.org/xen-devel/806a2978-19fb-4d31-ab6a-35ea7317c8de@suse.com/ --- xen/drivers/passthrough/device_tree.c | 33 ++++++++++++++++----------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/device_tree.c b/xen/drivers/passthrough/device_tree.c index 37e1437b65..f5850a2607 100644 --- a/xen/drivers/passthrough/device_tree.c +++ b/xen/drivers/passthrough/device_tree.c @@ -169,6 +169,7 @@ int iommu_add_dt_pci_sideband_ids(struct pci_dev *pdev) struct device *dev = pci_to_dev(pdev); const struct dt_device_node *np; int rc; + unsigned int devfn = pdev->devfn; if ( !iommu_enabled ) return 1; @@ -183,21 +184,27 @@ int iommu_add_dt_pci_sideband_ids(struct pci_dev *pdev) if ( !np ) return -ENODEV; - /* - * According to the Documentation/devicetree/bindings/pci/pci-iommu.txt - * from Linux. - */ - rc = dt_map_id(np, PCI_BDF(pdev->bus, pdev->devfn), "iommu-map", - "iommu-map-mask", &iommu_spec.np, iommu_spec.args); - if ( rc ) - return (rc == -ENODEV) ? 1 : rc; + do { + /* + * According to the Documentation/devicetree/bindings/pci/pci-iommu.txt + * from Linux. + */ + rc = dt_map_id(np, PCI_BDF(pdev->bus, devfn), "iommu-map", + "iommu-map-mask", &iommu_spec.np, iommu_spec.args); + if ( rc ) + return (rc == -ENODEV) ? 1 : rc; - rc = iommu_dt_xlate(dev, &iommu_spec, ops); - if ( rc < 0 ) - { - iommu_fwspec_free(dev); - return -EINVAL; + rc = iommu_dt_xlate(dev, &iommu_spec, ops); + if ( rc < 0 ) + { + iommu_fwspec_free(dev); + return -EINVAL; + } + + devfn += pdev->phantom_stride; } + while ( (devfn != pdev->devfn) && + (PCI_SLOT(devfn) == PCI_SLOT(pdev->devfn)) ); return rc; }