From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 76031A046B for ; Fri, 26 Jul 2019 09:56:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5CABE1C3C2; Fri, 26 Jul 2019 09:56:29 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id C0E8E1C3C2; Fri, 26 Jul 2019 09:56:27 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jul 2019 00:56:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,310,1559545200"; d="scan'208";a="181794576" Received: from npg-dpdk-cvl-yingwang-117d84.sh.intel.com ([10.67.117.84]) by orsmga002.jf.intel.com with ESMTP; 26 Jul 2019 00:56:25 -0700 From: Wang Ying A To: qi.z.zhang@intel.com Cc: dev@dpdk.org, qiming.yang@intel.com, ying.a.wang@intel.com, stable@dpdk.org Date: Fri, 26 Jul 2019 07:36:03 +0800 Message-Id: <1564097763-276974-1-git-send-email-ying.a.wang@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1564088408-99709-1-git-send-email-ying.a.wang@intel.com> References: <1564088408-99709-1-git-send-email-ying.a.wang@intel.com> Subject: [dpdk-stable] [PATCH v2] net/ice: fix LLDP forward X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The patch fix the issue that lldp packet can't be forwarded to host. Fixes: 59d151de6673 ("net/ice: stop LLDP by default") Cc: stable@dpdk.org Signed-off-by: Wang Ying A --- --- V2: Remove redundant macro definiton and function argument; Modify the function name, variables and comments to avoid similarities with kernel code. --- drivers/net/ice/ice_ethdev.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 08fc9ec..9550aed 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -1385,6 +1385,40 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) return ret; } +/* Forward LLDP packets to default VSI by set switch rules*/ +static int +ice_vsi_config_sw_lldp(struct ice_vsi *vsi, bool on) +{ + struct ice_hw *hw = ICE_VSI_TO_HW(vsi); + struct ice_fltr_list_entry *s_list_itr = NULL; + struct LIST_HEAD_TYPE list_head; + int ret = 0; + + INIT_LIST_HEAD(&list_head); + + s_list_itr = (struct ice_fltr_list_entry *) + ice_malloc(hw, sizeof(*s_list_itr)); + if (!s_list_itr) { + ret = -ENOMEM; + goto DONE; + } + s_list_itr->fltr_info.lkup_type = ICE_SW_LKUP_ETHERTYPE; + s_list_itr->fltr_info.vsi_handle = vsi->idx; + s_list_itr->fltr_info.l_data.ethertype_mac.ethertype = + RTE_ETHER_TYPE_LLDP; + s_list_itr->fltr_info.fltr_act = ICE_FWD_TO_VSI; + s_list_itr->fltr_info.flag = ICE_FLTR_RX; + s_list_itr->fltr_info.src_id = ICE_SRC_ID_LPORT; + LIST_ADD(&s_list_itr->list_entry, &list_head); + if (on) + ret = ice_add_eth_mac(hw, &list_head); + else + ret = ice_remove_eth_mac(hw, &list_head); +DONE: + rte_free(s_list_itr); + return ret; +} + static int ice_dev_init(struct rte_eth_dev *dev) { @@ -1492,7 +1526,13 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) ret = ice_aq_stop_lldp(hw, TRUE, FALSE, NULL); if (ret != ICE_SUCCESS) PMD_INIT_LOG(DEBUG, "lldp has already stopped\n"); - + ret = ice_init_dcb(hw, TRUE); + if (ret != ICE_SUCCESS) + PMD_INIT_LOG(DEBUG, "Failed to init DCB\n"); + /* Forward LLDP packets to default VSI */ + ret = ice_vsi_config_sw_lldp(vsi, TRUE); + if (ret != ICE_SUCCESS) + PMD_INIT_LOG(DEBUG, "Failed to cfg lldp\n"); /* register callback func to eal lib */ rte_intr_callback_register(intr_handle, ice_interrupt_handler, dev); -- 1.8.3.1