From patchwork Wed Jul 18 02:02:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John Daley (johndale)" X-Patchwork-Id: 43176 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 C1E412BD3; Wed, 18 Jul 2018 04:02:25 +0200 (CEST) Received: from alln-iport-6.cisco.com (alln-iport-6.cisco.com [173.37.142.93]) by dpdk.org (Postfix) with ESMTP id D41502BC9 for ; Wed, 18 Jul 2018 04:02:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=2164; q=dns/txt; s=iport; t=1531879344; x=1533088944; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=eQJ7QEIuwJIUuCEhrWGWkM9q90MQosM5dWFn9mopAFo=; b=VKbndB4iLHWvnLzhia9vByy0JsYN2m2s1FKrSpcSXWZ8AP5bCSPwNzgG W0R4akaJ+zAVZY5Qz8ZZGAKCGcTpQFtT5JRqluVqp/Xk+iBG9kyYzfBNz gGjyGtbarXVWygbtSmZhXUSKm26oun774UgWoHqYYvShvtA/TtHJvz6+w o=; X-IronPort-AV: E=Sophos;i="5.51,368,1526342400"; d="scan'208";a="144068465" Received: from rcdn-core-9.cisco.com ([173.37.93.145]) by alln-iport-6.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jul 2018 02:02:22 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by rcdn-core-9.cisco.com (8.15.2/8.15.2) with ESMTP id w6I22MBU013977; Wed, 18 Jul 2018 02:02:22 GMT Received: by cisco.com (Postfix, from userid 392789) id 6A42220F2001; Tue, 17 Jul 2018 19:02:22 -0700 (PDT) From: John Daley To: ferruh.yigit@intel.com Cc: dev@dpdk.org, Hyong Youb Kim Date: Tue, 17 Jul 2018 19:02:16 -0700 Message-Id: <20180718020216.10821-1-johndale@cisco.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180714005452.28195-1-johndale@cisco.com> References: <20180714005452.28195-1-johndale@cisco.com> Subject: [dpdk-dev] [PATCH v2] net/enic: pick the right Rx handler after changing MTU 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" From: Hyong Youb Kim enic_set_mtu always reverts to the default Rx handler after changing MTU. Try to use the simpler, non-scatter handler in this case as well. Fixes: 35e2cb6a1795 ("net/enic: add simple Rx handler") Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- v2: remember to actually assign default handler drivers/net/enic/enic_main.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index c8456c4b7..f04dc0878 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -514,6 +514,21 @@ static void enic_prep_wq_for_simple_tx(struct enic *enic, uint16_t queue_idx) } } +static void pick_rx_handler(struct enic *enic) +{ + struct rte_eth_dev *eth_dev; + + /* Use the non-scatter, simplified RX handler if possible. */ + eth_dev = enic->rte_dev; + if (enic->rq_count > 0 && enic->rq[0].data_queue_enable == 0) { + PMD_INIT_LOG(DEBUG, " use the non-scatter Rx handler"); + eth_dev->rx_pkt_burst = &enic_noscatter_recv_pkts; + } else { + PMD_INIT_LOG(DEBUG, " use the normal Rx handler"); + eth_dev->rx_pkt_burst = &enic_recv_pkts; + } +} + int enic_enable(struct enic *enic) { unsigned int index; @@ -571,13 +586,7 @@ int enic_enable(struct enic *enic) eth_dev->tx_pkt_burst = &enic_xmit_pkts; } - /* Use the non-scatter, simplified RX handler if possible. */ - if (enic->rq_count > 0 && enic->rq[0].data_queue_enable == 0) { - PMD_INIT_LOG(DEBUG, " use the non-scatter Rx handler"); - eth_dev->rx_pkt_burst = &enic_noscatter_recv_pkts; - } else { - PMD_INIT_LOG(DEBUG, " use the normal Rx handler"); - } + pick_rx_handler(enic); for (index = 0; index < enic->wq_count; index++) enic_start_wq(enic, index); @@ -1550,7 +1559,7 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu) /* put back the real receive function */ rte_mb(); - eth_dev->rx_pkt_burst = enic_recv_pkts; + pick_rx_handler(enic); rte_mb(); /* restart Rx traffic */