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 3152BA034C for ; Fri, 25 Feb 2022 18:16:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C6DD4114F; Fri, 25 Feb 2022 18:16:36 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id B3330410FD for ; Fri, 25 Feb 2022 18:16:34 +0100 (CET) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (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-internal-0.canonical.com (Postfix) with ESMTPS id 1403D3FCA5 for ; Fri, 25 Feb 2022 17:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809392; bh=ixMWVIYkja7StskoAHc2Y8CDXnrpNE2HY0NelbopVGc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sPP3Q2hbfxkQYdi1L/AabfuZPu8R5gu7H+8yrPZ8i3aaMX/68rPjmMig2x0kG/wT+ t7nHLWNVYUNN/wlXNMpM/DJJuXcVRUtfrg0k54o1VZeDq1l58VIFe+t5ezEwLoQWh9 EH5GDEnb7p1aznfhx1405ZLjFWblSP6ID9ppABiO7nYCU1C7O/6HAowXiObnlmkHJF dFqq1cjdo4wcWwbZK1o7V31uWzD00zh8zdLeGee6G07K4t8xDAARPVamqIZ0gKZl80 lgGRgzVfKbC9dszDwcRCEcUGdUpeHJ7j6mFnyHs9TDMZhi+uy7AJZHDWzL8Fer9qhe +qQ9ytWHfrU9w== Received: by mail-wr1-f72.google.com with SMTP id c5-20020adffb05000000b001edbbefe96dso1099395wrr.8 for ; Fri, 25 Feb 2022 09:16:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ixMWVIYkja7StskoAHc2Y8CDXnrpNE2HY0NelbopVGc=; b=vnUdiruLGepLUfYZQMW3V7m94xpvPkD4sWjUKTqk2fSm6HcaeMHCdsitL2myJ0atMg Sx0Eta0HCnxRQepRdx19X9zeRm2RQUTOTCdnOLPYHYgFZvfc4TUBxZAgAqh4Q+X0YKHg vOWJx25dIqObUTdOaME/pyzSfOME6+S0excKsglFWeHHVZzOofVKmQEPyXCyats9wS+j duBVpFye3qHxAWfa3Y6saqXLmgUKL4ZEp1Ea+K3DZ89ahUN6Etr34jo713bdilzCuw5a UX0N2s9UmC8Yxw0R3OrTa+SxbmDMAdpLSovh3NaOZXMFq5XH8CQdsNPTBp65VU5u7a6t /sww== X-Gm-Message-State: AOAM531jy9qbXQyzYSNLcu1UmJ97jloeq0sTp9DcWB66GV+o7u1AkhVO jXRhzXLhXf2opLf+tPBzTy5hE9edXQjE0VTglJdWeSw1VP5/nDwDx9tWJ+vm+PpzrxSNe9A/9yS m8yAzWFsV0u+HXb1LmOsx8Hs8 X-Received: by 2002:a1c:e915:0:b0:37b:d847:e127 with SMTP id q21-20020a1ce915000000b0037bd847e127mr3654738wmc.180.1645809389842; Fri, 25 Feb 2022 09:16:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6cgbJM0vQmy7QwOcebw+WlD5CTmwUqRmyYXOLjFl7KsPLmHt245a8MmCsfLlTzeSYp5Oz0g== X-Received: by 2002:a1c:e915:0:b0:37b:d847:e127 with SMTP id q21-20020a1ce915000000b0037bd847e127mr3654722wmc.180.1645809389593; Fri, 25 Feb 2022 09:16:29 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id g20-20020a05600c4ed400b003811fab7f3esm3466378wmq.30.2022.02.25.09.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:16:28 -0800 (PST) From: christian.ehrhardt@canonical.com To: Yunjian Wang Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix mode type mismatch' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:06 +0100 Message-Id: <20220225171550.3499040-13-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/27/22. 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/f4a9c37bef544e9ebbf286a0b6c4a5005b7f3666 Thanks. Christian Ehrhardt --- >From f4a9c37bef544e9ebbf286a0b6c4a5005b7f3666 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 10 Dec 2021 19:41:01 +0800 Subject: [PATCH] net/bonding: fix mode type mismatch [ upstream commit cc5097b1e46ddee8df8d2210a67ec675f3807ba2 ] There were some type-mismatch issues in bonding and fix them: - Use %u to fix argument type mismatch in RTE_BOND_LOG. - The internals->mode is of type uint8_t. But the function parameter 'mode' is of type int. So change the mode type from int to uint8_t. Fixes: 2efb58cbab6e ("bond: new link bonding library") Fixes: a45b288ef21a ("bond: support link status polling") Fixes: 68451eb6698c ("net/bonding: call through EAL on create/free") Signed-off-by: Yunjian Wang Acked-by: Min Hu (Connor) --- drivers/net/bonding/eth_bond_private.h | 2 +- drivers/net/bonding/rte_eth_bond_api.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h index 72f99e1140..98933be3b0 100644 --- a/drivers/net/bonding/eth_bond_private.h +++ b/drivers/net/bonding/eth_bond_private.h @@ -240,7 +240,7 @@ slave_remove_mac_addresses(struct rte_eth_dev *bonded_eth_dev, uint16_t slave_port_id); int -bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode); +bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, uint8_t mode); int slave_configure(struct rte_eth_dev *bonded_eth_dev, diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index 73dfab4983..7ae865c2cf 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -663,7 +663,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, } if (slave_idx < 0) { - RTE_BOND_LOG(ERR, "Couldn't find slave in port list, slave count %d", + RTE_BOND_LOG(ERR, "Couldn't find slave in port list, slave count %u", internals->slave_count); return -1; } diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index df1e9136b5..a9d81fe936 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1558,7 +1558,7 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev) } int -bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode) +bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, uint8_t mode) { struct bond_dev_private *internals; @@ -3262,7 +3262,7 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode) /* Set mode 4 default configuration */ bond_mode_8023ad_setup(eth_dev, NULL); if (bond_ethdev_mode_set(eth_dev, mode)) { - RTE_BOND_LOG(ERR, "Failed to set bonded device %d mode to %d", + RTE_BOND_LOG(ERR, "Failed to set bonded device %u mode to %u", eth_dev->data->port_id, mode); goto err; } -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:44.790216558 +0100 +++ 0013-net-bonding-fix-mode-type-mismatch.patch 2022-02-25 16:58:44.204990382 +0100 @@ -1 +1 @@ -From cc5097b1e46ddee8df8d2210a67ec675f3807ba2 Mon Sep 17 00:00:00 2001 +From f4a9c37bef544e9ebbf286a0b6c4a5005b7f3666 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cc5097b1e46ddee8df8d2210a67ec675f3807ba2 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 9626b26d67..156335c425 100644 +index 72f99e1140..98933be3b0 100644 @@ -39 +40 @@ -index 2d5cac6c51..8840d9e17b 100644 +index 73dfab4983..7ae865c2cf 100644 @@ -42 +43 @@ -@@ -668,7 +668,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, +@@ -663,7 +663,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, @@ -52 +53 @@ -index 0f11a2f5a8..9607141b39 100644 +index df1e9136b5..a9d81fe936 100644 @@ -55 +56 @@ -@@ -1554,7 +1554,7 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev) +@@ -1558,7 +1558,7 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev) @@ -64 +65 @@ -@@ -3300,7 +3300,7 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode) +@@ -3262,7 +3262,7 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)