From patchwork Mon Feb 26 08:48:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 13571598 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2054.outbound.protection.outlook.com [40.107.96.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 945CD5F85B; Mon, 26 Feb 2024 08:48:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937309; cv=fail; b=QLFw7HigesG1YjyljOMUAdQM8s74Fi4Lpr0P/eEdcqoXJHtEwX9wGdfryz8NIefV15yLGQ4UgKhgEWGdHi5aj7CwZK6Cqt0T0w5B7QugSK6VkXghpMKoCDQAuEIwVYlnoKgiV+tUZ/BTurR/Ok+PO3zFUpCxMLBvq8v9M4pr05I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937309; c=relaxed/simple; bh=ALwljT275X1oocuxixKkMr/CVnh5dDI8AARiZM459uk=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=YY3C/+WziJ1RStN+jzxbsvXDjInVj0BWbSYV4BWbkHNJD5nwYImoWacrErIEffqmkCKK+SfTMD3NXkrjqjhn9PNm3OtK8IbPjKDs+Xcs4OQwS056I5ZNXd9lHah61OXLmHFn8VBZ+XY3AvxTk+mDO+M37iI5YLW1sxp7MRETV64= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=a/E3n8eo; arc=fail smtp.client-ip=40.107.96.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="a/E3n8eo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gjY/Ps5WZdAxF3seaZiv9asoDchNllx1zWaxL2fPW7TrFTLWSNQNL1Wi35m5jw/pe/LZ+09Y1jawFGlUyoUoCWEfU1PsZsq/9Xm8E8lWNta1Owg2MNRnHKfgLmmNaU/ADeOeliNTVkUdwBkxFH2Us8zEHlp8z0lP18Xc1yrnAAlEVbaZhXRQqTBjO4nbqe5D8NrJ3LgRuuEg8W8NdOfCjx9WwM8oa4MbWB3spuW4j7ZzuoRX4ZvZpzsdZ4Lcm4KmNpN+RVsc0xbsFGXF0Fo37dq9wOud9bTJBTnl3Sw8rjpMrBvvTKIKiUSYiCjflHPDgSdn6Y5JsWrG6zFASnQ1Jw== 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=QT/p6S8B9O86DPpl4PbzwGQ4v4HXY0ioufqlPH65s54=; b=P84owdVbSaofftccNQOBIDrHse0uYJYsyKKoA/JA4MIqiIbBbyOj3MaoyvxhdbgJF/tbKazu58cDCUCTrNYtIAOY0BQFrhF4fIyc2DOQvO+aWpULmMWLe7CMs/SFKYACe5Vy4rZrFydmQy8A5OwVnaRqkpKbfHFe+rfeOK9L+wD+0SY5aRKyYhwcwzrDNUXyqlO6m6r0r0hGEi5osXQ76dMqUogUFy4bezpqRQvNhVKfovvDBuuGWitMMJ6BUwhr8+iUjzIamC0ZMeYZI79cHqrdA9Ldl02VlfqmV1g2PvB/7RKNVaJI1GtU1CdMnaW/NSvgmSTkqM3SQvGpzrHjyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QT/p6S8B9O86DPpl4PbzwGQ4v4HXY0ioufqlPH65s54=; b=a/E3n8eoFEZZuTScc+scbhorEj929OgXmL6WYn3o5YludnWllbW1eIBxy+OCCcNxzygYSfPLkn5vJjdZNdc5BnJy5y71taJilYbw/jFH8alweuYSZTYmJaXB3bsog2Hr7TjUyB1kzZV4zY4MVwXgwReWNMbB3dGNI7eqri5ymi0= Received: from DS7PR03CA0016.namprd03.prod.outlook.com (2603:10b6:5:3b8::21) by SJ2PR12MB7961.namprd12.prod.outlook.com (2603:10b6:a03:4c0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Mon, 26 Feb 2024 08:48:25 +0000 Received: from CY4PEPF0000EE3E.namprd03.prod.outlook.com (2603:10b6:5:3b8:cafe::b4) by DS7PR03CA0016.outlook.office365.com (2603:10b6:5:3b8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 08:48:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by CY4PEPF0000EE3E.mail.protection.outlook.com (10.167.242.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 08:48:24 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 26 Feb 2024 02:48:23 -0600 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 26 Feb 2024 00:48:23 -0800 Received: from xhdipdslab41.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Mon, 26 Feb 2024 02:48:19 -0600 From: Nipun Gupta To: , , , , CC: , , , , , , , , Nipun Gupta Subject: [PATCH v3 1/2] genirq/msi: add wrapper msi allocation API and export msi functions Date: Mon, 26 Feb 2024 14:18:12 +0530 Message-ID: <20240226084813.101432-1-nipun.gupta@amd.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3E:EE_|SJ2PR12MB7961:EE_ X-MS-Office365-Filtering-Correlation-Id: dcc006a5-5f7a-4303-7a76-08dc36a7b190 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Eyg5+OQLU1gBD3foB+iuZMNTXbVWreVmayNF+A20MznMTPi0wBNOzuTb6knS5NfLIVGXxMZZk0viNYGdPIKMmFVuBL7L+zlWwTozcRJBWXaw0vh1vsnuIPRMV2A1e3KY3iQiSHPkWGdEsriq642QPu+7OQLoNPlgdGMn7qcZG1WW1G8IVW2c4u60wjdzklsEVOL3M88EHFbSXpa632LfZa5QSB5obNmOnglITDv9VaoPxkI9OOuSHc7zJb/Zn69140d4tPEzZhVkvaFIf5kFwD+eDVEYHIg3g2zaxfSAFIVFjNgJ5UKePPrvAliXPkTtZiyncCiF+Rwls7jelzEZanSgK194ysrIA7CbVTCk9s8CU6BsO/9iJyZ+7vu1tl35gIl+gLrGQSyWptvPSs//5MXzEXxnuMKxFpKqrZ0P/gzkihQjTnchFULovvQgfQ09HtiJkbSijhQDb04bzeZVtdD8AdcNaRY5JkMjkBwMfOk95hOhVbvlTevg+ADIDljoi2RW+DrvNOp0wgWMBLrqXNoMU6tV2/RrnSR3e4qjjG1ONWSQ1QEGZ1dD81zGrtGn8FT4CHWUt5GmA3iI6+hdcR6Lr+DQ86uKBbHTc5pDGutaN3jroI01BBANZcPt0GtnMHPzwsLugFxTh5MezgHsy1jenhCrse+uwXzTBbWsuv1IwC4FVj2jCu1KWrssp9sNJHsDH0f4gajlhJz+hLIFt/y6Lh3Ni9hqi0wXoG9x374sS294+MrGctlvO83/dLLw X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 08:48:24.5148 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dcc006a5-5f7a-4303-7a76-08dc36a7b190 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB7961 MSI functions can be for allocation and free can be directly used by the device drivers without any wrapper provided by bus drivers. So export these MSI functions. Also, add a wrapper API to allocate MSIs providing only the number of IRQ's rather than range for simpler driver usage. Signed-off-by: Nipun Gupta --- Changes in v3: - New in this patch series. VFIO-CDX uses the new wrapper API msi_domain_alloc_irqs and exported APIs. (This patch is moved from CDX interrupt support to vfio-cdx patch, where these APIs are used). include/linux/msi.h | 6 ++++++ kernel/irq/msi.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/include/linux/msi.h b/include/linux/msi.h index ddace8c34dcf..a9f77cbc8847 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -658,6 +658,12 @@ void platform_msi_device_domain_free(struct irq_domain *domain, unsigned int vir void *platform_msi_get_host_data(struct irq_domain *domain); bool msi_device_has_isolated_msi(struct device *dev); + +static inline int msi_domain_alloc_irqs(struct device *dev, unsigned int domid, int nirqs) +{ + return msi_domain_alloc_irqs_range(dev, domid, 0, nirqs - 1); +} + #else /* CONFIG_GENERIC_MSI_IRQ */ static inline bool msi_device_has_isolated_msi(struct device *dev) { diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 79b4a58ba9c3..4a324f683858 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -1404,6 +1404,7 @@ int msi_domain_alloc_irqs_range(struct device *dev, unsigned int domid, msi_unlock_descs(dev); return ret; } +EXPORT_SYMBOL_GPL(msi_domain_alloc_irqs_range); /** * msi_domain_alloc_irqs_all_locked - Allocate all interrupts from a MSI interrupt domain @@ -1596,6 +1597,7 @@ void msi_domain_free_irqs_range(struct device *dev, unsigned int domid, msi_domain_free_irqs_range_locked(dev, domid, first, last); msi_unlock_descs(dev); } +EXPORT_SYMBOL_GPL(msi_domain_free_irqs_all); /** * msi_domain_free_irqs_all_locked - Free all interrupts from a MSI interrupt domain From patchwork Mon Feb 26 08:48:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 13571599 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2077.outbound.protection.outlook.com [40.107.223.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AB835FB8B; Mon, 26 Feb 2024 08:48:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937315; cv=fail; b=J3Rv1xtMJYcaXhbfhazN5WO2OFYgyy8Ejpb0U6Kdr0/Pd0DnMs/fd97PoFH6E0PPQbbB2MOWf3rms3XlnN9qWrkVV5HfYrR6x7TQydqfoP3133KIKOAtX6XrAcI2hN1kw9MYeihj/1A8OcTmk3itfRTxKJwC/umzvxsdYTFGyZ8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937315; c=relaxed/simple; bh=/aDe9D0KrhQ9o45UAq60HUpeCNPpDrJvU2jTKpVhH5Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UcZZmaLvKipWk68ERuKhJ446y42Z7lunQBktKT1D13PUYPothwYTY0SDRna3MD2kC4Ndi2orOOuS9Y5tif8C/1RMHQbR/kgc6KhmQkwVSRD/Z7KKGnjDeVt0cCKNYO9xE8vuCCbWhfJ2HIszUgZPqlTMEPa9Zfp0a2g9xpGLisw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=h1MAGBap; arc=fail smtp.client-ip=40.107.223.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="h1MAGBap" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RWn+30LSngLB+RrHL11LP1eSEtrXXNz+gImce3cU/of58wNgb+M7VquP3mmYFtiVsOP8cH1H9biy+DrPwbMsl+kqmoVwLgV6ZwK3oGnxCnprQQla7RZVoo4cUz6nIh3tAAseN+dLT+c2HciGDuud3y0SPGJxoZhs1OvBwJlg6CnnuFXEVsnWMlasX6HgctmA17Ghu0o2UZ/IwtKCy/Pj9R/rfF9rXKW5VvvAHhCpV5C5lXc5w7nD2vf7eXLCpXKvxxNZ8o9cmXqQlKiayN77c5aajgEPKXzBEBBc0BEBiD4JY8eLMbsfJGvWad34T2EDo/lUOB8YkEUWGuoGvic/sg== 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=Z8AL+t2QJNpVp0VxAsyctdc0pObEmwJ1BDmSvC+b+1I=; b=h4Tj3Rv5I73z5iGHAqWCQJLFHPp8eJkqb1aITOhxADi7VdVcY6CwVJFqSulfrlPjNa6RVlf6UIapcFNBRPFT5P8r/lG6ejDGeA6saFHVkPdW5a/OMic7NznP1Gfgpxu2TM5awp3hSDn/xRA5/zSYBeruUXF5UGW6KrRo+V9ihls6suFNRyG3Z+eo9S02BprUSLMAl5zgdblhxljiovc8+JbbHMobKavj1tL8a/vA/U2poGN67MBm2gZl890+abuvBJzYDq7s444+DBcaxImjumGp9SJaEeano60XT2EYT9n0EI5v0kBMu+P2TS5HzTr9s8YI1nX2lArmmIDAFN1FZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z8AL+t2QJNpVp0VxAsyctdc0pObEmwJ1BDmSvC+b+1I=; b=h1MAGBapESP8GC/8Owy2v5CWzDBfzbyXUyY1fOcHzTftfDFAzs1/drR7f/Q9Mc6DVpDa5h86SvwIJnLmpoYTU6JnPxA8fEd6mSmeu/ALyWxXaBHpRXHN3oN4j4mkmbcAwHwYSh9x0npFhaa/AEwhjWsYzjUjDARDTuZw7xw7yUc= Received: from BL0PR0102CA0033.prod.exchangelabs.com (2603:10b6:207:18::46) by PH7PR12MB6979.namprd12.prod.outlook.com (2603:10b6:510:1b9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Mon, 26 Feb 2024 08:48:30 +0000 Received: from BL02EPF0001A102.namprd05.prod.outlook.com (2603:10b6:207:18:cafe::dc) by BL0PR0102CA0033.outlook.office365.com (2603:10b6:207:18::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.49 via Frontend Transport; Mon, 26 Feb 2024 08:48:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL02EPF0001A102.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.25 via Frontend Transport; Mon, 26 Feb 2024 08:48:30 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 26 Feb 2024 02:48:29 -0600 Received: from xhdipdslab41.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Mon, 26 Feb 2024 02:48:26 -0600 From: Nipun Gupta To: , , , , CC: , , , , , , , , Nipun Gupta Subject: [PATCH v3 2/2] vfio/cdx: add interrupt support Date: Mon, 26 Feb 2024 14:18:13 +0530 Message-ID: <20240226084813.101432-2-nipun.gupta@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240226084813.101432-1-nipun.gupta@amd.com> References: <20240226084813.101432-1-nipun.gupta@amd.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Received-SPF: None (SATLEXMB04.amd.com: nipun.gupta@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A102:EE_|PH7PR12MB6979:EE_ X-MS-Office365-Filtering-Correlation-Id: 44813053-139b-4841-d313-08dc36a7b510 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XItRmogRP+wf79UouS3tIKYKYN0AvdEFsf5fhmrJMvJbjQClq8Zu6KEHgDozBCqmxOVmLB7Qsk1KvRq9UouIK0cCM3LFSK7O1mfogexSnOvV6Yp767PdsCNu9zEpphmqkPiOnbPr4fqhHIOGBmYAIQhiWvytDUMHpfxxE6PV65kJN/PsH4ZMXyz1GZH8tOa8Q1DaZ8Be6o7YxsphSMmm2E6H82FKYEt9K7w1PPlNz65XqopnEiKS5rgpCQGR1CeV0ytnFEZwpY+PjPllazFTCfmrSfg26FPBUocUCl3mNzEEtHjcWb+YJNoR/Ys11WHBZAYyYM9GIp0kyajavDTe0UaLMiOOytK1MN9k+aiTRbN36Iq42p2vcm4io/6V9aKpQMpW+aFoq5gd5CtyaG4qUOqdeiVji2E0gCy6HW3ZFikHRLj8jItgND58tR4Qz5O4hAnq+dkugxvhpmhjJthrwEgPMybn5DQPxDmtDxmsNgIJyCdXQX9DPs9hBIInJsNogT8LjBXFO/8e8apOjFrVhfjEt4QBBqL1IaAAOeLQxxU9q+nOFIIQseKXXr0fulU5hQKrT5FfFooBduwthp/qxEz02Tfcu4g4wYrJmG/FoEeQ/ognPejBxhhwxwxKFDDS6zTL6B4t2RIG4R1NVvj92ttneGC7busgRVm2Yl9g5hNehkK1bPErN1a7zU9Wn1R4Rx5SMyVNU+p8t6dIDqJn4jjd4s+t0jhokG7rY3LB1zalhNDA/fWyVEPWXJPZdXfT X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 08:48:30.4672 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44813053-139b-4841-d313-08dc36a7b510 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A102.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6979 Support the following ioctls for CDX devices: - VFIO_DEVICE_GET_IRQ_INFO - VFIO_DEVICE_SET_IRQS This allows user to set an eventfd for cdx device interrupts and trigger this interrupt eventfd from userspace. All CDX device interrupts are MSIs. The MSIs are allocated from the CDX-MSI domain. Signed-off-by: Nipun Gupta Reviewed-by: Pieter Jansen van Vuuren --- This patch depends on CDX MSI support patch: https://lore.kernel.org/lkml/20240226082816.100872-1-nipun.gupta@amd.com/ Changes v2->v3: - Use generic MSI alloc/free APIs instead of CDX MSI APIs - Rebased on Linux 6.8-rc6 Changes v1->v2: - Rebased on Linux 6.7-rc1 drivers/vfio/cdx/Makefile | 2 +- drivers/vfio/cdx/intr.c | 211 +++++++++++++++++++++++++++++++++++++ drivers/vfio/cdx/main.c | 60 ++++++++++- drivers/vfio/cdx/private.h | 18 ++++ 4 files changed, 289 insertions(+), 2 deletions(-) create mode 100644 drivers/vfio/cdx/intr.c diff --git a/drivers/vfio/cdx/Makefile b/drivers/vfio/cdx/Makefile index cd4a2e6fe609..df92b320122a 100644 --- a/drivers/vfio/cdx/Makefile +++ b/drivers/vfio/cdx/Makefile @@ -5,4 +5,4 @@ obj-$(CONFIG_VFIO_CDX) += vfio-cdx.o -vfio-cdx-objs := main.o +vfio-cdx-objs := main.o intr.o diff --git a/drivers/vfio/cdx/intr.c b/drivers/vfio/cdx/intr.c new file mode 100644 index 000000000000..4637b57d0242 --- /dev/null +++ b/drivers/vfio/cdx/intr.c @@ -0,0 +1,211 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2022-2023, Advanced Micro Devices, Inc. + */ + +#include +#include +#include +#include +#include +#include + +#include "linux/cdx/cdx_bus.h" +#include "private.h" + +static irqreturn_t vfio_cdx_msihandler(int irq_no, void *arg) +{ + struct eventfd_ctx *trigger = arg; + + eventfd_signal(trigger); + return IRQ_HANDLED; +} + +static int vfio_cdx_msi_enable(struct vfio_cdx_device *vdev, int nvec) +{ + struct cdx_device *cdx_dev = to_cdx_device(vdev->vdev.dev); + struct device *dev = vdev->vdev.dev; + int msi_idx, ret; + + vdev->cdx_irqs = kcalloc(nvec, sizeof(struct vfio_cdx_irq), GFP_KERNEL); + if (!vdev->cdx_irqs) + return -ENOMEM; + + ret = cdx_enable_msi(cdx_dev); + if (ret) { + kfree(vdev->cdx_irqs); + return ret; + } + + /* Allocate cdx MSIs */ + ret = msi_domain_alloc_irqs(dev, MSI_DEFAULT_DOMAIN, nvec); + if (ret) { + cdx_disable_msi(cdx_dev); + kfree(vdev->cdx_irqs); + return ret; + } + + for (msi_idx = 0; msi_idx < nvec; msi_idx++) + vdev->cdx_irqs[msi_idx].irq_no = msi_get_virq(dev, msi_idx); + + vdev->irq_count = nvec; + vdev->config_msi = 1; + + return 0; +} + +static int vfio_cdx_msi_set_vector_signal(struct vfio_cdx_device *vdev, + int vector, int fd) +{ + struct eventfd_ctx *trigger; + int irq_no, ret; + + if (vector < 0 || vector >= vdev->irq_count) + return -EINVAL; + + irq_no = vdev->cdx_irqs[vector].irq_no; + + if (vdev->cdx_irqs[vector].trigger) { + free_irq(irq_no, vdev->cdx_irqs[vector].trigger); + kfree(vdev->cdx_irqs[vector].name); + eventfd_ctx_put(vdev->cdx_irqs[vector].trigger); + vdev->cdx_irqs[vector].trigger = NULL; + } + + if (fd < 0) + return 0; + + vdev->cdx_irqs[vector].name = kasprintf(GFP_KERNEL, "vfio-msi[%d](%s)", + vector, dev_name(vdev->vdev.dev)); + if (!vdev->cdx_irqs[vector].name) + return -ENOMEM; + + trigger = eventfd_ctx_fdget(fd); + if (IS_ERR(trigger)) { + kfree(vdev->cdx_irqs[vector].name); + return PTR_ERR(trigger); + } + + ret = request_irq(irq_no, vfio_cdx_msihandler, 0, + vdev->cdx_irqs[vector].name, trigger); + if (ret) { + kfree(vdev->cdx_irqs[vector].name); + eventfd_ctx_put(trigger); + return ret; + } + + vdev->cdx_irqs[vector].trigger = trigger; + + return 0; +} + +static int vfio_cdx_msi_set_block(struct vfio_cdx_device *vdev, + unsigned int start, unsigned int count, + int32_t *fds) +{ + int i, j, ret = 0; + + if (start >= vdev->irq_count || start + count > vdev->irq_count) + return -EINVAL; + + for (i = 0, j = start; i < count && !ret; i++, j++) { + int fd = fds ? fds[i] : -1; + + ret = vfio_cdx_msi_set_vector_signal(vdev, j, fd); + } + + if (ret) { + for (--j; j >= (int)start; j--) + vfio_cdx_msi_set_vector_signal(vdev, j, -1); + } + + return ret; +} + +static void vfio_cdx_msi_disable(struct vfio_cdx_device *vdev) +{ + struct cdx_device *cdx_dev = to_cdx_device(vdev->vdev.dev); + struct device *dev = vdev->vdev.dev; + + vfio_cdx_msi_set_block(vdev, 0, vdev->irq_count, NULL); + + if (!vdev->config_msi) + return; + + msi_domain_free_irqs_all(dev, MSI_DEFAULT_DOMAIN); + cdx_disable_msi(cdx_dev); + kfree(vdev->cdx_irqs); + + vdev->cdx_irqs = NULL; + vdev->irq_count = 0; + vdev->config_msi = 0; +} + +static int vfio_cdx_set_msi_trigger(struct vfio_cdx_device *vdev, + unsigned int index, unsigned int start, + unsigned int count, u32 flags, + void *data) +{ + struct cdx_device *cdx_dev = to_cdx_device(vdev->vdev.dev); + int i; + + if (start + count > cdx_dev->num_msi) + return -EINVAL; + + if (!count && (flags & VFIO_IRQ_SET_DATA_NONE)) { + vfio_cdx_msi_disable(vdev); + return 0; + } + + if (flags & VFIO_IRQ_SET_DATA_EVENTFD) { + s32 *fds = data; + int ret; + + if (vdev->config_msi) + return vfio_cdx_msi_set_block(vdev, start, count, + fds); + ret = vfio_cdx_msi_enable(vdev, cdx_dev->num_msi); + if (ret) + return ret; + + ret = vfio_cdx_msi_set_block(vdev, start, count, fds); + if (ret) + vfio_cdx_msi_disable(vdev); + + return ret; + } + + for (i = start; i < start + count; i++) { + if (!vdev->cdx_irqs[i].trigger) + continue; + if (flags & VFIO_IRQ_SET_DATA_NONE) + eventfd_signal(vdev->cdx_irqs[i].trigger); + } + + return 0; +} + +int vfio_cdx_set_irqs_ioctl(struct vfio_cdx_device *vdev, + u32 flags, unsigned int index, + unsigned int start, unsigned int count, + void *data) +{ + if (flags & VFIO_IRQ_SET_ACTION_TRIGGER) + return vfio_cdx_set_msi_trigger(vdev, index, start, + count, flags, data); + else + return -EINVAL; +} + +/* Free All IRQs for the given device */ +void vfio_cdx_irqs_cleanup(struct vfio_cdx_device *vdev) +{ + /* + * Device does not support any interrupt or the interrupts + * were not configured + */ + if (!vdev->cdx_irqs) + return; + + vfio_cdx_set_msi_trigger(vdev, 1, 0, 0, VFIO_IRQ_SET_DATA_NONE, NULL); +} diff --git a/drivers/vfio/cdx/main.c b/drivers/vfio/cdx/main.c index 9cff8d75789e..eb1c5879150b 100644 --- a/drivers/vfio/cdx/main.c +++ b/drivers/vfio/cdx/main.c @@ -61,6 +61,7 @@ static void vfio_cdx_close_device(struct vfio_device *core_vdev) kfree(vdev->regions); cdx_dev_reset(core_vdev->dev); + vfio_cdx_irqs_cleanup(vdev); } static int vfio_cdx_bm_ctrl(struct vfio_device *core_vdev, u32 flags, @@ -123,7 +124,7 @@ static int vfio_cdx_ioctl_get_info(struct vfio_cdx_device *vdev, info.flags |= VFIO_DEVICE_FLAGS_RESET; info.num_regions = cdx_dev->res_count; - info.num_irqs = 0; + info.num_irqs = cdx_dev->num_msi ? 1 : 0; return copy_to_user(arg, &info, minsz) ? -EFAULT : 0; } @@ -152,6 +153,59 @@ static int vfio_cdx_ioctl_get_region_info(struct vfio_cdx_device *vdev, return copy_to_user(arg, &info, minsz) ? -EFAULT : 0; } +static int vfio_cdx_ioctl_get_irq_info(struct vfio_cdx_device *vdev, + struct vfio_irq_info __user *arg) +{ + unsigned long minsz = offsetofend(struct vfio_irq_info, count); + struct cdx_device *cdx_dev = to_cdx_device(vdev->vdev.dev); + struct vfio_irq_info info; + + if (copy_from_user(&info, arg, minsz)) + return -EFAULT; + + if (info.argsz < minsz) + return -EINVAL; + + if (info.index >= 1) + return -EINVAL; + + info.flags = VFIO_IRQ_INFO_EVENTFD; + info.count = cdx_dev->num_msi; + + return copy_to_user(arg, &info, minsz) ? -EFAULT : 0; +} + +static int vfio_cdx_ioctl_set_irqs(struct vfio_cdx_device *vdev, + struct vfio_irq_set __user *arg) +{ + unsigned long minsz = offsetofend(struct vfio_irq_set, count); + struct cdx_device *cdx_dev = to_cdx_device(vdev->vdev.dev); + struct vfio_irq_set hdr; + size_t data_size = 0; + u8 *data = NULL; + int ret = 0; + + if (copy_from_user(&hdr, arg, minsz)) + return -EFAULT; + + ret = vfio_set_irqs_validate_and_prepare(&hdr, cdx_dev->num_msi, + 1, &data_size); + if (ret) + return ret; + + if (data_size) { + data = memdup_user(arg->data, data_size); + if (IS_ERR(data)) + return PTR_ERR(data); + } + + ret = vfio_cdx_set_irqs_ioctl(vdev, hdr.flags, hdr.index, + hdr.start, hdr.count, data); + kfree(data); + + return ret; +} + static long vfio_cdx_ioctl(struct vfio_device *core_vdev, unsigned int cmd, unsigned long arg) { @@ -164,6 +218,10 @@ static long vfio_cdx_ioctl(struct vfio_device *core_vdev, return vfio_cdx_ioctl_get_info(vdev, uarg); case VFIO_DEVICE_GET_REGION_INFO: return vfio_cdx_ioctl_get_region_info(vdev, uarg); + case VFIO_DEVICE_GET_IRQ_INFO: + return vfio_cdx_ioctl_get_irq_info(vdev, uarg); + case VFIO_DEVICE_SET_IRQS: + return vfio_cdx_ioctl_set_irqs(vdev, uarg); case VFIO_DEVICE_RESET: return cdx_dev_reset(core_vdev->dev); default: diff --git a/drivers/vfio/cdx/private.h b/drivers/vfio/cdx/private.h index 8e9d25913728..7a8477ae4652 100644 --- a/drivers/vfio/cdx/private.h +++ b/drivers/vfio/cdx/private.h @@ -13,6 +13,14 @@ static inline u64 vfio_cdx_index_to_offset(u32 index) return ((u64)(index) << VFIO_CDX_OFFSET_SHIFT); } +struct vfio_cdx_irq { + u32 flags; + u32 count; + int irq_no; + struct eventfd_ctx *trigger; + char *name; +}; + struct vfio_cdx_region { u32 flags; u32 type; @@ -25,6 +33,16 @@ struct vfio_cdx_device { struct vfio_cdx_region *regions; u32 flags; #define BME_SUPPORT BIT(0) + struct vfio_cdx_irq *cdx_irqs; + u32 irq_count; + u32 config_msi; }; +int vfio_cdx_set_irqs_ioctl(struct vfio_cdx_device *vdev, + u32 flags, unsigned int index, + unsigned int start, unsigned int count, + void *data); + +void vfio_cdx_irqs_cleanup(struct vfio_cdx_device *vdev); + #endif /* VFIO_CDX_PRIVATE_H */