2000-02-03 Roland McGrath <roland@baalperazim.frob.com>

	Complete overhaul of pfinet based on the IPv4 networking code from the
	Linux 2.2.12 kernel sources.  This page describes a single unified set
	of interdependent changes, but there are so many changes that I have
	broken up the log entry into paragraphs based on rough topical
	divisions of the work involved.

	Subset of verbatim Linux 2.2.12 sources imported on a vendor branch.
	* linux-src: New directory, see README for details.
	* README: New file, describes linux-src layout and procedures for
	tracking Linux source updates.

	Light modifications to linux-src files to avoid really bending over
	backwards with the glue macros.  All modifications to files in
	linux-src are conditionalized by #ifdef _HURD_.
	* linux-src/include/linux/net.h [_HURD_] (struct socket): New members
	refcnt and identity; elide members fasync_list, file.
	* linux-src/include/linux/rtnetlink.h [! CONFIG_RTNETLINK]
	(rtnl_shlock, rtnl_shunlock) [! _HURD_]: Conditionalize contents on
	this, making these no-ops #ifdef _HURD_.
	* linux-src/net/core/dev.c [_HURD_] (dev_ioctl): Don't define the
	function, instead #define it to 0.
	* linux-src/net/ipv4/af_inet.c [_HURD_] (inet_ioctl): Likewise.
	* linux-src/net/ipv4/arp.c [_HURD_] (arp_ioctl): Likewise.
	* linux-src/net/ipv4/udp.c [_HURD_] (udp_ioctl): Likewise.
	* linux-src/net/ipv4/tcp.c [_HURD_] (tcp_ioctl): Likewise.
	[_HURD_] (tcp_tiocinq): New function, TIOCINQ code from tcp_ioctl.
	* linux-src/net/ipv4/devinet.c [_HURD_] (devinet_ioctl): Don't define
	the function, instead #define it to 0.
	[_HURD_] (configure_device): New function, cobbled from SIOCSIFADDR
	and SIOCSIFNETMASK code from devinet_ioctl.

	* glue-include/asm, glue-include/linux: New directories.
	These contain glue kludge headers that replace all of the
	Linux <asm/*.h> headers except checksum.h, and several of
	the Linux <linux/*.h> headers (the remainder come from
	linux-src/include/linux and are mostly unmodified).
	* glue-include/asm/atomic.h: New file, glue replacement header.
	* glue-include/asm/bitops.h: New file, glue replacement header.
	* glue-include/asm/byteorder.h: New file, glue replacement header.
	* glue-include/asm/checksum.h: New file, glue replacement header.
	* glue-include/asm/errno.h: New file, glue replacement header.
	* glue-include/asm/hardirq.h: New file, glue replacement header.
	* glue-include/asm/init.h: New file, glue replacement header.
	* glue-include/asm/segment.h: New file, glue replacement header.
	* glue-include/asm/spinlock.h: New file, glue replacement header.
	* glue-include/asm/system.h: New file, glue replacement header.
	* glue-include/asm/types.h: New file, glue replacement header.
	* glue-include/asm/uaccess.h: New file, glue replacement header.
	* glue-include/linux/autoconf.h: New file, glue replacement header.
	* glue-include/linux/binfmts.h: New file, glue replacement header.
	* glue-include/linux/config.h: New file, glue replacement header.
	* glue-include/linux/errno.h: New file, glue replacement header.
	* glue-include/linux/fcntl.h: New file, glue replacement header.
	* glue-include/linux/fs.h: New file, glue replacement header.
	* glue-include/linux/in.h: New file, glue replacement header.
	* glue-include/linux/in6.h: New file, glue replacement header.
	* glue-include/linux/interrupt.h: New file, glue replacement header.
	* glue-include/linux/ioctl.h: New file, glue replacement header.
	* glue-include/linux/ipv6.h: New file, glue replacement header.
	* glue-include/linux/kernel.h: New file, glue replacement header.
	* glue-include/linux/limits.h: New file, glue replacement header.
	* glue-include/linux/major.h: New file, glue replacement header.
	* glue-include/linux/malloc.h: New file, glue replacement header.
	* glue-include/linux/mm.h: New file, glue replacement header.
	* glue-include/linux/param.h: New file, glue replacement header.
	* glue-include/linux/personality.h: New file, glue replacement header.
	* glue-include/linux/poll.h: New file, glue replacement header.
	* glue-include/linux/proc_fs.h: New file, glue replacement header.
	* glue-include/linux/sched.h: New file, glue replacement header.
	* glue-include/linux/slab.h: New file, glue replacement header.
	* glue-include/linux/socket.h: New file, glue replacement header.
	* glue-include/linux/sockios.h: New file, glue replacement header.
	* glue-include/linux/stat.h: New file, glue replacement header.
	* glue-include/linux/string.h: New file, glue replacement header.
	* glue-include/linux/termios.h: New file, glue replacement header.
	* glue-include/linux/time.h: New file, glue replacement header.
	* glue-include/linux/timer.h: New file, glue replacement header.
	* glue-include/linux/timex.h: New file, glue replacement header.
	* glue-include/linux/types.h: New file, glue replacement header.
	* glue-include/linux/un.h: New file, glue replacement header.
	* glue-include/linux/version.h: New file, glue replacement header.
	* glue-include/linux/wait.h: New file, glue replacement header.

	* kmem_cache.c: New file.  Glue code replaces Linux kmem_cache_t et al.
	* stubs.c: New file.  No-op functions and stub variables for a few
	things the Linux networking code needs to link.

	* Makefile (core-srcs, arch-lib-srcs, ethernet-srcs, ipv4-srcs): New
	variables, listing sources used from linux-src subdirectories.
	(LINUXSRCS): Define using those.
	(SRCS): Remove devices.c; add kmem_cache.c, stubs.c.
	(UNUSEDSRC): Variable removed.
	(vpath %.c): Remove vpath for $(srcdir)/linux-inet directory.
	Add vpaths for $(srcdir)/linux-src subdirectories.
	(CPPFLAGS): Add -D_HURD_SYSTYPE defining it to $(asm_syntax) as a
	double-quoted string.  Add -I's for glue-include and linux-src/include.

	* pfinet.h: Include <sys/socket.h>, and not <linux/netdevice.h>.
	(master_device): Remove decl.
	(global_lock, packet_queue_lock): Remove common defns.
	(global_lock, net_bh_lock): Declare them as externs.
	(struct sockaddr): Remove len member, make address member just a
	struct sockaddr rather than a 0-length array.
	(setup_loopback_device, become_task_protid, become_task): Remove decls.
	(ethernet_initialize): Declare it.
	(input_work_thread): Remove decl.
	(net_bh_thread): Declare it.
	(tcp_readable): Remove decl.
	(tcp_tiocinq): Declare it.

	* config.h: Rewritten based on Linux 2.2.12 set of CONFIG_* options.
	(CONFIG_NET, CONFIG_INET, CONFIG_SKB_LARGE): These are the only
	Linux config options we set.
	(CONFIG_IP_NOSIOCRT): New macro (not a proper config option, but
	used conveniently in the code).
	* ethernet.c (ethernet_set_multi): Take only one parameter.
	Remove assert, since we always get passed IGMP_ALL_HOSTS.
	(ethernet_thread): Make static.
	(ethernet_demuxer): Use __mutex_lock in place of mutex_lock, so as to
	get cthreads instead of linux/spinlock.h glue macros.  Lock
	net_bh_lock instead of global_lock.  Set SKB->protocol with
	eth_type_trans before calling netif_rx.
	(ethernet_initialize): New function, one-time initialization broken
	out of ethernet_open.
	(ethernet_open): Ports setup moved to ethernet_initialize.
	Don't use `errno' to avoid glue conflicts.
	Use get_privileged_ports here to get the master device port, and
	deallocate it after calling device_open.
	(ethernet_xmit): Use assert_perror.  Only one arg to dev_kfree_skb now.
	(setup_ethernet_device): Change initializations for structure changes.
	Call dev_init_buffers and register_netdevice on the device.
	* timer-emul.c (all functions): Use __mutex_lock instead of mutex_lock.
	Adjust for renaming of `prevp' member to `prev' in struct timer_list.
	(mod_timer): New function.
	* socket.c (proto_ops): Variable removed.
	(net_families): New variable replaces it.
	(sock_register): Rewritten for new calling convention, set
	net_families rather than proto_ops.
	(make_sock_user, clean_socketport, sock_alloc, sock_release):
	Functions moved here from misc.c.
	* sched.c (packet_queue_lock): Variable removed.
	(net_bh_lock, net_bh_wakeup): New variables.
	(current): Variable removed (now a macro in the glue headers).
	(interruptible_sleep_on, wake_up_interruptible): Functions removed.
	They are replaced by inlines in the glue headers.
	(become_task, become_task_protid): Functions removed; they are
	replaced by macros in glue-include/linux/sched.h.
	(net_bh_worker): New function.
	* loopback.c: Completely rewritten, mostly copied from linux-2.2.12's
	drivers/net/loopback.c source file.

	* io-ops.c (all functions): Use __mutex_lock in place of mutex_lock.
	(S_io_write): Call ops->sendmsg instead of ops->write,
	which no longer exists.  If O_NONBLOCK is set, set MSG_DONTWAIT in
	msg_flags.
	(S_io_read): Call ops->recvmsg instead of ops->read,
	which no longer exists  If O_NONBLOCK is set, pass MSG_DONTWAIT.
	(S_io_readable): Use USER->sock->data in place of USER->sock->sk.
	For SOCK_STREAM and SOCK_SEQPACKET types, call tcp_tiocinq.
	(S_io_set_all_openmodes, S_io_get_openmodes, S_io_set_some_openmodes,
	S_io_clear_some_openmodes): Member USER->sock->userflags is now
	renamed USER->sock->flags.
	(S_io_select): Completely rewritten using ops->poll.
	(select_wait): Function removed.
	(S_io_stat): Set st_mode to reflect S_IFSOCK.
	* socket-ops.c (all functions): Use __mutex_lock instead of mutex_lock.
	(S_socket_create): Don't set SOCK->ops or call SOCK->ops->create.
	Instead, call net_families[PF_INET]->create.
	(S_socket_listen): Remove extra checks; just call ops->listen.
	(S_socket_accept): Remove extra checks before ops->accept call.
	Avoid use of goto.
	(S_socket_connect): Remove extra checks; just call ops->connect.
	(S_socket_bind): Adjust for struct sock_addr changes.
	(S_socket_create_address): Likewise.
	(S_socket_whatis_address): Likewise.
	(S_socket_connect2): Don't diddle data structures after
	ops->socketpair call.
	(S_socket_getopt): Use sock_getsockopt if LEVEL is SOL_SOCKET.
	Accept any data size, not just sizeof (int).
	(S_socket_setopt): Use sock_setsockopt if LEVEL is SOL_SOCKET.
	(S_socket_send): Always use ops->sendmsg instead of ops->send or
	ops->sendto, which no longer exist.  If O_NONBLOCK is set, set
	MSG_DONTWAIT in msg_flags.
	(S_socket_recv): Always use ops->recvmsg instead of ops->recv, which
	no longer exists.  If O_NONBLOCK is set, set MSG_DONTWAIT in flags.
	Check for error from S_socket_create_address.

	* main.c (find_device): Don't try to set ether_dev.pa_mask (it's gone).
	(main): Don't call init_devices.  Call ethernet_initialize.
	Start net_bh_worker instead of input_work_thread.  Don't call
	setup_loopback_device.  Instead, take global_lock, do prepare_current,
	and then call sk_init, skb_init, inet_proto_init, and net_dev_init.
	Keep global_lock held while calling argp_parse.
	Call arrange_shutdown_notification only after all that.
	Fix error call for "contacting parent" to pass ERR instead of errno.
	* options.c (ADDR): #undef before defining macro.
	(parse_opt): #if 0 out EDESTADDRREQ check (I don't understand it).
	To apply settings, call configure_devices.
	(ADD_ADDR_OPT): #if 0 --address and --netmask options.  Needs fixed.
	* misc.c (make_sock_user, clean_socketport, sock_alloc, sock_release):
	Functions moved to socket.c.
	(sock_release_peer): Function removed.
	(make_sockaddr_port): Use struct sockaddr_storage to size buffer.
	Fix size calculation for new struct sock_addr layout.
	Initialize sa_family and sa_len of new struct sock_addr.

	Remove the old Linux (2.0.??) network stack and the glue code for it.
	* linux-inet, asm, linux: Directories and all files removed.
	Some of the new files in glue-include came from the old glue headers
	in the asm and linux directories, but most were substantially modified.
	* devices.c: File removed.  The equivalent glue is now elsewhere.

1 files changed, 57 insertions, 39 deletions

diff --git a/pfinet/ethernet.c b/pfinet/ethernet.c
index 85162fd8..1b81e1aa 100644
--- a/pfinet/ethernet.c
+++ b/pfinet/ethernet.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,98,99,2000 Free Software Foundation, Inc.
    Written by Michael I. Bushnell, p/BSG.
 
    This file is part of the GNU Hurd.
@@ -18,15 +18,18 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
+#include "pfinet.h"
+
 #include <device/device.h>
 #include <device/net_status.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <error.h>
 
-#include "pfinet.h"
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/if_arp.h>
+
 
 device_t ether_port;
 
@@ -53,9 +56,8 @@ ethernet_stop (struct device *dev)
 }
 
 void
-ethernet_set_multi (struct device *dev, int numaddrs, void *addrs)
+ethernet_set_multi (struct device *dev)
 {
-  assert (numaddrs == 0);
 }
 
 static short ether_filter[] =
@@ -68,7 +70,7 @@ static int ether_filter_len = sizeof (ether_filter) / sizeof (short);
 static struct port_bucket *etherport_bucket;
 
 
-any_t
+static any_t
 ethernet_thread (any_t arg)
 {
   ports_manage_port_operations_one_thread (etherport_bucket,
@@ -98,7 +100,7 @@ ethernet_demuxer (mach_msg_header_t *inp,
   datalen = ETH_HLEN
     + msg->packet_type.msgt_number - sizeof (struct packet_header);
 
-  mutex_lock (&global_lock);
+  __mutex_lock (&net_bh_lock);
   skb = alloc_skb (datalen, GFP_ATOMIC);
   skb->len = datalen;
   skb->dev = &ether_dev;
@@ -110,32 +112,46 @@ ethernet_demuxer (mach_msg_header_t *inp,
 	 datalen - ETH_HLEN);
 
   /* Drop it on the queue. */
