From patchwork Mon Mar 26 20:40:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 891227 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cavium.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="ZlPz9RCm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4095d66Pvnz9s0y for ; Tue, 27 Mar 2018 07:40:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751355AbeCZUkj (ORCPT ); Mon, 26 Mar 2018 16:40:39 -0400 Received: from mail-by2nam03on0089.outbound.protection.outlook.com ([104.47.42.89]:12948 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750983AbeCZUkh (ORCPT ); Mon, 26 Mar 2018 16:40:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1Bv5R3WVjVrjJufuim3usEoI3oYR6RZqojO+FDzAsFQ=; b=ZlPz9RCm+vNLTxy8uc8j5u15rac6OQ5/VD0+lJWF60Qpac+QX3i4wiE9LRR8AMIoXajTo6dMQFmsobHKTZHBY1/+2/JlMfJbuNzMM/i7dnJKOuFYTgTRRwoKvUeq7G4XDb7rtUJAPoDrVt4Ryj2PYZ0ICCOMvNtfM94s8iTTUgs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by BN7PR07MB4210.namprd07.prod.outlook.com (2603:10b6:406:b2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Mon, 26 Mar 2018 20:40:36 +0000 Date: Mon, 26 Mar 2018 13:40:27 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, felix.manlunas@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next] liquidio: Removed duplicate Tx queue status check Message-ID: <20180326204027.GA8101@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR11CA0028.namprd11.prod.outlook.com (2603:10b6:300:115::14) To BN7PR07MB4210.namprd07.prod.outlook.com (2603:10b6:406:b2::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dbe8105f-f724-4ca0-1ae8-08d59359d420 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BN7PR07MB4210; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 3:9GoYQs0zousmM0NBpJd1zXRtugOL2Ym7WiNR+VJFWeFWyltDzKyE6eZOEeKkGvgfs1MHU1HNidDQqE1RSwjilk1MLro5mkCwkzWTNJqAW/D40gQ8UwtXgHQin8eVP/n11e9uC4DXtONG3qaDB+jUhXzrdgCcrAWV9cKbjXNvdQkIwoLtYIXxnUOD9eCQAy98uPp/gtDwBbZPMg0uPTIdAJGdwZi16c4cHs/2aKZ4BdFc5bUrKFNl3TmcyaDg/YLy; 25:NWyGYt6iqGLbDESsBtqsz5H1XlUjIO+GH4K3G2iFx11Ts8JwjuMRkEGxA9dknCHDnR9jDgjZjmnhUI8dDHk6gEDvTUOx+eqBxWfy9wsHGaKGwm4u6V+BmaX4gFSLwdcE5CYpu2iqiSwvvN+N7TCPTGs7sEiZA7l6kLtjWyfOVuRA7eVBggzUnAAZKOktpP5WeTH5Nj8C9LxYbnEZyIixezgpzEJtpVHPKUy8ndpcFhOupb/XW710TV3BYoWcEIzHHTu0IhE0ijJ66UOEVJd6qb6n2BbeJm5oRsbhj5O0RSBAKbTzP/U4h9fIkAFJokm4xesawXe2p64bQOyX3jUkZQ==; 31:GOuPnBtES5taDki1wO74+lbdIlvl9NrFtOxZmyTu4Vj3cSKWIqX/M2uGbCE1skfhx9pj8Bxt0L9b2lF/5PpRmTW/IQw7pG2rAhVQWz9Uh/6uvGopqYScN1rfEkzV656zrvjWGaKRiI+WcGAyQtnjDRnS8x6GSgCg+tjGyx6vwMZzb2/0GkUKhISPGUN10eOMaB+vuo+hzfN6ZVSXeh/rthZtws5bY7Prm29QeQqcFLY= X-MS-TrafficTypeDiagnostic: BN7PR07MB4210: X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 20:PkwpeVG2aoiDNPOtWnzvAoSYc7u2sqgZzKcU1aBmolrwP+cFoBhwW6fUI2LTPqIVDQH/xMDCQaMYeveE7rSc9SS01UlKiJm33LoDUeM/fP6Kkb6x56HB6WgmjaEtZF/8iDvz8/vaCblIYjdo4+ilF7DkdbivpjwCTQ8gHFv0A2+sbidRYAJO5E+6zYtdPua5ehsuSMChNED3fvs6bRRfxmkmdWQNAsRXNqX8/uB9LToxixuUPeEwWAKiGUa2zwzkmIja+GOegd8Kqamm89JUypYgHJFgSwXJU1Ss+RVVZ1rwKtiEkLkMw+I8bjmQyExteqr/6jfLUOG17B7/CuDeIkrVRQFbpQ4LrPsfDLCNB17S5WQipskzcZ4IwX6F5uTWhvKm1p1LpWsAKsY3tpYhsfhC0mM02GgZ+Dhb4U6dsvstTqdYbqTxjQKb/wjJfgZx0UJN58rVlUHendhXmZLQ4cuDVfS5I7gfJ+vZHogU8Eogf2Pw4dZk5Z5g2zh62D7w; 4:80ceOtRPHh7zFm984Pte3cjr22AS0yXF8duy7Wqd6Bp7w6h25VU+aN3PI8z0LjoizHThFP+qWE/gIABqJr15fhl9PoUmO6fXJkkCiq5vLxeThk/BeZkSGjswXOZj5mHBoNxFD/aTOuxPP/K1mJs4/kZCAaFGy8so5PZoH7bz6faLM93H8k4CxluPkQMeaMz899HHw/Nxmff/yFaytASmvvmsSjV/vnB6WVPOX7NsgA8RQwNtwLNzd/fzpUWf3aHhDJveU2pcWMW7j2DlKcjbPg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231221)(944501327)(52105095)(93006095)(93001095)(6041310)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:BN7PR07MB4210; BCL:0; PCL:0; RULEID:; SRVR:BN7PR07MB4210; X-Forefront-PRVS: 06237E4555 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(366004)(396003)(346002)(39380400002)(376002)(199004)(189003)(68736007)(316002)(6496006)(86362001)(72206003)(105586002)(33656002)(6666003)(81166006)(8936002)(107886003)(53936002)(2351001)(2361001)(486005)(486005)(76506005)(106356001)(6486002)(4326008)(25786009)(1076002)(7736002)(2906002)(26005)(16526019)(186003)(16586007)(956004)(8676002)(66066001)(59450400001)(97736004)(478600001)(386003)(23726003)(47776003)(50466002)(305945005)(5660300001)(81156014)(6116002)(3846002)(52116002)(6916009)(58126008)(476003)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR07MB4210; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 23:wgVSjQdPi1XYwrmTQKUPc3KoEY3AXEFxzt294wbY+IoXMUUlkfHMMQSRCBFjqaveDqcFndJjrPPiFvImf1PqYlSrHs3CcvihMfxiIF5BaxjLyDQS8D5HIuaxAT6Jjhtjrvr67qFsLJConCRN4BqwkLKR8PWUVvRtrkkdCi9Mvz1WhNioxZGP0/loQlqy4rkyYH1MNjpkOLmeqM586Stkb3QBUHFn5jUwjFfcT1f6vUH62jcI86ZWWVRwBRjyg/8mPPaCifFNPx9kXdL3MtXlGam0LKdLH93JN1YPRs7F6eB1X8HJMlFe8TzeFM2XEjdFJxva/irNSSxaStM+7XQal8ksF0LUdvQlCn+VgBsSPOKm7Vdh8iCcKkyxAw8R9QH6AbYu7JPdifi5ohDUKN7ozlgAnsuUB2fhuwcmfqJ2ZD9aqWhXrK1Spz37NtLDczdrnkOQuyMXwfn2P9w8jD+wEaK1SDp3q56eTGm02eqdDMdkG2s4Ze5C/Yd5oCHy00nWoCcDHkde2lioqG0ZvmKzPGS/PnhAUvmAdVDs3Cqod4ZzKWoVoDnfpRclsovo/G6Bim4qYW713JiKwMnt9K6hpVZdYUu7KdB7T9L2YLKJ+Y8HnZiOxlAUnY2qcMbvnzyv5P83KGwkzLeZbTMXa4yLiH6W/UyB7aC0gSPS9PZRxEyRrH1zHaXHDbxgzh3bgGnBLLfLV0TxjpAS61iocNUA6NFB3G0fhwm7qc7GWhBl+bvnAo3MXRdWaBDFIETnnBLZSZfGoXAS/Fa676ZfuDqHxM4kluqUBfBTuFh4XdMJgh8c2WGsDITOFAsMnRQIC696eXifJquNhB1qbOfwUkQj6ObCOKyrFNbaMl99PSPDcIVqst3wNt7qiQ/LQX/z9YKbLhnW3oY+Cl0djXMTRRnw99lLkYBTrRYqcMftj+KOoSZ4X0WxIncSqMSflh0f13VartedwerSI9iCC98mit3vvGwMRUaXOGsFM2FQFhqDcXOQevN9xCIACEj1KhCsT0tmFN8b6CGnItmgutmFl+Qtilg2UQPIYR9QlR2HtDumP0RJDOaQXVD540xsGFUJfVXhAwit0+2uLxz7G3Y5D/tPApPwC4fPx/mjj3mgWmfmM1IQC8LCxo+hpRTnDrM1cTuuGBv2skNMTCG5sUnqms9bFMkzZmSCkPTHibhmHRKoqNAVfo5QH/bp3L6UcKW3aEWHJ3OpqByQ2Kc8XwGNwwN0On6F3W4iq5Omi8tAsfSrjUDfn/0kYgH+blPYGF+kkTD5 X-Microsoft-Antispam-Message-Info: dyyzF0ImGjC04U1Y8viD5cy817M79P9s9yFKGIn5JDqeV17C0+JWAloWL5/JsiovdoPg1GHba5jz6D7Cn14M+DxS+gPaYzKlIUeHn3Rmi/l3pgt+WuuuJamdLFnVnm8EoGxusf5oecThAs88TeWlPmBSf/TKloeRzUmz2m2Age0ZesrtEW3zUnVd7utwtOEG X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 6:qCwAu1mVDhZLNjG0fdAA9R3ME7tVqyV6OrIwLIj4ZuB9RRpyJGP3hibyO1S5U3QobEGjxL+wgD9IlvehdQQrOO5AG5nnDF1uB3n7/kSSQJz3tvnjf6OvT4IEC0YaOR2vco6l19KO6UBCBFPmn48IXInUyYQdzy2LOMFmJ+vkmluSM615r8melNZhWVcvUtzq7jiCu2OAYeSkHsl7+5F6KiDlTjVbViWuX7X35udIQU47AZiDPt6d3irhsB76FuSc1n58fZM6uE0UCk6N/pMc6tSZC4xtNAqRU1+sWxSjChaveGZjun8OyDfMJVrKl03yFhPqnnfy6ysCLrv3YIuXz8BXrf+DQ2UIpVns5vmjz+nGPU6joRRnOXVh662HYmuM48C60hWmKbmhB6HEQBfDUg0O4vC3JZquC+0cS4CWwAMJ9Wk6uKBsiQ4R3kX52sxOqY5IDqKodwe2FqnacQsTSg==; 5:iB9UnNd/QCRj/xiUoajm/+iZa8fkwovDm0ELg+5s7LOY6KK7Z0unVPsnUKiIAskZm59bi+a+wLsM5FPukW2AGHA2zK0/AlU/iPoPq8fCFp4vR/5icd14l21PgVDfqwtbE8430TyPWV5KmxrP2H4DKJXLiaJ2aFpxobL4BTtweFA=; 24:o0faSnR7KfZVACQdMCZsis1GS9RKdYKu7BhXPh4Qag5lFD+pAMDzCDg8z/DsHC7kHxAXVYakkNU3/Ao3MFypqz6OBdT2XUh8FQiVJYFdXdg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4210; 7:z2FaJZK6qDxeuN2l3/H5nQ0M+WVdmPnF590l1vP8ChT3oJa7Z+PJYn4ImcsShT3m9q6QHNnvftPYZf9lnvUh2M8bu20Ok553QXKBitriOnlKLnWGfv7+CwFYaGLyW16c6Ll4Iw9aNEwZZeDXv+BcXtg8N0Ao8UY2NI0SmphDxTcm+KWQP6afj0PvgxXf3lI+TXJD43AEn+RK5nf5g9twUSZvNPXuaB2HjbafnigWmpxqcDsNH4ZXEFIrOFYV89+S X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2018 20:40:36.0851 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dbe8105f-f724-4ca0-1ae8-08d59359d420 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR07MB4210 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha Napi is checking Tx queue status and waking the Tx queue if required. Same operation is being done while freeing every Tx buffer. So removed the duplicate operation of checking Tx queue status from the Tx buffer free functions. Signed-off-by: Intiyaz Basha Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/lio_main.c | 28 --------------------- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 29 ---------------------- 2 files changed, 57 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 58b5c75..43c5ba0 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -1635,28 +1635,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct) } /** - * \brief Check Tx queue state for a given network buffer - * @param lio per-network private data - * @param skb network buffer - */ -static inline int check_txq_state(struct lio *lio, struct sk_buff *skb) -{ - int q, iq; - - q = skb->queue_mapping; - iq = lio->linfo.txpciq[(q % lio->oct_dev->num_iqs)].s.q_no; - - if (octnet_iq_is_full(lio->oct_dev, iq)) - return 0; - - if (__netif_subqueue_stopped(lio->netdev, q)) { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1); - netif_wake_subqueue(lio->netdev, q); - } - return 1; -} - -/** * \brief Unmap and free network buffer * @param buf buffer */ @@ -1673,8 +1651,6 @@ static void free_netbuf(void *buf) dma_unmap_single(&lio->oct_dev->pci_dev->dev, finfo->dptr, skb->len, DMA_TO_DEVICE); - check_txq_state(lio, skb); - tx_buffer_free(skb); } @@ -1715,8 +1691,6 @@ static void free_netsgbuf(void *buf) list_add_tail(&g->list, &lio->glist[iq]); spin_unlock(&lio->glist_lock[iq]); - check_txq_state(lio, skb); /* mq support: sub-queue state check */ - tx_buffer_free(skb); } @@ -1762,8 +1736,6 @@ static void free_netsgbuf_with_resp(void *buf) spin_unlock(&lio->glist_lock[iq]); /* Don't free the skb yet */ - - check_txq_state(lio, skb); } /** diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index d5f5c9a..dc62698 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -954,29 +954,6 @@ static int octeon_pci_os_setup(struct octeon_device *oct) } /** - * \brief Check Tx queue state for a given network buffer - * @param lio per-network private data - * @param skb network buffer - */ -static int check_txq_state(struct lio *lio, struct sk_buff *skb) -{ - int q, iq; - - q = skb->queue_mapping; - iq = lio->linfo.txpciq[q % lio->oct_dev->num_iqs].s.q_no; - - if (octnet_iq_is_full(lio->oct_dev, iq)) - return 0; - - if (__netif_subqueue_stopped(lio->netdev, q)) { - INCR_INSTRQUEUE_PKT_COUNT(lio->oct_dev, iq, tx_restart, 1); - netif_wake_subqueue(lio->netdev, q); - } - - return 1; -} - -/** * \brief Unmap and free network buffer * @param buf buffer */ @@ -993,8 +970,6 @@ static void free_netbuf(void *buf) dma_unmap_single(&lio->oct_dev->pci_dev->dev, finfo->dptr, skb->len, DMA_TO_DEVICE); - check_txq_state(lio, skb); - tx_buffer_free(skb); } @@ -1036,8 +1011,6 @@ static void free_netsgbuf(void *buf) list_add_tail(&g->list, &lio->glist[iq]); spin_unlock(&lio->glist_lock[iq]); - check_txq_state(lio, skb); /* mq support: sub-queue state check */ - tx_buffer_free(skb); } @@ -1083,8 +1056,6 @@ static void free_netsgbuf_with_resp(void *buf) spin_unlock(&lio->glist_lock[iq]); /* Don't free the skb yet */ - - check_txq_state(lio, skb); } /**