patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11
@ 2020-10-06 12:07 Kevin Traynor
  2020-10-06 12:07 ` [dpdk-stable] patch 'net/mlx5: fix netlink buffer allocation from stack' " Kevin Traynor
  2020-10-25 11:53 ` [dpdk-stable] patch 'eal: remove useless makefiles' " Ali Alnubani
  0 siblings, 2 replies; 6+ messages in thread
From: Kevin Traynor @ 2020-10-06 12:07 UTC (permalink / raw)
  To: Thomas Monjalon; +Cc: Bruce Richardson, David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/12/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/4a2be43591df63d55d9665389ff41fcba19db85a

Thanks.

Kevin.

---
From 4a2be43591df63d55d9665389ff41fcba19db85a Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Fri, 27 Mar 2020 02:15:33 +0100
Subject: [PATCH] eal: remove useless makefiles

[ upstream commit 4448a202b61e1a373c647aa4638093d092b3f5de ]

When moving files to the directory kernel/,
the file BSDmakefile.meson was left in eal/.

Also the intermediate makefiles in linuxapp/ and bsdapp/ became useless.

Fixes: acaa9ee991b5 ("move kernel modules directories")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: David Marchand <david.marchand@redhat.com>
---
 MAINTAINERS                             |  1 -
 lib/librte_eal/Makefile                 |  4 +--
 lib/librte_eal/bsdapp/BSDmakefile.meson | 43 -------------------------
 lib/librte_eal/bsdapp/Makefile          |  8 -----
 lib/librte_eal/linuxapp/Makefile        | 11 -------
 5 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 lib/librte_eal/bsdapp/BSDmakefile.meson
 delete mode 100644 lib/librte_eal/bsdapp/Makefile
 delete mode 100644 lib/librte_eal/linuxapp/Makefile

diff --git a/MAINTAINERS b/MAINTAINERS
index 16c04e8a13..a32d6c3921 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -115,5 +115,4 @@ Meson build
 M: Bruce Richardson <bruce.richardson@intel.com>
 F: meson.build
-F: lib/librte_eal/bsdapp/BSDmakefile.meson
 F: meson_options.txt
 F: config/rte_config.h
diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile
index ccd45cb840..fd56a69ba3 100644
--- a/lib/librte_eal/Makefile
+++ b/lib/librte_eal/Makefile
@@ -5,7 +5,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 
 DIRS-y += common
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp
+DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp/eal
 DEPDIRS-linuxapp := common
-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp
+DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp/eal
 DEPDIRS-bsdapp := common
 
