From patchwork Wed Mar 28 02:25:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 891944 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="RXMoldka"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 409sDS62R4z9s0x for ; Wed, 28 Mar 2018 13:25:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752161AbeC1CZ0 (ORCPT ); Tue, 27 Mar 2018 22:25:26 -0400 Received: from mail-sn1nam02on0063.outbound.protection.outlook.com ([104.47.36.63]:5991 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751059AbeC1CZZ (ORCPT ); Tue, 27 Mar 2018 22:25:25 -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=CdUUkYsqrqMBkMJvzPlJIJvdeEPRSugJKEYR454MnVk=; b=RXMoldkaPh1gbmeEnZgoYa4uBEaLe2VDRG4kiFF1Z0UidwPeZTUc05yVUE4AmU+hJ3sHYHQt12JU+oDWpimu2UxPbMtDIVOK9S2t/R3ejjlj3iv/7Mh5J6LvOtSf4qWzcBCkOzJ4FrMJDhgxDsMenSFdvym4teXZnOHrBxpOWvU= Received: from localhost (50.233.148.156) by BN7PR07MB4209.namprd07.prod.outlook.com (2603:10b6:406:b2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.10; Wed, 28 Mar 2018 02:25:22 +0000 Date: Tue, 27 Mar 2018 19:25:18 -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: Prioritize control messages Message-ID: <20180328022518.GA9011@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: CO1PR15CA0044.namprd15.prod.outlook.com (2603:10b6:101:1f::12) To BN7PR07MB4209.namprd07.prod.outlook.com (2603:10b6:406:b2::11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4cd123da-5f58-4cea-0a06-08d594532891 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BN7PR07MB4209; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 3:NYzxxnoBsFqsbWEcprfzGzTYZCz68UxOImJz60WIwumkgjB48Ji+TGAVTlBscbC+TIqyLsa5qWOYSmG4zn8MRc5rv4wvxNoFrniBJ2HLDDWkekGDgTHIt8dQFtFz7nuKjIZrRLt0sWVmmwCTHmWUuKXvjioQIDj5iq8ST2VX1x5iKLGKEL0CTqWIQhnAwgI23payO5gNXNoG1S049JJ6DaYhyTVRPSS/8aIlS/4fetDZSou3ZZUgUbrgr/o2iHqg; 25:qBhE0ZDLBmKtdPMhFFxf6yaSJ+DByMaEwUWjO6xxzDod/6p2G7OVQ5gd89ZWyVYk80xBmvbvYYw99+DdG3H4YkGKqEEWfmNjxUslJRLbZWKlqjhXWLRVI6WP9tDaNW4NeUVWevKSxza1oz3ereiH2wP5BVvP+ZRbaJOcFhNYEOuTLvfPmsCT+NpECJKBwPk14HeHQ9x+91w9HuZdZfYog8lP0wWjWUgJLTmliEkGvZL6dN3bwPRPA42E1z1DQvJua+xBXz7TypXnTJntSH1TjiEs86w4mFENuUBWF98BVNrWy7mlY8r4EW034Gw8dzwQyxIceQcaDj3g3FvZwUIX8A==; 31:T627pIylEcPH5VLc+I4oedHlKnEqH1weHdxXwhZN1+JK4DesN7EpH1KkENj9CbUTT0v6vI//8zGypdDbge6ds9fSxh2wC/VlvlQBj30qzo/SO8wBu4aSkuRY4adNagRP2huMDnTRqtJHWhYyBK3JQvnsO+REdDgo7cFGQt63ULoIG34TmrjcRxjRdz9q3PGnCOVeExdurLgQ0pUamz3535M5GwLqniwwjVJshUkg0r0= X-MS-TrafficTypeDiagnostic: BN7PR07MB4209: X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 20:c+hb0nJ0EtMhE+R9FBO1PS3S4yN6YQaVx6dfYjB4S4XgbC5Sc3gnfF53/kF7ZQsxgXBOTM4EP5SdCA7oAa4dKDpYVQkd3ufdlvlvfw7Nwvs1dpmjydvixvVdbQ5xZrCPpYxB7xMoLRdG2DGoWVECA8Je71RUO/DN6scEmZW6siZOQ9aQMZwFRyw2bWucAR/e09/4AX9SL6m31IJAtKeX5iOOYhkQ6FKvrKa+ZZnl11SI6l04WlmYvs9G7ih+9u9SPSGOQuBaIp8+9L5khw62o8IszXEr04ldhE98bnhsMLcM42nqNeWw27oHdRTCfhYonHQXb2K8FmUwA9yDHnFo8Hepi2AaFPXLH9a6UMghiXdHdQpI8sbirTt1X++Br79rXg2yryyQ2hBha7sLXijPGqGD+sIfv+081BjW5DsgYnJEU5egih6Q9nfh8OX830w8aLJrwGKzzfrBazGe0nD/P5YZaWEhQDXTAyX5WvgkDxIpZqPkTTEcG2JH6JeoPL7Q; 4:C6TPjm04yQx8G5wQWV0puug59yfWD5/giMHMzPEaK8PG7iHeYXjN2gZcdcI1DKegvWKblTlZPUYKAnew4VdmKkc6Sqf55Mx0oMZTJ5PFtMauPPNA1DW/fc3ufCIIUwUkIrnb7ihIrA9p8env/x69RaxKE1/OsADp2rqkHLp0ky74xDr2TpSlv+U0FP1KFXO+XfIoUqyfHM4NyaGg+Vt23NK0r91JTUIMqVHZbaSprXGQhc2RmU8i6gdG1X0ho8Q7Qo03uBU84wh4lszWSd6FWQ== 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)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:BN7PR07MB4209; BCL:0; PCL:0; RULEID:; SRVR:BN7PR07MB4209; X-Forefront-PRVS: 06259BA5A2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(366004)(39380400002)(396003)(376002)(346002)(39860400002)(189003)(199004)(68736007)(5660300001)(97736004)(15650500001)(1076002)(50466002)(23726003)(16586007)(3846002)(6116002)(7736002)(2361001)(58126008)(2351001)(316002)(305945005)(6916009)(6666003)(8936002)(81156014)(66066001)(2906002)(76506005)(8676002)(81166006)(33656002)(47776003)(105586002)(52116002)(86362001)(106356001)(6496006)(25786009)(6346003)(26005)(107886003)(53936002)(4326008)(478600001)(386003)(956004)(72206003)(59450400001)(6486002)(476003)(486005)(186003)(16526019)(486005)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR07MB4209; H:localhost; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 23:LO+tRNwVhAH3XMaXyv9L12frT4ckoHUvWF1dPpAcBNgbhVTv5fldBGZhiX7Vx91Sug4WQsJhXTddmtZTGuU4WELlOG/gHrKSfwyhDM49vhuTicaGTbjKTGHIj8ad262Ho/IBGACNUYuyFh673wcP6tm8H+8kt3TSb4A45lDN7fLdxNolw2oRF6+IKWCrcUrSY9OcOf2iZda9ebKZoKkU6GpLbsDRJknTdASq79RijtV2VSCkFiGfAvtk8fNTbB7eoj37b2013eVQ/pyfnxeSRBgR+e7mOE3Y8hUp+r+q7awe0Ni3Aaxi/iRKZobF3+2aLgf+G8RErWZRgmG3TFCYkKr19tVVtGBJBAQ9s8/kNG/cWijKzWbkttP7d7wMiH6qYgE+YBfUNNLRdoTvZMyv2Rzm4iP8VUL8hOj167DQq/fglLGfz+05nALpWmLbfCZHZc1pVb6iMqlng1odVtVJ4dMrbuFw851EHJX8ijNFm3J2im3noePU58QnfoWtIQEHMOeDLYB3dE30psuL++wK2sU+228+P+faHCcS4fx4ORsg8HOU/6MY1IZSOLeUMtM2VNzE9AXGin+8qeLDcqtn1nmtK9Df8+ZxkyOrUW2hapE3BTENQptRtfJfTCC/O8WZuuTWPVqIHhv2GFqUrVcKUNd+y3w3hrbqL+aceIhDTEgDXGPydxloUTs2Mam5SQuDvoL4wm3T0IGa4aMtp6dKCfFuxaZ07Sz8gObP9U7q8WNpbLkI3WYpGCzs1ZsckkSb8rrocpF/TFV9t+W9GxQa3VV7SY+H2lFmN9K8NXjbQHAKeGteXEq+mlIfdawZTOKDinA1pIpgokXjwWDFvoaIHRN8zN8psX4i5HkVDhsDeRGchbegDI0yVIzfi7X4sIfMCoyeGia07JbQSz7GObszyhilEiNWpbhk30fpMV3CEX0cWZZjnhTF7iOCuhFP4ZoZUq9GofQ4ndmABqOtTkcXiVYpyNdPtqWscmKIRHENsYfoPbFv8DNtoQs5tdgUi9pA/aRLVcUQBEKnWpJWTBIM5gZV4Jh0JhoCFD6Dy1y5jJfZxXaDYfVYBs/dLeOFBB4Ba9XkLhAI0UFBrm3qneBehVnrbrA3E3EaJIOfPloJlabbUhAfWEbCmUiMQg9CHtACG1wEWlhqNdXeCLpbAkcokUbphqn0UexwFi8VgjJnexuJkwtW+RZFiUk8j1t/7wl9UmLO4TnFLX1O8STMPKTA/9RTkY0C4InSZygK/wooehu/LbmsVdqDlHkjkcWlavIZf20O3ArqsEHq3r0ZOw1RIdKx9CxSrgnjTvr1rOXc8P0= X-Microsoft-Antispam-Message-Info: 53lvwretIxQwvYt0ratFWihctvcwMu5Gavusgc7ym4+6+Pu7jJIginoYvsAwxnZfW9c78MjsTgBEiadtz4DqINFWMekIbQ8x5XOT5OwFgauMAtJjsG0RsjLOa78+F2861HTHOnEy+mv87GPAnohDxTW4AHBkdQnChw+Ok9RqIGbcjrdz4wjTmouMvWNg9vHp X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 6:LeLUPcD64WbnOKJx0wfndCeTAe+vx60AL5oBaZ1c6bWXMY/UIY7u3KEA1ehv96A7a3UEumuhgy3v3+k7NvLDMbtmWdcYq/Bl9TZv50Rhm778ogSKGcgxgg8OHVMcv/v+8bnYbugnu67pUphsvG50tseQ+p2qenpmjRvI+H4L9B/xHrl+XUmJjzRiaA0ZVOlcPbBvb53pRfCe8pkfqlKOT/tgwwgOPR2wAyyjAmqIe0aRhYQaa3WSfmJLtST6tRlxAlL+Oqb0zrRcS2yVZfjOVXrne34YNXqWQupr5UQTNFSvN1v6CHRzCayY0+/6k09JLMOuXDtSNOflg42vC3oGUsmKtZHQDK+VPy3VeUTwCUOtuRsaQBFftdlx++zCUp1TsN1wZxtV17jTkRwKrYl2Ym8kozNI0PcgiuQUiMxAsNgeUfohRKysdZF6YxeCGKr6ZADv5NpKqdtqweLs7xjDdg==; 5:cOcvFFdm5XqUVNYNejh6kZjsk1eJ3ODNrTDzdLj6n6naf02L7q4umBDOZlE30cmpfOOjLKKGVB3lVesmjsTnOQ+KlvPaWulc+DF8KoTrd64Ir8XKvpz/PBk72G02Ov1UYC+x8aG1nBaT+d9Lo2oBtDkI+1OzjJswbA2NxaqnwCU=; 24:dfHX2weY9luZMsQAoz/DURheOXrifP0h/2siE/uKgz1uD4nX/M4psprow/ycppCQEqRWILOu6ifFU77iS9ynztHg62ioQaUbT1s1TwQTjss= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4209; 7:1buBuci3XN3JGozyjaHtrr7krcgemRtc3VIHEXx1XKy1A1RKuNe90gNxm3UftxSuTYu42fGWS7IO4i7ZbUZRMdfbLHLpfYX9G0sM+9Eg1ugPTnZbVDChwgfiK1tYTo0Sttg+N9qb+7v5evOGzTesMb3V1K7urg1TDxUXFLs65w3MGsXEpiFwZ9LJ2NnU//0ki7pXrXLsUg66WJpOnhm31jYLfO8cEaYq2davk0RLkAqTy3SWKCpQWutVoK0z7K8g X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2018 02:25:22.4395 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4cd123da-5f58-4cea-0a06-08d594532891 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR07MB4209 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Intiyaz Basha During heavy tx traffic, control messages (sent by liquidio driver to NIC firmware) sometimes do not get processed in a timely manner. Reason is: the low-level metadata of control messages and that of egress network packets indicate that they have the same priority. Fix it by setting a higher priority for control messages through the new ctrl_qpg field in the oct_txpciq struct. It is the NIC firmware that does the actual setting of priority by writing to the new ctrl_qpg field; the host driver treats that value as opaque and just assigns it to pki_ih3->qpg Signed-off-by: Intiyaz Basha Signed-off-by: Felix Manlunas --- drivers/net/ethernet/cavium/liquidio/liquidio_common.h | 8 ++++++-- drivers/net/ethernet/cavium/liquidio/request_manager.c | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h index 82a783d..75eea83 100644 --- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h +++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h @@ -712,9 +712,13 @@ enum lio_phy_type { u64 pkind:6; u64 use_qpg:1; u64 qpg:11; - u64 reserved:30; + u64 reserved0:10; + u64 ctrl_qpg:11; + u64 reserved:9; #else - u64 reserved:30; + u64 reserved:9; + u64 ctrl_qpg:11; + u64 reserved0:10; u64 qpg:11; u64 use_qpg:1; u64 pkind:6; diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c index 2766af0..b127035 100644 --- a/drivers/net/ethernet/cavium/liquidio/request_manager.c +++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c @@ -628,7 +628,8 @@ static void check_db_timeout(struct work_struct *work) pki_ih3->tag = LIO_CONTROL; pki_ih3->tagtype = ATOMIC_TAG; pki_ih3->qpg = - oct->instr_queue[sc->iq_no]->txpciq.s.qpg; + oct->instr_queue[sc->iq_no]->txpciq.s.ctrl_qpg; + pki_ih3->pm = 0x7; pki_ih3->sl = 8;