From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3AC9DA0C3F for ; Sat, 12 Jun 2021 01:10:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 352D740E46; Sat, 12 Jun 2021 01:10:25 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2070.outbound.protection.outlook.com [40.107.223.70]) by mails.dpdk.org (Postfix) with ESMTP id 04E9C40E46 for ; Sat, 12 Jun 2021 01:10:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CxdxY4KFIl9fo74DgwOVypUOR8qkdzCqI+CEiFtBU1KcmZJ+08vwlREFSoiTXnIwjmNgZiE3NxDj3Vy2pgrojvRdxtJ65IELD+j6Iu3NIoxSl4JcqCsfx7owgq1C6zyE0AI8McER5/VvJ6V3mJk15730AfibNdSI621wNWdqu105R2z2WdBZgBwkYI6nkn+3aDzuCV0GEt+TlHuM07hwhIKN0Ultp1nvLXGHR8gpRlSfO2kh/vgM6NiOGsAcokAYeT3WRgehONLu9uxo1FJRpBgeL2pG9DtyGU023bkq1zfwk5Jf1eY+UVvW9v4TOkFOUuKvNe1BqSxFVdb66pcxxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p7ThpUQ6JlcAtiK6Yt8VdOgZZIOomveJ5d7CYG5xnuk=; b=mRmKGL3Uf7vXE/OInqwMT6HJQMgYe0NP+24y6t4YIVDzZlOEKaaNPu9+a5eUQ+2mrsiPNZJD/NceaeCY0CIXX4OIPtjgtx0aGj8Lq0Pf+foWVHGT1hpuCU/kz4rQHKZ932zn5cSvLM3a68eEZTpmrPBNXf2dtJNTE1YQxNbAi4HmLeMtn4X/Vq/et9KvWdxNba+weQlWmjnK5wdjnevUHS3CJVIa4WCQuPtk7nhuG0sFzthD34IaunEQCcy9tt6qeuz6loYuGcfF0mxXwnNPXrszOBxa+iL00494Ukv84RaXcIr8/xsAnK51paRooHHuxqOAQN3fkkS5L329CLh9Gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p7ThpUQ6JlcAtiK6Yt8VdOgZZIOomveJ5d7CYG5xnuk=; b=QBsvtTqG2q6tReJ9PJZ89IFy8IpyZFedy2yUgCLbLIzRY/edfw4uGmQ+bmwnu2Jfrg4WrlbpjzRGkZl7lv8p4399jNIRtk9+HdzVQ8vusJ2El4Nt0sQHwgIIROLMh4yf8Hv6NNNYsbkDcPzm1jkBiB5jKp1ZORueaTGPMSCSGouCAForCps3n4EokbClL3qFId8m5/b6sJEL8ksxV+n4qNJENU2Y+/5EM/zoE6lby/9zlU//ydG5nsdjv5KaSv7twqnaTiAXHbR88ZFfJRSBe7jvCggRRXhdoYAxyUqyDyH/GnXkb7zDlPCcipuKJC8ha+xV91h9Z0Ik6iCsdguZLQ== Received: from MW4PR04CA0251.namprd04.prod.outlook.com (2603:10b6:303:88::16) by BN6PR12MB1457.namprd12.prod.outlook.com (2603:10b6:405:10::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:10:22 +0000 Received: from CO1NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:303:88::4) by MW4PR04CA0251.outlook.office365.com (2603:10b6:303:88::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:10:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT040.mail.protection.outlook.com (10.13.174.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:10:22 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:10:20 +0000 From: Xueming Li To: Robin Zhang CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Sat, 12 Jun 2021 07:02:33 +0800 Message-ID: <20210611230433.8208-59-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c28fc828-f528-40fe-2e8d-08d92d2e16c1 X-MS-TrafficTypeDiagnostic: BN6PR12MB1457: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3RtHieqgWyStzR3tpsA1J4w+gfK3srerbpubDIiFaBKee0R2PoiDMWpJoUJkTkM4grbj/Ty5bE9FV6bzALq+BeyA5pQ7p7qcNahbA0WmwBThEzibAZDSWcvygK4tu1XwpxdsBs6lJpnPVOMgNqXNu8gBgM8GziznPbJTDvZ3sbEO2YQoLHt0Qq621lmNXpddxiBwS+zuO7sHBoCY3p14WFPtQYf1Dy2tuozSydgm7lHcxOz/a2414xhekHuWoM5ssBRP8/D0CIwt8E/mtEepSPSUosOUi0bqe/qF50/wqb4EiSexcE5wh5XY6AlztO4twWNoS0hQZ9Gu1xK0sRwcvs/nm8KQfPPyOdOtwsVhbf3UWFxJiUykjCQrQ2bMV0y8NPdT1fPBg296hujMKqCdHmPDdbP5seZX4AB/fBLNZRfYyCOd1VvJiaD0pBEJLHj+mvw2aupascPOWIsf7cq1EjVoGW+GMZKHlu02mz+ZaDlxqQTuTG3Azk+zVO5aK2S3lLBW/eiMkfzOOCmyyZhQ51EWWyAhV/oaGc96sZAnW2/flns7ZrJpAZFCOchBmMbml3MnFJqTnl5mHKKuX1FfEp1rflNAAADOnmS5SpMpXqeE3PQa6vOLsZjwuXiZ9Ujazpa7laQ+AC1UBFYqzhIgOJ7o0hc8qS8p/H14YaSLCOhsl9soCfDU4Pi9J6dGXubH3iwJo+YX5mjK4+iXrkiwM3SVB0pCGnDK5gpE8Kri9CvvNxmZgUexoJOxM8iSxq515jS9rnzun2lfJ6xjY1v9atSTSWD4rJJY2mEKQxBa3YPi9L+5yJaKbQ15yL8uTBA8 X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(396003)(346002)(136003)(39860400002)(36840700001)(46966006)(82740400003)(478600001)(356005)(7636003)(8676002)(55016002)(6666004)(966005)(8936002)(16526019)(186003)(6916009)(70586007)(54906003)(6286002)(26005)(7696005)(5660300002)(36860700001)(70206006)(47076005)(4326008)(1076003)(426003)(2906002)(2616005)(53546011)(82310400003)(336012)(83380400001)(36906005)(36756003)(316002)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:10:22.2081 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c28fc828-f528-40fe-2e8d-08d92d2e16c1 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1457 Subject: [dpdk-stable] patch 'net/iavf: fix primary MAC type when starting port' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/38b01e7fa31bc7be98b9e223f2981faf8ee76ba7 Thanks. Xueming Li --- >From 38b01e7fa31bc7be98b9e223f2981faf8ee76ba7 Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Wed, 28 Apr 2021 08:04:51 +0000 Subject: [PATCH] net/iavf: fix primary MAC type when starting port Cc: Luca Boccassi [ upstream commit 8f156d2b1af2cb096dba0df37e1c2a187be9292f ] When start port, all MAC addresses will be set. We should set the MAC type of default MAC address as VIRTCHNL_ETHER_ADDR_PRIMARY. Fixes: b335e7203475 ("net/iavf: fix lack of MAC type when set MAC address") Signed-off-by: Robin Zhang Acked-by: Qi Zhang --- drivers/net/iavf/iavf_vchnl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index ed00521898..064133785e 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -1022,7 +1022,9 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add) continue; rte_memcpy(list->list[j].addr, addr->addr_bytes, sizeof(addr->addr_bytes)); - list->list[j].type = VIRTCHNL_ETHER_ADDR_EXTRA; + list->list[j].type = (j == 0 ? + VIRTCHNL_ETHER_ADDR_PRIMARY : + VIRTCHNL_ETHER_ADDR_EXTRA); PMD_DRV_LOG(DEBUG, "add/rm mac:%x:%x:%x:%x:%x:%x", addr->addr_bytes[0], addr->addr_bytes[1], addr->addr_bytes[2], addr->addr_bytes[3], -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.171907800 +0800 +++ 0059-net-iavf-fix-primary-MAC-type-when-starting-port.patch 2021-06-12 06:53:56.290000000 +0800 @@ -1 +1 @@ -From 8f156d2b1af2cb096dba0df37e1c2a187be9292f Mon Sep 17 00:00:00 2001 +From 38b01e7fa31bc7be98b9e223f2981faf8ee76ba7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 8f156d2b1af2cb096dba0df37e1c2a187be9292f ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 0026120cf4..5d57e8b541 100644 +index ed00521898..064133785e 100644 @@ -22 +24 @@ -@@ -1172,7 +1172,9 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add) +@@ -1022,7 +1022,9 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)