From patchwork Tue Jun 19 04:58:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudarsana Reddy Kalluru X-Patchwork-Id: 931365 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="klnzla/v"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 418whR3cWwz9s37 for ; Tue, 19 Jun 2018 14:58:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937129AbeFSE6N (ORCPT ); Tue, 19 Jun 2018 00:58:13 -0400 Received: from mail-bn3nam01on0089.outbound.protection.outlook.com ([104.47.33.89]:10240 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751777AbeFSE6K (ORCPT ); Tue, 19 Jun 2018 00:58:10 -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:X-MS-Exchange-SenderADCheck; bh=cco4MChlGze0f1G6x7SeY5XlQxjgJ/afBKH72LBUODk=; b=klnzla/vuwOThxECfomjBdjpEVpEFStc9DsaaMDlYzasocr6OXEpgpuWwXcdebV6iHaNV6iCFKZ5ZtYb5w/MeTAcRsCz2GjxTMp7g/u9OPkbbo6up5t5c8gaoHSBIzgQYCSyJvsyxm2LzQjzK9g/U8qWWPgXbuvftsC00LaxS5s= Received: from DM5PR07CA0044.namprd07.prod.outlook.com (2603:10b6:3:16::30) by BY2PR07MB1458.namprd07.prod.outlook.com (2a01:111:e400:515f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.17; Tue, 19 Jun 2018 04:58:07 +0000 Received: from DM3NAM05FT047.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::206) by DM5PR07CA0044.outlook.office365.com (2603:10b6:3:16::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.863.14 via Frontend Transport; Tue, 19 Jun 2018 04:58:07 +0000 Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by DM3NAM05FT047.mail.protection.outlook.com (10.152.98.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.884.14 via Frontend Transport; Tue, 19 Jun 2018 04:58:07 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Mon, 18 Jun 2018 21:58:05 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id w5J4w5uf024091; Mon, 18 Jun 2018 21:58:05 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w5J4w5cS024090; Mon, 18 Jun 2018 21:58:05 -0700 From: Sudarsana Reddy Kalluru To: CC: , , Subject: [PATCH net 1/3] qed: Fix possible memory leak in Rx error path handling. Date: Mon, 18 Jun 2018 21:58:00 -0700 Message-ID: <20180619045802.24050-2-sudarsana.kalluru@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180619045802.24050-1-sudarsana.kalluru@cavium.com> References: <20180619045802.24050-1-sudarsana.kalluru@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(396003)(346002)(376002)(2980300002)(438002)(199004)(189003)(76176011)(316002)(2906002)(86362001)(51416003)(356003)(5660300001)(8936002)(16586007)(42186006)(8676002)(106002)(6666003)(6916009)(6346003)(54906003)(26005)(186003)(106466001)(59450400001)(81166006)(81156014)(47776003)(486006)(69596002)(80596001)(36756003)(2616005)(2351001)(50226002)(305945005)(48376002)(11346002)(446003)(476003)(126002)(107886003)(72206003)(1076002)(4326008)(336012)(87636003)(478600001)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB1458; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Pass; LANG:en; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM05FT047; 1:nEr6uNIc8LtDHdnHxeMAfokiCQT3U4Gxwi0tCtZDsQeE1fcgFGAajEjJ1wuSQYsIh+wedtvrVO7Vc/8Sf4uUlIYQtJcV/FCsjHEVKkpCmmtLE59u94pk0/JrgmGBFAg2 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57aab755-6232-41c4-1c11-08d5d5a13f7f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(4608076)(2017052603328)(7153060); SRVR:BY2PR07MB1458; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 3:sLuTSrBXY0T2ejphXlChfObDTbpgbDiBC6w9dqYYRjdTI0RyFzfAyGv94UhC812JnT+S5jdXGaDljoEipGBZsZSkt6cJZYCr3slnIBGZ9uVBzFqusrH3oPc0ghjctTSFnWFdeb1A1rtSMBCqomgI4Ftr4+DOI4H8pwpZycT5D1pwACDytZvhXw3DkE1I3mJTIxMWyz9LowGjYcNDtE5wHky8fffevlJrBk82Sm8QxQljdzunrLhzfV5S+9Kq3Dj9AeAcE5OY52uEB2c2AsB0iWUJ2WXoKP76ZzWZ7y+TU4jtY6iKlhwn8nOnOIIADT7T5tdo5OnrH5wtCn3Sokn0uA==; 25:JeAu2dkVGMtnL8Wa39X6+VoJW2MKsyTZ82hykxPJlTfETm/j3G7bLBXS7xHKL2j1vAk2pkSgbE99tUFxGhb0vsUsBoJOtjsHAbBOhaoZID0iFVDk5rYFsqBEwezwUpyKswMQQYDv7LSWrXYg0yIYrjVd75y6VxoD3JsY7HbVfxRvTXPOLu4E/tSqRaRRDHYrvpT9JUZpd0P/M/7CngBq+Ka7D3pk7UmjvQVTNZfIWIVdozdsfnNWuKzyL8EW40U8h9V9hvEFND8cOena8wc0OnhfjeAHyNq4Sch1xr+sh+A8mF2bnp746WhIRji7jH0zdCLePcyYfS5iip45fCMp9w==; 31:aj98Sbz7l0wPXjhcjDPJkY85+o3eV8mSlxyOS74vvs9dzjjupiKxLUXBwsk3+UeHNv0nuR1GmH2bcmHjYh0fxE9t8kO7Z79IRHEDyWA0SznZPcKs8OR586tWKTQlQBNLSQp9uj29bBvOO/i04KyCR/Jxo8OwuyogED+UH/EwIFEnez/UMG4pmkjlpmpLXRRKeCwxm6tGEyf8G6ttlibyZgWqFup1jRsE9onhGJku78c= X-MS-TrafficTypeDiagnostic: BY2PR07MB1458: X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 20:JaozfWPqkHp7R6of7YikUHtOqMh2IP+Sp1PEOT9qqqITsrEkhUl3GCGks9ef7GE1cXfSXlUBSBVZhhDvEdQ7crIgZsh1cq7xvvapUVacnok3W4wojoGdtB1LdBV++qyjhAf9Jy9In5YHqWzQSlpFHaLQGSmo0ADoRqnDbFoNtEybeGfSHjoV+CtxJw2mEfTp+Ch/V73lrd29hlDSgjFAhtU3cs6MoSlmYlNYJl0J2eLUTlCjdzH+++hPIKmMbtEJkO/WJs9OCM85psxn4/b2XUHcUA/CuN/ORIw4yHIDb8iHkPfiNVHyksHdC2X4Fi9fZbLB+0mIABaeLNPHyC1aGNNjJpZJUq5+F8Lg93SbQHOaeTalp+0MjM3smozos95q/sKAH0Fa6F//O41BElMBA00LQoDl072etLRi63pPhm98QF1fRTMAqDIWYoVfFWadLvh6I+5v304n6dko4gKF7BoN+dlz5G4l6Cz1TxrmDY2Ats+y89PfotCGbDlzVUpq; 4:wMewpfWa58J5+ylcwu2XkRJlNyliA6YHYaZzVNTMD7RvcLCcsCb5yaflCSpAz35S19ggl5vdKRZfa4gV1NuDpoLddfol5TvrmYtx9S7IKvlT+uTxS3EeYCaMpfteLD6pt9/LncbecQBtE3awuJHfPRcZfBTiEgjwOzhJVDjfT1a3HfF951jIyjtWJQ/bHNPMOGqEDhS0oskhK8Dz+BwDG4AXXXG60g8txTkZ6a8fKOevz096VS7BugrMw0arhgVdSwDFgdtW5To4dmdmnGccww== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93004095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:BY2PR07MB1458; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB1458; X-Forefront-PRVS: 07083FF734 X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 23:k8+EcVUep8J+/ZlNMb6Dt7g4wDHqw/psEdb8M3W40OjO1xxreeRipQvHidOt7OBnR0Cuht3gYw5w8Z7e/AXD+nHJfXmWKV7sBLDV6t6AZ8FZU8GL/CrDnYkkjUSzxJXy1lzz3Qc7uEgQSdZh56V3zDR3egmYmbBmRW9J7j7/YjPpvLD+FaeXpmp3ncoMpIaP9ArMpjZqLKkZiQB+mRZnKHCSyIiP4Oxbr2wI5yuz0suC3MJpBP+YLL+X1IIPeLn5TaJg42YVmvl9uPwst+DFFP5IgVLZ1P9I6uz+zHB0hGA5hxQBw2tqzKND0UU6xAPZR7t3JoTw5qG4P+7ijQZO5Dbv5bh3yfPGQYpgsdtVUGQCukQzJUKQrXADclhm8S4v1i71yS0g3OLh87d/sE//U0FlY9phv4l2D9AEErIKu50D3ZaniX4puZUtMCjMt+4puLVDuRoB/zfo9Ck3LMIl8cQPzAmhy46WZQBKJjPLJvPVxwl4dFANPqJi9Phz/bj2bnV6rZ6DCrGDe++hWb4xHRoSEIu/qOqE4uuH38b0RhEYhXmiNrVezH4sY2TJIA8exgDywcu0H95GuiOwRd6QkdPXiTkVTwN0AbJvISRgQEmhmov3Qf3rv6ITt6zy4pT4Gg6J8tQTw/dzRaLyQt0pp3Q09H11ye3jrXy0rXEjzlw1DM6BthNKu6ouW+BHoJSn/XGm6LVzL5PDEeoH9HdZAeLuuFWH2AsPBXMGu46dxlFxtmlC1lbmVhEd5A7szCs3w5m+A/F/lVd41TbjZTBMeBF4H1NbZ8235jl+0xiWFB3Qahg/mMK2s0rFLJOBm+kvGEWmT6/eRyJzQguHZjYS3S8t1dCgOdHA1DA/Hg3kFATv87dbDxZ1GvBQfQ8LIystS9SHt5ZFwIq3sfj4KVUMyoFUv0163MWDGIfXtaqbGXcgeJUqkMaIi+6PwFp+Zn/YgeCsSe33S1z9i0QA6Oo0KnFH/lEba6CwbutlIxiKZKzWlxDdOctBHbU9v0H3Ve1Q973a0ICwTfuKkuVERxeETWQN2SI/hTbtiKcn0HYFKmW5TqqPJzTreRRaemKvxxpTqOoFL6wPsojG17vv/fhsSOKufq8HvYrWsauKFUeyhzNpNBLrHrKohRZKxwN9fKyT/tw4mVbcW8B7+iPvT7++dm677Mwir3ek2GFo7oHC4kc= X-Microsoft-Antispam-Message-Info: kMcXxAVi0wKKqzzdcqdGepz5Nc8Pk1kIYpxlbB6v3+jjLUe78DbQsmEpgXJblGJ3e94/Rwnqy6z53mXqP8NAPn2Z5jZb5txo1AZwRve7u/fHm/g4rgBerIkSEYx3V/Fgp+Fg3zHGpZH/FDZ4b6LYG3MuolCT4aqXUSNi7xE9jywG/kiEbeVm47CMMul6Wy/ru2KfIaZ5Kt3wTkn8Lfo/3DvmB8N+B5+2eqg8yEXRyPLQpu7HDDTRjpf1g6x2kCjkYOzNp34WqwkUsBVSTd6JnmwXEz9HE9/ebW52w1aAuQgXfEk44vFgrhlYqGotUmws5Yru1sCjJ3B6ccQEd5rsiQ== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 6:19cWG+3/ElajWXi4UIDVrLA15vUM32+NPSD8cSmWuc4RbNLaJhf6nRE9uf2QCyRxBtvVFHe3F+tU+3CWwllV633jBEIY1dL+k7fnxMKBkLnXLWPV2kMeuxODP5uEpDR56FmlB+ZeNr7OK8Y2lPuhQVIICc75oNQ6JFOEyxO4R5+kygfmfkmG00Ech6ALDZ+AvgMIpEfXFcR4SjxK1x264Beaug28Hcgnuo0aCDhbgIAqHfhGvWMMd6JmtniLDHet9/aesAHB1ucOpqhd4TYVAbXOcFA8HRTVMJNJcdwkCTjxLUTLlIsPMWN/XKDYV1V36XKq5v/yTQWZ0pRvbWyLyESykTncwL8MilD71km4NyCXBEwE2OVZx93Vz2CMni2nzGyEp9S1TYHVz5C/NXXerX180tZo3kF+tmrb9TQ8uwzEXk9CWPpEsLOUyQ+soeI6JT5OLOeutGQcSXB00XHprA==; 5:LedWYrpHeymmj7NSwrmW9CXLxB9lXPfG5ZoInFfdjZT743y+I4Uth8TxI0+cit9R/scRsIoEgO4ygkAMLW0BFl+026AcO+WtApgI07P6wQoRYWxxTEkqdvHXp93odfPg0d64kQDlxSEId54vfhBu5yCROPwga5qLevvQBWe12vY=; 24:IZKUEW7xBe2qPAznXlWJfjEW0AdNjw+GpDuh758XuJBa/5+zDekC5Utu3wEgjHeQtec3vMJ/TXWyBWP2TScFIOJ8Cq+1mD2+Rdfjyx/tspo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 7:m64dVqS3OxmvCO2xJyIQA2DYdY6W+qlooVAoj+59gxkstDjaPZ2CibftW1Om3rwYdkOHs9E0bE4hYhiXq6+7SFc5bWVoojNIOTPIc/iyXKMEi1ZbE08q1hpU0GaNeFMm9lSArUud+Ch5/CZ0Wd4eIh3QZPP2ODdDo7aziIsF7eHZ+c9vWyq/UyNFfrmQA+CWb+0fv2KCNAdOilUi7tJorKBjb8fno2UiRW/Ln9kbrt4DBEw10VjGZU8HS92bwUkp X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2018 04:58:07.1570 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57aab755-6232-41c4-1c11-08d5d5a13f7f X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB1458 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Memory for packet buffers need to be freed in the error paths as there is no consumer (e.g., upper layer) for such packets and that memory will never get freed. The issue was uncovered when port was attacked with flood of isatap packets, these are multicast packets hence were directed at all the PFs. For foce PF, this meant they were routed to the ll2 module which in turn drops such packets. Fixes: 0a7fb11c ("qed: Add Light L2 support") Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Ariel Elior Signed-off-by: Michal Kalderon --- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c index c97ebd6..012973d 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c +++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c @@ -201,8 +201,9 @@ void qed_ll2b_complete_rx_packet(void *cxt, struct qed_ll2_comp_rx_data *data) skb = build_skb(buffer->data, 0); if (!skb) { - rc = -ENOMEM; - goto out_post; + DP_INFO(cdev, "Failed to build SKB\n"); + kfree(buffer->data); + goto out_post1; } data->u.placement_offset += NET_SKB_PAD; @@ -224,8 +225,14 @@ void qed_ll2b_complete_rx_packet(void *cxt, struct qed_ll2_comp_rx_data *data) cdev->ll2->cbs->rx_cb(cdev->ll2->cb_cookie, skb, data->opaque_data_0, data->opaque_data_1); + } else { + DP_VERBOSE(p_hwfn, (NETIF_MSG_RX_STATUS | NETIF_MSG_PKTDATA | + QED_MSG_LL2 | QED_MSG_STORAGE), + "Dropping the packet\n"); + kfree(buffer->data); } +out_post1: /* Update Buffer information and update FW producer */ buffer->data = new_data; buffer->phys_addr = new_phys_addr; From patchwork Tue Jun 19 04:58:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudarsana Reddy Kalluru X-Patchwork-Id: 931366 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="AEB8DFtv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 418whV4YR2z9s37 for ; Tue, 19 Jun 2018 14:58:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937297AbeFSE6Q (ORCPT ); Tue, 19 Jun 2018 00:58:16 -0400 Received: from mail-bn3nam01on0089.outbound.protection.outlook.com ([104.47.33.89]:10240 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751777AbeFSE6N (ORCPT ); Tue, 19 Jun 2018 00:58:13 -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:X-MS-Exchange-SenderADCheck; bh=gSHobrba8IuBiv+vTZrTJe1tJ2Z+7AMenlUlZUKovrE=; b=AEB8DFtvRx8YbbZJnQzRJdV1wf86Fi5jn0d80KITg2tvAzy3ywSlHGgBkObuAzkv4Bk82pYlvD0jGYXZ5MpemhIlLUzI1dWtvW8Eq0ObS0H5yzkddpHV8GYLK96ZAocjZAiQjhdB5XU5WVEnFBZ5e+dv5lC5kXxpN9Wd7KNTQkE= Received: from DM5PR07CA0043.namprd07.prod.outlook.com (2603:10b6:3:16::29) by BY2PR07MB1458.namprd07.prod.outlook.com (2a01:111:e400:515f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.17; Tue, 19 Jun 2018 04:58:11 +0000 Received: from DM3NAM05FT047.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::206) by DM5PR07CA0043.outlook.office365.com (2603:10b6:3:16::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.863.17 via Frontend Transport; Tue, 19 Jun 2018 04:58:11 +0000 Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by DM3NAM05FT047.mail.protection.outlook.com (10.152.98.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.884.14 via Frontend Transport; Tue, 19 Jun 2018 04:58:10 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Mon, 18 Jun 2018 21:58:05 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id w5J4w53a024095; Mon, 18 Jun 2018 21:58:05 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w5J4w5VN024094; Mon, 18 Jun 2018 21:58:05 -0700 From: Sudarsana Reddy Kalluru To: CC: , , Subject: [PATCH net 2/3] qed: Add sanity check for SIMD fastpath handler. Date: Mon, 18 Jun 2018 21:58:01 -0700 Message-ID: <20180619045802.24050-3-sudarsana.kalluru@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180619045802.24050-1-sudarsana.kalluru@cavium.com> References: <20180619045802.24050-1-sudarsana.kalluru@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(39380400002)(39860400002)(396003)(346002)(376002)(2980300002)(438002)(199004)(189003)(76176011)(316002)(2906002)(86362001)(51416003)(356003)(5660300001)(8936002)(16586007)(42186006)(8676002)(106002)(6666003)(6916009)(6346003)(54906003)(26005)(186003)(106466001)(59450400001)(81166006)(81156014)(47776003)(486006)(69596002)(80596001)(36756003)(2616005)(2351001)(50226002)(305945005)(48376002)(11346002)(446003)(476003)(126002)(107886003)(72206003)(1076002)(4326008)(336012)(87636003)(478600001)(50466002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB1458; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Pass; LANG:en; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM05FT047; 1:tMhL7NRNqiy8MuCDADutCWrbWuCJPpNjycFTAs2NFnyNTnw4s1maV37q/N4micd902EHgKBkLM2B7GqHe6FjYKGdGBukIzHqeCQWkAdm+S5CLFhKzo8CZHX/YJfu4+Pg X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0bbfdc8a-9689-4821-3fb5-08d5d5a141c7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(4608076)(2017052603328)(7153060); SRVR:BY2PR07MB1458; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 3:1xi7M+aLk70Je1JSILTXcpHTquMDTgItP6gDgYPzX5pWYRI7fgF6eUTyzNR3bfqolQizu80nb7lEoYAuSbgFDgmEemLtk+WKZQgHSEBjAwbAK8p9cbPwun5m5JrUiO76QKfBNIjUP3nGE3h4T0G0zvG92HLpndA83aWXcQKfKyRoAcObpl45kxKOwfhV5/5nN7IvcKJMKNKwpErkdZPVJtHuJaBBc51dCICuEWQio5XbZbM3+hJRp19XSVnjMCSWb7ELZ0LLzouM3XWquaksSJ0ISHVDwbNqGRmvikPDBr23Ug0YNgVBnIDlXcllfij3PQHDa7lgO+A0uC61O2G6yw==; 25:TuKZouvwZz8RAu5nWtf5KU/svNW92+bpPtWPfItX9xBDnpbGYdxCk3/befbxg34F0wLAL9E4lPh+RjmvpTRpMGH+aeV8t24QWX8YiUarFQZDl5x7+asW86zwmIVfDKo625pSrAVR4nKdqL8B6VNtPLw+OY5/N9pKtI7qyHwzwIddxpnlrl7xYwDiim2ayO/AS39d0bWnfga/A45hhkeSoq1b32mMcP1iXlaZFbzWOFC4NSIOXegA3/XA/SKPWM93mvjBLCB3XB7CsUci4jvGaBdbBLBcFSJTvDacGsYeYrYAjma2b0ZxDP7z4tzPTLwLpXddTPitjP0nGAhe7y/gLQ==; 31:5Q5hhaQJk4cgJdTAeVcs8WOgVPSwnueA7s9XWNLXD5qzxdWih3Lz08VU4j/00w97DH1iYm1Mz/8NYPjWPJLuv4pvtlzbGhrInHWRheTlzhUV9fk0ipXDQl4GYzACHovMBMRPUUQx+xwKY5quiynWsA5SRk3d86m2fz8/r524IP4D3L3pAqL2qN2Ft/4EuI6Dx5Bsy0d9EWu6CDNRCfQg0Rb2aGzXGt7ob9VEWacPSxQ= X-MS-TrafficTypeDiagnostic: BY2PR07MB1458: X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 20:bL3JeaxTy0ZtLV2cYeRk0/K1ph1i8KZrdKV0XOLhsV7YLTlm0YEAvN0PgP+ZeHf2Gxuy2ZVXsyeaqKqLpQ36j8vjCZsUzFEwTViOXKkpAhIurLhad4ZvnvwNKMxhUQiFzN3cf60WHqFXhwvd/klbpqlKjq4aWwllvk9Ul1zpFomzBS7XGJNVoKmwfd4YjLvL79Lx0PWRsFHcZXp4nagnXIRcOK+7Md4FE8wRFNnxT7XVutWGlfMNO1nXLFERDq5oJ4ogb/36JwaaNC0o7iPHFrvVV4D4Z10K78f2lUQD7khTIHzwfiDJwEp2w/QDXiaIwIZ3akxAsn3OU0ZwTEmAgKEtCKVq6OG3Cl7jI8azVoJzedePMNlqdyBsMYMN9vm0tqrGLZtXl7jH7dJw9WaTkChyFnoeVGgSoXFYVOfFQInq/Zo57OGAedcdtsN1LThWGEzVeTfY6tp1NBHsTGVv3zmwgMy4HnZTk+ngTdYIxb0egNUg5Y0HCz5uoFvbhZAO; 4:eugUvXOy07Wh8hSirGBBLQV85lxRdjDjUGfdKMyPLSqc6T6Q/gmiMZBLV1yr0BzNoRqhVJB9l/Pm7zXKD0g7tRCgpIfVUOWHFVEYOBZOjfKckgIwKfmyR+25WoXb3rDqN7y2xxX1lrJp/1TKj/d/Q7qPtZzJQgTja4YvbfvCK3merwa5Mu+zB5eABrRcSvrXb2M6XAsXjyfxsBImtEfqVPwUVZD9Esa4Y5wVr/lyg5l0OLqBfU6E939qEqEfGdRBotHgGxEfy7xsXC9JSqbnGw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93004095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:BY2PR07MB1458; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB1458; X-Forefront-PRVS: 07083FF734 X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 23:3ZURT05kOYHDo0T2EyntXe4qOUsq5U5JuLgzX0hnQo8LtcQNJIbBE5sbkiSd6h5infNCquJqCz8HSnAGL1ShaMHfK+nIVQU7kLFJX5BYDX6eHUQguBG1ZQEhF/qQSFHN2FzvP0l2JtX72OcXOQ6y+GCW5UlKZ+Zh4TinYETJRFnQ2jVIqEdss1LZCfS51iLlkfMzvNMPGHJ/b+dTOpoHA6aObsJYs90VQF4ELne8N+SB3N/OsQHDUvSfGtFzgqw+5X1jZlwn4S3kW2OooY1tyZI0JRxMiCekgghY6kv19CvYBgZpbGlhQ79MUajTc2jkqd31uH1g8C/qRUnih96omPvwb/tv5jHwyCZlXZysvjtN04qk5zOnnrbsiYVSjaEQj93P+ThLXmor+fYGUQkIRIOQMaqrOwicgCBCBw7bHi5hrnEyWKhgYBZx2k55SYUqtpuy/VFH9CaMN0yivuompazYhIKhwUyDIWy0lWfz0wOJl/NW3GUWXMR3slz/KBOJQLPFyFvsPkoReMp0GlohEAwMum91xIdiyNh1i22h/SkMtDIR5Ed8bd3fSzc/Kn2wLplwc++M9F94gHvLXfKmmwGZP9UtlL6P4HIEcN7xAUi0UD55Ln2whcMHg9yElZRmMtf275LbM6L43aEp8WmrKAyqVAcO0/rknWYRT5lQwitbzv0VIZs6RniOpTSMfJ6GkNwZ5PEEm60tglEmBX0UlQQgTwzxV1jKOVhDUT9yTIbg3tMntL1C21THt3QZnZbhqngaiL6MaM4RDjq5gfjRx3rpWOzsbrxWCBSAVBbiF6BDCqVCgVds8gY1EkFYW70W026YgAi3u7VS8Q+dJ41mc/sql3XpRommP1/JbjX1tWM0yT86zlV62okpGSxAgs9Bvi8AM9vKXs0ETQX2kIIXiVz/X5KAZtO4G46+HvYpWMRStabYYaOGQmN0RnnLuK1WDSRZD3/SnxE61jd52wQFP9ws4hWIMWtNVJFhoomHXOHSbx8NBeTsra0OFYFUGQFakbfaMAuBeJHuAWPtbDwysE07haNfqRvVyGuIxws2qgqbq2UEFmDwJnLjlM8OI/Frxk6AAgXJgI2G2p411HvyI3jhdAI4X6XUTcpHvglzsGM/Lp3jpc6wVL3okl/ULKvkhk3f3Z5qq6UnLU+aGKvfAqGZmrGBfrSaXVyyUl4I8KCpQBWOl6+JnTJULl5ACg9t3gtsxiXcBBdRXkCj2nQw1Hq52Fr1XuWxpxeDcWx29wHSpDxuJ6zmQaf0WsucR+/F3JQXjwOoYWz/7sf8MruIwA== X-Microsoft-Antispam-Message-Info: 9NeWwHWTFaZ43nbxSLNiKPsJUKZWVqaCuZBnCWGebXvJFDRk6ocl7SOGgCApHDCTSPkXi4RjCHQhJX4+FgRDQySNXBSXc8dXmFty1jX1k4utIMICPUTyuYzDpozS5jQUopYt/JrX9nDh2OurLQzBfX76FyZ0PMdRxlRB30J3NYcTUWxa4oEQSgyvpK8sthHu1QSQQ6S1omyI5IlFc+FekVLN8VYjI/jRXW4w099C6rpt0ZdofCp/GVkot19ztJ/cS+yVg5souJAFXr+qRioia0mgr5TcSrr5L5fRvc6f2x8oWkt8Zc1TbrWrM4x3N/fqpLDkgNVlgoeKsyGOlBRIrw== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 6:2n6o2y90CvrNnCqc4jx/V/0RrVjj7ut2VEPrZ/n5C+u4oF86zDCDAHJXLQizSB0d+zwH72o+MHqw2z87+6N0Uawmj8Ru325EtUsot0Yr8GNWjMO6pjck6WR3WN4Yypayk2WhKH42cn0E+Za0OMDHYLW/RT3GDm5UTx1FBjdwC+O8U5sleyFDNFSWvbBNim1/h1pOiCtfCquNu3DrknOtmS7seGVM9B4bS32BSOgeG81crl0juDUA/Vt7XUDx92yXDxdfj8GdHFR/WgWR4MY0EvjocwFYd7xqBAfXLH6peQfj6+pdslL10CarFKzdcTwjFjCao1WpOGq555l5FtVZcRQiYgUN3enAVuMLzcy3Gk8kChABfeE/5wJBZ8JNwg/t6yPTJYpJyVb1goijRH5/Lf5rFIxspbPSaQw7hbTtHgITPWx4T7H8BrhuUSNll4fYK59/B0XXvLsTuNRdRfoAsA==; 5:AorhP3CKZ6J7pxSrkiu3xsCIJUqXMvimd5AfqT+TLgq1JJp22W+A/AHva2OxAYz+oDL89hcocqxgEt98/l3j49sG2fYkgtnK9SORWBCZ01CMoy+FZkAVnuRbA8By5CqV4+RMborD3jF+dVFbxHxEuSJwYVEuqtnGgU3ItB3WC2A=; 24:n8DaM6f9vXjMibmuqNLLUAiL8SXbXl+8sJp8Rm9jhht+3/dhvjG7QEwJWNV829NHILvMKIhK9aRlviuXfABPCdygFo7zf/K3/c36SPUW+38= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 7:fny1cMR7IQ/DWGQ40Dyz/+2i1EfhYwNDhC60lWs3lEoVymjQByTVFvfETuZUWrTHomrp3jdFVJrkxO7BGkFjkSII3kbXwnEP8/L5/Nlj16/mImmunL2QP51RrDzAc+nSq09K9d3vv/Qd1inQ0h5tLu+F29uy/VpTlmuXjGQfL/7Wf/az66RLZu42jjQZfKgPN4+XJhoQrg2EG3aVlAk5xnqCMrPGGDcnR/Tln9NiEiy1feUzmMu/vpai9OhZAVH5 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2018 04:58:10.9852 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0bbfdc8a-9689-4821-3fb5-08d5d5a141c7 X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB1458 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Avoid calling a SIMD fastpath handler if it is NULL. The check is needed to handle an unlikely scenario where unsolicited interrupt is destined to a PF in INTa mode. Fixes: fe56b9e6a ("qed: Add module with basic common support") Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Ariel Elior Signed-off-by: Michal Kalderon --- drivers/net/ethernet/qlogic/qed/qed_main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c index b04d57c..5c10fd7 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_main.c +++ b/drivers/net/ethernet/qlogic/qed/qed_main.c @@ -567,8 +567,16 @@ static irqreturn_t qed_single_int(int irq, void *dev_instance) /* Fastpath interrupts */ for (j = 0; j < 64; j++) { if ((0x2ULL << j) & status) { - hwfn->simd_proto_handler[j].func( - hwfn->simd_proto_handler[j].token); + struct qed_simd_fp_handler *p_handler = + &hwfn->simd_proto_handler[j]; + + if (p_handler->func) + p_handler->func(p_handler->token); + else + DP_NOTICE(hwfn, + "Not calling fastpath handler as it is NULL [handler #%d, status 0x%llx]\n", + j, status); + status &= ~(0x2ULL << j); rc = IRQ_HANDLED; } From patchwork Tue Jun 19 04:58:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudarsana Reddy Kalluru X-Patchwork-Id: 931368 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="QR0f8kQ7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 418whg1Kx2z9s37 for ; Tue, 19 Jun 2018 14:58:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937310AbeFSE6Z (ORCPT ); Tue, 19 Jun 2018 00:58:25 -0400 Received: from mail-bn3nam01on0089.outbound.protection.outlook.com ([104.47.33.89]:10240 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S937229AbeFSE6P (ORCPT ); Tue, 19 Jun 2018 00:58:15 -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:X-MS-Exchange-SenderADCheck; bh=uURfKbuy7WsXiW83n8vxiHZQIusHaz5ZtBndNAXJoYw=; b=QR0f8kQ7CdrJ6BtWZciF5exWEoxnLACppz3AszCwSssGpwMVxSu0PlLv9PjWR0LbuO/mzmgGtnl+HBUS6OBjfBmc7Hn7mDNXWT1tUrKlA0bw3a26A4CFHSx9w5eRqAGpEZeogP2l+LacOYxThYuAbIgpd3LRwwVavtY8b/3HnuE= Received: from DM5PR07CA0044.namprd07.prod.outlook.com (2603:10b6:3:16::30) by BY2PR07MB1458.namprd07.prod.outlook.com (2a01:111:e400:515f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.17; Tue, 19 Jun 2018 04:58:13 +0000 Received: from DM3NAM05FT047.eop-nam05.prod.protection.outlook.com (2a01:111:f400:7e51::206) by DM5PR07CA0044.outlook.office365.com (2603:10b6:3:16::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.863.14 via Frontend Transport; Tue, 19 Jun 2018 04:58:12 +0000 Received-SPF: Pass (protection.outlook.com: domain of cavium.com designates 50.232.66.26 as permitted sender) receiver=protection.outlook.com; client-ip=50.232.66.26; helo=CAEXCH02.caveonetworks.com; Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by DM3NAM05FT047.mail.protection.outlook.com (10.152.98.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.884.14 via Frontend Transport; Tue, 19 Jun 2018 04:58:12 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Mon, 18 Jun 2018 21:58:05 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id w5J4w5eL024099; Mon, 18 Jun 2018 21:58:05 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id w5J4w5oL024098; Mon, 18 Jun 2018 21:58:05 -0700 From: Sudarsana Reddy Kalluru To: CC: , , Subject: [PATCH net 3/3] qed: Do not advertise DCBX_LLD_MANAGED capability. Date: Mon, 18 Jun 2018 21:58:02 -0700 Message-ID: <20180619045802.24050-4-sudarsana.kalluru@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180619045802.24050-1-sudarsana.kalluru@cavium.com> References: <20180619045802.24050-1-sudarsana.kalluru@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(396003)(346002)(376002)(2980300002)(438002)(199004)(189003)(76176011)(316002)(2906002)(86362001)(575784001)(51416003)(356003)(5660300001)(8936002)(16586007)(42186006)(8676002)(106002)(6666003)(6916009)(6346003)(54906003)(26005)(186003)(106466001)(81166006)(81156014)(47776003)(486006)(69596002)(80596001)(36756003)(2616005)(2351001)(50226002)(305945005)(48376002)(11346002)(446003)(476003)(126002)(107886003)(72206003)(1076002)(4326008)(336012)(87636003)(478600001)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB1458; H:CAEXCH02.caveonetworks.com; FPR:; SPF:Pass; LANG:en; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; DM3NAM05FT047; 1:VlWP5ktq/GnUmwX2p2dj4CohOOm6752f7yQCUD+opQ/b2yw6pcN6UuPlFR8od0Icj0fSZdJTg6pc1nBI3b6Jljt+cSUT6D33ffPWgUbxinPWIXpMPr8vIpowpC8+uFPX X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7963170-056c-4697-5cf9-08d5d5a142c6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(4608076)(2017052603328)(7153060); SRVR:BY2PR07MB1458; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 3:u3QjZsQi76lPizx16UQlyOuPFSaMoPfrKAIWZap1aGIABwvR5kqpdTgXWufboCgsBBOYTerzme+vfQxXixm+0eDWIwnAVu+CxZHZty+Py9hTqLrAi2gwvCvga/IJvaB11aiYZ/aRqX3GWb8l6xQBWL/f0K4Hv43qa9lcKSXCwIkJ1gAkkQZFbGlAdHsVn5PnpWqAgDFjts1mMGh9SRlablqNDBikQZbFlzpyf9axkIx9YR/LyXBVb6bI3eNxRA2pCL478W40lsF2mHR88j8Cpor2di2zugh1LuA8VYYKK8ll4yc2NjHfrO4ZX2TjqmRGL4LMN/kD1dGPESPXeJSThQ==; 25:33B1tfQ/ZHris8e+DrRsu5Qun/JLMEIHAmEikIzvOF9Cn+43SaWTDxfYz+kTpYJuxicuEt2nSYk0zLlgRqXN+rfP7x7PoFYDNAaWKwCW4t3qPohI35wVrt/MrT9AfEMqSFKWJiO97mnZVycyi1V4+aD0Sl9PdwGdVvLXR+AcxBMYhngIj62OhYJpo/LL7RnQ0ETsAXXRz7xqQri0nMZLLQ6aWved5r/CNab/472DNQNxbrzxmOts4va3duvL/l6v/t0wXcgjU4Z3rJTAt3Tknhv8rLZ2F6n7Va3qEICRhoTU6zflIK8YLWPZrhNryl/Yjz2VPfjSbgTn6PNnx1gJ2g==; 31:m80/xYZITUfzMIARz1QzryEyZSl/M6LXFr4vBQdz14XjSN4dVS5HU0pelQPz/fEi1wt1KV8DJR4ERyoIqLZr+A/S3pJDB2qc8THjHUNbs6irvg1LxbgwNVUtQOyzE5ATkuvv+7eniY4CnmUqQidDfwGdFwUHhRUn+9Efn0iF2OuApifRnJjMYAE/Jhwhlu3+mWMen1dm0aQzABqGHMSz/kyWcizoQDiRdGcDohBDzXc= X-MS-TrafficTypeDiagnostic: BY2PR07MB1458: X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 20:QraHSUqIqlVjtaRQelWfib3o/6CdDVBN/nS9Wir+Dgn4Bc92lJhoJv8MXkTMGDdEXRKnYlbBLH48h7necOJKARzH7+Ejv9whCZoXltvlTOgFncnOyvnr5wsvv/WGV5XKYGcOU8HUD7wJBXcATfCxZG20ZvGH/yAZN6AMzN2lu+Vd8J30pVrg8GUAj//1U7xE3xf3G79FXS+oZUImaWMNCHB1yrSG8nJbvA3okMk/1syWFOKDa6NjeQQvVT7uxqKudXPY7LNozbyzS4hehvT7dH+7gP8CapMhTCSTzQCaXjTOg1vZ1jasF5t9MU/WjBz4VFiNZUniO/S4EBybgbXtNGTSfHP7qXm3XBAVlgvVTZX5f6tJZGL/0mU8I1uEIuDG94Jq/a1lKp8CmeZc+wSLHGybeLIJ1/Q39Pi9b7O9Ai9wBRngN1J844mqY+kpyCaLTrXRqhn0Yq006N37+QpEfY5q6Ll/D8HXRBmLbluT7DFI8Bsa//uWcJigtDhVztTj; 4:AkMJ0DcQoHZFxUEzLm2M+IMccgFZ0q+asDaGlNJIA848xIcQjQAYY9X7Jv1WkOmI1r8MYQBoTMYLRB4dSeq3U8zEOvDpqrRYg/Nbf+ZNcCNJ4lheH28SjeR4mfUMoVzFnRHsIuXq88olXZhNTXa31ad5hfkZK6WKdo4N8/HWK/hqFeDqBqoLJKVhyg6f0k+VdmsF/X21CTTehI/erv49VM7bcuda1isPd3p005Ds7X33XIbjY7ZxmDulbLOB++fAUf78HWQ/FXI7GuFw6mdW5Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93004095)(10201501046)(3002001)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:BY2PR07MB1458; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB1458; X-Forefront-PRVS: 07083FF734 X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 23:jbxkR8+NQpUOA6nkwUSbMr2AnJZXxMF5CH8hvvaUMArGt/4AS/vGk410yY7pm3k4X5VS1sxEqVn70phMxFGkbVGfB7may6hComv6t7ajL98+7fhFLfjtyL3gNC6IQWwU/6fQIscbjCZN8QOkjpac4BN2z28d6tqoe5WehbixX8Yvt8DIwRs+LjjU75DwV6Iw/c7v4Eephcr9kxUXDgbobcL+78tB9nBgpX1AjT+d19jOLX2HrBx68v1vZ8hEp4hd1udkbD1ZcCaS3G0/d7ku9v91Uv2uk2XkJKrfep9D9bACnj6j2hNy5xP0nR5+yvyZdR7sa16Yhe4j4tDlK+EdxiP2ywQ5mvLO/rdm8dgUaAuYcn7jESImTZn6nCpCzAq+2Wx4J1IK1nnE5kYk28DjVAaUdJFyO53O6duxFe2nPI70VwFSqxpFX1JRAZzbp12lou6TIj156posPOAE1c+8nJWKuM3hVnml62rHoTNm2v1dxvPlz2tEyeHa6xVixpbQZhceITM9mJzQZ4W8tJLktdgoB/ItqaXDEjH3tOara0MqIva2XwCVLQdWMoC8RQTtafHu/XccLjTSofVEWY0dief68oYLTBn2UgXirlud1vyLJJbEJUnsuwlMlvqkZfocPp6bPkw1Bdo206MX4wHWtH1G83YERCO2C6jJe/9xDOtaiJfYAqsboBokeNW8HLtYV5iV3k6AqTve9nPAW0UQOfJ6lc685n/e4mNwElo6DggOovONciuJ1N7Z47Up2t8OK2j3I8ux5RYZilU8zV7xtT8bKEtiRKS16j54CwaclP6Q7puf4mkEWAxgtr7gwB9dpBbILd/NQshJyAXVcj+44oJlw6u9ElqNV7xmTh/I3J4gGnT/gQVtl5DE2V9s6zJJNakDt6k2wVnaYVasj/73hJ+7eqkz/C917W4PQjIKSfa+bbyaqkb2h9DCplhvm6o3L9b7pmHpRAup6nmU9282YeNHqvhkNDHP0s3qdDjOfUwuON1QgslbGqbRRhz3AnLeymmy2Rtrxv21Gi8Kytaf2bxevpxen4AietgbMZND3m8nBIJr6V/t+HySTf4Sucw7oRz7J+laCh5+FTPFHnMViBGH4g5rkevWYNQ9qBTqWQr4mzcmnvy+XikuP7aIetEDLVajLALg++Gn8PJpjbTjE9pbDbCI4kNSIpqxXNlocJI= X-Microsoft-Antispam-Message-Info: iIOb/1GoOVsihrKRH2UIf4o6r3PFbLCnHWFSdhFRsmOvTdaDo8l0qhuh+hhM5EUK4SGJJR9OZB59aQCpReePZx7YeIZnsjeu6a01eiIEL67QMQeuLNgPFhFkmBHvIWTZ79JOdoQi98XdlebeFv4Tn5MSRQyNvSCVZRHc25DNr68lGTYtP2uQ8SAiJolxvsfYpSDsGfNdHXdcz9V7K++Gczj+y/l5Hb+zeo6/2pzW9RO2JL9m0zUSndrbLSkVgQlj41sy3Qu9E4QeQIXnhS+mHkUl3ZBhr7UccOdB0kcesN5sbjGzx/kgFjh+sQl+A9Q2+mERX+1T8GyZ8QMySFfW8g== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 6:ExMvJsW56N8SdMSpo0YzVX3w7K7bODthq2O5odctsTrfJIlmLIdClEpTjCHE/WuwQ6RU1zdBvh6D/Si248C3BTcoACojpDgdUc6ab9zCdJElFROlGQKdmEOH9JcbeBBJHwID94p+MOzbhRok+JMN6/ku9eBPZeO2U/dZc1AkMZFt0cW1/8sTjg6nl+PwcsF4kCdYJ7QBzUsDdnLvb/VoSaDAIACWVyxzA4xa/EI/0yO1eDHzboE1wE+C9BDefrmQHoUB+HOe3m2/wZV3y694PhTSTUfcM0IKOgMC3R0IERsUA+FQusKsWpJ4CaIo3XCr6FFadh/4WI8dLjER+GYL1+DRxhl9YefcD/TOybU9MMQuwjLy/BDwC4QUzVwOUuz9LikHhJpp1s4CNcMB1NJcP3gyiZbyUjxFLMzIZLQRWpOCvUvsZnwZ6YQyDtV6aCqDSfRcbQ6bI/c1M/0MRQlIUg==; 5:fpLzaw8wI2zIh5Z2QBfe88L6aFVlLvEwgnwz8DGlPDYIHJE4ijKDsg/asE6l2Ohk1EsIsrk7pHS50tjL850D7L4WO1l9xtTbV4nGUzA27SqrqG9pnK2qSho0c7zM6ahjUR5l7ryD9aO052ZXAHiAI3SglPEt7K6SxXT9bm6tbPg=; 24:pmJSBGLah8JyKNHMdk6vjEUIONr4MkmCyiUOYD+mQ5CS6kVAdrfL+w8ZDQR2ng1Ni3mcj2jf4IarLxzqnyJ6a/g6XtEpWLFYcqEI4yd2aJE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB1458; 7:QVjcpVn8vbrtZy0/+99S8rTxi0uBSnGWsdWLtDF/98grtZiFD6UJQDWw8tkIh2/FwNA5xtBDJI4xmVUhPBM6E0/OiORIP8kaLuHTVqXrw0ayd4vmoGfUxf6inCoVDCzK/ikvurbbgFjYRPJdWbWz62RTSwhI/zb6/U1O/ExxbbwVyyARV7dPAe6Y5F+ZTBA/QiYg8eF4PaHHq8tyVm6IgAjqlnyW01WG29wM/z6Mg72QNXm9IzhFsjB4l5F52Dwa X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2018 04:58:12.6415 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7963170-056c-4697-5cf9-08d5d5a142c6 X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB1458 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Do not advertise DCBX_LLD_MANAGED capability i.e., do not allow external agent to manage the dcbx/lldp negotiation. MFW acts as lldp agent for qed* devices, and no other lldp agent is allowed to coexist with mfw. Also updated a debug print, to not to display the redundant info. Fixes: a1d8d8a51 ("qed: Add dcbnl support.") Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Ariel Elior Signed-off-by: Michal Kalderon --- drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c index 8f31406..f0b0138 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c @@ -255,9 +255,8 @@ static bool qed_dcbx_roce_v2_tlv(u32 app_info_bitmap, u16 proto_id, bool ieee) *type = DCBX_PROTOCOL_ROCE_V2; } else { *type = DCBX_MAX_PROTOCOL_TYPE; - DP_ERR(p_hwfn, - "No action required, App TLV id = 0x%x app_prio_bitmap = 0x%x\n", - id, app_prio_bitmap); + DP_ERR(p_hwfn, "No action required, App TLV entry = 0x%x\n", + app_prio_bitmap); return false; } @@ -1479,8 +1478,8 @@ static u8 qed_dcbnl_getcap(struct qed_dev *cdev, int capid, u8 *cap) *cap = 0x80; break; case DCB_CAP_ATTR_DCBX: - *cap = (DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_CEE | - DCB_CAP_DCBX_VER_IEEE | DCB_CAP_DCBX_STATIC); + *cap = (DCB_CAP_DCBX_VER_CEE | DCB_CAP_DCBX_VER_IEEE | + DCB_CAP_DCBX_STATIC); break; default: *cap = false; @@ -1548,8 +1547,6 @@ static u8 qed_dcbnl_getdcbx(struct qed_dev *cdev) if (!dcbx_info) return 0; - if (dcbx_info->operational.enabled) - mode |= DCB_CAP_DCBX_LLD_MANAGED; if (dcbx_info->operational.ieee) mode |= DCB_CAP_DCBX_VER_IEEE; if (dcbx_info->operational.cee)