Drop all patches, not needed anymore

Change-Id: I04fc3c1765395b92984d980af39f6027b6901f48
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

3 files changed, 0 insertions, 462 deletions

diff --git a/debian/patches/fix-vhost-user-socket-permission.patch b/debian/patches/fix-vhost-user-socket-permission.patch
deleted file mode 100644
index 0c4859cf..00000000
--- a/debian/patches/fix-vhost-user-socket-permission.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-Description: eal: provide option to set vhost_user socket owner/permissions
-
-The API doesn't hold a way to specify a owner/permission set for vhost_user
-created sockets.
-
-Projects consuming DPDK started to do 'their own workarounds' like openvswitch
-https://patchwork.ozlabs.org/patch/559043/
-https://patchwork.ozlabs.org/patch/559045/
-But for this specific example they are blocked/stalled behind a bigger
-rework (https://patchwork.ozlabs.org/patch/604898/).
-
-We need something now for existing code linking against DPDK. That implies to
-avoid changing API/ABI. So I created a DPDK EAL commandline option based ideas
-in the former patches.
-
-Fixes LP: #1546565
-
-*Update*
- - with the split libs it now needs to be listed in
-   lib/librte_eal/linuxapp/eal/rte_eal_version.map to work on link steps
- - please note that upstream gravitates towards not extending but creating a
-   new the API in DPDK as long term solution (will take a while)
- - also as listed before most affected projects seem to create their own
-   workaround.
- So over time we have to check when we can drop it at the price of a config
- transition - likely OVS 2.6 won't need it anymore.
-
-*Update*
- - the handling and lifecycle of this changed in Openvswitch 2.7 so we can no
-   more use internal_config.
- - Also the upstreaming was aborted as that now clearly goes towards client
-   mode vhost sockets for this (and other issues).
- - But until that is fully working we have to carry the workaround.
- - Updated to work with Openvswitch 2.7 (and backward compatible to 2.6)
-
-*Update*
- - in 17.05 the patch now needs to be hooked up on a different place in vhost
-   socket.c
- - also the former rebase dropped a create socket call which is now restored
-
-Forwarded: yes
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2017-08-23
-
---- a/doc/guides/testpmd_app_ug/run_app.rst
-+++ b/doc/guides/testpmd_app_ug/run_app.rst
-@@ -133,6 +133,25 @@ See the DPDK Getting Started Guides for
- 
-     Use malloc instead of hugetlbfs.
- 
-+*   ``--vhost-owner``
-+
-+     When creating vhost_user sockets change owner and group to the specified value.
-+     This can be given as ``user:group``, but also only ``user`` or ``:group`` are supported.
-+
-+    Examples::
-+
-+       --vhost-owner 'libvirt-qemu:kvm'
-+       --vhost-owner 'libvirt-qemu'
-+       --vhost-owner ':kvm'
-+
-+*   ``--vhost-perm``
-+
-+    When creating vhost_user sockets set them up with these permissions.
-+
-+    For example::
-+
-+       --vhost-perm '0664'
-+
- 
- Testpmd Command-line Options
- ----------------------------
---- a/lib/librte_eal/common/eal_common_options.c
-+++ b/lib/librte_eal/common/eal_common_options.c
-@@ -78,6 +78,8 @@ eal_long_options[] = {
- 	{OPT_VMWARE_TSC_MAP,    0, NULL, OPT_VMWARE_TSC_MAP_NUM   },
- 	{OPT_LEGACY_MEM,        0, NULL, OPT_LEGACY_MEM_NUM       },
- 	{OPT_SINGLE_FILE_SEGMENTS, 0, NULL, OPT_SINGLE_FILE_SEGMENTS_NUM},
-+	{OPT_VHOST_OWNER,       1, NULL, OPT_VHOST_OWNER_NUM      },
-+	{OPT_VHOST_PERM,        1, NULL, OPT_VHOST_PERM_NUM       },
- 	{0,                     0, NULL, 0                        }
- };
- 
---- a/lib/librte_eal/common/eal_options.h
-+++ b/lib/librte_eal/common/eal_options.h
-@@ -63,6 +63,10 @@ enum {
- 	OPT_LEGACY_MEM_NUM,
- #define OPT_SINGLE_FILE_SEGMENTS    "single-file-segments"
- 	OPT_SINGLE_FILE_SEGMENTS_NUM,
-+#define OPT_VHOST_OWNER       "vhost-owner"
-+	OPT_VHOST_OWNER_NUM,
-+#define OPT_VHOST_PERM        "vhost-perm"
-+	OPT_VHOST_PERM_NUM,
- 	OPT_LONG_MAX_NUM
- };
- 
---- a/lib/librte_eal/common/include/rte_eal.h
-+++ b/lib/librte_eal/common/include/rte_eal.h
-@@ -498,6 +498,11 @@ enum rte_iova_mode rte_eal_iova_mode(voi
- const char *
- rte_eal_mbuf_user_pool_ops(void);
- 
-+/**
-+ * Set owner/permissions on sockets if requested on EAL commandline
-+ */
-+void rte_eal_set_socket_permissions(const char *);
-+
- #ifdef __cplusplus
- }
- #endif
---- a/lib/librte_eal/linuxapp/eal/eal.c
-+++ b/lib/librte_eal/linuxapp/eal/eal.c
-@@ -23,6 +23,9 @@
- #if defined(RTE_ARCH_X86)
- #include <sys/io.h>
- #endif
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include <grp.h>
- 
- #include <rte_compat.h>
- #include <rte_common.h>
-@@ -89,6 +92,12 @@ struct lcore_config lcore_config[RTE_MAX
- /* internal configuration */
- struct internal_config internal_config;
- 
-+/* workaround to be able to create the sockets under a certain set of
-+ * owner/permissions as specified to EAL until solved upstream */
-+static uid_t debian_vhost_sock_uid = (uid_t)-1;
-+static gid_t debian_vhost_sock_gid = (gid_t)-1;
-+static mode_t debian_vhost_sock_perm = 0;
-+
- /* used by rte_rdtsc() */
- int rte_cycles_vmware_tsc_map;
- 
-@@ -408,6 +417,8 @@ eal_usage(const char *prgname)
- 	       "  --"OPT_VFIO_INTR"         Interrupt mode for VFIO (legacy|msi|msix)\n"
- 	       "  --"OPT_LEGACY_MEM"        Legacy memory mode (no dynamic allocation, contiguous segments)\n"
- 	       "  --"OPT_SINGLE_FILE_SEGMENTS" Put all hugepage memory in single files\n"
-+	       "  --"OPT_VHOST_OWNER"       Create vhost-user sockets with this owner:group\n"
-+	       "  --"OPT_VHOST_PERM"        Create vhost-user sockets with these permissions\n"
- 	       "\n");
- 	/* Allow the application to print its usage message too if hook is set */
- 	if ( rte_application_usage_hook ) {
-@@ -566,6 +577,121 @@ eal_log_level_parse(int argc, char **arg
- 	optarg = old_optarg;
- }
- 
-+/* Try to double the size of '*buf', return true
-+ * if successful, and '*sizep' will be updated with
-+ * the new size. Otherwise, return false.  */
-+static int
-+enlarge_buffer(char **buf, size_t *sizep)
-+{
-+    size_t newsize = *sizep * 2;
-+
-+    if (newsize > *sizep) {
-+        *buf = realloc(*buf, newsize);
-+        *sizep = newsize;
-+        return 1;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+get_owners_from_str(const char *user_spec, uid_t *uid, gid_t *gid)
-+{
-+	size_t bufsize = 4096;
-+
-+	char *pos = strchr(user_spec, ':');
-+	user_spec += strspn(user_spec, " \t\r\n");
-+	size_t len = pos ? (size_t)(pos - user_spec) : strlen(user_spec);
-+
-+	char *buf = NULL;
-+	struct passwd pwd, *res;
-+	int e;
-+
-+	buf = malloc(bufsize);
-+	char *user_search = NULL;
-+	if (len) {
-+		user_search = malloc(len + 1);
-+		memcpy(user_search, user_spec, len);
-+		user_search[len] = '\0';
-+		while ((e = getpwnam_r(user_search, &pwd, buf, bufsize, &res)) == ERANGE) {
-+			if (!enlarge_buffer(&buf, &bufsize)) {
-+				break;
-+			}
-+		}
-+
-+		if (e != 0) {
-+			RTE_LOG(ERR, EAL,"Failed to retrive user %s's uid (%s), aborting.",
-+				user_search, strerror(e));
-+			goto release;
-+		}
-+		if (res == NULL) {
-+			RTE_LOG(ERR, EAL,"user %s not found,  aborting.",
-+				user_search);
-+			e = -1;
-+			goto release;
-+		}
-+	} else {
-+		/* User name is not specified, use current user.  */
-+		while ((e = getpwuid_r(getuid(), &pwd, buf, bufsize, &res)) == ERANGE) {
-+			if (!enlarge_buffer(&buf, &bufsize)) {
-+				break;
-+			}
-+		}
-+
-+		if (e != 0) {
-+			RTE_LOG(ERR, EAL,"Failed to retrive current user's uid "
-+				"(%s), aborting.", strerror(e));
-+			goto release;
-+		}
-+		user_search = strdup(pwd.pw_name);
-+	}
-+
-+	if (uid)
-+		*uid = pwd.pw_uid;
-+
-+	free(buf);
-+	buf = NULL;
-+
-+	if (pos) {
-+		char *grpstr = pos + 1;
-+		grpstr += strspn(grpstr, " \t\r\n");
-+
-+		if (*grpstr) {
-+			struct group grp, *res;
-+
-+			bufsize = 4096;
-+			buf = malloc(bufsize);
-+			while ((e = getgrnam_r(grpstr, &grp, buf, bufsize, &res))
-+					 == ERANGE) {
-+				if (!enlarge_buffer(&buf, &bufsize)) {
-+					break;
-+				}
-+			}
-+
-+			if (e) {
-+				RTE_LOG(ERR, EAL,"Failed to get group entry for %s, "
-+					"(%s), aborting.", grpstr,
-+					strerror(e));
-+				goto release;
-+			}
-+			if (res == NULL) {
-+				RTE_LOG(ERR, EAL,"Group %s not found, aborting.",
-+					grpstr);
-+				e = -1;
-+				goto release;
-+			}
-+
-+			if (gid)
-+				*gid = grp.gr_gid;
-+		}
-+	}
-+
-+ release:
-+	free(buf);
-+	free(user_search);
-+	return e;
-+}
-+
- /* Parse the argument given in the command line of the application */
- static int
- eal_parse_args(int argc, char **argv)
-@@ -668,6 +794,26 @@ eal_parse_args(int argc, char **argv)
- 			    strdup(optarg);
- 			break;
- 
-+		case OPT_VHOST_OWNER_NUM:
-+			if (get_owners_from_str(optarg, &debian_vhost_sock_uid,
-+									&debian_vhost_sock_gid)) {
-+				RTE_LOG(ERR, EAL,"vhost-user socket unable to get"
-+					" specified user/group: %s\n", optarg);
-+				debian_vhost_sock_uid = (uid_t)-1;
-+				debian_vhost_sock_gid = (gid_t)-1;
-+			}
-+			else {
-+				RTE_LOG(INFO, EAL,"socket owner specified as %s (%d:%d)\n",
-+					optarg, debian_vhost_sock_uid, debian_vhost_sock_gid);
-+			}
-+			break;
-+
-+		case OPT_VHOST_PERM_NUM:
-+			debian_vhost_sock_perm = (mode_t)strtoul(optarg, NULL, 0);
-+			RTE_LOG(INFO, EAL,"socket perm specified as '%#o' from '%s'\n",
-+					debian_vhost_sock_perm, optarg);
-+			break;
-+
- 		default:
- 			if (opt < OPT_LONG_MIN_NUM && isprint(opt)) {
- 				RTE_LOG(ERR, EAL, "Option %c is not supported "
-@@ -1145,3 +1291,47 @@ rte_eal_check_module(const char *module_
- 	/* Module has been found */
- 	return 1;
- }
-+
-+static void
-+vhost_set_permissions(const char *vhost_sock_location)
-+{
-+	int err = chmod(vhost_sock_location, debian_vhost_sock_perm);
-+	if (err) {
-+		RTE_LOG(ERR, EAL,"vhost-user socket cannot set"
-+			" permissions to %#o (%s).\n",
-+			debian_vhost_sock_perm, strerror(err));
-+		return;
-+	}
-+	RTE_LOG(INFO, EAL,"Socket %s changed permissions"
-+			" to %#o\n", vhost_sock_location,
-+			debian_vhost_sock_perm);
-+}
-+
-+static void
-+vhost_set_ownership(const char *vhost_sock_location)
-+{
-+	int err = chown(vhost_sock_location, debian_vhost_sock_uid, debian_vhost_sock_gid);
-+	if (err) {
-+		RTE_LOG(ERR, EAL,"vhost-user socket unable to set"
-+			" ownership to %d:%d (%s).\n",
-+			debian_vhost_sock_uid, debian_vhost_sock_gid,
-+			strerror(err));
-+		return;
-+	}
-+
-+	RTE_LOG(INFO, EAL,"Socket %s changed ownership"
-+			" to %d:%d.\n", vhost_sock_location,
-+			debian_vhost_sock_uid, debian_vhost_sock_gid);
-+}
-+
-+void
-+rte_eal_set_socket_permissions(const char *path)
-+{
-+	if (debian_vhost_sock_perm != 0) {
-+		vhost_set_permissions(path);
-+	}
-+
-+	if (debian_vhost_sock_uid != (uid_t)-1 || debian_vhost_sock_gid != (gid_t)-1) {
-+		vhost_set_ownership(path);
-+	}
-+}
---- a/lib/librte_eal/rte_eal_version.map
-+++ b/lib/librte_eal/rte_eal_version.map
-@@ -116,6 +116,7 @@ DPDK_16.04 {
- 
- 	rte_cpu_get_flag_name;
- 	rte_eal_primary_proc_alive;
-+	rte_eal_set_socket_permissions;
- 
- } DPDK_2.2;
- 
---- a/lib/librte_vhost/socket.c
-+++ b/lib/librte_vhost/socket.c
-@@ -77,6 +77,8 @@ struct vhost_user {
- 	pthread_mutex_t mutex;
- };
- 
-+#include <rte_eal.h>
-+
- #define MAX_VIRTIO_BACKLOG 128
- 
- static void vhost_user_server_new_connection(int fd, void *data, int *remove);
-@@ -374,6 +376,7 @@ vhost_user_start_server(struct vhost_use
- 		goto err;
- 	}
- 
-+	rte_eal_set_socket_permissions(path);
- 	return 0;
- 
- err:
diff --git a/debian/patches/series b/debian/patches/series
index 8ca0109f..e69de29b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-fix-vhost-user-socket-permission.patch
-tmpfix-ppc-build-error.patch
diff --git a/debian/patches/tmpfix-ppc-build-error.patch b/debian/patches/tmpfix-ppc-build-error.patch
deleted file mode 100644
index 7244817b..00000000
--- a/debian/patches/tmpfix-ppc-build-error.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Description: Fix ppc64le build error between altivec and bool
-
-We really hope there will eventually be a better fix for this, but currently
-we have to unbreak building this code so until something better is available
-let's use this modification.
-
-Forwarded: yes
-Forward-info: http://mails.dpdk.org/archives/dev/2018-August/109926.html
-Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Last-Update: 2018-08-22
---- a/drivers/net/mlx5/mlx5_nl.c
-+++ b/drivers/net/mlx5/mlx5_nl.c
-@@ -834,8 +834,8 @@ mlx5_nl_switch_info_cb(struct nlmsghdr *
- 		.switch_id = 0,
- 	};
- 	size_t off = NLMSG_LENGTH(sizeof(struct ifinfomsg));
--	bool port_name_set = false;
--	bool switch_id_set = false;
-+	int port_name_set = 0;
-+	int switch_id_set = 0;
- 
- 	if (nh->nlmsg_type != RTM_NEWLINK)
- 		goto error;
-@@ -854,7 +854,7 @@ mlx5_nl_switch_info_cb(struct nlmsghdr *
- 			if (errno ||
- 			    (size_t)(end - (char *)payload) != strlen(payload))
- 				goto error;
--			port_name_set = true;
-+			port_name_set = 1;
- 			break;
- 		case IFLA_PHYS_SWITCH_ID:
- 			info.switch_id = 0;
-@@ -862,7 +862,7 @@ mlx5_nl_switch_info_cb(struct nlmsghdr *
- 				info.switch_id <<= 8;
- 				info.switch_id |= ((uint8_t *)payload)[i];
- 			}
--			switch_id_set = true;
-+			switch_id_set = 1;
- 			break;
- 		}
- 		off += RTA_ALIGN(ra->rta_len);
---- a/drivers/net/mlx5/mlx5_ethdev.c
-+++ b/drivers/net/mlx5/mlx5_ethdev.c
-@@ -1335,8 +1335,8 @@ mlx5_sysfs_switch_info(unsigned int ifin
- 	char ifname[IF_NAMESIZE];
- 	FILE *file;
- 	struct mlx5_switch_info data = { .master = 0, };
--	bool port_name_set = false;
--	bool port_switch_id_set = false;
-+	int port_name_set = 0;
-+	int port_switch_id_set = 0;
- 	char c;
- 
- 	if (!if_indextoname(ifindex, ifname)) {
---- a/drivers/net/mlx5/mlx5_nl_flow.c
-+++ b/drivers/net/mlx5/mlx5_nl_flow.c
-@@ -385,11 +385,11 @@ mlx5_nl_flow_transpose(void *buf,
- 	const struct rte_flow_action *action;
- 	unsigned int n;
- 	uint32_t act_index_cur;
--	bool in_port_id_set;
--	bool eth_type_set;
--	bool vlan_present;
--	bool vlan_eth_type_set;
--	bool ip_proto_set;
-+	int in_port_id_set;
-+	int eth_type_set;
-+	int vlan_present;
-+	int vlan_eth_type_set;
-+	int ip_proto_set;
- 	struct nlattr *na_flower;
- 	struct nlattr *na_flower_act;
- 	struct nlattr *na_vlan_id;
-@@ -404,11 +404,11 @@ init:
- 	action = actions;
- 	n = 0;
- 	act_index_cur = 0;
--	in_port_id_set = false;
--	eth_type_set = false;
--	vlan_present = false;
--	vlan_eth_type_set = false;
--	ip_proto_set = false;
-+	in_port_id_set = 0;
-+	eth_type_set = 0;
-+	vlan_present = 0;
-+	vlan_eth_type_set = 0;
-+	ip_proto_set = 0;
- 	na_flower = NULL;
- 	na_flower_act = NULL;
- 	na_vlan_id = NULL;