RPM

.gitignore

@@ -75,3 +75,8 @@ LINUX/scripts/conf
 config.mak
 *.rej
 utils/producer
+e1000e
+i40e
+igb
+ixgbe
+ixgbevf

LINUX/RPM/README

@@ -0,0 +1,19 @@
+
+HOWTO GENERATE RPM FILE
+-----------------------
+
+1) Edit netmap.spec! Increase at least revision number, but also add
+ something useful to the %changelog section.
+
+2) Commit the changes. The RPM build will clone a fresh copy from git.
+
+3) $ rpmbuild -ba RPM/netmap.spec
+ This (default) directory for your RPM builds may have been changed in
+ ~/.rpmbuild (parameter %_topdir). Another favourite location is
+ /usr/src/redhat/.
+
+3) Find result in ~/rpmbuild/RPMS and upload to repository
+ $ cd $rpmbuild/RPMS/x86_64/
+ $ ls -l
+ $ cp *.rpm $REPODIR/x86_64
+

LINUX/RPM/netmap.spec

@@ -0,0 +1,85 @@
+# RPMBUILD file for netmap in NectarCAM
+# Dirk Hoffmann -CPPM-, 2014-2018
+Name:           netmap
+Version:        11.4
+Release:        1%{?dist}
+Summary:        Netmap distribution for CTA-North EVB
+License:        GPL
+#URL:            https://portal.cta-observatory.org/WP/MST/...???
+#Source0:        http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  linuxptp
+BuildRequires:  kernel-devel
+Requires:       kernel-x86_64 = 3.10.0-693.17.1
+Requires:       module-init-tools
+Requires:       kernel-devel
+
+%description
+The netmap driver with adapted network interface drivers e1000e, i40e, igb,
+ixgbe, ixgbevf for CentOS/EL/SL 7 prepared for Cherenkov Telescope Array
+by Julien Houles and Dirk Hoffmann -CPPM-.
+
+%define kver     %(uname -r)
+%define kmod_dir /lib/modules/%{kver}
+
+%prep
+#%setup -q
+rm -rf %{name}
+#git clone https://github.com/luigirizzo/netmap.git
+git clone https://github.com/DirkHoffmann/netmap.git --branch rpm
+
+
+%build
+cd %{name}
+./configure --install-mod-path=%{buildroot} --prefix=%{buildroot}/usr
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+cd %{name}
+make install 
+
+
+%post
+depmod
+modprobe -r ixgbe
+modprobe ixgbe
+
+
+%postun
+depmod
+modprobe -r ixgbe
+modprobe ixgbe
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc
+%{kmod_dir}/extra
+%{kmod_dir}/updates
+%{_mandir}/*/*.gz
+%attr(4755,root,root) %{_bindir}/*
+%{_includedir}/net/*.h
+%exclude %{kmod_dir}/modules.*
+
+%changelog
+* Fri Jul 27 2018 Dirk Hoffmann <[email protected]> - 11.4
+- Bumping to the official netmap version (tag) number
+- One (tiny) step back in kernel release number
+* Mon Feb 12 2018 Dirk Hoffmann <[email protected]> - 2.0
+- Pulled latest version from github
+- Adapted to CentOS 7.4
+* Mon Mar 14 2016 Dirk Hoffmann <[email protected]> 
+- Adapted to the "git-way of netmap distribution"
+* Mon Sep 15 2014 Dirk Hoffmann <[email protected]>
+- Binary is now suid'd
+- Requiring kernel 3.16.2
+* Wed Sep 10 2014 Dirk Hoffmann <[email protected]> - 1.0
+- Initial version of the package
+

LINUX/bsd_glue.h

@@ -57,6 +57,7 @@
 
 #include <linux/io.h>	// virt_to_phys
 #include <linux/hrtimer.h>
+#include <linux/highmem.h> // kmap
 
 #define KASSERT(a, b)		BUG_ON(!(a))
 
@@ -181,6 +182,10 @@ static inline int skb_checksum_start_offset(const struct sk_buff *skb) {
 #define NM_UNREG_NETDEV_NOTIF(nb)	unregister_netdevice_notifier(nb)
 #endif /* NETMAP_LINUX_HAVE_REG_NOTIF_RH */
 
+#ifndef NETMAP_LINUX_HAVE_PAGE_TO_VIRT
+#define page_to_virt(p) 		phys_to_virt(page_to_phys(p))
+#endif /* NETMAP_LINUX_HAVE_PAGE_TO_VIRT */
+
 /*----------- end of LINUX_VERSION_CODE dependencies ----------*/
 
 /* Type redefinitions. XXX check them */

LINUX/configure

@@ -91,7 +91,8 @@ setop()
 }
 
 # available subsystems
-subsystem_avail="vale pipe monitor generic ptnetmap-guest ptnetmap-host sink"
+subsystem_avail="vale pipe monitor generic ptnetmap-guest ptnetmap-host sink \
+	extmem"
 #enabled subsystems (bitfield)
 subsystem=0
 
@@ -305,9 +306,10 @@ Available options:
   --disable-ptnetmap           disable ptnetmap (both guest and host)
   --enable-sink   	       enable the netmap sink device
   --disable-sink   	       disable the netmap sink device
+  --enable-extmem   	       enable the external memory allocators
+  --disable-extmem   	       disable the external memory allocators
   --force-debug	       	       build the modules w/ debug symbols (default)
   --no-force-debug	       build the modules w/ or w/o debug symbols,
-  			       according to the kernel configuration
   --cache=		       dir for reusing/caching of netmap_linux_config.h
 
   --cc=                        C compiler to be used for the apps [$cc]
