Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801AbdGSJ2Y (ORCPT ); Wed, 19 Jul 2017 05:28:24 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:10322 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753574AbdGSJ2V (ORCPT ); Wed, 19 Jul 2017 05:28:21 -0400 From: Aviad Krawczyk To: CC: , , , , , , Subject: [PATCH V2 net-next 21/21] net-next/hinic: Add select_queue and netpoll Date: Wed, 19 Jul 2017 17:19:19 +0800 Message-ID: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.162.197.60] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090201.596F2633.00E9,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: eb6d49bffe07b0cc600c76de7c44929f Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2416 Lines: 82 Add more netdev operations. Signed-off-by: Aviad Krawczyk Signed-off-by: Zhao Chen --- MAINTAINERS | 7 ++++++ drivers/net/ethernet/huawei/hinic/hinic_main.c | 35 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1347726..5c85602 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6269,6 +6269,13 @@ L: linux-input@vger.kernel.org S: Maintained F: drivers/input/touchscreen/htcpen.c +HUAWEI ETHERNET DRIVER +M: Aviad Krawczyk +L: netdev@vger.kernel.org +S: Supported +F: Documentation/networking/hinic.txt +F: drivers/net/ethernet/huawei/* + HUGETLB FILESYSTEM M: Nadia Yvette Chambers S: Maintained diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c index d0f8b9e..9e464cf 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c @@ -786,6 +786,37 @@ static void hinic_get_stats64(struct net_device *netdev, stats->tx_errors = nic_tx_stats->tx_dropped; } +static u16 hinic_select_queue(struct net_device *netdev, struct sk_buff *skb, + void *accel_priv, + select_queue_fallback_t fallback) +{ + u16 qid; + + if (skb_rx_queue_recorded(skb)) + qid = skb_get_rx_queue(skb); + else + qid = fallback(netdev, skb); + + return qid; +} + +#ifdef CONFIG_NET_POLL_CONTROLLER +static void hinic_netpoll(struct net_device *netdev) +{ + struct hinic_dev *nic_dev = netdev_priv(netdev); + struct hinic_hwdev *hwdev = nic_dev->hwdev; + int i, num_qps = hinic_hwdev_num_qps(hwdev); + + for (i = 0; i < num_qps; i++) { + struct hinic_txq *txq = &nic_dev->txqs[i]; + struct hinic_rxq *rxq = &nic_dev->rxqs[i]; + + napi_schedule(&txq->napi); + napi_schedule(&rxq->napi); + } +} +#endif + static const struct net_device_ops hinic_netdev_ops = { .ndo_open = hinic_open, .ndo_stop = hinic_close, @@ -798,6 +829,10 @@ static void hinic_get_stats64(struct net_device *netdev, .ndo_start_xmit = hinic_xmit_frame, .ndo_tx_timeout = hinic_tx_timeout, .ndo_get_stats64 = hinic_get_stats64, + .ndo_select_queue = hinic_select_queue, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = hinic_netpoll, +#endif }; static void netdev_features_init(struct net_device *netdev) -- 1.9.1