+  skb->protocol = eth_type_trans (skb, &ether_dev);
   netif_rx (skb);
-  mutex_unlock (&global_lock);
+  __mutex_unlock (&net_bh_lock);
 
   return 1;
 }
 
 
+void
+ethernet_initialize (void)
+{
+  etherport_bucket = ports_create_bucket ();
+  etherreadclass = ports_create_class (0, 0);
+
+  cthread_detach (cthread_fork (ethernet_thread, 0));
+}
+
 int
 ethernet_open (struct device *dev)
 {
   error_t err;
+  device_t master_device;
 
-  if (ether_port != MACH_PORT_NULL)
-    return 0;
+  assert (ether_port == MACH_PORT_NULL);
 
-  etherreadclass = ports_create_class (0, 0);
-  errno = ports_create_port (etherreadclass, etherport_bucket,
-			     sizeof (struct port_info), &readpt);
-  assert_perror (errno);
+  err = ports_create_port (etherreadclass, etherport_bucket,
+			   sizeof (struct port_info), &readpt);
+  assert_perror (err);
   readptname = ports_get_right (readpt);
   mach_port_insert_right (mach_task_self (), readptname, readptname,
 			  MACH_MSG_TYPE_MAKE_SEND);
 
   mach_port_set_qlimit (mach_task_self (), readptname, MACH_PORT_QLIMIT_MAX);
 
+  err = get_privileged_ports (0, &master_device);
+  if (err)
+    error (2, err, "cannot get device master port");
+
   err = device_open (master_device, D_WRITE | D_READ, dev->name, &ether_port);
+  mach_port_deallocate (mach_task_self (), master_device);
   if (err)
     error (2, err, "%s", dev->name);
 
@@ -144,7 +160,6 @@ ethernet_open (struct device *dev)
 			   ether_filter, ether_filter_len);
   if (err)
     error (2, err, "%s", dev->name);