@@ -1498,6 +1500,49 @@ EOF
 	}
 EOF
 
+# check for get_user_pages_unlocked number of args
+  add_test 'have GUP_4ARGS' <<EOF
+  	#include <linux/mm.h>
+
+	long
+	dummy(unsigned long start, unsigned long nr_pages,
+		struct page **pages, unsigned int gup_flags) {
+		return get_user_pages_unlocked(start, nr_pages, pages, gup_flags);
+	}
+EOF
+
+  add_test 'have GUP_5ARGS' <<EOF
+  	#include <linux/mm.h>
+
+	long
+	dummy(unsigned long start, unsigned long nr_pages,
+		int write, int force, struct page **pages) {
+		return get_user_pages_unlocked(start, nr_pages, write, force, pages);
+	}
+EOF
+
+  add_test 'have GUP_7ARGS' <<EOF
+  	#include <linux/mm.h>
+
+	long
+	dummy(struct task_struct *tsk, struct mm_struct *mm,
+		unsigned long start, unsigned long nr_pages,
+		int write, int force, struct page **pages) {
+		return get_user_pages_unlocked(tsk, mm, start, nr_pages,
+			write, force, pages);
+	}
+EOF
+
+# check for page_to_virt
+  add_test 'have PAGE_TO_VIRT' <<EOF
+  	#include <linux/mm.h>
+
+	void *
+	dummy(struct page *page) {
+		return page_to_virt(page);
+	}
+EOF
+
   #####################################################
   # checks related to drivers                         #
   #####################################################

LINUX/if_e1000_netmap.h

@@ -315,7 +315,6 @@ static int e1000_netmap_init_buffers(struct SOFTC_T *adapter)
 		i = rxr->count - 1 - nm_kr_rxspace(&na->rx_rings[0]);
 		if (i < 0) // XXX something wrong here, can it really happen ?
 			i += rxr->count;
-		D("i now is %d", i);
 		wmb(); /* Force memory writes to complete */
 		writel(i, hw->hw_addr + rxr->rdt);
 	}

LINUX/netmap_linux.c

@@ -51,6 +51,15 @@ nm_os_malloc(size_t size)
 	return rv;
 }
 
+void *
+nm_os_vmalloc(size_t size)
+{
+	void *rv = vmalloc(size);
+	if (IS_ERR(rv))
+		return NULL;
+	return rv;
+}
+
 void *
 nm_os_realloc(void *addr, size_t new_size, size_t old_size)
 {
@@ -67,6 +76,11 @@ nm_os_free(void *addr){
 	kfree(addr);
 }
 
+void
+nm_os_vfree(void *addr){
+	vfree(addr);
+}
+
 void
 nm_os_selinfo_init(NM_SELINFO_T *si)
 {
@@ -1033,7 +1047,8 @@ linux_netmap_mmap(struct file *f, struct vm_area_struct *vma)
 {
 	int error = 0;
 	unsigned long off;
-	u_int memsize, memflags;
+	uint64_t memsize;
+	u_int memflags;
 	struct netmap_priv_d *priv = f->private_data;
 	struct netmap_adapter *na = priv->np_na;
 	/*
@@ -1057,6 +1072,8 @@ linux_netmap_mmap(struct file *f, struct vm_area_struct *vma)
 			(vma->vm_end - vma->vm_start), memsize);
 	if (off + (vma->vm_end - vma->vm_start) > memsize)
 		return -EINVAL;
+	if (memflags & NETMAP_MEM_EXT)
+		return -ENODEV;
 	if (memflags & NETMAP_MEM_IO) {
 		vm_ooffset_t pa;
 

apps/pkt-gen/pkt-gen.c

@@ -1623,7 +1623,7 @@ sender_body(void *data)
 			}
 			m = send_packets(txring, pkt, frame, size, targ->g,
 					 limit, options, frags);
-			ND("limit %d tail %d frags %d m %d",
+			ND("limit %lu tail %d frags %d m %d",
 				limit, txring->tail, frags, m);
 			sent += m;
 			if (m > 0) //XXX-ste: can m be 0?
@@ -2953,7 +2953,7 @@ main(int arc, char **argv)
 	 * reconfigure. We do the open here to have time to reset.
 	 */
 	flags = NM_OPEN_IFNAME | NM_OPEN_ARG1 | NM_OPEN_ARG2 |
-		NM_OPEN_ARG3 | NM_OPEN_RING_CFG;
+		NM_OPEN_ARG3 | NM_OPEN_EXTMEM | NM_OPEN_RING_CFG;
 	if (g.nthreads > 1) {
 		base_nmd.req.nr_flags &= ~NR_REG_MASK;
 		base_nmd.req.nr_flags |= NR_REG_ONE_NIC;
@@ -2965,7 +2965,7 @@ main(int arc, char **argv)
 		goto out;
 	}
 	g.main_fd = g.nmd->fd;
-	D("mapped %dKB at %p", g.nmd->req.nr_memsize>>10, g.nmd->mem);
+	D("mapped %uKB at %p", g.nmd->req.nr_memsize>>10, g.nmd->mem);
 
 	if (g.virt_header) {
 		/* Set the virtio-net header length, since the user asked

apps/tlem/GNUmakefile

@@ -9,7 +9,7 @@ SRCDIR ?= ../..
 VPATH = $(SRCDIR)/apps/tlem
 
 NO_MAN=
-CFLAGS = -O2 -pipe
+CFLAGS = -O2 -pipe -g
 CFLAGS += -Werror -Wall -Wunused-function
 CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include
 CFLAGS += -Wextra