From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id D2701235 for ; Tue, 21 Nov 2017 14:25:55 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 87D54206CC; Tue, 21 Nov 2017 08:25:55 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:25:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=UVALd//Q4ktS1TFMF l7GzazaHr78Kroh55AAQ/qYHfc=; b=VhUucCn7qYnTKhr0B14UyZgCeP6knhTUC BWTM/SXO8LVR3/DNt+ZjAmB7f+aZmduKv0ehkb4peAJKWWq3K+julFiQdedAsvN/ FuRv5HSSkuVkuhHSitPAWkUSkAcUpHx/EflYAxu64tU4mYSPCcM7JlI3clHM5ME+ Txz16ymnZpZHKV511RFSvIGEx+NOSvZ3r3cY7fpQVbFpR69lmBNTyHwRHIpdnx0y L9+/EazxK3S0VVeoDc7rlID/1TC7F+IhVDHcPC9+msK8/FyCx7fRKhwjckNtPsOF u9Sf7xWzjlZIv3Y1KlsHtWft8SScpKDfgIBL15alFRkA6XRGMTz0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=UVALd//Q4ktS1TFMFl7GzazaHr78Kroh55AAQ/qYHfc=; b=d7mPIurj hSRzI1rLKwuArPFblj8xTAccix+TV0HKDihNRY+aLQsz3dmDOT9g+vrXHzm9F/M4 UQupXDJqMQHjrhNUYACFBa4XU5k1zj3LsTOSU6arTrWegZjAqdIVa5N1oyRmJXf+ xKXVMQ4CvOIMZociai77UuuKX8irhTBBk0fPuXu1g8Tm+3JE5dyvPTpzpA+65ILY rq4TClPEuV8LfkiafKz057YXuRLkz/cVxf+UeSwPPX0NA3q9HUT0SC+O36qY74rh tNrqgBAznX+bpKsm1K+jgKaebyLtOxstcpxPUliM9kMCVjeUeAPQCEXotyO3nP6i nnEWGDFBKcWi1Q== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id DB603248B4; Tue, 21 Nov 2017 08:25:52 -0500 (EST) From: Yuanhan Liu To: Ajit Khaparde Cc: dpdk stable Date: Tue, 21 Nov 2017 21:17:26 +0800 Message-Id: <1511270333-31002-104-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/bnxt: fix the association of a MACVLAN per VNIC' has been queued to stable release 17.08.1 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: , X-List-Received-Date: Tue, 21 Nov 2017 13:25:56 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 0a6b9b4dbbc85f88fa96b180e0743686ada5ae7e Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Tue, 10 Oct 2017 09:23:03 -0500 Subject: [PATCH] net/bnxt: fix the association of a MACVLAN per VNIC [ upstream commit 75cd6fb1d901e3f62fa9b5d9e1eba75777f99efa ] We were not associating a MAC+VLAN per VNIC filter correctly. This patch fixes that. Also set the VLAN type appropriately. Fixes: f92735db1e4c ("net/bnxt: add L2 filter alloc/init/free") Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 22 ++++++++++++++++++++++ drivers/net/bnxt/bnxt_rxq.c | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index c54e51a..896405c 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -360,7 +360,23 @@ int bnxt_hwrm_set_filter(struct bnxt *bp, int rc = 0; struct hwrm_cfa_l2_filter_alloc_input req = {.req_type = 0 }; struct hwrm_cfa_l2_filter_alloc_output *resp = bp->hwrm_cmd_resp_addr; + struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf; + const struct rte_eth_vmdq_rx_conf *conf = + &dev_conf->rx_adv_conf.vmdq_rx_conf; uint32_t enables = 0; + uint16_t j = dst_id - 1; + + //TODO: Is there a better way to add VLANs to each VNIC in case of VMDQ + if (conf->pool_map[j].pools & (1UL << j)) { + RTE_LOG(DEBUG, PMD, + "Add vlan %u to vmdq pool %u\n", + conf->pool_map[j].vlan_id, j); + + filter->l2_ivlan = conf->pool_map[j].vlan_id; + filter->enables |= + HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN | + HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN_MASK; + } if (filter->fw_l2_filter_id != UINT64_MAX) bnxt_hwrm_clear_filter(bp, filter); @@ -385,8 +401,14 @@ int bnxt_hwrm_set_filter(struct bnxt *bp, HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN) req.l2_ovlan = filter->l2_ovlan; if (enables & + HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN) + req.l2_ovlan = filter->l2_ivlan; + if (enables & HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN_MASK) req.l2_ovlan_mask = filter->l2_ovlan_mask; + if (enables & + HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN_MASK) + req.l2_ovlan_mask = filter->l2_ivlan_mask; if (enables & HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_SRC_ID) req.src_id = rte_cpu_to_le_32(filter->src_id); if (enables & HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_SRC_TYPE) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 054cb35..2665ed5 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -184,7 +184,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) filter->l2_ivlan = conf->pool_map[j].vlan_id; filter->enables |= - HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_OVLAN; + HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN; } } /* -- 2.7.4