From patchwork Wed Dec 14 23:21:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brett Creeley X-Patchwork-Id: 13073679 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94A7CC4167B for ; Wed, 14 Dec 2022 23:24:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229806AbiLNXYN (ORCPT ); Wed, 14 Dec 2022 18:24:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbiLNXXt (ORCPT ); Wed, 14 Dec 2022 18:23:49 -0500 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2071.outbound.protection.outlook.com [40.107.96.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82EF5537E6; Wed, 14 Dec 2022 15:22:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l6yV8qO1+FKhyHM/yoxDghVbW+7H6l2dIPwLVfz6veavqwkgw1LHMwBiIZyu5Pk/Smrlaq3Alg5yWV100nsKXLVF+nn+vLt5NcIXvNGyE2J5LPv3FWmFBK6aTQiYsmxYjOEDOQRePu/n+Nzx9rCehGzx/ijGF4K1GiUUdkG8J/KMps1N48dNGTekEm28cRsFHLjP9Ufls/23HXQj1WBuM/fOTZPYOaLcE09mYrmOgAr3kYvmlTXTMYihF36XX2fpGS9YNCuHk3pWNN991cmvILOOPDV7NoHAlRAs8NOpnz3ty3qQQqa7uxwPZiotrDCfW6dEcLM7SFy71aAmWm6muw== 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=fSigXJD7xfzPdw+sDFPpI+GEjPq18BDlkclE8FTzddw=; b=Jb+N5zDqVW9/yEp6USEev/jrD/VyEp6WOMdk14e44MIIlVvIlZk9jOQn0RIyKDmFXUUI2sOKYxlHT2byZPPaEmUesB1sFfVLdlcsktlvnVr5mHWsl2bClmFnwA2rJiRHhmYWlcouh/xJA5IAR6h9J7f4PKJe+7ukF0whvjz5MXWSRkf+oNmMswAHp6+JMSSceg1tsAv9fWyFp5hfwRJ99GeLy+J6UAdaiBarenrd4MCzMhFz3Btu3KjHeMCi79FpieY0T4bLX88h0cILwF5+IPKx/dAcjocE52Lxsm9qpvdxh9/QxH3cWhJz/j4PscLEv0NXRdqkYQIb226oEJlMnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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 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=fSigXJD7xfzPdw+sDFPpI+GEjPq18BDlkclE8FTzddw=; b=4Q8aBB00Ibx2PaoR7Wgv670jh47C+H7vwb64DEwPpmIqsnEC9BBeG7pueDv5iKWtbRCQntcyhwJhcmES4RXshSRW3QSe5n7Otbp8DBBNGwXTlXCL1s9czwQEVdjaq53EhqF5AhLL6M0AMBHqRqIM5es5YbKxJiomPAUmG15mZqg= Received: from BN9PR03CA0640.namprd03.prod.outlook.com (2603:10b6:408:13b::15) by CH0PR12MB5026.namprd12.prod.outlook.com (2603:10b6:610:e1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.11; Wed, 14 Dec 2022 23:22:02 +0000 Received: from BN8NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::a3) by BN9PR03CA0640.outlook.office365.com (2603:10b6:408:13b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.11 via Frontend Transport; Wed, 14 Dec 2022 23:22:02 +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 BN8NAM11FT009.mail.protection.outlook.com (10.13.176.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5924.12 via Frontend Transport; Wed, 14 Dec 2022 23:22:02 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) 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.2375.34; Wed, 14 Dec 2022 17:21:55 -0600 From: Brett Creeley To: , , , , , , , CC: , , Brett Creeley Subject: [RFC PATCH v2 vfio 2/7] vfio/pds: Add support to register as PDS client Date: Wed, 14 Dec 2022 15:21:31 -0800 Message-ID: <20221214232136.64220-3-brett.creeley@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221214232136.64220-1-brett.creeley@amd.com> References: <20221214232136.64220-1-brett.creeley@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT009:EE_|CH0PR12MB5026:EE_ X-MS-Office365-Filtering-Correlation-Id: 02e4f66e-406c-467c-f264-08dade2a01aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /2D1/1SaAdW8Gu0UJAQ1wlSRuhYRtcflpj9WUH/piiEwrXkZb7tDb6/TK7vDQcQE+cJ7/b4hqgnt6r6lGxC8iTsVDxihQiTH9z915f5GbUM2NHdgbW67c8EQWmz9AM1ZzU1JPA+LsaFlLX+8BR0fHWFRNzOG3teMvahMCih+U0A95aSo8g7K0crhzF1IIXGYEBswEjcCFoz8k6/LU/5I5w7DKiWyzhu/w66TlF53LPpb8rgqLCiQV7IQxTTpi25JVBKWxiR/NI3g4T8pfbSMvNgPBBX3F1Q84fyW8CEMdD9m+V6vkXEBwjrKibmdQdChdM3JADV8MJGS8ZxOKyQHoDudIeL/gQgjRxr3QTjxiVyVV2Edz8ny+o5AXUTFpATM1XNBXPhej7/WkVz/ydUH92gLA55i7lYxzd1FVeHdilV7JGaVJifejOJFvbR5S5Epox3chTLU6jBMkBvVaFXE7Pa+gzthpEl/dMdXTwqUYx33Gj4BmBaEMX5BKN0AycDKpqzrnOkwaqC1YJG6WEsEA0rNvSyY9Bxslgga3jh0k2zaAHDOZffwh7TBlxXndNPbUYFFm/+uYYxBxMdPqShCp8ibFmK9O1NoKao0kPu8l7dT7gAKfyoHSwdlzXeRBvP4UneVuXLQKOCCCh4JiMqNHAj6IVjSnYPRAIXSEREWIn6k3ur3oq7JjvDM73ZLpvH3gw2cjKVYyFU2XphcElljHjAUI4s2z0UqPYMe0bgVA2c= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:CA;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(396003)(376002)(346002)(136003)(39860400002)(451199015)(46966006)(40470700004)(36840700001)(82310400005)(36756003)(40460700003)(16526019)(186003)(8676002)(26005)(70586007)(86362001)(40480700001)(41300700001)(478600001)(336012)(4326008)(1076003)(2616005)(70206006)(44832011)(426003)(8936002)(47076005)(5660300002)(2906002)(30864003)(83380400001)(6666004)(316002)(110136005)(54906003)(82740400003)(81166007)(356005)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 23:22:02.3850 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02e4f66e-406c-467c-f264-08dade2a01aa 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: BN8NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5026 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-State: RFC The pds_core driver will create auxiliary devices for each PCI device supported by pds_vfio. In order to communicate with the device, the pds_vfio driver needs to register as an auxiliary driver for the previously mentioned auxiliary device. Once the auxiliary device is probed, the pds_vfio driver can send admin queue commands and receive events from the device by way of pds_core. Use the following commands to enable a VF and tell pds_core to create its corresponding auxiliary device: echo 1 > /sys/bus/pci/drivers/pds_core/$PF_BDF/sriov_numvfs devlink dev param set pci/$PF_BDF name enable_migration value true cmode runtime This functionality is needed to support live migration commands, which are added later in the series. Signed-off-by: Brett Creeley Signed-off-by: Shannon Nelson --- drivers/vfio/pci/pds/Makefile | 2 + drivers/vfio/pci/pds/aux_drv.c | 154 ++++++++++++++++++++++++++++++++ drivers/vfio/pci/pds/aux_drv.h | 29 ++++++ drivers/vfio/pci/pds/cmds.c | 30 +++++++ drivers/vfio/pci/pds/cmds.h | 14 +++ drivers/vfio/pci/pds/pci_drv.c | 18 +++- drivers/vfio/pci/pds/pci_drv.h | 11 +++ drivers/vfio/pci/pds/vfio_dev.c | 8 ++ drivers/vfio/pci/pds/vfio_dev.h | 1 + include/linux/pds/pds_lm.h | 12 +++ 10 files changed, 278 insertions(+), 1 deletion(-) create mode 100644 drivers/vfio/pci/pds/aux_drv.c create mode 100644 drivers/vfio/pci/pds/aux_drv.h create mode 100644 drivers/vfio/pci/pds/cmds.c create mode 100644 drivers/vfio/pci/pds/cmds.h create mode 100644 drivers/vfio/pci/pds/pci_drv.h create mode 100644 include/linux/pds/pds_lm.h diff --git a/drivers/vfio/pci/pds/Makefile b/drivers/vfio/pci/pds/Makefile index dcc8f6beffe2..49bf8289739b 100644 --- a/drivers/vfio/pci/pds/Makefile +++ b/drivers/vfio/pci/pds/Makefile @@ -2,5 +2,7 @@ obj-$(CONFIG_PDS_VFIO_PCI) += pds_vfio.o pds_vfio-y := \ + aux_drv.o \ + cmds.o \ pci_drv.o \ vfio_dev.o diff --git a/drivers/vfio/pci/pds/aux_drv.c b/drivers/vfio/pci/pds/aux_drv.c new file mode 100644 index 000000000000..494551894926 --- /dev/null +++ b/drivers/vfio/pci/pds/aux_drv.c @@ -0,0 +1,154 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#include +#include +#include + +#include +#include +#include +#include + +#include "aux_drv.h" +#include "vfio_dev.h" +#include "pci_drv.h" +#include "cmds.h" + +static const +struct auxiliary_device_id pds_vfio_aux_id_table[] = { + { .name = PDS_LM_DEV_NAME, }, + {}, +}; + +static void +pds_vfio_aux_notify_handler(struct pds_auxiliary_dev *padev, + union pds_core_notifyq_comp *event) +{ + struct device *dev = &padev->aux_dev.dev; + u16 ecode = le16_to_cpu(event->ecode); + + dev_dbg(dev, "%s: event code %d\n", __func__, ecode); +} + +static int +pds_vfio_aux_probe(struct auxiliary_device *aux_dev, + const struct auxiliary_device_id *id) + +{ + struct pds_auxiliary_dev *padev = + container_of(aux_dev, struct pds_auxiliary_dev, aux_dev); + struct pds_vfio_pci_device *pds_vfio; + struct device *dev = &aux_dev->dev; + struct pds_vfio_aux *vfio_aux; + struct pci_dev *pdev; + struct pci_bus *bus; + int busnr; + u16 devfn; + int err; + + /* Find our VF PCI device */ + busnr = PCI_BUS_NUM(padev->id); + devfn = padev->id & 0xff; + bus = pci_find_bus(0, busnr); + pdev = pci_get_slot(bus, devfn); + + if (!pds_vfio_is_vfio_pci_driver(pdev)) { + dev_dbg(&aux_dev->dev, "unbind %s from %s driver and bind to %s driver for live migration support\n", + pci_name(pdev), dev_driver_string(&pdev->dev), PDS_VFIO_DRV_NAME); + return -EPROBE_DEFER; + } + + pds_vfio = pci_get_drvdata(pdev); + if (!pds_vfio) { + dev_dbg(&pdev->dev, "PCI device not probed yet, defer until PCI device is probed by %s driver\n", + PDS_VFIO_DRV_NAME); + return -EPROBE_DEFER; + } + + vfio_aux = kzalloc(sizeof(*vfio_aux), GFP_KERNEL); + if (!vfio_aux) + return -ENOMEM; + + vfio_aux->padev = padev; + vfio_aux->pds_vfio = pds_vfio; + auxiliary_set_drvdata(aux_dev, vfio_aux); + + dev_dbg(dev, "%s: id %#04x busnr %#x devfn %#x bus %p pds_vfio %p\n", + __func__, padev->id, busnr, devfn, bus, vfio_aux->pds_vfio); + + vfio_aux->pds_vfio->vfio_aux = vfio_aux; + + vfio_aux->padrv.event_handler = pds_vfio_aux_notify_handler; + err = pds_vfio_register_client_cmd(vfio_aux->pds_vfio); + if (err) { + dev_err(dev, "failed to register as client: %pe\n", + ERR_PTR(err)); + goto err_out; + } + + return 0; + +err_out: + auxiliary_set_drvdata(aux_dev, NULL); + kfree(vfio_aux); + + return err; +} + +static void +pds_vfio_aux_remove(struct auxiliary_device *aux_dev) +{ + struct pds_vfio_aux *vfio_aux = auxiliary_get_drvdata(aux_dev); + struct pds_vfio_pci_device *pds_vfio = vfio_aux->pds_vfio; + + if (pds_vfio) { + pds_vfio_unregister_client_cmd(pds_vfio); + vfio_aux->pds_vfio->vfio_aux = NULL; + pci_dev_put(pds_vfio->pdev); + } + + kfree(vfio_aux); + auxiliary_set_drvdata(aux_dev, NULL); +} + +static struct auxiliary_driver +pds_vfio_aux_driver = { + .name = PDS_DEV_TYPE_LM_STR, + .probe = pds_vfio_aux_probe, + .remove = pds_vfio_aux_remove, + .id_table = pds_vfio_aux_id_table, +}; + +struct auxiliary_driver * +pds_vfio_aux_driver_info(void) +{ + return &pds_vfio_aux_driver; +} + +static int +pds_vfio_aux_match_id(struct device *dev, const void *data) +{ + dev_dbg(dev, "%s: %s\n", __func__, (char *)data); + return !strcmp(dev_name(dev), data); +} + +struct pds_vfio_aux * +pds_vfio_aux_get_drvdata(int vf_pci_id) +{ + struct auxiliary_device *aux_dev; + char name[32]; + + snprintf(name, sizeof(name), "%s.%d", PDS_LM_DEV_NAME, vf_pci_id); + aux_dev = auxiliary_find_device(NULL, name, pds_vfio_aux_match_id); + if (!aux_dev) + return NULL; + + return auxiliary_get_drvdata(aux_dev); +} + +void +pds_vfio_put_aux_dev(struct pds_vfio_aux *vfio_aux) +{ + put_device(&vfio_aux->padev->aux_dev.dev); +} diff --git a/drivers/vfio/pci/pds/aux_drv.h b/drivers/vfio/pci/pds/aux_drv.h new file mode 100644 index 000000000000..0f05a968bb00 --- /dev/null +++ b/drivers/vfio/pci/pds/aux_drv.h @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _AUX_DRV_H_ +#define _AUX_DRV_H_ + +#include + +#include +#include +#include +#include + +struct pds_vfio_pci_device; + +struct pds_vfio_aux { + struct pds_auxiliary_dev *padev; + struct pds_auxiliary_drv padrv; + struct pds_vfio_pci_device *pds_vfio; +}; + +struct auxiliary_driver * +pds_vfio_aux_driver_info(void); +struct pds_vfio_aux * +pds_vfio_aux_get_drvdata(int vf_pci_id); +void +pds_vfio_put_aux_dev(struct pds_vfio_aux *vfio_aux); + +#endif /* _AUX_DRV_H_ */ diff --git a/drivers/vfio/pci/pds/cmds.c b/drivers/vfio/pci/pds/cmds.c new file mode 100644 index 000000000000..5a3fadcd38d8 --- /dev/null +++ b/drivers/vfio/pci/pds/cmds.c @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#include +#include + +#include +#include +#include + +#include "vfio_dev.h" +#include "aux_drv.h" +#include "cmds.h" + +int +pds_vfio_register_client_cmd(struct pds_vfio_pci_device *pds_vfio) +{ + struct pds_vfio_aux *vfio_aux = pds_vfio->vfio_aux; + struct pds_auxiliary_dev *padev = vfio_aux->padev; + + return padev->ops->register_client(padev, &vfio_aux->padrv); +} + +void +pds_vfio_unregister_client_cmd(struct pds_vfio_pci_device *pds_vfio) +{ + struct pds_auxiliary_dev *padev = pds_vfio->vfio_aux->padev; + + padev->ops->unregister_client(padev); +} diff --git a/drivers/vfio/pci/pds/cmds.h b/drivers/vfio/pci/pds/cmds.h new file mode 100644 index 000000000000..7fe2d1efd894 --- /dev/null +++ b/drivers/vfio/pci/pds/cmds.h @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _CMDS_H_ +#define _CMDS_H_ + +struct pds_vfio_pci_device; + +int +pds_vfio_register_client_cmd(struct pds_vfio_pci_device *pds_vfio); +void +pds_vfio_unregister_client_cmd(struct pds_vfio_pci_device *pds_vfio); + +#endif /* _CMDS_H_ */ diff --git a/drivers/vfio/pci/pds/pci_drv.c b/drivers/vfio/pci/pds/pci_drv.c index 09cab0dbb0e9..d6ad15719ec4 100644 --- a/drivers/vfio/pci/pds/pci_drv.c +++ b/drivers/vfio/pci/pds/pci_drv.c @@ -11,8 +11,9 @@ #include #include "vfio_dev.h" +#include "aux_drv.h" +#include "pci_drv.h" -#define PDS_VFIO_DRV_NAME "pds_vfio" #define PDS_VFIO_DRV_DESCRIPTION "Pensando VFIO Device Driver" #define PCI_VENDOR_ID_PENSANDO 0x1dd8 @@ -75,9 +76,17 @@ pds_vfio_pci_driver = { .driver_managed_dma = true, }; +bool +pds_vfio_is_vfio_pci_driver(struct pci_dev *pdev) +{ + return (to_pci_driver(pdev->dev.driver) == &pds_vfio_pci_driver); +} + static void __exit pds_vfio_pci_cleanup(void) { + auxiliary_driver_unregister(pds_vfio_aux_driver_info()); + pci_unregister_driver(&pds_vfio_pci_driver); } module_exit(pds_vfio_pci_cleanup); @@ -93,6 +102,13 @@ pds_vfio_pci_init(void) return err; } + err = auxiliary_driver_register(pds_vfio_aux_driver_info()); + if (err) { + pr_err("aux driver register failed: %pe\n", ERR_PTR(err)); + pci_unregister_driver(&pds_vfio_pci_driver); + return err; + } + return 0; } module_init(pds_vfio_pci_init); diff --git a/drivers/vfio/pci/pds/pci_drv.h b/drivers/vfio/pci/pds/pci_drv.h new file mode 100644 index 000000000000..549092f40f5a --- /dev/null +++ b/drivers/vfio/pci/pds/pci_drv.h @@ -0,0 +1,11 @@ +#ifndef _PCI_DRV_H +#define _PCI_DRV_H + +#include + +#define PDS_VFIO_DRV_NAME "pds_vfio" + +bool +pds_vfio_is_vfio_pci_driver(struct pci_dev *pdev); + +#endif /* _PCI_DRV_H */ diff --git a/drivers/vfio/pci/pds/vfio_dev.c b/drivers/vfio/pci/pds/vfio_dev.c index f8f4006c0915..30c3bb47a2be 100644 --- a/drivers/vfio/pci/pds/vfio_dev.c +++ b/drivers/vfio/pci/pds/vfio_dev.c @@ -5,6 +5,7 @@ #include #include "vfio_dev.h" +#include "aux_drv.h" struct pds_vfio_pci_device * pds_vfio_pci_drvdata(struct pci_dev *pdev) @@ -22,6 +23,7 @@ pds_vfio_init_device(struct vfio_device *vdev) container_of(vdev, struct pds_vfio_pci_device, vfio_coredev.vdev); struct pci_dev *pdev = to_pci_dev(vdev->dev); + struct pds_vfio_aux *vfio_aux; int err; err = vfio_pci_core_init_dev(vdev); @@ -30,6 +32,12 @@ pds_vfio_init_device(struct vfio_device *vdev) pds_vfio->vf_id = pci_iov_vf_id(pdev); pds_vfio->pci_id = PCI_DEVID(pdev->bus->number, pdev->devfn); + vfio_aux = pds_vfio_aux_get_drvdata(pds_vfio->pci_id); + if (vfio_aux) { + vfio_aux->pds_vfio = pds_vfio; + pds_vfio->vfio_aux = vfio_aux; + pds_vfio_put_aux_dev(vfio_aux); + } return 0; } diff --git a/drivers/vfio/pci/pds/vfio_dev.h b/drivers/vfio/pci/pds/vfio_dev.h index 289479a08dce..b16668693e1f 100644 --- a/drivers/vfio/pci/pds/vfio_dev.h +++ b/drivers/vfio/pci/pds/vfio_dev.h @@ -10,6 +10,7 @@ struct pds_vfio_pci_device { struct vfio_pci_core_device vfio_coredev; struct pci_dev *pdev; + struct pds_vfio_aux *vfio_aux; int vf_id; int pci_id; diff --git a/include/linux/pds/pds_lm.h b/include/linux/pds/pds_lm.h new file mode 100644 index 000000000000..fdaf2bf71d35 --- /dev/null +++ b/include/linux/pds/pds_lm.h @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright(c) 2022 Pensando Systems, Inc */ + +#ifndef _PDS_LM_H_ +#define _PDS_LM_H_ + +#include "pds_common.h" + +#define PDS_DEV_TYPE_LM_STR "LM" +#define PDS_LM_DEV_NAME PDS_CORE_DRV_NAME "." PDS_DEV_TYPE_LM_STR + +#endif /* _PDS_LM_H_ */