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 27592A0C47 for ; Tue, 10 Aug 2021 17:43:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20669411C3; Tue, 10 Aug 2021 17:43:58 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 1131C4114F for ; Tue, 10 Aug 2021 17:43:57 +0200 (CEST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id E3BFF3F107 for ; Tue, 10 Aug 2021 15:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610236; bh=5RWJff/H5f0MOvoSYauAuk9cHKfoDTpBAr42c9iTWGQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S5GUZAz4Cr0TzyOEsQybskAXY9xHjrFdUD7Gd5JMdgRTURMM6a5H5pH9++MkdsiB2 MtP9meExDo+7YLB4FM+hTL9b4IEPobNZVaMCTQmtqBOJRX4UpX4nJVdTBi1mYyHZFx aDsJ3SzEjGVZhHogxEohdfoIR2k0DJE5KV8KVmiJOBEe0BU1Ampix934wl0xIfXjvp 1c1llSE4Qk9o/4G73g2rCgkU2Hk0XVmmvuQH9u6RKzw+JHBJ9MrltDCFiv9enFqnSM GriRqJ78/7xcodxyrAix+4I5/tu65cJoIVV1Kpp0UHO3p+BjhhPZ4ZgSLb/J/eW1yE gv5nGpKdoJwnw== Received: by mail-ed1-f69.google.com with SMTP id t23-20020a50ab570000b02903be808b9ca3so345013edc.11 for ; Tue, 10 Aug 2021 08:43:56 -0700 (PDT) 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=5RWJff/H5f0MOvoSYauAuk9cHKfoDTpBAr42c9iTWGQ=; b=D2DHQSVIPcpKydHvxOSMPlgewTT25uGEDl0R5xQxAiSH4SsnXfS6LP5AhdPq251MZJ X2GoTIpvU70gf9l2A3PlAnw1LIW/sPRy88a5wDjYLxCnnV9er1zhcU91yLKJaVxwzr/W yTGb0VKQrB2Rvdnbj8bKnishnTmMFgZeI7kpDAz9Ei1mmTxYDtlAADxJ/2yPpdIhGuQE aARNfPLiaIXZ+Gc+wBypxmKttpxLeQdeenqVNTZygqRwupMqjQF52mkJw8dBlsDA2pWe JJMvSk4gm/BJvizohpYyq2mjmj4IXaXpRs3MMeZJf4s55SJc8jvaejSP3p3JLeVMbHyo 2amQ== X-Gm-Message-State: AOAM53375n+Fb4wQZXpZsUpkqjJq2z8o0xs+gIUeAko/fNsRzQCW/XNc wmsIAiJDtu1tp3/MSoQttdRAEOCqkemO8aXIf6T7Evf72VQuZFMlUTeYnC6NDzzbR2EAzHfq2Hv NqV1Gq3G/XdaxYR3xlAmHxzaE X-Received: by 2002:a17:906:5855:: with SMTP id h21mr8776283ejs.230.1628610236574; Tue, 10 Aug 2021 08:43:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyM2sLJoAhAh/j7b6pZ3kf3oqrnLAJKoWBL9tJSyHqEp1u6x9fVv2duMxv6NymQjQR4uY1ODA== X-Received: by 2002:a17:906:5855:: with SMTP id h21mr8776267ejs.230.1628610236334; Tue, 10 Aug 2021 08:43:56 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id s18sm6979936ejc.52.2021.08.10.08.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:55 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Dana Vardi Cc: Liron Himi , dpdk stable Date: Tue, 10 Aug 2021 17:39:47 +0200 Message-Id: <20210810154022.749358-67-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mvpp2: fix port speed overflow' has been queued to stable release 19.11.10 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 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/de826be26ae7135eb30e9f588342b3f911a64e6c Thanks. Christian Ehrhardt --- >From de826be26ae7135eb30e9f588342b3f911a64e6c Mon Sep 17 00:00:00 2001 From: Dana Vardi Date: Sun, 11 Jul 2021 16:11:43 +0300 Subject: [PATCH] net/mvpp2: fix port speed overflow [ upstream commit 8fa07a68a6f842aa81b8949976e8088e2b6318a3 ] ethtool_cmd_speed return uint32 and after the arithmetic operation in mrvl_get_max_rate func the result is out of range. Fixes: 429c394417 ("net/mvpp2: support traffic manager") Signed-off-by: Dana Vardi Reviewed-by: Liron Himi --- drivers/net/mvpp2/mrvl_tm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mvpp2/mrvl_tm.c b/drivers/net/mvpp2/mrvl_tm.c index 3de8997030..7fcd37229c 100644 --- a/drivers/net/mvpp2/mrvl_tm.c +++ b/drivers/net/mvpp2/mrvl_tm.c @@ -57,7 +57,7 @@ mrvl_get_max_rate(struct rte_eth_dev *dev, uint64_t *rate) close(fd); - *rate = ethtool_cmd_speed(&edata) * 1000 * 1000 / 8; + *rate = (uint64_t)ethtool_cmd_speed(&edata) * 1000 * 1000 / 8; return 0; } -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.615269865 +0200 +++ 0067-net-mvpp2-fix-port-speed-overflow.patch 2021-08-10 15:11:13.066638446 +0200 @@ -1 +1 @@ -From 8fa07a68a6f842aa81b8949976e8088e2b6318a3 Mon Sep 17 00:00:00 2001 +From de826be26ae7135eb30e9f588342b3f911a64e6c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8fa07a68a6f842aa81b8949976e8088e2b6318a3 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index e98f576cfa..7e3c46f956 100644 +index 3de8997030..7fcd37229c 100644