From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3689844-1523235797-2-11946354362076201529 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523235796; b=AXra7+sOIuSF8NwA/5k7ZNI4uDlWV/bP0PRf1xeUFyxh8VW4L7 QbdNqLec9iohOMPPKSx0PvgZ84NcggzV3GMzk7FXJrqzRTaG3jZokxMrBQsv/aVY 1iToOPdWu6njhlEBocawa6s66cxz+y3VFWMhEHpg0KcbCD2hvzIiAgSU3u2QI6RC Q52ONH2UYdIE1tne9UoNLEdeAVYj6Ik0SEL2tYEo2zJDvp79N6HGcacdEyfHH6Qz bNfx3kXa84fgOS49e2wqsysIn3x1kxvscLzpt9rosahRsvoQxjkz5YadhoV82gFy scSB+jet/a5B4Coj0G6mo7oW2b8CBfCqDifg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=fm2; t=1523235796; bh=f9Qa6reqYm TAsnDMPC8XpSJpuEAChN7+2bNgUZdPWHE=; b=qmjtuM2UbVo9a0R7gdMaQU1Hod JY1UWz8h316hGovunixrAd1pRM6iLiSZJ01GQrM6+yCH1Bkkorz1INYhku2HroGD SdBQjx/tPgna2cjpcqhNT3sY9ZnBCXuWj2rDdRXxY2e/f+NwrhJAQP/6pMsu4De3 HfxpDv7lRMXq1SjsXwqSxHQcGmE61B6SVJxfxKe2ecXHKIdu9+lSU9tqKTgF7zjN /8gvcm+htjubMHNtvHLqUmk0noWkoh76d86hA0Wnm8dkWQ0gNmcvMP5TLfYksku+ rQWkay7WI5WrzpVbnQFgejW8nvttxEPsu4jb8C7GHViE4ogjtrSI3jxp+CIw== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Dw2KHV4n x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Dw2KHV4n x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfMFW389DKFr/2NgfIhr8/eh25yMQogj56Sk+der9wFRsKU7up+mzykfev/kC6XJjoUJxikp7+zSNVA4zrtr8CHDRqvDIjBRyzSQZId+Pxpyj9m8YmuUF kKcqdbrQayfFxrOZrgoRz7RHueyWPzWqe7CeKTjE5HTvmQxFjNlqg6s+8HJJrVX8+cNhDcZPLkjhy+BQjdrHggBcX05SOfsWxW8jlC/TiTW4RsYNEnnbgV3e X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=zAyngx5bAAAA:8 a=J1Y8HTJGAAAA:8 a=yMhMjlubAAAA:8 a=donMdxIkcKOA4bL1sPcA:9 a=wPNLvfGTeEIA:10 a=4LA4qAFo6bo561LpWNDU:22 a=y1Q9-5lHfBjTkpIzbSAN:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755027AbeDIBC7 (ORCPT ); Sun, 8 Apr 2018 21:02:59 -0400 Received: from mail-co1nam03on0132.outbound.protection.outlook.com ([104.47.40.132]:50200 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933156AbeDIAjg (ORCPT ); Sun, 8 Apr 2018 20:39:36 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: "Mintz, Yuval" , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 010/101] bnx2x: Allow vfs to disable txvlan offload Thread-Topic: [PATCH AUTOSEL for 3.18 010/101] bnx2x: Allow vfs to disable txvlan offload Thread-Index: AQHTz5qi970IblIQ3EKAHZghoG8pSQ== Date: Mon, 9 Apr 2018 00:35:17 +0000 Message-ID: <20180409003505.164715-10-alexander.levin@microsoft.com> References: <20180409003505.164715-1-alexander.levin@microsoft.com> In-Reply-To: <20180409003505.164715-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1047;7:hTbWsRmYum7rhh+uAj38qR8V1boJCiCLYp1nxXt94OLSwhRwWrnRNTqQ8EoT8zTTYkbHQ2M7PokXairjlc0NvGaa0UW4q2914chX5SSBSFYZYJvd8j8TbQ0tnna5LgRZNWQehZfNjKaxFwE4Ha7Vl4Hq+WL9JR8HJ2y+0wCAzici+YQSlg9wHUXFb4X7TBWuoguDVx4SGom8Gv7w4c+xw8RTCTV+6BoBtpECGDq1Th7Y1VZfGDlWv6XP3yk0lSys;20:Q2E1Hm1xGokjXg0Y0AaQtNEPSRA2wazAerVBTXGW4vrm3q748+XukM1lBhq3oBozq5vAnIyCkZZ0tAuVs9kAqJQplHI3P65x5Q8lL4vADp3zHYOLCFh+cgIOayFtTupr6kXNk8BDJBgCdByHHnHMloovZ+pKPNpVSsWodmra6ME= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: e05f8544-1ce7-46d2-820d-08d59db25cbd x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB1047; x-ms-traffictypediagnostic: DM5PR2101MB1047: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB1047;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1047; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(366004)(39860400002)(346002)(39380400002)(189003)(199004)(97736004)(3660700001)(2900100001)(2906002)(8936002)(11346002)(3280700002)(106356001)(446003)(68736007)(72206003)(1076002)(86612001)(25786009)(3846002)(36756003)(107886003)(6116002)(81166006)(4326008)(486006)(81156014)(6512007)(6436002)(53936002)(14454004)(8676002)(26005)(5250100002)(86362001)(105586002)(6666003)(305945005)(186003)(10290500003)(7736002)(10090500001)(102836004)(6486002)(2616005)(5660300001)(316002)(2501003)(66066001)(22452003)(54906003)(99286004)(110136005)(478600001)(59450400001)(476003)(76176011)(6506007)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1047;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: XQjF9sgn0/SgoSHUz+nyiOPR5NHPkfPRmVX7XFceDfhh0OFC2hg8lHE1reg+HPhSt+4ZafLTPFxl5axTwGcisL6C9SMlBcL9YLtDWNs5Xv5QvzZy5FMvsQXuvzxVkaZ4M5ZPOBYZ5F81zra34+yuWmolwkFBx1csLDL+bgWtPeo2lSHW5s4TI01+rX+uSWJeVqA0xtNUwo8VolFb/me3oyIN7+RYIvc61oQ3GzC7PeGChX+BpjL7hC0DD2VZwiJGJgvLscL1dABAz/QTGpc6iUNhLj3HgrZcpWjtMf6LTGzmpnPHQOmeEWIwvzfU3gVcgru8DiejdHVCZKTOxwZk1i75tap8yWqKcCRCUu9jp/CJQrS0eu5Lji5aAYz1clPwpnNNsanlQHfywkllPozk7Mw2DIPAanYVwWPEFvx77vo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: e05f8544-1ce7-46d2-820d-08d59db25cbd X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:35:17.7361 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1047 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: "Mintz, Yuval" [ Upstream commit 92f85f05caa51d844af6ea14ffbc7a786446a644 ] VF clients are configured as enforced, meaning firmware is validating the correctness of their ethertype/vid during transmission. Once txvlan is disabled, VF would start getting SKBs for transmission here vlan is on the payload - but it'll pass the packet's ethertype instead of the vid, leading to firmware declaring it as malicious. Signed-off-by: Yuval Mintz Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/= ethernet/broadcom/bnx2x/bnx2x_cmn.c index ed4f2705a65c..f41f53fe1340 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -3876,15 +3876,26 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, s= truct net_device *dev) /* when transmitting in a vf, start bd must hold the ethertype * for fw to enforce it */ + u16 vlan_tci =3D 0; #ifndef BNX2X_STOP_ON_ERROR - if (IS_VF(bp)) + if (IS_VF(bp)) { #endif - tx_start_bd->vlan_or_ethertype =3D - cpu_to_le16(ntohs(eth->h_proto)); + /* Still need to consider inband vlan for enforced */ + if (__vlan_get_tag(skb, &vlan_tci)) { + tx_start_bd->vlan_or_ethertype =3D + cpu_to_le16(ntohs(eth->h_proto)); + } else { + tx_start_bd->bd_flags.as_bitfield |=3D + (X_ETH_INBAND_VLAN << + ETH_TX_BD_FLAGS_VLAN_MODE_SHIFT); + tx_start_bd->vlan_or_ethertype =3D + cpu_to_le16(vlan_tci); + } #ifndef BNX2X_STOP_ON_ERROR - else + } else { /* used by FW for packet accounting */ tx_start_bd->vlan_or_ethertype =3D cpu_to_le16(pkt_prod); + } #endif } =20 --=20 2.15.1