Test-Label: Intel-compilation
Test-Status: FAILURE
http://dpdk.org/patch/61909

_apply issues_

Submitter: Ciara Power <ciara.power@intel.com>
Date: 2019-10-24 13:31:44
Reply_mail: 20191024133145.12246-6-ciara.power@intel.com
DPDK git baseline:
	Repo:dpdk, CommitID: 5d92c4e592c43166e23501fddee5ee0dc910cd6f

*Repo: dpdk
'netmap_compat', 'ntb', 'packet_ordering',
	'performance-thread', 'ptpclient',
	'qos_meter', 'qos_sched',
	'rxtx_callbacks',

error: patch failed: examples/meson.build:30
error: examples/meson.build: patch does not apply
Checking patch examples/netmap_compat/Makefile...
Checking patch examples/netmap_compat/bridge/Makefile...
Checking patch examples/netmap_compat/bridge/bridge.c...
error: while searching for:
--
	req.nr_version = NETMAP_API;
	req.nr_ringid = 0;

	err = rte_netmap_ioctl(port->fd, NIOCGINFO, &req);
	if (err) {
		printf("[E] NIOCGINFO ioctl failed (error %d)\n", err);
		return err;
	}

	strlcpy(req.nr_name, port->str, sizeof(req.nr_name));
	req.nr_version = NETMAP_API;
	req.nr_ringid = 0;

	err = rte_netmap_ioctl(port->fd, NIOCREGIF, &req);
	if (err) {
		printf("[E] NIOCREGIF ioctl failed (error %d)\n", err);
		return err;
	}

	/* mmap only once. */
	if (ports.mem == NULL)
		ports.mem = rte_netmap_mmap(NULL, req.nr_memsize,
			PROT_WRITE | PROT_READ, MAP_PRIVATE, port->fd, 0);

	if (ports.mem == MAP_FAILED) {
		printf("[E] NETMAP mmap failed for fd: %d)\n", port->fd);
		return -ENOMEM;
	}

	port->nmif = NETMAP_IF(ports.mem, req.nr_offset);

--
	printf("Bridge stopped!\n");

	for (i = 0; i != ports.num; i++) {
		err = rte_netmap_ioctl(ports.p[i].fd, NIOCUNREGIF, &req);
		if (err) {
			printf("[E] NIOCUNREGIF ioctl failed (error %d)\n",
				err);
		}
		else
			printf("Port %hhu unregistered from Netmap mode\n", ports.p[i].id);

		rte_netmap_close(ports.p[i].fd);
	}
	return 0;
}

error: patch failed: examples/netmap_compat/bridge/bridge.c:1
error: examples/netmap_compat/bridge/bridge.c: patch does not apply
Checking patch examples/netmap_compat/lib/compat_netmap.c...
error: while searching for:
/* SPDX-License-Identifier: BSD-3-Clause
 * Copyright(c) 2010-2014 Intel Corporation
--

		/* Update the Netmap ring structure to reflect the change */
		ring->avail += n_tx;
		n_used_slots -= n_tx;

		/* Return the mbufs that failed to transmit to their pool */
		if (unlikely(n_tx != burst_size)) {
			for (i = n_tx; i < burst_size; i++)
				rte_pktmbuf_free(tx_mbufs[i]);
	        	break;
		}
--
	sz = buf_ofs + port_bufs * conf->max_bufsz * port_num;

	if (sz > UINT32_MAX ||
			(netmap.mem = rte_zmalloc_socket(__func__, sz,
			RTE_CACHE_LINE_SIZE, conf->socket_id)) == NULL) {
		RTE_LOG(ERR, USER1, "%s: failed to allocate %zu bytes\n",
			__func__, sz);
		return -ENOMEM;
	}

	netmap.mem_sz = sz;
--
	if (!FD_VALID(fd) || length + offset > netmap.mem_sz ||
			(prot & cprot) != cprot ||
			((flags & MAP_FIXED) != 0 && addr != NULL)) {

		errno = EINVAL;
		return MAP_FAILED;
	}

	return (void *)((uintptr_t)netmap.mem + (uintptr_t)offset);
}

--
	while ((ret == 0 && timeout < 0) || timeout);

	return ret;
}

error: patch failed: examples/netmap_compat/lib/compat_netmap.c:1
error: examples/netmap_compat/lib/compat_netmap.c: patch does not apply
Checking patch examples/netmap_compat/lib/compat_netmap.h...
Checking patch examples/netmap_compat/meson.build...
Checking patch examples/netmap_compat/netmap/netmap.h...
Checking patch examples/netmap_compat/netmap/netmap_user.h...

DPDK STV team