diff --git a/lib/librte_eal/bsdapp/BSDmakefile.meson b/lib/librte_eal/bsdapp/BSDmakefile.meson
deleted file mode 100644
index 42f5b2b9d8..0000000000
--- a/lib/librte_eal/bsdapp/BSDmakefile.meson
+++ /dev/null
@@ -1,43 +0,0 @@
-#   BSD LICENSE
-#
-#   Copyright(c) 2017 Intel Corporation. All rights reserved.
-#   All rights reserved.
-#
-#   Redistribution and use in source and binary forms, with or without
-#   modification, are permitted provided that the following conditions
-#   are met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in
-#       the documentation and/or other materials provided with the
-#       distribution.
-#     * Neither the name of Intel Corporation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-# makefile for building kernel modules using meson
-# takes parameters from the environment
-
-# source file is passed via KMOD_SRC as full path, we only use final
-# component of it, as VPATH is used to find actual file, so as to
-# have the .o files placed in the build, not source directory
-VPATH = ${KMOD_SRC:H}
-SRCS = ${KMOD_SRC:T} device_if.h bus_if.h pci_if.h
-CFLAGS += $(KMOD_CFLAGS)
-
-.include <bsd.kmod.mk>
diff --git a/lib/librte_eal/bsdapp/Makefile b/lib/librte_eal/bsdapp/Makefile
deleted file mode 100644
index 5b06b216aa..0000000000
--- a/lib/librte_eal/bsdapp/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_eal/linuxapp/Makefile b/lib/librte_eal/linuxapp/Makefile
deleted file mode 100644
index a0fffa98e8..0000000000
--- a/lib/librte_eal/linuxapp/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal
-DEPDIRS-kni := eal
-
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.subdir.mk
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-06 13:03:27.058293583 +0100
+++ 0001-eal-remove-useless-makefiles.patch	2020-10-06 13:03:26.980072558 +0100
@@ -1 +1 @@
-From 4448a202b61e1a373c647aa4638093d092b3f5de Mon Sep 17 00:00:00 2001
+From 4a2be43591df63d55d9665389ff41fcba19db85a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4448a202b61e1a373c647aa4638093d092b3f5de ]
+
@@ -9 +11 @@
-Also the intermediate makefiles in linux/ and freebsd/ became useless.
+Also the intermediate makefiles in linuxapp/ and bsdapp/ became useless.
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -18,9 +19,9 @@
- MAINTAINERS                              |  1 -
- lib/librte_eal/Makefile                  |  4 ++--
- lib/librte_eal/freebsd/BSDmakefile.meson | 14 --------------
- lib/librte_eal/freebsd/Makefile          |  8 --------
- lib/librte_eal/linux/Makefile            | 11 -----------
- 5 files changed, 2 insertions(+), 36 deletions(-)
- delete mode 100644 lib/librte_eal/freebsd/BSDmakefile.meson
- delete mode 100644 lib/librte_eal/freebsd/Makefile
- delete mode 100644 lib/librte_eal/linux/Makefile
+ MAINTAINERS                             |  1 -
+ lib/librte_eal/Makefile                 |  4 +--
+ lib/librte_eal/bsdapp/BSDmakefile.meson | 43 -------------------------
+ lib/librte_eal/bsdapp/Makefile          |  8 -----
+ lib/librte_eal/linuxapp/Makefile        | 11 -------
+ 5 files changed, 2 insertions(+), 65 deletions(-)
+ delete mode 100644 lib/librte_eal/bsdapp/BSDmakefile.meson
+ delete mode 100644 lib/librte_eal/bsdapp/Makefile
+ delete mode 100644 lib/librte_eal/linuxapp/Makefile
@@ -29 +30 @@
-index db235c2ccf..a3f1a53c4e 100644
+index 16c04e8a13..a32d6c3921 100644
@@ -32 +33 @@
-@@ -127,5 +127,4 @@ Meson build
+@@ -115,5 +115,4 @@ Meson build
@@ -35 +36 @@
--F: lib/librte_eal/freebsd/BSDmakefile.meson
+-F: lib/librte_eal/bsdapp/BSDmakefile.meson
@@ -39 +40 @@
-index 86434f5b31..9c383d42bd 100644
+index ccd45cb840..fd56a69ba3 100644
@@ -45,6 +46,6 @@
--DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux
-+DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux/eal
- DEPDIRS-linux := common
--DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd
-+DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd/eal
- DEPDIRS-freebsd := common
+-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp
++DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp/eal
+ DEPDIRS-linuxapp := common
+-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp
++DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp/eal
+ DEPDIRS-bsdapp := common
@@ -52 +53 @@
-diff --git a/lib/librte_eal/freebsd/BSDmakefile.meson b/lib/librte_eal/freebsd/BSDmakefile.meson
+diff --git a/lib/librte_eal/bsdapp/BSDmakefile.meson b/lib/librte_eal/bsdapp/BSDmakefile.meson
@@ -54,2 +55,2 @@
-index 53c4e79c61..0000000000
---- a/lib/librte_eal/freebsd/BSDmakefile.meson
+index 42f5b2b9d8..0000000000
+--- a/lib/librte_eal/bsdapp/BSDmakefile.meson
@@ -57,3 +58,32 @@
-@@ -1,14 +0,0 @@
--#   SPDX-License-Identifier: BSD-3-Clause
--#   Copyright(c) 2017 Intel Corporation.
+@@ -1,43 +0,0 @@
+-#   BSD LICENSE
+-#
+-#   Copyright(c) 2017 Intel Corporation. All rights reserved.
+-#   All rights reserved.
+-#
+-#   Redistribution and use in source and binary forms, with or without
+-#   modification, are permitted provided that the following conditions
+-#   are met:
+-#
+-#     * Redistributions of source code must retain the above copyright
+-#       notice, this list of conditions and the following disclaimer.
+-#     * Redistributions in binary form must reproduce the above copyright
+-#       notice, this list of conditions and the following disclaimer in
+-#       the documentation and/or other materials provided with the
+-#       distribution.
+-#     * Neither the name of Intel Corporation nor the names of its
+-#       contributors may be used to endorse or promote products derived
+-#       from this software without specific prior written permission.
+-#
+-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#
@@ -72 +102 @@
-diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile
+diff --git a/lib/librte_eal/bsdapp/Makefile b/lib/librte_eal/bsdapp/Makefile
@@ -74,2 +104,2 @@
-index fc42058b6b..0000000000
---- a/lib/librte_eal/freebsd/Makefile
+index 5b06b216aa..0000000000
+--- a/lib/librte_eal/bsdapp/Makefile
@@ -83 +113 @@
--DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal
+-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal
@@ -86 +116 @@
-diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile
+diff --git a/lib/librte_eal/linuxapp/Makefile b/lib/librte_eal/linuxapp/Makefile
@@ -88,2 +118,2 @@
-index 4c68bd61b8..0000000000
---- a/lib/librte_eal/linux/Makefile
+index a0fffa98e8..0000000000
+--- a/lib/librte_eal/linuxapp/Makefile
@@ -97 +127 @@
--DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal
+-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [dpdk-stable] patch 'net/mlx5: fix netlink buffer allocation from stack' has been queued to LTS release 18.11.11
  2020-10-06 12:07 [dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11 Kevin Traynor
@ 2020-10-06 12:07 ` Kevin Traynor
  2020-10-25 11:53 ` [dpdk-stable] patch 'eal: remove useless makefiles' " Ali Alnubani
  1 sibling, 0 replies; 6+ messages in thread
From: Kevin Traynor @ 2020-10-06 12:07 UTC (permalink / raw)
  To: Viacheslav Ovsiienko; +Cc: Stephen Hemminger, Matan Azrad, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/12/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/9c8ee8bda5c8e94095a5e10b0f978c416dea6297

Thanks.

Kevin.

---
From 9c8ee8bda5c8e94095a5e10b0f978c416dea6297 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Date: Thu, 14 May 2020 07:11:12 +0000
Subject: [PATCH] net/mlx5: fix netlink buffer allocation from stack

[ upstream commit 3acf1071958185d2a299b9765e0c5c82e67ff416 ]

The buffer size to receive netlink reply messages is relatively
large (32K), and it is allocated on the stack and it might
break in application is using smaller per-thread stacks.
This patch allocates temporary buffer from heap.

Fixes: ccdcba53a3f4 ("net/mlx5: use Netlink to add/remove MAC addresses")

Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx5/mlx5_nl.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_nl.c b/drivers/net/mlx5/mlx5_nl.c
index 7098d31322..2393d75817 100644
--- a/drivers/net/mlx5/mlx5_nl.c
+++ b/drivers/net/mlx5/mlx5_nl.c
@@ -245,8 +245,8 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
 {
 	struct sockaddr_nl sa;
-	char buf[MLX5_RECV_BUF_SIZE];
+	void *buf = malloc(MLX5_RECV_BUF_SIZE);
 	struct iovec iov = {
 		.iov_base = buf,
-		.iov_len = sizeof(buf),
+		.iov_len = MLX5_RECV_BUF_SIZE,
 	};
 	struct msghdr msg = {
@@ -260,4 +260,8 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
 	int ret = 0;
 
+	if (!buf) {
+		rte_errno = ENOMEM;
+		return -rte_errno;
+	}
 	do {
 		struct nlmsghdr *nh;
@@ -268,5 +272,6 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
 			if (recv_bytes == -1) {
 				rte_errno = errno;
-				return -rte_errno;
+				ret = -rte_errno;
+				goto exit;
 			}
 			nh = (struct nlmsghdr *)buf;
@@ -280,13 +285,17 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
 				if (err_data->error < 0) {
 					rte_errno = -err_data->error;
-					return -rte_errno;
+					ret = -rte_errno;
+					goto exit;
 				}
 				/* Ack message. */
-				return 0;
+				ret = 0;
+				goto exit;
 			}
 			/* Multi-part msgs and their trailing DONE message. */
 			if (nh->nlmsg_flags & NLM_F_MULTI) {
-				if (nh->nlmsg_type == NLMSG_DONE)
-					return 0;
+				if (nh->nlmsg_type == NLMSG_DONE) {
+					ret =  0;
+					goto exit;
+				}
 				multipart = 1;
 			}
@@ -294,8 +303,10 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
 				ret = cb(nh, arg);
 				if (ret < 0)
-					return ret;
+					goto exit;
 			}
 		}
 	} while (multipart);
