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 5CECEA0C3F for ; Sat, 12 Jun 2021 01:10:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5785F4014F; Sat, 12 Jun 2021 01:10:26 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2062.outbound.protection.outlook.com [40.107.237.62]) by mails.dpdk.org (Postfix) with ESMTP id 587A0410F7 for ; Sat, 12 Jun 2021 01:10:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dEaTrR6IGuJah2uI7jNhJxzWXCyIu0jJCHmbOecdiyoXpSYuyh5It8nD6Azqcc7yD2jXz+4VMfzXBV7Yq0579ok4MuLDFHytNq6AWWEjuFhtCt6ayaMnkdjpcyqGRj9EaniPuT1K9pNfy1odwZlV8sYUEqDcuBrIGLQpEe/KgfrN2Vq/dMmAQCOGGmkLv3hM71Lx2Bs5ibd9zVuf2YjDtuVjeuOz/+JgI7Ed9LGlxNKPQJD5u6aKuPgqMlp4jhPlrplpZ7ARUPj4N+2Dt2W5E0jd1lhTnJoKQMOJpe0I6KPl0E3g441O9NIQ0vmT5kYxe4Pj9IQbCI0p/r2BplZlHQ== 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=WFlbSCEXeZ74oEDybOcYH5OtCGxF9rBMKp6c+WX41ak=; b=Tw7JiH57V3WhckxfJeV+sERZ+k5GlAQATB6Qrl9THO78SvgrE2iTvvg8fBfajCXdybQjVAsMorhXNy9R6U6v1Sg46rM+vF10y/44/0vC2XL2zIk2t+yC/qD+1cJBJleLxWR0QVFWhnakZm1OaeLhNpEVU4m0Ejgi+B674PoM1awXHroeesBDZYnSjuzdZvMSiUGAiF+qaqNZuso2Dd798qzNr2DBfCRvGZb/63jcGwDkykMa662APyWaFdUWsjil/QGaVS2W4NPS4gB57jD8R5cNrwHTQ7QDUy3uxA3idblfv2f3KhBDDJh7EfmKxJCd7hCQf0WJaeyRkrfCPKDP1Q== 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=WFlbSCEXeZ74oEDybOcYH5OtCGxF9rBMKp6c+WX41ak=; b=efauk0+izV66TtbqxWjk9nSOyF+O18K4KU7eLuai9EWx21GSuy4bLFNXW3XUKJDNqIi1fJH353nKSpVHDihRY4z19UkYpf7IZhai8WyjstLAnT7UhywQ8CWOff3hQi6EhKM6loaIz3Mf3CGfjOz1+xFa6kIh9V5r/J4j+L/GuKMOBVfRATlt/e6i2Xs3imfUQvwLms4WMIZ8wWPPC7zjfkwQ9Ze/yIKXAiL5lvZiA7fYpApQSC4Jr33kg/VDOnQ2la7E/je1VaFHlz+icH6hJ2dk6lZBNffw5PPEvVJEvI0rAyz8K33Xo1mYDHkXDg+oJ7sNzMsHdV1gI4Q75JMpJQ== Received: from MWHPR17CA0086.namprd17.prod.outlook.com (2603:10b6:300:c2::24) by CH2PR12MB4840.namprd12.prod.outlook.com (2603:10b6:610:c::33) 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:23 +0000 Received: from CO1NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:300:c2:cafe::52) by MWHPR17CA0086.outlook.office365.com (2603:10b6:300:c2::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:10:23 +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 CO1NAM11FT047.mail.protection.outlook.com (10.13.174.132) 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:23 +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:22 +0000 From: Xueming Li To: Robin Zhang CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Sat, 12 Jun 2021 07:02:34 +0800 Message-ID: <20210611230433.8208-60-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: 53f0c716-b03f-44df-14fc-08d92d2e178b X-MS-TrafficTypeDiagnostic: CH2PR12MB4840: 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: pTtvW79Y8mMYW66vBmzMgUuvUXR/IyaMb76lMOLPwzvLbqQM3mNrB7dTNjPPQDp8adYN06zfu2q4Dg6RdjXif5077yQDQnvpEppJ3nBb41fxCjtp963jukQ8fiIvsSeYxUGr6tlwaF7ceFl6/pGrAfMqzjeuo19VU4QqbfqSNHqMQdMXUedxgf0f8wERtlpQ6uzuBG26M9ER/Cr4dQLmhX9GbJVxdIbG8sIkHL5RRZBLENp+VJoOuFeu7aVMWWAaoCr2BTT/kHk9+Bv53HwSWz/C5qkR2ds4YU5s3Tp+tRdiA3xTwvqL1S88Ez/fCMoKplpgFMw8Oixchl9k/6rWR+OD9jm5BB7sbcCxKKbw8DZzwZKkPXf5yWuZ9xVZRrsULoHjLeWa9H1AnY/I6LJTtIrIduuM+7MLdOTDFjL5oBIhsdsPtwR63B8kJjnG9OmGXjeeE9gVhdozvoGP9bPcT9Z6vTXTwHF2lFeGzkizJV2wCgljSQHVJj9XIEDV+RzwnlpgCLJoKD9eNbOFQ+twk65En5EnBKc+BeOcRNUYMlInAQknUwMv3i1RQdAHzTm5RPNSCtk6KCaAY5kH4zOBQDE2NykN2CRhTIXZ/AdHkBCLhMuWU6owCaCN7StHkG9Y875I8qn/g0N1yR+Pqqii8XCjIEfhGJvRckoDWDO/7kGrd5JjFNj3ciByb/7N72aHg9oDNiHBUEEAh7DKJJpvoUJj9Cl2B/MziYZHzRoDmZgRgcENzgehT375BY6N/CaRGpezR2UxaV6ZLioS+Lx+qvQYbF1QMoKVjKugPltSWOdw/rj17bd2DiZ1IC33fnes 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)(136003)(396003)(39860400002)(376002)(346002)(36840700001)(46966006)(6916009)(5660300002)(36756003)(16526019)(36860700001)(8936002)(478600001)(2616005)(47076005)(7636003)(186003)(82740400003)(316002)(6286002)(7696005)(54906003)(356005)(966005)(86362001)(26005)(36906005)(426003)(83380400001)(6666004)(70586007)(55016002)(336012)(8676002)(70206006)(53546011)(82310400003)(4326008)(2906002)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:10:23.5332 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 53f0c716-b03f-44df-14fc-08d92d2e178b 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: CO1NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4840 Subject: [dpdk-stable] patch 'net/i40e: 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/40c046441f3716ad0ded74e7b3b7afb1ae65ed64 Thanks. Xueming Li --- >From 40c046441f3716ad0ded74e7b3b7afb1ae65ed64 Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Wed, 28 Apr 2021 08:04:52 +0000 Subject: [PATCH] net/i40e: fix primary MAC type when starting port Cc: Luca Boccassi [ upstream commit 2e468c03b0a4095988ec788a62669abf8e6f4908 ] 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: 3f604ddf33cf ("net/i40e: fix lack of MAC type when set MAC address") Signed-off-by: Robin Zhang Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev_vf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 10cb68eb97..625981048a 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -2081,7 +2081,9 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, 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.194629000 +0800 +++ 0060-net-i40e-fix-primary-MAC-type-when-starting-port.patch 2021-06-12 06:53:56.290000000 +0800 @@ -1 +1 @@ -From 2e468c03b0a4095988ec788a62669abf8e6f4908 Mon Sep 17 00:00:00 2001 +From 40c046441f3716ad0ded74e7b3b7afb1ae65ed64 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 2e468c03b0a4095988ec788a62669abf8e6f4908 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 156ad9ab96..ad80aa1e29 100644 +index 10cb68eb97..625981048a 100644 @@ -22 +24 @@ -@@ -2128,7 +2128,9 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add) +@@ -2081,7 +2081,9 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)