net: a network *class*, so the stack stops knowing what an e1000 is
The TCP/IP stack reached straight into the first driver anyone wrote.
net.c called e1000_present(), the lwIP glue was named netif_e1000.c and
called e1000_transmit(), and include/defs.h declared the driver's
internals to the whole kernel. The second NIC driver would therefore
have arrived with a near-identical copy of the glue file and a patch to
the protocol stack, which is the arrangement include/device.h was
written to prevent -- the e1000 even said so, with `.ops = 0, // no
class vtable yet; there is no net class`.
There is now. A driver publishes a struct netdev_ops -- transmit,
receive, mac, link_up -- and is finished: it never mentions lwIP, and
nothing above it learns its name. The display class was already this
shape; this is the same shape for networking, and the two now read the
same way in kernel/dev/device.c.
What that made possible immediately:
- One netif per bound device instead of one per driver. lwIP's glue is
netif_eth.c, it takes a struct device, and it holds up to NETIF_MAX
interfaces. net.c attaches every network device it finds and starts
DHCP on each, because which interface the network answers on is not
ours to decide.
- /proc/netif lists all of them, one block of fields each, with the
interface name and the driver that claimed it.
- The ARP self-test moved from the e1000 to the class. Nothing in it
was chip-specific, and it is the first thing anyone will want to run
against the next driver. Still `echo n > /proc/sysrq`.
- Private headers live with their driver: e1000.h was in include/,
where exactly one file could use it. The driver build now adds the
driver's own directory to the include path.
The e1000 also drives more than one card. Its probe() refused the second
outright, because there was a single static instance -- so a machine
with two of them drove one and silently ignored the other. Instances are
an array now, and the instance is hung on dev->priv by a new optional
`attached` hook that the bus calls once the device exists. probe() runs
before device_add(), so there was previously nowhere to put it; that is
the whole reason the hook exists rather than a line inside probe.
QEMU gets an explicit NIC on every target (QEMU_NET). The default device
happens to be an e1000 on this machine type today, which is exactly the
sort of thing that stays true until a QEMU release changes it and the
network stops being exercised without anyone noticing.
Verified:
- bootcheck -Net passes, 48 [ok], no failures -- including the moved
self-test and two new checks that /proc/netif names both the
interface and the driver behind it, which together say the stack
went through the class rather than through a driver it was compiled
to know.
- Two NICs attached by hand (-device e1000 twice, second with its own
MAC): eth0 and eth1 both attach, each reports its own MAC in
/proc/netif, and each gets its own DHCP lease. Before this commit
the same machine produced one interface.
- make schfs-check still passes in full.
One trap worth recording: moving a header broke the build for anyone
with stale .d files -- make stopped with "No rule to make target
'include/e1000.h'". CFLAGS gains -MP, which emits a phony target per
header so a moved or deleted one can never wedge the build again.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
parent
042ca7fb70
commit
20cc673a41
16 changed files with 729 additions and 367 deletions
|
|
@ -257,6 +257,11 @@ if ($Net) {
|
|||
# arrived" rather than "TCP is broken" -- two very different bugs that look
|
||||
# identical from a failed connect.
|
||||
$commands += 'cat /proc/netif'
|
||||
# The raw driver path, underneath lwIP: an ARP request built by hand and
|
||||
# the reply read back off the receive ring. It lives on the netdev class
|
||||
# now rather than inside the e1000, so this is also the check that moving
|
||||
# it did not break it.
|
||||
$commands += 'echo n > /proc/sysrq'
|
||||
$commands += "nettest 10.0.2.2 $netPort"
|
||||
$commands += "nettest -u 10.0.2.2 $netUdpPort"
|
||||
}
|
||||
|
|
@ -782,7 +787,12 @@ if ($Net) {
|
|||
# 10.0.2.15 is the address QEMU's user-mode networking hands out, so this
|
||||
# is DHCP genuinely completing -- discover, offer, request, ack -- and not
|
||||
# a hardcoded guess: nothing in the guest knows that number in advance.
|
||||
Expect 'net: 10\.0\.2\.15/' 'DHCP obtained an address from SLIRP'
|
||||
Expect 'net: eth\d 10\.0\.2\.15/' 'DHCP obtained an address from SLIRP'
|
||||
# The interface is named for the device, and the device names the driver
|
||||
# that claimed it. Together they say the stack went through the netdev
|
||||
# class rather than calling a driver it was compiled to know about.
|
||||
Expect '(?m)^interface\s+eth\d' '/proc/netif names the bound interface'
|
||||
Expect '(?m)^driver\s+e1000' 'and the driver behind it'
|
||||
Expect '(?m)^state\s+up' '/proc/netif reports the interface up'
|
||||
Expect '(?m)^address\s+10\.0\.2\.15' '/proc/netif reports the address it was given'
|
||||
Expect '(?m)^gateway\s+10\.0\.2\.2' '/proc/netif reports the gateway'
|
||||
|
|
@ -790,6 +800,7 @@ if ($Net) {
|
|||
# zero here means the counters are wrong rather than the network.
|
||||
Expect '(?m)^rx_frames\s+[1-9]' 'frames arrived and reached the stack'
|
||||
Expect '(?m)^tx_frames\s+[1-9]' 'frames were transmitted'
|
||||
Expect 'netdev: ARP reply' 'the raw driver path carries a frame both ways'
|
||||
|
||||
# And now real traffic. Each of these is a different part of the exchange,
|
||||
# so a failure says which one: the handshake, the guest's receive path, and
|
||||
|
|
|
|||
Loading…
Reference in a new issue