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 D351AA0032 for ; Fri, 18 Feb 2022 13:41:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF45340E2D; Fri, 18 Feb 2022 13:41:34 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 7D7CA40141 for ; Fri, 18 Feb 2022 13:41:33 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id d14-20020a05600c34ce00b0037bf4d14dc7so6309336wmq.3 for ; Fri, 18 Feb 2022 04:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bc5sIo5gbJr1qsVM2lNIxE139XY8RkK37ljnPyhvXEQ=; b=dvJ2JQ1Jfl2WQXCtGpRigorHUP7C9ZiDaILYKttvVCPiwjOykpaOQ4ZgDbRpZwHuFw aR+Ui2UESntFwVxJbTvI4IgfVgzvooSALuu345g4Ulsj8z5D8jUCzJ0EwKkiQ+aiMPO2 eBMJTFHTAmAwtqsYTVgWb9I13mtdjWlTJ+nahoD0GewEfFujXUIYzf1nCzW63VY467O1 R2qhEHb3pI+PSSU8+UfAJs38LvzSbXP9Bg9mvrIQuibaEkh6C1scJ78jVlZcGm7tHvxL JIP966pF8Vkj8ZwPKWGqSjEDGJXS8Gszpy9xh+0xeygQK53Wngims7yUyj8g9VtrC/Qs 70Ww== 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=bc5sIo5gbJr1qsVM2lNIxE139XY8RkK37ljnPyhvXEQ=; b=dPyWhzOoycCIXPd63YPZoTxOJqp0t8o3BOvO5Frvhw72yrr0+AmC5LkGYOBAyc9nVQ wkVqEpuf5CI6OwuNBx2Q4GCeJMcD0ASIv8tMP/89Iu+40JYg2JaAypy+nScVANM14UKd kTcWxZGjUb15y9SP6bEHzlkrCfATAdzdF0/Cx6t9C+dW0ng3N2UFIlIEgWvcXIuK4qV3 4VilRJK4/PJeDWCTGNZPbT5qhWnffzZyT6CtzDWX+kBycL5TokgPdvQuuAe1rw6LGxIK MxQYHnf0wWc71IlswfmIlmPKdBheUgssd2Zcqd079x1DrPiO+FSdVWBL5z15LYTFmftc ZXKw== X-Gm-Message-State: AOAM532IPx+bTumiLIdnZgYllKBXRXo3JIBQglxG0p1aMWDTenfkox1Z nUgVaiNV+kk1L8FG3SvhIq0= X-Google-Smtp-Source: ABdhPJwBM8bP2YevLB+01wcZ7IYphh5A+lvvVDkYRbmHb7oQVWcZbkxjKldJl7/EwT/E1IHouAuz/A== X-Received: by 2002:a7b:c955:0:b0:353:41b:cee1 with SMTP id i21-20020a7bc955000000b00353041bcee1mr10597785wml.18.1645188093224; Fri, 18 Feb 2022 04:41:33 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id f6sm22730236wrv.116.2022.02.18.04.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:41:32 -0800 (PST) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix mode type mismatch' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:08 +0000 Message-Id: <20220218123931.1749595-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/239f57b000c566dce6d1b840b7efa1e2d9b7d743 Thanks. Luca Boccassi --- >From 239f57b000c566dce6d1b840b7efa1e2d9b7d743 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 50501ba963..d7a7646194 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 c2b0a15567..2f8d003cb0 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -668,7 +668,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 e38d55f0d7..be92a5e15a 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; @@ -3300,7 +3300,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.600534060 +0000 +++ 0039-net-bonding-fix-mode-type-mismatch.patch 2022-02-18 12:37:37.634790670 +0000 @@ -1 +1 @@ -From cc5097b1e46ddee8df8d2210a67ec675f3807ba2 Mon Sep 17 00:00:00 2001 +From 239f57b000c566dce6d1b840b7efa1e2d9b7d743 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 50501ba963..d7a7646194 100644 @@ -39 +40 @@ -index 2d5cac6c51..8840d9e17b 100644 +index c2b0a15567..2f8d003cb0 100644 @@ -52 +53 @@ -index 0f11a2f5a8..9607141b39 100644 +index e38d55f0d7..be92a5e15a 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)