From mboxrd@z Thu Jan 1 00:00:00 1970 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 CEEE3C64EC4 for ; Wed, 8 Mar 2023 05:14:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229776AbjCHFOV (ORCPT ); Wed, 8 Mar 2023 00:14:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229676AbjCHFNq (ORCPT ); Wed, 8 Mar 2023 00:13:46 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C62373028E for ; Tue, 7 Mar 2023 21:13:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QOaW8p0q+DhbS7gpQ7zzXUw1d5pwzipWL+gDHUhBA3F/rtKYzSiiDE/yIvBwISGem96KYu+3K+lrp+3ACd+qvwOFuBVsHkjs7p1UBqpEBg/qTUD1FreIYAKUAdYFAlw9UdCAXKoEImT1/9DhnyBHuODStf0oz7kdOlfTfKI4pRUwC5m/PcNwKXdLqTOYLNBBYJKLjTEsyv3CyFRvVvs1uK8J9cHL8yp2fqix+4W3aXy67KbZeow7G+VE8bSe3xLVo0z42+HfkS5Il+9cUC+8LtKShSdH4RLtwk8dxXdPl0SNVlbdaNX48btwog/ELarOwEWpUHD7epUrKa7YrPh7nQ== 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=I4aBQNIUcKQuekWvd60Za8EO76aIrrnpC7bDU057j2Q=; b=QcZGiuph388/+FeCXgn9/zas1+rsPISnA2hmammcsEdFx03a6e2O+QV2upKgB4e7A50HEcwlE5bfc/MqRhZdr/an2J31B3gYkQ/hJsxj4mb5xHBIj2v9yQH+p0bEBW/Cu9I7Zp2Fxqk/wzLEuEXFztOQZvD4bgzYMFOckIyXxPx1O2cb7rWeS+bx6ljUSsiynbEz6r5Uggss1+p/VhQ0X29UPXDjx2YEauPfX1HbVlb9f3YAtI9B+AOP4jgZbwtwVkne5fmle9OdWxDqj+I1R+ocHPAOxXD3U6IgP4qR8wQOIGf+CehISyyUh7w14vgNAwEm3z0KB3DIG9jkh3zvQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=davemloft.net 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=I4aBQNIUcKQuekWvd60Za8EO76aIrrnpC7bDU057j2Q=; b=3RgWbvuV8aIftoaaGLpFHsr2rBh3x6f9S+2AiSlvSDvNK9qc+F8JHLgoyO4tBUUpMhRMuSr1tGi2WvYPH4sZ1a8T4gu+sq4scyunfasBOihBvI3la1qZv30IHN9xlSC+pYwygJ2eUmXGUxsC9nbYVEXV3TtnVRWoaHN/N1B0Y74= Received: from BN9PR03CA0708.namprd03.prod.outlook.com (2603:10b6:408:ef::23) by MW6PR12MB7069.namprd12.prod.outlook.com (2603:10b6:303:238::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.16; Wed, 8 Mar 2023 05:13:40 +0000 Received: from BN8NAM11FT075.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ef:cafe::95) by BN9PR03CA0708.outlook.office365.com (2603:10b6:408:ef::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29 via Frontend Transport; Wed, 8 Mar 2023 05:13:39 +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 BN8NAM11FT075.mail.protection.outlook.com (10.13.176.208) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6178.16 via Frontend Transport; Wed, 8 Mar 2023 05:13:39 +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; Tue, 7 Mar 2023 23:13:38 -0600 From: Shannon Nelson To: , , , , CC: , , Subject: [PATCH RFC v4 net-next 07/13] pds_core: set up the VIF definitions and defaults Date: Tue, 7 Mar 2023 21:13:04 -0800 Message-ID: <20230308051310.12544-8-shannon.nelson@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230308051310.12544-1-shannon.nelson@amd.com> References: <20230308051310.12544-1-shannon.nelson@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT075:EE_|MW6PR12MB7069:EE_ X-MS-Office365-Filtering-Correlation-Id: 9824504a-8058-4adb-bf9a-08db1f93e10d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DYff60gj0VHE/7WrySChPtEgqPs3PchWgTnV0Nqso7YOdG5VwRvosznmiTp8VTYP+24WGJMpum9Als1iX0lA4/4Xv+QuwkNWDHx8nE/qn98oxvcoTBae1/dH2tLHuTAkyORXgghrdktI3S8fN2wR5FUeDFVdgU9MqmsQy5B2FlNGx0wdbF/l9rxMAFloP7Oz6rIT/JUtB74Jk6YS55liL54ZRCKtdAtgbadJ0p0p+7QB3jvCsUUWEh4nIjyV2FUQeq5WQbN6XngwRoYIKCWAp0VQHVgV0+t5l7aRwiR2wgy7W4rzuYxI+Y2kaGsv7aP16QHKiU1eMtXVx1sjes2qbKqbO8i1lO1vSlXBTMPSFuzBKp0APFlts5gU5OaPv4fk6KkoaMm21ARU3Ys2QZR/8I46dwpWeZAMoyuL58PjI5qCBDWYZnIMfT5K0CHRfz9/7IGhLMGRIcqAU7CCn2w+BgGa+OxQK668sARuUsG517HfX6p/UyqTasakdQEUGiscMBC+f8qgO9XE5R4JW628LgAougdd2CIajos4ZlmmsoZbaFBcbqwlB4cZu31pGLP8GNCQahy7lnxYmNM46weRSzlE5j4KKPDuI68vCe5yU2q6r0ilSu1pg7g4PNFc0mrDu95U+MKl0ZhN+9wT6kUzGWZVB/b2hJnp8qHVWFPINQj8Dk+r1Zw3f9R2/5DGeDD3QBxD3VpX7WSAujBmYm6cVIHWHSbqMIKfWmLoRWJPJQcgxs3i7EARqzH4r086s5evta21jH74VFIjfTfHh0FCkQ== 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:(13230025)(4636009)(136003)(39860400002)(396003)(376002)(346002)(451199018)(46966006)(36840700001)(40470700004)(2906002)(40480700001)(40460700003)(186003)(16526019)(336012)(6666004)(26005)(83380400001)(82310400005)(47076005)(426003)(41300700001)(86362001)(70586007)(70206006)(4326008)(8676002)(110136005)(54906003)(316002)(2616005)(478600001)(44832011)(1076003)(356005)(36756003)(81166007)(36860700001)(82740400003)(8936002)(5660300002)(36900700001)(309714004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 05:13:39.9172 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9824504a-8058-4adb-bf9a-08db1f93e10d 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: BN8NAM11FT075.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB7069 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Virtual Interfaces (VIFs) supported by the DSC's configuration (VFio Live Migration, vDPA, etc) are reported in the dev_ident struct. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/amd/pds_core/core.c | 47 +++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/debugfs.c | 23 ++++++++++ include/linux/pds/pds_common.h | 17 ++++++++ include/linux/pds/pds_core.h | 13 ++++++ 4 files changed, 100 insertions(+) diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c index b97d62297bae..96b0522c0306 100644 --- a/drivers/net/ethernet/amd/pds_core/core.c +++ b/drivers/net/ethernet/amd/pds_core/core.c @@ -352,6 +352,42 @@ static int pdsc_core_init(struct pdsc *pdsc) return err; } +static struct pdsc_viftype pdsc_viftype_defaults[] = { + [PDS_DEV_TYPE_VDPA] = { .name = PDS_DEV_TYPE_VDPA_STR, + .vif_id = PDS_DEV_TYPE_VDPA, + .dl_id = DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET }, + [PDS_DEV_TYPE_MAX] = { 0 } +}; + +static int pdsc_viftypes_init(struct pdsc *pdsc) +{ + enum pds_core_vif_types vt; + + pdsc->viftype_status = kzalloc(sizeof(pdsc_viftype_defaults), GFP_KERNEL); + if (!pdsc->viftype_status) + return -ENOMEM; + + for (vt = 0; vt < PDS_DEV_TYPE_MAX; vt++) { + bool vt_support; + + if (!pdsc_viftype_defaults[vt].name) + continue; + + /* Grab the defaults */ + pdsc->viftype_status[vt] = pdsc_viftype_defaults[vt]; + + /* See what the Core device has for support */ + vt_support = !!le16_to_cpu(pdsc->dev_ident.vif_types[vt]); + dev_dbg(pdsc->dev, "VIF %s is %ssupported\n", + pdsc->viftype_status[vt].name, + vt_support ? "" : "not "); + + pdsc->viftype_status[vt].supported = vt_support; + } + + return 0; +} + int pdsc_setup(struct pdsc *pdsc, bool init) { int numdescs; @@ -394,6 +430,14 @@ int pdsc_setup(struct pdsc *pdsc, bool init) if (err) goto err_out_teardown; + /* Set up the VIFs */ + err = pdsc_viftypes_init(pdsc); + if (err) + goto err_out_teardown; + + if (init) + pdsc_debugfs_add_viftype(pdsc); + clear_bit(PDSC_S_FW_DEAD, &pdsc->state); return 0; @@ -410,6 +454,9 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing) pdsc_qcq_free(pdsc, &pdsc->notifyqcq); pdsc_qcq_free(pdsc, &pdsc->adminqcq); + kfree(pdsc->viftype_status); + pdsc->viftype_status = NULL; + if (pdsc->intr_info) { for (i = 0; i < pdsc->nintrs; i++) pdsc_intr_free(pdsc, i); diff --git a/drivers/net/ethernet/amd/pds_core/debugfs.c b/drivers/net/ethernet/amd/pds_core/debugfs.c index 9f3558b10170..904aa1b40127 100644 --- a/drivers/net/ethernet/amd/pds_core/debugfs.c +++ b/drivers/net/ethernet/amd/pds_core/debugfs.c @@ -82,6 +82,29 @@ void pdsc_debugfs_add_ident(struct pdsc *pdsc) debugfs_create_file("identity", 0400, pdsc->dentry, pdsc, &identity_fops); } +static int viftype_show(struct seq_file *seq, void *v) +{ + struct pdsc *pdsc = seq->private; + int vt; + + for (vt = 0; vt < PDS_DEV_TYPE_MAX; vt++) { + if (!pdsc->viftype_status[vt].name) + continue; + + seq_printf(seq, "%s\t%d supported %d enabled\n", + pdsc->viftype_status[vt].name, + pdsc->viftype_status[vt].supported, + pdsc->viftype_status[vt].enabled); + } + return 0; +} +DEFINE_SHOW_ATTRIBUTE(viftype); + +void pdsc_debugfs_add_viftype(struct pdsc *pdsc) +{ + debugfs_create_file("viftypes", 0400, pdsc->dentry, pdsc, &viftype_fops); +} + static int irqs_show(struct seq_file *seq, void *v) { struct pdsc *pdsc = seq->private; diff --git a/include/linux/pds/pds_common.h b/include/linux/pds/pds_common.h index fd889c01f24e..93ce1256e8ff 100644 --- a/include/linux/pds/pds_common.h +++ b/include/linux/pds/pds_common.h @@ -50,6 +50,23 @@ enum pds_core_driver_type { PDS_DRIVER_ESXI = 6, }; +enum pds_core_vif_types { + PDS_DEV_TYPE_VDPA = 1, + PDS_DEV_TYPE_VFIO = 2, + PDS_DEV_TYPE_ETH = 3, + PDS_DEV_TYPE_RDMA = 4, + PDS_DEV_TYPE_LM = 5, + + /* new ones added before this line */ + PDS_DEV_TYPE_MAX = 16 /* don't change - used in struct size */ +}; + +#define PDS_DEV_TYPE_VDPA_STR "vDPA" +#define PDS_DEV_TYPE_VFIO_STR "VFio" +#define PDS_DEV_TYPE_ETH_STR "Eth" +#define PDS_DEV_TYPE_RDMA_STR "RDMA" +#define PDS_DEV_TYPE_LM_STR "LM" + #define PDS_CORE_IFNAMSIZ 16 /** diff --git a/include/linux/pds/pds_core.h b/include/linux/pds/pds_core.h index ffed29c7bd16..274c899bbc55 100644 --- a/include/linux/pds/pds_core.h +++ b/include/linux/pds/pds_core.h @@ -123,6 +123,15 @@ struct pdsc_qcq { struct dentry *dentry; }; +struct pdsc_viftype { + char *name; + bool supported; + bool enabled; + int dl_id; + int vif_id; + struct pds_auxiliary_dev *padev; +}; + /* No state flags set means we are in a steady running state */ enum pdsc_state_flags { PDSC_S_FW_DEAD, /* fw stopped, waiting for startup or recovery */ @@ -172,6 +181,7 @@ struct pdsc { struct pdsc_qcq adminqcq; struct pdsc_qcq notifyqcq; u64 last_eid; + struct pdsc_viftype *viftype_status; }; /** enum pds_core_dbell_bits - bitwise composition of dbell values. @@ -226,6 +236,7 @@ struct pdsc *pdsc_dl_alloc(struct device *dev, bool is_pf); void pdsc_dl_free(struct pdsc *pdsc); int pdsc_dl_register(struct pdsc *pdsc); void pdsc_dl_unregister(struct pdsc *pdsc); +int pdsc_dl_vif_add(struct pdsc *pdsc, enum pds_core_vif_types vt, const char *name); #ifdef CONFIG_DEBUG_FS void pdsc_debugfs_create(void); @@ -233,6 +244,7 @@ void pdsc_debugfs_destroy(void); void pdsc_debugfs_add_dev(struct pdsc *pdsc); void pdsc_debugfs_del_dev(struct pdsc *pdsc); void pdsc_debugfs_add_ident(struct pdsc *pdsc); +void pdsc_debugfs_add_viftype(struct pdsc *pdsc); void pdsc_debugfs_add_irqs(struct pdsc *pdsc); void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq); void pdsc_debugfs_del_qcq(struct pdsc_qcq *qcq); @@ -242,6 +254,7 @@ static inline void pdsc_debugfs_destroy(void) { } static inline void pdsc_debugfs_add_dev(struct pdsc *pdsc) { } static inline void pdsc_debugfs_del_dev(struct pdsc *pdsc) { } static inline void pdsc_debugfs_add_ident(struct pdsc *pdsc) { } +static inline void pdsc_debugfs_add_viftype(struct pdsc *pdsc) { } static inline void pdsc_debugfs_add_irqs(struct pdsc *pdsc) { } static inline void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq) { } static inline void pdsc_debugfs_del_qcq(struct pdsc_qcq *qcq) { } -- 2.17.1