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 9ED42A0C47 for ; Mon, 26 Jul 2021 15:56:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9801540DDA; Mon, 26 Jul 2021 15:56:24 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 31A3C40DDA for ; Mon, 26 Jul 2021 15:56:23 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id c16so1353660wrp.13 for ; Mon, 26 Jul 2021 06:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3e2eu4hQWM9DBvCsP3AG11tMlPhWZMG3Y72LHUI5aXg=; b=EpjVG231VyMHQtN0db9oyImkxUCUvA5zxNQdEwPclhqnaDeA9s7Yuu4mfV21nrbMKg Jdbr38sTZEtYuNeMoqYRirjLOV1ORoYBDK+zu5GSE5vsqSeXo4yuUPaVWaFqkbsJAWMU YDA024Eg8GBFukb4JYBaEfp4lVRfnioCsuVYJk8OA9HcB5mimxnQ5Ej29VHRH9fW2xW7 Q8QhQ99oe81lxsdiXsEbXlDuslENLfYqIP6/A4Rk+T3bTjvs+kSgZOrDaNUe9Ti9fI1u 3DIWowEeJJq/+8nJqoyrpi069q4MuLMfd0sNmHti8S+Q+qQUPPSwHs7knsBgtt8mFort 1JZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3e2eu4hQWM9DBvCsP3AG11tMlPhWZMG3Y72LHUI5aXg=; b=NuJ9Ja5JPxljbZjuQhUMt+edXCrcVeMogOXKQyaKYxG2ToR5nPmdBKufpSBms0S/d4 pBCoYVu09dMqRFanJB6K8r3kCYqIX69Dw77EHZOxlERlBThTNudQF7RYq3r2HQNzGA2C kIKkmXmP4WPz2xhnsDiCALeh76mzvO/giVbxovQK6Hsl2t1Dpc+o0kdvi787j7Fxa9Ve 60BKMfB6Cm1Cd65Vh+mOWF4s1KpjIMuUoNJ4IbYarKZ87evg03N/vOXiNhL7S+zT/HSt A1vdYJXg3pDQiT4vRAFClkFfEPRMmIjXx+qLCJLfzTyPmculsAyjElMjGsgfntR5Wrhg 8dTA== X-Gm-Message-State: AOAM530nbWz2PYcZZFp8rQRWVQhdDDKolAwlIRLApvybPSciRbSCyRRF a2qXbdVWagxc7LEA9dTAZjE= X-Google-Smtp-Source: ABdhPJy9+PWEL1q2LbPZF/EPaigm1TnxKzeQ5Iz+w5TqEkiJb3bIHTqW32zMws9cyoQXHSH2oLeJow== X-Received: by 2002:a5d:4b48:: with SMTP id w8mr2548447wrs.109.1627307783023; Mon, 26 Jul 2021 06:56:23 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id j2sm23978864wrp.90.2021.07.26.06.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:56:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Yuying Zhang Cc: Aman Deep Singh , Xiaoyun Li , dpdk stable Date: Mon, 26 Jul 2021 14:53:22 +0100 Message-Id: <20210726135322.149850-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix MAC address after port reset' has been queued to stable release 20.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/2f39890f4a7707e2a02c536fc40bb173bbf95da8 Thanks. Luca Boccassi --- >From 2f39890f4a7707e2a02c536fc40bb173bbf95da8 Mon Sep 17 00:00:00 2001 From: Yuying Zhang Date: Wed, 14 Jul 2021 02:20:27 +0000 Subject: [PATCH] app/testpmd: fix MAC address after port reset [ upstream commit 5ffc4a2acadad427f2f9ddf8e072632764ad2d47 ] MAC address of each port in global variable ports hasn't been updated after resetting. It was the initial one after resetting VF MAC address. This patch gets correct port MAC address when starting port. Fixes: a5279d25616d ("app/testpmd: check status of getting MAC address") Signed-off-by: Yuying Zhang Acked-by: Aman Deep Singh Acked-by: Xiaoyun Li --- app/test-pmd/testpmd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index c442bcc5ff..5288c04ab6 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2414,7 +2414,6 @@ start_port(portid_t pid) int peer_pi; queueid_t qi; struct rte_port *port; - struct rte_ether_addr mac_addr; struct rte_eth_hairpin_cap cap; if (port_id_is_invalid(pid, ENABLED_WARN)) @@ -2583,11 +2582,14 @@ start_port(portid_t pid) RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0) printf("Port %d can not be set into started\n", pi); - if (eth_macaddr_get_print_err(pi, &mac_addr) == 0) + if (eth_macaddr_get_print_err(pi, &port->eth_addr) == 0) printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi, - mac_addr.addr_bytes[0], mac_addr.addr_bytes[1], - mac_addr.addr_bytes[2], mac_addr.addr_bytes[3], - mac_addr.addr_bytes[4], mac_addr.addr_bytes[5]); + port->eth_addr.addr_bytes[0], + port->eth_addr.addr_bytes[1], + port->eth_addr.addr_bytes[2], + port->eth_addr.addr_bytes[3], + port->eth_addr.addr_bytes[4], + port->eth_addr.addr_bytes[5]); /* at least one port started, need checking link status */ need_check_link_status = 1; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:19.421484539 +0100 +++ 0059-app-testpmd-fix-MAC-address-after-port-reset.patch 2021-07-26 13:53:15.997295734 +0100 @@ -1 +1 @@ -From 5ffc4a2acadad427f2f9ddf8e072632764ad2d47 Mon Sep 17 00:00:00 2001 +From 2f39890f4a7707e2a02c536fc40bb173bbf95da8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5ffc4a2acadad427f2f9ddf8e072632764ad2d47 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index a48f70962f..37aba40272 100644 +index c442bcc5ff..5288c04ab6 100644 @@ -24 +25 @@ -@@ -2441,7 +2441,6 @@ start_port(portid_t pid) +@@ -2414,7 +2414,6 @@ start_port(portid_t pid) @@ -32 +33 @@ -@@ -2612,11 +2611,14 @@ start_port(portid_t pid) +@@ -2583,11 +2582,14 @@ start_port(portid_t pid)