Date: Tue, 6 Feb 2018 15:02:10 -0700 From: John Nielsen <lists@jnielsen.net> To: Maurizio Vairani <maurizio1018@gmail.com> Cc: freebsd-current <freebsd-current@freebsd.org>, Daisuke Aoyama <aoyama@peach.ne.jp>, Ian Lepore <ian@FreeBSD.org> Subject: Re: Fatal trap 12 booting FreeBSD-CURRENT via isboot kernel module. Message-ID: <1C97132B-099B-4BAA-9C39-A1BE00481CAC@jnielsen.net> In-Reply-To: <1517943001.1366.100.camel@freebsd.org> References: <CAN0zgYXfKjKo3CjjfbEX7oSrd2NXqU6kmSXy__OVPr0y3R2Log@mail.gmail.com> <3E242843-7D43-4A36-A448-E4B0DACB2AB4@jnielsen.net> <CAN0zgYWY0QqjHNfnVmOv%2B06H8qAvjKu0N7qvSMgcUo7vi6Bt-A@mail.gmail.com> <DC546197-0C18-4C2A-8E5D-AF6846AA94F3@jnielsen.net> <5EDB0747-41DE-4ECF-925E-EF24FAA550F3@jnielsen.net> <1517943001.1366.100.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On Feb 6, 2018, at 11:50 AM, Ian Lepore <ian@FreeBSD.org> wrote: > > On Tue, 2018-02-06 at 11:33 -0700, John Nielsen wrote: >> >> Apparently sending a NULL socket pointer to ifioctl hasn't worked >> since this commit in 2011: >> https://svnweb.freebsd.org/base?view=revision&revision=218757 >> >> So I'm going to add this patch to the port unconditionally once it >> works. >> >> Unfortunately, I can't compile the port with either my patch below or >> your original replacement version of isboot_ifup(). :( Did you make >> other changes? Here's the error I'm getting: >> >> --- isboot.o --- >> isboot.c:425:53: error: incomplete definition of type 'struct thread' >> error = socreate(AF_INET, &so, SOCK_DGRAM, 0, td->td_ucred, td); >> ~~^ >> /usr/src/sys/sys/systm.h:185:8: note: forward declaration of 'struct >> thread' >> struct thread; >> ^ >> 1 error generated. >> > > Try adding #include <sys/proc.h> if it's not already in the list. It > may be that that file got included via pollution from some other header > file in the past and maybe now that has changed. > > If you're already including sys/proc.h then I'm clueless. Thanks Ian, that appears to work. Maurizio, can you apply the attached patch to a clean ports tree and see if isboot-kmod will build and function properly for you? This is all the changes from this thread and the previous one. If you let me know it works I'll get the port updated. [-- Attachment #2 --] diff -uPr isboot-kmod.orig/Makefile isboot-kmod/Makefile --- isboot-kmod.orig/Makefile 2018-01-11 07:18:01.000000000 -0700 +++ isboot-kmod/Makefile 2018-02-06 14:56:23.654737000 -0700 @@ -2,7 +2,7 @@ PORTNAME= isboot-kmod PORTVERSION= 0.2.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://www.peach.ne.jp/archives/isboot/ DISTNAME= isboot-${PORTVERSION} @@ -12,9 +12,7 @@ LICENSE= BSD2CLAUSE -BROKEN_aarch64= fails to compile: /usr/src/sys/sys/bus.h:724:10: fatal error: 'device_if.h' file not found BROKEN_armv6= fails to compile: implicit declaration of function 'cp15_pmccntr_get' is invalid in C99 -BROKEN_armv7= fails to compile: /usr/src/sys/sys/bus.h:724:10: fatal error: 'device_if.h' file not found BROKEN_powerpc64= fails to compile: pcpu.h: size of array '__assert_0' is negative USES= kmod uidfix diff -uPr isboot-kmod.orig/files/patch-Makefile isboot-kmod/files/patch-Makefile --- isboot-kmod.orig/files/patch-Makefile 1969-12-31 17:00:00.000000000 -0700 +++ isboot-kmod/files/patch-Makefile 2018-01-29 10:24:27.372206000 -0700 @@ -0,0 +1,10 @@ +--- Makefile.orig 2015-09-23 22:33:04.000000000 -0600 ++++ Makefile 2018-01-29 10:20:10.453188000 -0700 +@@ -6,6 +6,7 @@ + SRCS= isboot.c ibft.c iscsi.c + SRCS+= isboot.h ibft.h iscsi_compat.h + SRCS+= opt_cam.h ++SRCS+= device_if.h bus_if.h + #CFLAGS+= -DVIMAGE + #CFLAGS+= -DIBFT_VERBOSE + #CFLAGS+= -DDEBUG diff -uPr isboot-kmod.orig/files/patch-isboot.c isboot-kmod/files/patch-isboot.c --- isboot-kmod.orig/files/patch-isboot.c 2016-05-06 08:34:57.000000000 -0600 +++ isboot-kmod/files/patch-isboot.c 2018-02-06 14:24:47.447244000 -0700 @@ -1,6 +1,14 @@ ---- isboot.c.orig 2015-11-05 16:50:51 UTC -+++ isboot.c -@@ -347,9 +347,9 @@ isboot_set_v4gw(struct sockaddr_in *gate +--- isboot.c.orig 2015-11-05 09:50:51.000000000 -0700 ++++ isboot.c 2018-02-06 14:23:24.479249000 -0700 +@@ -38,6 +38,7 @@ + #include <sys/socketvar.h> + #include <sys/sockio.h> + #include <sys/sysctl.h> ++#include <sys/proc.h> + #include <net/if.h> + #include <net/if_dl.h> + #include <net/if_types.h> +@@ -347,9 +348,9 @@ netmask.sin_addr.s_addr = htonl(0); /* delete gateway if exists */ @@ -12,7 +20,7 @@ if (error) { if (error != ESRCH) { printf("rtrequest RTM_DELETE error %d\n", -@@ -359,9 +359,9 @@ isboot_set_v4gw(struct sockaddr_in *gate +@@ -359,9 +360,9 @@ } /* set new default gateway */ @@ -24,7 +32,7 @@ if (error) { printf("rtrequest RTM_ADD error %d\n", error); return (error); -@@ -391,9 +391,9 @@ isboot_set_v6gw(struct sockaddr_in6 *gat +@@ -391,9 +392,9 @@ memset(&netmask.sin6_addr, 0, 16); /* delete gateway if exists */ @@ -36,7 +44,7 @@ if (error) { if (error != ESRCH) { printf("rtrequest RTM_DELETE error %d\n", -@@ -403,9 +403,9 @@ isboot_set_v6gw(struct sockaddr_in6 *gat +@@ -403,9 +404,9 @@ } /* set new default gateway */ @@ -48,3 +56,42 @@ if (error) { printf("rtrequest RTM_ADD error %d\n", error); return (error); +@@ -417,28 +418,36 @@ + isboot_ifup(struct ifnet *ifp) + { + struct ifreq ifr; ++ struct socket *so; + struct thread *td; + int error; + + memset(&ifr, 0, sizeof(ifr)); + td = curthread; + ++ error = socreate(AF_INET, &so, SOCK_DGRAM, 0, td->td_ucred, td); ++ if (error) { ++ printf("%s: socreate, error=%d\n", __func__, error); ++ return (error); ++ } ++ + /* boot NIC */ + strlcpy(ifr.ifr_name, ifp->if_xname, sizeof(ifr.ifr_name)); + + /* set IFF_UP */ +- error = ifioctl(NULL, SIOCGIFFLAGS, (caddr_t)&ifr, td); ++ error = ifioctl(so, SIOCGIFFLAGS, (caddr_t)&ifr, td); + if (error) { + printf("ifioctl SIOCGIFFLAGS\n"); + return (error); + } + ifr.ifr_flags |= IFF_UP; +- error = ifioctl(NULL, SIOCSIFFLAGS, (caddr_t)&ifr, td); ++ error = ifioctl(so, SIOCSIFFLAGS, (caddr_t)&ifr, td); + if (error) { + printf("ifioctl SIOCSIFFLAGS\n"); + return (error); + } + ++ soclose(so); + return (0); + } + diff -uPr isboot-kmod.orig/files/patch-iscsi.c isboot-kmod/files/patch-iscsi.c --- isboot-kmod.orig/files/patch-iscsi.c 1969-12-31 17:00:00.000000000 -0700 +++ isboot-kmod/files/patch-iscsi.c 2018-01-29 10:24:54.854580000 -0700 @@ -0,0 +1,27 @@ +--- iscsi.c.orig 2015-11-05 09:50:51.000000000 -0700 ++++ iscsi.c 2018-01-29 10:20:00.586277000 -0700 +@@ -1070,9 +1070,11 @@ + return (n); + } + +- +-#if __FreeBSD_version >= 1100000 ++#if __FreeBSD_version >= 1200051 + static void ++isboot_free_mbufext(struct mbuf *m) ++#elif __FreeBSD_version >= 1100000 ++static void + isboot_free_mbufext(struct mbuf *m, void *p, void *optarg) + #elif __FreeBSD_version >= 1000050 && __FreeBSD_version < 1100000 + static int +@@ -1082,7 +1084,9 @@ + isboot_free_mbufext(void *p, void *optarg) + #endif + { +- ++#if __FreeBSD_version >= 1200051 ++ void *p = m->m_ext.ext_arg1; ++#endif + ISBOOT_TRACE("isboot_free_mbufext\n"); + if (p == NULL) + #if __FreeBSD_version >= 1000050 && __FreeBSD_version < 1100000 [-- Attachment #3 --]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1C97132B-099B-4BAA-9C39-A1BE00481CAC>