| Message ID | 20180324003736.GA6575@felix-thinkpad.cavium.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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=<UNKNOWN>) 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="Xc2vmCbM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 407M230nqGz9s0y for <patchwork-incoming-netdev@ozlabs.org>; Sat, 24 Mar 2018 11:37:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752299AbeCXAho (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Fri, 23 Mar 2018 20:37:44 -0400 Received: from mail-bn3nam01on0064.outbound.protection.outlook.com ([104.47.33.64]:26336 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752266AbeCXAhl (ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 23 Mar 2018 20:37:41 -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=E5Q3Zr6c1DN6eZiFv6lDuu5Fk2ttQl4SHYhhTHLA7s0=; b=Xc2vmCbMkYNKCzs7IOQJaaQOuKyuatzu5Zju98QqWa7mjWFKN1mQ3wdgLGmAa6oMj1F7hgczYGKGC7RJnCmGLgxCqAUevHzoIuZAOyygW1Z0E9ILPomJqqfizNOjxALvR8FsxvyoXJ8WygaIViYRaUnoSxZzAzmZLJVmNBXodn8= Received: from localhost (50.233.148.156) by BYAPR07MB4213.namprd07.prod.outlook.com (2603:10b6:a02:be::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Sat, 24 Mar 2018 00:37:38 +0000 Date: Fri, 23 Mar 2018 17:37:36 -0700 From: Felix Manlunas <felix.manlunas@cavium.com> To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, intiyaz.basha@cavium.com Subject: [PATCH net-next 10/13] liquidio: Function call skb_iq for deriving queue from skb Message-ID: <20180324003736.GA6575@felix-thinkpad.cavium.com> References: <20180324003618.GA6457@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180324003618.GA6457@felix-thinkpad.cavium.com> User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: CO1PR15CA0111.namprd15.prod.outlook.com (2603:10b6:101:21::31) To BYAPR07MB4213.namprd07.prod.outlook.com (2603:10b6:a02:be::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 750207b5-b781-4938-b5f2-08d5911f7232 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4213; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 3:6DnXt8vg1DHyGQbVXHViNFA0WaRvQ81by+0X8N988UCh1QdPoOTbxwS94dR0RWiHl/MjNNamWSEPVhj2ujzlcNt9Lb6GfCVK8ZqBaHIDj0yOtrt6T0XoHUeK2gj0cQfKCSan87hPUUqnMBTqCcGk8/daLT+eOIwdRlrrFtGUyQxEMTfg/gX7nIh/z7sg1PrESq7733AF6pPW3v0GaFoGLoxljoXFaju4lCJ9RSBagBPsgGJhi1E6wcK7BjASrsdD; 25:QZ2TQw6QQwhXdCGO+9lCi4cyKHUcO/qHkHtvTiJuNceELaYdvAZVVPFqTKNTAfQxH7KM4jV4dsL6myu6YxcI2SBkNjeysA8qK1KEzZRlPm9lCY2SiqTa5w3wOFd+Fh0erK4Alrr/C8S2gdNTUaet8+VQnL8MhImhwCKH+XLhg3WUdGH4zyOQuM+mU0weI/B5B9WgEZgzgvGKzVOC2g+TFtrvCI6gnE8kDr/LwWq37ooEdi9G37zhc0UvnRhmnqUZ6iWyeND5f/8mEOcJXAv8/DITz+jtg/oNVxND08OOf38N+rAYQsu9wbVl/HRufnZF1s66fKXTMBwiLz2krtyAjg==; 31:QKjCuBpnkzglIZh4uvLFr5BptY9CfSYBmJw/vdNb3UuM/TV4H90KecQBcMeb62qYwVhFTarqdieBCQqkRaBU1mw8hplywWve31fP3QfUnH3vUZkMcBw5R3DXTlPWT+DU+ipFahm0z+0lxEHbA1kWDpLv/tk6U9CQiVQtEB0G2QhO/HZ2fK5KzUL5/WAYP8D4/JnPM0zCoz0IHlEIHR6Xy680wjiKNlkQt9wXGdoIbck= X-MS-TrafficTypeDiagnostic: BYAPR07MB4213: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 20:jzbcNOI6Okt76N6UWcm4bWVm2pXKiiwDIB1V8nf9w12CQdet+lrcYFU5jAV8nnBz24nh6bhnAWq5Q2N4HVbxHG4cA+hVaPCC28/UDVq1IH+1wVGvJEPFA1B6V6fvn0SS8NHR5ReiNLtWL2zqtYThnzTOZAwjkOsFIEAzdFLHY9Iy6Guwhv4twKi20vvw75xGF8ZU/9QPIuhxsovO5SjVwqwF3Y7ozQzKTSfOYjkuJssrg4A4AdcDK9dO0FgChOmGrmuo977UKNe4ruas/6At021BHK6eW/fK2oX9SJFCcivHjDLlkpsIleZZ/BVv8m+0C7slInL4aodd6uM+qaNk7P1XtkxukT4RXLz6xaNrDi09MNR6zpQhYs3erlHeDHjksy6fL6OHsXlYCpucNmw2YnnKnGpkBoZGfQg616bQ9CGYQzKU+TiyJ6M5mzfbkaxDgiBFjvi0jDvJ7sM2qzI6wm3m02aDCJ/IyFwUaXh1NJF+tzsm5Tf0t2kT6HI5lVlf; 4:xG3x1KE50KpA7UpKgYI+rJ0fYCk54MrmPqSRIwPQzla3jlQcsyeo9hCDaX1vMLHzy3ZcK0FPEs1qIhUI8gINjdYqs6d/7+ctX1DvpEDZz+dsjxvXHPZgZfzVCriA98fNqp8i+QvFwqHs6o09r28MyZfbw4cobFPgH4+s6etKN11WnELT5w+enKkjYQwp8qeIs26dsS2Wzp7Whz5SRZ/C1yDvXWWrK+rQB9KS6elJTv1Cuxql74GlifRhkwupyF7w7Rha6Zzhfz0HV8MuwWzlFA== X-Microsoft-Antispam-PRVS: <BYAPR07MB421379EBBE387A3A7034EB0DE7AF0@BYAPR07MB4213.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(10201501046)(3002001)(93006095)(93001095)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:BYAPR07MB4213; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4213; X-Forefront-PRVS: 0621E7E436 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(39860400002)(396003)(376002)(346002)(39380400002)(366004)(199004)(189003)(4326008)(186003)(68736007)(58126008)(16586007)(105586002)(106356001)(1076002)(25786009)(7736002)(16526019)(956004)(33656002)(5660300001)(47776003)(6116002)(316002)(66066001)(446003)(386003)(3846002)(2361001)(2351001)(478600001)(76506005)(6486002)(23726003)(8676002)(11346002)(6916009)(107886003)(81166006)(2906002)(76176011)(8936002)(6496006)(50466002)(52116002)(53936002)(72206003)(26005)(97736004)(81156014)(305945005)(86362001)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4213; 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; BYAPR07MB4213; 23:Uq2Mzf7ZSYsWlm2Degqq8ceTdgPpO24S6qk6cP4pbGdfxwxIUlO2p/Ej1D9aPH9pMOmJyPCfwLTCUMgniiKmaEsgG6gGHPl6I41XEHvYdKXQHy1Rnx9aFQZl2n+YzDFCsbHAk/VqeR+ddFKNzBCa6QGxMP5ynVZWalx6rjrm3RU29TjvhhaMlr/C3abtXSy9InpXoJnTkdnzPM3zcVjr1e6sHtvMhAKajClrG75DSBovj0j8n54Khx6Nqbf4MAEZTMH09nffZhgVYY1qMEh6pFT6lB/EESt8NnOcNZHp5FsUlBMY4O+xstF87WGZiCgdlBaGLTfDQpC6TicNEofW6SziRS/XkSloEdiHAzsh8t9KugiMlYAnJlcLAF9Vh7Q8QRgWpaIchV/HHeCuv1FKjTjbLTVuUbKg34FYICKd+AEAhfuCR5/aLStt/ylfUyZ1WBLOxAv/lZU6Xu1bMb8da9bMU/uZatlCYHrPPFFNkNkVpxyXedRzFndICpVzARgk2bgGAQAo3VA4YIfWebFjtmfdsFpxxy49P9fBx3+lZj8RnTC2aLSx3yEW2aBaVVetn8YvnYBHZCUB0tfJ7anPaRZb0/PvMuPUPmTioh8SsgNIceIQkZ2XywCpu8pjasZkr5QVPMyYTuHpUoe7QNRDGoGzzy3z0izVxVD2Uiv0/ev3mKQ7eY1Pxx/kzlv7QPpbc+F4uUKZrBYyvXwOc7aQiVVnYOULs7xYoXWhMMvzbpg7VksqB8aDi1Q+4N19UsRBl6VM1IHbgoi7iQZfbHS039cIp9X4X32m89CgbnJE57eJRzyuEJsCIQmVA99OI3UsibNH8OhojG4FP95GEBp4x+D7elm+QUXYVrGFxYZJdC54hZPVNpTvYmZnUzvebct3JxsaCMETp4fS1rmHDBC/Y9PCq1P0/PDoxnu7CyNsPcF7yedd2aWhfKTTB6hQUKYcNn5RBJnfxx4MTCNI+++UOcuPzZW50W9/IyP2KttNpfeelLd8QuX06iLk2Utih8N4sCf5sfQsSEgzwm6VZMmu5oFQfz7+KE8YmrzP6vBu6MTrXLJiybu006xPFvmLdXiH1FLiTwbAeR+hRgLsYC8jsq/16n0wXe7AGqgDUL/b0G9wxsUN1D16MnYRLCFsXjKCTUdVImW0ZJKlWsmAoJuKZTIou9R4ntOHAmVAOHj22n+TVdBcEFFFTTVIFLCAQMIh5Mg543ly5bNZB63EMsPupQ== X-Microsoft-Antispam-Message-Info: 40B5CaVSvrm85TCY2aCraH4Brq3kdR0D4lLt42/5dN5l1PncimF3XFhFyt6KnluJkz0nQuDUb1+ej2NURkIMUWm3n9dHGeMoDpIDa0P78b4YeqBywMfGUf241gPhtBDvZ4P5Wj3Dl4DfAicY4hXRnXknTIA2+nPZpZ1FD634L8PYLSFeKy36fM3S/Jyzqfdf X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 6:jv9U7RpBD71Q1ifCcV4CSklB6CvQB0kQ4HpXaBKIyvBQoqpLS/ngyDYQdEFIQCl1p16OYXXUFoTIkAhxh1iCpcSglsHs6JCXeT9uJjNe0krXAw41NGzO+KAGDWvcrrQJ0mw7SiMi2iyVwU8ww0H8zM0YpYfiUm+lL8NCdGHPQbOFM6yUZM4rE2cvHZpBbii7WunbfIQUHCRUn2QgQj4ZpLr13HCVMNYCi0QZqIOX+x/T8qokQORjLJuJuGYTTjQuSTfvPcrbA2dYHVNPOUxMgyzOmI+V6IOvho7DM33nwFh2f7M0Z3tMtBHTW2fvYYM+nc//Ub7KCFM0TmxKPQVZ0oKty/lVYUU0LpBAMIwQW1rXO7UmytoXBq2Npr7WZNswGMcavma1MmGNm0pwj2QobJj6hC3l/5Ophn8/q3H0aZUNL38ZUF7gY9Sch6Sz1wKUFi4lED+bgbs4YdogNK3fug==; 5:RqpHFj/anxefLAaHz7nO9pjaJIx9LjGCTFzAHpKY9Meks1VG+HxECA0LFZrHwCqdH7N9gPFRodSuLiwhhgjge4DgQBVMSFjCrrgZpHeSDBnSXpt4LoeiOql4AI1ckpTt1/fUBkWEg0ky3BcfJjtfoAeEszLxnNChAOEkgGjjdcA=; 24:t+UfEQwwN5CsLWVEFDtOI6qPaOMAZE2SjuliJKjAEJ11UPp2BpfxdsCDZSyjmADsy/5B6qxHgkKMX8YS0ytGf/CpgH5Fsd0BkPrCBiQwdWA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4213; 7:j4e82gVdptxI3QuMVCEGAg6GSAUxJ/zQv25aeaNRhmPom2hcwZWnkBXPdKKu+2i61fIyasTy7f0w9zNsLXeXJUuB/eQr0FPLPNDbHzmDxBuM4M9YshjuGESTlK/ukYFroqSj+b8nJdbKqQpEZxSqJcbN5RhE4KsTc03VFjaq0G1dZRJk5FgoPp1fT+lrxrodzReiBBXY8Md/aHC2FECDB7x7KP8FjmMxJy1npCyPK8KM+JeUoUirWVhvmmjo9gbk X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2018 00:37:38.7639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 750207b5-b781-4938-b5f2-08d5911f7232 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4213 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
| Series |
liquidio: Tx queue cleanup
|
expand
|
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 78f6794..2558a94 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -2528,8 +2528,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) lio = GET_LIO(netdev); oct = lio->oct_dev; - q_idx = skb->queue_mapping; - q_idx = (q_idx % (lio->linfo.num_txpciq)); + q_idx = skb_iq(lio, skb); tag = q_idx; iq_no = lio->linfo.txpciq[q_idx].s.q_no; diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 5ab0831..478c20a 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -1604,8 +1604,7 @@ static int liquidio_xmit(struct sk_buff *skb, struct net_device *netdev) lio = GET_LIO(netdev); oct = lio->oct_dev; - q_idx = skb->queue_mapping; - q_idx = (q_idx % (lio->linfo.num_txpciq)); + q_idx = skb_iq(lio, skb); tag = q_idx; iq_no = lio->linfo.txpciq[q_idx].s.q_no;