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 655C6A04AF for ; Thu, 20 Aug 2020 17:34:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 592F31C027; Thu, 20 Aug 2020 17:34:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id C2E921C0C4 for ; Thu, 20 Aug 2020 17:34:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KyGo6nn4uj186yMotFWoM+51o16Y/9Pl2btW8so0gMc=; b=BN5j6graFoC5ji/tNj65UH5CuyIbZx2QeLb5qvMm6IVhIKMylykZR/S6d8xrlBT/SYsGKE DkAjSgdBLD5FdtC1bd8gYwsVpTkIjZSE1NT2tLEMTDIfvRXrbi+wBaQxvQrVwQOrFJ1+Ny BfsYIGQBfKvmD4qR+xaFcQgkro3zrxk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-328-U0cSZm8jPAWc5VQFxwARvw-1; Thu, 20 Aug 2020 11:34:46 -0400 X-MC-Unique: U0cSZm8jPAWc5VQFxwARvw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 414791885D87; Thu, 20 Aug 2020 15:34:45 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50A24100AE53; Thu, 20 Aug 2020 15:34:40 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Chas Williams , dpdk stable Date: Thu, 20 Aug 2020 16:33:30 +0100 Message-Id: <20200820153341.171927-25-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix socket ID check' has been queued to LTS release 18.11.10 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 LTS release 18.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/25/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/f3f75f632ac2175b103801d5ad238d0971573761 Thanks. Kevin. --- >From f3f75f632ac2175b103801d5ad238d0971573761 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 0beea19c47..a66a027545 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -959,5 +959,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, 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(); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.730174530 +0100 +++ 0025-net-bonding-fix-socket-ID-check.patch 2020-08-20 16:26:15.810324197 +0100 @@ -1 +1 @@ -From 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 Mon Sep 17 00:00:00 2001 +From f3f75f632ac2175b103801d5ad238d0971573761 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index b77a37ddb3..b7ffa2f2cf 100644 +index 0beea19c47..a66a027545 100644 @@ -23 +24 @@ -@@ -1044,5 +1044,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev, +@@ -959,5 +959,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,