+exit:
+	free(buf);
 	return ret;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-06 13:03:27.146661447 +0100
+++ 0002-net-mlx5-fix-netlink-buffer-allocation-from-stack.patch	2020-10-06 13:03:26.985072603 +0100
@@ -1 +1 @@
-From 3acf1071958185d2a299b9765e0c5c82e67ff416 Mon Sep 17 00:00:00 2001
+From 9c8ee8bda5c8e94095a5e10b0f978c416dea6297 Mon Sep 17 00:00:00 2001
@@ -4 +4,3 @@
-Subject: [PATCH] common/mlx5: fix netlink buffer allocation from stack
+Subject: [PATCH] net/mlx5: fix netlink buffer allocation from stack
+
+[ upstream commit 3acf1071958185d2a299b9765e0c5c82e67ff416 ]
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
- drivers/common/mlx5/mlx5_nl.c | 27 +++++++++++++++++++--------
+ drivers/net/mlx5/mlx5_nl.c | 27 +++++++++++++++++++--------
@@ -21,5 +22,5 @@
-diff --git a/drivers/common/mlx5/mlx5_nl.c b/drivers/common/mlx5/mlx5_nl.c
-index 65efcd3df2..1a1033a40b 100644
---- a/drivers/common/mlx5/mlx5_nl.c
-+++ b/drivers/common/mlx5/mlx5_nl.c
-@@ -331,8 +331,8 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
+diff --git a/drivers/net/mlx5/mlx5_nl.c b/drivers/net/mlx5/mlx5_nl.c
+index 7098d31322..2393d75817 100644
+--- a/drivers/net/mlx5/mlx5_nl.c
++++ b/drivers/net/mlx5/mlx5_nl.c
+@@ -245,8 +245,8 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
@@ -36 +37 @@
-@@ -346,4 +346,8 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
+@@ -260,4 +260,8 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
@@ -45 +46 @@
-@@ -354,5 +358,6 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
+@@ -268,5 +272,6 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
@@ -53 +54 @@
-@@ -366,13 +371,17 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
+@@ -280,13 +285,17 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
@@ -75 +76 @@
-@@ -380,8 +389,10 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),
+@@ -294,8 +303,10 @@ mlx5_nl_recv(int nlsk_fd, uint32_t sn, int (*cb)(struct nlmsghdr *, void *arg),


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11
  2020-10-06 12:07 [dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11 Kevin Traynor
  2020-10-06 12:07 ` [dpdk-stable] patch 'net/mlx5: fix netlink buffer allocation from stack' " Kevin Traynor
@ 2020-10-25 11:53 ` Ali Alnubani
  2020-10-29 11:23   ` Kevin Traynor
  2020-10-29 12:10   ` David Marchand
  1 sibling, 2 replies; 6+ messages in thread
From: Ali Alnubani @ 2020-10-25 11:53 UTC (permalink / raw)
  To: Kevin Traynor, NBU-Contact-Thomas Monjalon
  Cc: Bruce Richardson, David Marchand, dpdk stable

Hi,

> -----Original Message-----
> From: stable <stable-bounces@dpdk.org> On Behalf Of Kevin Traynor
> Sent: Tuesday, October 6, 2020 3:08 PM
> To: NBU-Contact-Thomas Monjalon <thomas@monjalon.net>
> Cc: Bruce Richardson <bruce.richardson@intel.com>; David Marchand
> <david.marchand@redhat.com>; dpdk stable <stable@dpdk.org>
> Subject: [dpdk-stable] patch 'eal: remove useless makefiles' has been
> queued to LTS release 18.11.11
> 
> Hi,
> 
> FYI, your patch has been queued to LTS release 18.11.11
> 
<removed>
> ---
> From 4a2be43591df63d55d9665389ff41fcba19db85a Mon Sep 17 00:00:00
> 2001
> From: Thomas Monjalon <thomas@monjalon.net>
> Date: Fri, 27 Mar 2020 02:15:33 +0100
> Subject: [PATCH] eal: remove useless makefiles
> 
> [ upstream commit 4448a202b61e1a373c647aa4638093d092b3f5de ]
> 
> When moving files to the directory kernel/, the file BSDmakefile.meson was
> left in eal/.
> 
> Also the intermediate makefiles in linuxapp/ and bsdapp/ became useless.
> 
> Fixes: acaa9ee991b5 ("move kernel modules directories")
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> Acked-by: David Marchand <david.marchand@redhat.com>
>
<removed>

Backporting this patch to 18.11 started causing the following build failure with older gcc versions on RHEL and CentOS with make:
"""
...
  SYMLINK-FILE include/rte_pci_dev_features.h
  CC eal_memory.o
  CC eal_thread.o
  SYMLINK-FILE include/rte_malloc.h
  CC eal_log.o
  CC eal_vfio.o
  SYMLINK-FILE include/rte_keepalive.h
lib/librte_eal/linuxapp/eal/eal_cpuflags.c:19:26: fatal error: rte_cpuflags.h: No such file or directory
 #include <rte_cpuflags.h>
                          ^
compilation terminated.
  SYMLINK-FILE include/rte_time.h
lib/librte_eal/linuxapp/eal/eal_thread.c:16:24: fatal error: rte_atomic.h: No such file or directory
 #include <rte_atomic.h>
                        ^
compilation terminated.
In file included from x86_64-native-linuxapp-gcc/include/rte_eal_memconfig.h:12:0,
                 from lib/librte_eal/linuxapp/eal/eal.c:35:
x86_64-native-linuxapp-gcc/include/rte_malloc_heap.h:10:26: fatal error: rte_spinlock.h: No such file or directory
 #include <rte_spinlock.h>
                          ^
compilation terminated.
...
"""

gcc version: 4.8.5

Regards,
Ali

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11
  2020-10-25 11:53 ` [dpdk-stable] patch 'eal: remove useless makefiles' " Ali Alnubani
@ 2020-10-29 11:23   ` Kevin Traynor
  2020-10-29 12:10   ` David Marchand
  1 sibling, 0 replies; 6+ messages in thread
From: Kevin Traynor @ 2020-10-29 11:23 UTC (permalink / raw)
  To: Ali Alnubani, NBU-Contact-Thomas Monjalon
  Cc: Bruce Richardson, David Marchand, dpdk stable

On 25/10/2020 11:53, Ali Alnubani wrote:
> Hi,
> 

Hi Ali, thanks for reporting.

>> -----Original Message-----
>> From: stable <stable-bounces@dpdk.org> On Behalf Of Kevin Traynor
>> Sent: Tuesday, October 6, 2020 3:08 PM
>> To: NBU-Contact-Thomas Monjalon <thomas@monjalon.net>
>> Cc: Bruce Richardson <bruce.richardson@intel.com>; David Marchand
>> <david.marchand@redhat.com>; dpdk stable <stable@dpdk.org>
>> Subject: [dpdk-stable] patch 'eal: remove useless makefiles' has been
>> queued to LTS release 18.11.11
>>
>> Hi,
>>
>> FYI, your patch has been queued to LTS release 18.11.11
>>
> <removed>
>> ---
>> From 4a2be43591df63d55d9665389ff41fcba19db85a Mon Sep 17 00:00:00
>> 2001
>> From: Thomas Monjalon <thomas@monjalon.net>
>> Date: Fri, 27 Mar 2020 02:15:33 +0100
>> Subject: [PATCH] eal: remove useless makefiles
>>
>> [ upstream commit 4448a202b61e1a373c647aa4638093d092b3f5de ]
>>
>> When moving files to the directory kernel/, the file BSDmakefile.meson was
>> left in eal/.
>>
>> Also the intermediate makefiles in linuxapp/ and bsdapp/ became useless.
>>
>> Fixes: acaa9ee991b5 ("move kernel modules directories")
>>
>> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
>> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
>> Acked-by: David Marchand <david.marchand@redhat.com>
>>
> <removed>
> 
> Backporting this patch to 18.11 started causing the following build failure with older gcc versions on RHEL and CentOS with make:

It compiled locally for me on F31 and F32, but later I saw multiple
build failures like this on OBS even for F31 and F32 with newer gcc. I
looked last Friday and the backport looked ok and it wasn't obvious to
me what the issue is.

I'm sure with time and/or the right eyes it could be fixed but as it is
just to remove a few unused make files, I don't think it's worth the
effort. Unless someone thinks differently, I will revert the patch in
18.11 branch by tomorrow.

thanks,
Kevin.

> """
> ...
>   SYMLINK-FILE include/rte_pci_dev_features.h
>   CC eal_memory.o
>   CC eal_thread.o
>   SYMLINK-FILE include/rte_malloc.h
>   CC eal_log.o
>   CC eal_vfio.o
>   SYMLINK-FILE include/rte_keepalive.h
> lib/librte_eal/linuxapp/eal/eal_cpuflags.c:19:26: fatal error: rte_cpuflags.h: No such file or directory
>  #include <rte_cpuflags.h>
>                           ^
> compilation terminated.
>   SYMLINK-FILE include/rte_time.h
> lib/librte_eal/linuxapp/eal/eal_thread.c:16:24: fatal error: rte_atomic.h: No such file or directory
>  #include <rte_atomic.h>
>                         ^
> compilation terminated.
> In file included from x86_64-native-linuxapp-gcc/include/rte_eal_memconfig.h:12:0,
>                  from lib/librte_eal/linuxapp/eal/eal.c:35:
> x86_64-native-linuxapp-gcc/include/rte_malloc_heap.h:10:26: fatal error: rte_spinlock.h: No such file or directory
>  #include <rte_spinlock.h>
>                           ^
> compilation terminated.
> ...
> """
> 
> gcc version: 4.8.5
> 
> Regards,
> Ali
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11
  2020-10-25 11:53 ` [dpdk-stable] patch 'eal: remove useless makefiles' " Ali Alnubani
  2020-10-29 11:23   ` Kevin Traynor
@ 2020-10-29 12:10   ` David Marchand
  2020-10-29 12:18     ` David Marchand
  1 sibling, 1 reply; 6+ messages in thread
From: David Marchand @ 2020-10-29 12:10 UTC (permalink / raw)
  To: Ali Alnubani, Kevin Traynor
  Cc: NBU-Contact-Thomas Monjalon, Bruce Richardson, dpdk stable

On Sun, Oct 25, 2020 at 12:53 PM Ali Alnubani <alialnu@nvidia.com> wrote:
>
> Hi,
>
> > -----Original Message-----
> > From: stable <stable-bounces@dpdk.org> On Behalf Of Kevin Traynor
> > Sent: Tuesday, October 6, 2020 3:08 PM
> > To: NBU-Contact-Thomas Monjalon <thomas@monjalon.net>
> > Cc: Bruce Richardson <bruce.richardson@intel.com>; David Marchand
> > <david.marchand@redhat.com>; dpdk stable <stable@dpdk.org>
> > Subject: [dpdk-stable] patch 'eal: remove useless makefiles' has been
> > queued to LTS release 18.11.11
> >
> > Hi,
> >
> > FYI, your patch has been queued to LTS release 18.11.11
> >
> <removed>
> > ---
> > From 4a2be43591df63d55d9665389ff41fcba19db85a Mon Sep 17 00:00:00
> > 2001
> > From: Thomas Monjalon <thomas@monjalon.net>
> > Date: Fri, 27 Mar 2020 02:15:33 +0100
> > Subject: [PATCH] eal: remove useless makefiles
> >
> > [ upstream commit 4448a202b61e1a373c647aa4638093d092b3f5de ]
> >
> > When moving files to the directory kernel/, the file BSDmakefile.meson was
> > left in eal/.
> >
> > Also the intermediate makefiles in linuxapp/ and bsdapp/ became useless.
> >
> > Fixes: acaa9ee991b5 ("move kernel modules directories")
> >
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> > Acked-by: David Marchand <david.marchand@redhat.com>
> >
> <removed>
>
> Backporting this patch to 18.11 started causing the following build failure with older gcc versions on RHEL and CentOS with make:
> """
> ...
>   SYMLINK-FILE include/rte_pci_dev_features.h
>   CC eal_memory.o
>   CC eal_thread.o
>   SYMLINK-FILE include/rte_malloc.h
>   CC eal_log.o
>   CC eal_vfio.o
>   SYMLINK-FILE include/rte_keepalive.h
> lib/librte_eal/linuxapp/eal/eal_cpuflags.c:19:26: fatal error: rte_cpuflags.h: No such file or directory
>  #include <rte_cpuflags.h>
>                           ^
> compilation terminated.
>   SYMLINK-FILE include/rte_time.h
> lib/librte_eal/linuxapp/eal/eal_thread.c:16:24: fatal error: rte_atomic.h: No such file or directory
>  #include <rte_atomic.h>
>                         ^
> compilation terminated.
> In file included from x86_64-native-linuxapp-gcc/include/rte_eal_memconfig.h:12:0,
>                  from lib/librte_eal/linuxapp/eal/eal.c:35:
> x86_64-native-linuxapp-gcc/include/rte_malloc_heap.h:10:26: fatal error: rte_spinlock.h: No such file or directory
>  #include <rte_spinlock.h>
>                           ^
> compilation terminated.
> ...
> """

I can reproduce with parallel compilation.
There is a dependency on installing EAL headers that got broken with
this backport.


-- 
David Marchand


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11
  2020-10-29 12:10   ` David Marchand
@ 2020-10-29 12:18     ` David Marchand
  0 siblings, 0 replies; 6+ messages in thread
From: David Marchand @ 2020-10-29 12:18 UTC (permalink / raw)
  To: Ali Alnubani, Kevin Traynor
  Cc: NBU-Contact-Thomas Monjalon, Bruce Richardson, dpdk stable

On Thu, Oct 29, 2020 at 1:10 PM David Marchand
<david.marchand@redhat.com> wrote:
> I can reproduce with parallel compilation.
> There is a dependency on installing EAL headers that got broken with
> this backport.

Ok, I will send a fix.

-- 
David Marchand


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-10-29 12:18 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-06 12:07 [dpdk-stable] patch 'eal: remove useless makefiles' has been queued to LTS release 18.11.11 Kevin Traynor
2020-10-06 12:07 ` [dpdk-stable] patch 'net/mlx5: fix netlink buffer allocation from stack' " Kevin Traynor
2020-10-25 11:53 ` [dpdk-stable] patch 'eal: remove useless makefiles' " Ali Alnubani
2020-10-29 11:23   ` Kevin Traynor
2020-10-29 12:10   ` David Marchand
2020-10-29 12:18     ` David Marchand

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git