-  cthread_detach (cthread_fork (ethernet_thread, 0));
   return 0;
 }
 
@@ -154,12 +169,12 @@ int
 ethernet_xmit (struct sk_buff *skb, struct device *dev)
 {
   u_int count;
-  int err;
+  error_t err;
 
   err = device_write (ether_port, D_NOWAIT, 0, skb->data, skb->len, &count);
-  assert (err == 0);
+  assert_perror (err);
   assert (count == skb->len);
-  dev_kfree_skb (skb, FREE_WRITE);
+  dev_kfree_skb (skb);
   return 0;
 }
 
@@ -169,36 +184,36 @@ setup_ethernet_device (char *name)
   struct net_status netstat;
   u_int count;
   int net_address[2];
-  int i;
   error_t err;
 
-  etherport_bucket = ports_create_bucket ();
+  bzero (&ether_dev, sizeof ether_dev);
 
-  /* Interface buffers. */
-  ether_dev.name = name;
-  for (i = 0; i < DEV_NUMBUFFS; i++)
-    skb_queue_head_init (&ether_dev.buffs[i]);
+  ether_dev.name = strdup (name);
 
-  /* Functions */
-  ether_dev.open = ethernet_open;
+  /* Functions.  These ones are the true "hardware layer" in Linux.  */
+  ether_dev.open = 0;		/* We set up before calling dev_open.  */
   ether_dev.stop = ethernet_stop;
   ether_dev.hard_start_xmit = ethernet_xmit;
