From patchwork Thu Sep 5 21:33:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John Daley (johndale)" X-Patchwork-Id: 58697 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 67C761F0A0; Thu, 5 Sep 2019 23:33:52 +0200 (CEST) Received: from rcdn-iport-1.cisco.com (rcdn-iport-1.cisco.com [173.37.86.72]) by dpdk.org (Postfix) with ESMTP id 215141F0A0 for ; Thu, 5 Sep 2019 23:33:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=1899; q=dns/txt; s=iport; t=1567719231; x=1568928831; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=D8GGpCbRkigrholnHL+MaZAOsh4EleovBsjs8hvFY8M=; b=IBoIp2eMjn4ernMHTu5ZlnVNKkP+h00IHwu8JygwZGUOPAvotwlJXX65 MkHvEcmn3n+fJovijl2qZh85Y8QAZ+QN/cwHzYqBrZmxYCOASvjyDqEHV YVKQqvpWT61K9QPl5P8WbgDbe6eHGTmlTvBfVu8QlAhmW1nlcAZm3IeB2 Y=; X-IronPort-AV: E=Sophos;i="5.64,471,1559520000"; d="scan'208";a="623924855" Received: from rcdn-core-5.cisco.com ([173.37.93.156]) by rcdn-iport-1.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 05 Sep 2019 21:33:47 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by rcdn-core-5.cisco.com (8.15.2/8.15.2) with ESMTP id x85LXkv2011766; Thu, 5 Sep 2019 21:33:46 GMT Received: by cisco.com (Postfix, from userid 392789) id 9361720F2003; Thu, 5 Sep 2019 14:33:42 -0700 (PDT) From: John Daley To: ferruh.yigit@intel.com Cc: dev@dpdk.org, John Daley , Hyong Youb Kim Date: Thu, 5 Sep 2019 14:33:17 -0700 Message-Id: <20190905213318.31799-1-johndale@cisco.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Outbound-SMTP-Client: 10.193.184.48, savbu-usnic-a.cisco.com X-Outbound-Node: rcdn-core-5.cisco.com Subject: [dpdk-dev] [PATCH 1/2] net/enic: add PCI ID for new virtual function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Probe for the PCI ID of a new mode of VF which will be added to VIC adapter firmware. When fully implemented, the new mode will operate independent of the Cisco Virtual Machine Fabric Extender (VM-FEX) and will not need to be provisioned through libvirt. The new mode is dubbed "Standalone vNic" mode or "SN" mode. Also, minor formatting changes. Signed-off-by: John Daley Reviewed-by: Hyong Youb Kim --- drivers/net/enic/enic.h | 2 ++ drivers/net/enic/enic_ethdev.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index 5a92508f0..ff4de8898 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -42,6 +42,8 @@ #define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */ #define PCI_DEVICE_ID_CISCO_VIC_ENET_VF 0x0071 /* enet SRIOV VF */ +/* enet SRIOV Standalone vNic VF */ +#define PCI_DEVICE_ID_CISCO_VIC_ENET_SN 0x02B7 /* Special Filter id for non-specific packet flagging. Don't change value */ #define ENIC_MAGIC_FILTER_ID 0xffff diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 06dc67122..5560af151 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -28,8 +28,9 @@ int enic_pmd_logtype; */ #define CISCO_PCI_VENDOR_ID 0x1137 static const struct rte_pci_id pci_id_enic_map[] = { - { RTE_PCI_DEVICE(CISCO_PCI_VENDOR_ID, PCI_DEVICE_ID_CISCO_VIC_ENET) }, - { RTE_PCI_DEVICE(CISCO_PCI_VENDOR_ID, PCI_DEVICE_ID_CISCO_VIC_ENET_VF) }, + {RTE_PCI_DEVICE(CISCO_PCI_VENDOR_ID, PCI_DEVICE_ID_CISCO_VIC_ENET)}, + {RTE_PCI_DEVICE(CISCO_PCI_VENDOR_ID, PCI_DEVICE_ID_CISCO_VIC_ENET_VF)}, + {RTE_PCI_DEVICE(CISCO_PCI_VENDOR_ID, PCI_DEVICE_ID_CISCO_VIC_ENET_SN)}, {.vendor_id = 0, /* sentinel */}, }; From patchwork Thu Sep 5 21:33:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John Daley (johndale)" X-Patchwork-Id: 58696 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8E6FF1F083; Thu, 5 Sep 2019 23:33:49 +0200 (CEST) Received: from rcdn-iport-3.cisco.com (rcdn-iport-3.cisco.com [173.37.86.74]) by dpdk.org (Postfix) with ESMTP id 0BC371F082 for ; Thu, 5 Sep 2019 23:33:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=3054; q=dns/txt; s=iport; t=1567719227; x=1568928827; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7WWaq9nNfIRjlygX4FxAysQSKhl3X0yjLAVsvMXJdiE=; b=JBVIHDdPwnhXj/vhp44JU/m41nbEy1rQ9s6qKnSfHsfwVIeTUkW4XkQn LiC3iQlYXF9cxkPTpeHc9QnxS56enbZjMSTH2urcF0Q35m5GubqQ4jVth tW4NEjk1Dfc+Lu1ajrn5mpaawlwXix44aLgLslYjp6lKUKxw08TnpBGt2 k=; X-IronPort-AV: E=Sophos;i="5.64,471,1559520000"; d="scan'208";a="613606282" Received: from rcdn-core-4.cisco.com ([173.37.93.155]) by rcdn-iport-3.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 05 Sep 2019 21:33:46 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by rcdn-core-4.cisco.com (8.15.2/8.15.2) with ESMTP id x85LXki0019530; Thu, 5 Sep 2019 21:33:46 GMT Received: by cisco.com (Postfix, from userid 392789) id A4BAA20F2004; Thu, 5 Sep 2019 14:33:42 -0700 (PDT) From: John Daley To: ferruh.yigit@intel.com Cc: dev@dpdk.org, John Daley , Hyong Youb Kim Date: Thu, 5 Sep 2019 14:33:18 -0700 Message-Id: <20190905213318.31799-2-johndale@cisco.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190905213318.31799-1-johndale@cisco.com> References: <20190905213318.31799-1-johndale@cisco.com> MIME-Version: 1.0 X-Outbound-SMTP-Client: 10.193.184.48, savbu-usnic-a.cisco.com X-Outbound-Node: rcdn-core-4.cisco.com Subject: [dpdk-dev] [PATCH 2/2] doc: remove comments about deprecated fdir in enic guide X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The legacy filter API "flow director" has been superseded by rte_flow since 2017. Remove comments in the enic guide regarding the deprecated feature. Signed-off-by: John Daley Reviewed-by: Hyong Youb Kim --- doc/guides/nics/enic.rst | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index 5681bdb54..5e80398bf 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -107,24 +107,6 @@ Configuration information TCP, IPv4, TCP-IPv4, IPv6, TCP-IPv6, IPv6 Extension, TCP-IPv6 Extension. -.. _enic-flow-director: - -Flow director support ---------------------- - -Advanced filtering support was added to 1300 series VIC firmware starting -with version 2.0.13 for C-series UCS servers and version 3.1.2 for UCSM -managed blade servers. In order to enable advanced filtering the 'Advanced -filter' radio button should be enabled via CIMC or UCSM followed by a reboot -of the server. - -With advanced filters, perfect matching of all fields of IPv4, IPv6 headers -as well as TCP, UDP and SCTP L4 headers is available through flow director. -Masking of these fields for partial match is also supported. - -Without advanced filter support, the flow director is limited to IPv4 -perfect filtering of the 5-tuple with no masking of fields supported. - SR-IOV mode utilization ----------------------- @@ -229,7 +211,13 @@ the use of SR-IOV. Generic Flow API support ------------------------ -Generic Flow API is supported. The baseline support is: +Generic Flow API (also called "rte_flow" API) is supported. More advanced +capabilities are available when "Advanced Filtering" is enabled on the adapter. +Advanced filtering was added to 1300 series VIC firmware starting with version +2.0.13 for C-series UCS servers and version 3.1.2 for UCSM managed blade +servers. Advanced filtering is available on 1400 series adapters and beyond. +To enable advanced filtering, the 'Advanced filter' radio button should be +selected via CIMC or UCSM followed by a reboot of the server. - **1200 series VICs** @@ -420,12 +408,6 @@ PKT_RX_VLAN_STRIPPED mbuf flags would not be set. This mode is enabled with the -w 12:00.0,ig-vlan-rewrite=untag -- Limited flow director support on 1200 series and 1300 series Cisco VIC - adapters with old firmware. Please see :ref:`enic-flow-director`. - -- Flow director features are not supported on generation 1 Cisco VIC adapters - (M81KR and P81E) - - **SR-IOV** - KVM hypervisor support only. VMware has not been tested. @@ -512,7 +494,6 @@ Supported features - IP checksum offload - Receive side VLAN stripping - Multiple receive and transmit queues -- Flow Director ADD, UPDATE, DELETE, STATS operation support IPv4 and IPv6 - Promiscuous mode - Setting RX VLAN (supported via UCSM/CIMC only) - VLAN filtering (supported via UCSM/CIMC only)