From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 345DEA0518 for ; Fri, 24 Jul 2020 14:09:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D0F41C1DF; Fri, 24 Jul 2020 14:09:25 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id D25651C1D0 for ; Fri, 24 Jul 2020 14:09:23 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id b6so8081780wrs.11 for ; Fri, 24 Jul 2020 05:09: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=CI8YXCuvN4OUJ2tcQExmvfX4joV81k5mPGWl+QY8U5U=; b=TlrjkYzrzpQ6ROpkpeYYLbD1jQA1lYgv/wfnpbDErRjtjpsLZ9dc8fPLpQYLp9wcbt R07/dTSFDOgxjbrB3F60sCjQIOm/Xp/gTJvfMZG7XSmBSV8vW82UdnOtvQfwI5SIPTY2 /Fs+ID8La04xw93bDFZeRSlYexkBhvP1eN1e82FgDYrcl7de/P+kRglmn2N3ruSMETX7 jSvds6z5dwc4jrDffeh6KdZsylb5kSnfeloDcxlQTYH0LsWcpzNUoYKjxa1eCgpsVMtC EiBWbZiGvW2Fc1jHyVPPCBXI5nzJyWT030DIi8ymnJWolHRXrAacgE0MKsiykrTxPiRJ UYtg== 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=CI8YXCuvN4OUJ2tcQExmvfX4joV81k5mPGWl+QY8U5U=; b=OA3ZY1QxmfpOo4LGf6lNvh7ae3GZnXDYkg25TcRfOvr7YJwyS8RJaPtnrvwzXH1eaE nq4TaOcV68s1/5wFfTz20WqmUa5YzqZUJz73uXE867GYI6f4YhMNUf+Jz7cfXUHuOYhV WsGkV+iE/02zqoqup/q8WNxK8ZHUu3bT1DVCc+5pjrtvpCPy9MSha13UayXrbbZiazBO XTW48k8dydKVCRQhh5RWui6oNMz1fC1bsdAAFzrkMSbnkaZZtGxoGyvy0cdxJ1xWC/6+ 1HwUUCyMf4/o3bKxRpQs30v4zrYE7lUyD6P75lq9tb2JVWX5WVdU1KIQN8hf+KDo0k64 ncWw== X-Gm-Message-State: AOAM5307KYS6HJUF6bpjna50Y4eIXUkKBN830qOq8Z37evvmepTr4tij ZEIFF6EZXw8MYqR3RD3O45DUmZRMO+Jc7A== X-Google-Smtp-Source: ABdhPJz2tjT11THUYfPhMV77nFA5SbIId659aSLfzdGMrpeCGDoMFZ4Y7k88ffClZn5a316TIqQc8w== X-Received: by 2002:adf:94c5:: with SMTP id 63mr8358213wrr.34.1595592563613; Fri, 24 Jul 2020 05:09:23 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k14sm1071432wrn.76.2020.07.24.05.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:22 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Chas Williams , dpdk stable Date: Fri, 24 Jul 2020 12:59:30 +0100 Message-Id: <20200724120030.1863487-132-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix socket ID check' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.4 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/26/20. 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. Thanks. Luca Boccassi --- >From 3e1f03cded0a2dc9a7fc14148c8295a08a822d2b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 16 Jun 2020 11:46:37 +0200 Subject: [PATCH] net/bonding: fix socket ID check [ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ] Caught by code review, rte_eth_dev_socket_id() returns -1 on error. The code should behave the same, but still, do not use LCORE_ID_ANY for something that is not a lcore id. Fixes: c15c5897340d ("net/bonding: avoid allocating mempool on unknown socket") Signed-off-by: David Marchand Acked-by: Chas Williams --- drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index b77a37ddb..b7ffa2f2c 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -1043,7 +1043,7 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, RTE_ASSERT(port->tx_ring == NULL); socket_id = rte_eth_dev_socket_id(slave_id); - if (socket_id == (int)LCORE_ID_ANY) + if (socket_id == -1) socket_id = rte_socket_id(); element_size = sizeof(struct slow_protocol_frame) + -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.612919377 +0100 +++ 0132-net-bonding-fix-socket-ID-check.patch 2020-07-24 12:53:48.427009068 +0100 @@ -1,14 +1,15 @@ -From 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 Mon Sep 17 00:00:00 2001 +From 3e1f03cded0a2dc9a7fc14148c8295a08a822d2b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 16 Jun 2020 11:46:37 +0200 Subject: [PATCH] net/bonding: fix socket ID check +[ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ] + Caught by code review, rte_eth_dev_socket_id() returns -1 on error. The code should behave the same, but still, do not use LCORE_ID_ANY for something that is not a lcore id. Fixes: c15c5897340d ("net/bonding: avoid allocating mempool on unknown socket") -Cc: stable@dpdk.org Signed-off-by: David Marchand Acked-by: Chas Williams