-  ether_dev.hard_header = eth_header;
-  ether_dev.rebuild_header = eth_rebuild_header;
-  ether_dev.type_trans = eth_type_trans;
   ether_dev.get_stats = ethernet_get_stats;
   ether_dev.set_multicast_list = ethernet_set_multi;
 
+  /* These are the ones set by drivers/net/net_init.c::ether_setup.  */
+  ether_dev.hard_header = eth_header;
+  ether_dev.rebuild_header = eth_rebuild_header;
+  ether_dev.hard_header_cache = eth_header_cache;
+  ether_dev.header_cache_update = eth_header_cache_update;
+  ether_dev.hard_header_parse = eth_header_parse;
+  /* We can't do these two (and we never try anyway).  */
+  /* ether_dev.change_mtu = eth_change_mtu; */
+  /* ether_dev.set_mac_address = eth_mac_addr; */
+
   /* Some more fields */
   ether_dev.type = ARPHRD_ETHER;
-  ether_dev.hard_header_len = sizeof (struct ethhdr);
+  ether_dev.hard_header_len = ETH_HLEN;
   ether_dev.addr_len = ETH_ALEN;
-  for (i = 0; i < 6; i++)
-    ether_dev.broadcast[i] = 0xff;
+  memset (ether_dev.broadcast, 0xff, ETH_ALEN);
   ether_dev.flags = IFF_BROADCAST | IFF_MULTICAST;
-  ether_dev.family = AF_INET;	/* hmm. */
-  ether_dev.pa_addr = ether_dev.pa_brdaddr = ether_dev.pa_mask = 0;
-  ether_dev.pa_alen = sizeof (unsigned long);
+  dev_init_buffers (&ether_dev);
 
   ethernet_open (&ether_dev);
 
@@ -222,8 +237,11 @@ setup_ethernet_device (char *name)
   net_address[1] = ntohl (net_address[1]);
   bcopy (net_address, ether_dev.dev_addr, ETH_ALEN);
 
-  /* That should be enough. */
+  /* That should be enough.  */
 
-  ether_dev.next = dev_base;
-  dev_base = &ether_dev;
+  /* This call adds the device to the `dev_base' chain,
+     initializes its `ifindex' member (which matters!),
+     and tells the protocol stacks about the device.  */
+  err = - register_netdevice (&ether_dev);
+  assert_perror (err);
 }