Add network stack #12

vinc · 2020-01-25T10:45:07Z

Driver:
https://wiki.osdev.org/RTL8139
https://www.cs.usfca.edu/~cruse/cs326f04/RTL8139D_DataSheet.pdf
https://docs.rs/smoltcp/0.6.0/smoltcp

DNS:
https://tools.ietf.org/html/rfc1035

vinc · 2020-01-26T19:44:46Z

First raw data received:

00000000: 0100 7200 3333 0000 0001 5256 0000 0002 ..r.33....RV....
00000010: 86DD 6000 0000 0038 3AFF FE80 0000 0000 ..`....8:.......
00000020: 0000 0000 0000 0000 0002 FF02 0000 0000 ................
00000030: 0000 0000 0000 0000 0001 8600 155E 4000 .............^@.
00000040: 0708 0000 0000 0000 0000 0101 5256 0000 ............RV..
00000050: 0002 0304 40C0 0001 5180 0000 3840 0000 ....@...Q...8@..
00000060: 0000 FEC0 0000 0000 0000 0000 0000 0000 ................
00000070: 0000 8CF2 6C74 0000 0000 0000 0000 0000 ....lt..........
00000080: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000A0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000B0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000C0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000D0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000E0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000F0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000100: 0000 0000 0000 0000 0000 0000 0000 0000 ................

vinc · 2020-01-26T21:30:25Z

By taking the packet header and length into account:

[389.970348] Polling ethernet interface...
`-> RTL8139 received data (cmd=0x0C, header=0x0001, length=114)

00000000: 3333 0000 0001 5256 0000 0002 86DD 6000 33....RV......`.
00000010: 0000 0038 3AFF FE80 0000 0000 0000 0000 ...8:...........
00000020: 0000 0000 0002 FF02 0000 0000 0000 0000 ................
00000030: 0000 0000 0001 8600 155E 4000 0708 0000 .........^@.....
00000040: 0000 0000 0000 0101 5256 0000 0002 0304 ........RV......
00000050: 40C0 0001 5180 0000 3840 0000 0000 FEC0 @...Q...8@......
00000060: 0000 0000 0000 0000 0000 0000 0000
`-> Err(unrecognized packet)

vinc · 2020-01-27T09:12:00Z

And now by taking CRC at the end into account:

[319.995387] Polling ethernet interface...
`-> RTL8139 received data:

cmd: 0x0C
header: 0x0001
length: 110
crc: 0x746CF28C

00000000: 3333 0000 0001 5256 0000 0002 86DD 6000 33....RV......`.
00000010: 0000 0038 3AFF FE80 0000 0000 0000 0000 ...8:...........
00000020: 0000 0000 0002 FF02 0000 0000 0000 0000 ................
00000030: 0000 0000 0001 8600 155E 4000 0708 0000 .........^@.....
00000040: 0000 0000 0000 0101 5256 0000 0002 0304 ........RV......
00000050: 40C0 0001 5180 0000 3840 0000 0000 FEC0 @...Q...8@......
00000060: 0000 0000 0000 0000 0000 0000 0000      ..............
`-> Err(unrecognized packet)

Confirmed with Wireshark:

Frame 1: 110 bytes on wire (880 bits), 110 bytes captured (880 bits)
Ethernet II, Src: 52:56:00:00:00:02 (52:56:00:00:00:02), Dst: IPv6mcast_01 (33:33:00:00:00:01)
Internet Protocol Version 6, Src: fe80::2, Dst: ff02::1
Internet Control Message Protocol v6

vinc · 2020-01-28T19:30:44Z

Got the packet transmission working!

------------------------------------------------------------------
[30.263896] NET RTL8139 transmitting frame:

TX Buffer: 3

00000000: FFFF FFFF FFFF 5254 0012 3456 0800 4500 ......RT..4V..E.
00000010: 011D 0000 4000 4011 2DC2 0A00 020F FFFF ....@.@.-. .....
00000020: FFFF 0044 0043 0109 AD1A 0101 0600 0000 ...D.C. ........
00000030: 0005 0000 0001 0000 0000 0000 0000 0000 ................
00000040: 0000 0000 0000 5254 0012 3456 0000 0000 ......RT..4V....
00000050: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000060: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000070: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000080: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000A0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000B0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000C0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000D0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000E0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000F0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000100: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000110: 0000 0000 0000 6382 5363 3501 013D 0701 ......c.Sc5..=..
00000120: 5254 0012 3456 3902 0384                RT..4V9...
------------------------------------------------------------------
[30.263896] NET RTL8139 receiving frame:

Command Register: 0x0C
Header: 0x0001
Length: 590 bytes
CRC: 0xAAD19FDE

00000000: FFFF FFFF FFFF 5255 0A00 0202 0800 4510 ......RU .....E.
00000010: 0240 0000 0000 4011 6C9C 0A00 0202 FFFF .@....@.l. .....
00000020: FFFF 0043 0044 022C BB6C 0201 0600 0000 ...C.D.,.l......
00000030: 0005 0000 0000 0000 0000 0A00 020F 0A00 .......... ... .
00000040: 0202 0000 0000 5254 0012 3456 0000 0000 ......RT..4V....
00000050: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000060: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000070: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000080: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000090: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000A0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000B0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000C0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000D0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000E0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000000F0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000100: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000110: 0000 0000 0000 6382 5363 3501 0236 040A ......c.Sc5..6.
00000120: 0002 0201 04FF FFFF 0003 040A 0002 0206 ........... ....
00000130: 040A 0002 0333 0400 0151 80FF 0000 0000 . ...3...Q......
00000140: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000150: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000160: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000170: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000180: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000190: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000001A0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000001B0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000001C0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000001D0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000001E0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
000001F0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000200: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000210: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000220: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000230: 0000 0000 0000 0000 0000 0000 0000 0000 ................
00000240: 0000 0000 0000 0000 0000 0000 0000      ..............
TX Buffer: 0
DHCP config: Config { address: Some(Cidr { address: Address([10, 0, 2, 15]), prefix_len: 24 }), router: Some(Address([10, 0, 2, 2])), dns_servers: [Some(Address([10, 0, 2, 3])), None, None] }
Assigned a new IPv4 address: 10.0.2.15/24
Default gateway: 10.0.2.2
DNS servers:
- 10.0.2.3

Used the following example for the DHCP client: https://github.com/m-labs/smoltcp/blob/master/examples/dhcp_client.rs

vinc · 2020-02-01T19:59:41Z

Everything seems to be working except we'll need to update the allocator to have physical memory blocks larger than the 4iB page size. After receiving a few big (or many small) packets the card will start to write in space than has not been allocated and we can't read it back.

vinc · 2020-02-02T16:39:51Z

Creating an unused array that will "push" the other one into a contiguous area in memory proved that this was indeed the issue.

vinc · 2020-02-02T17:55:11Z

Going to merge this as it is and work on the allocator this week.

vinc added 19 commits January 25, 2020 11:44

Display MAC address

4afa53e

Add kernel::pci::find_device

d428d25

Mask lower bits of 16-bit Memory Space BAR

5ad2dcb

Use array instead of vector for MAC address

af8bc7a

Split interrupts module

3f59610

Use IRQ constants instead of InterruptIndex enum

4fa9c84

Replace kernel::sleep by kernel::time

8c0a221

Add kernel::idt::set_irq_handler

69ca7c1

Add interrupt handler for RTL8139

350dbc5

Enable bus mastering for RTL8139

633368d

Setup NIC

4d118c0

Add features for vga/serial and qwerty/dvorak

f913504

Add smoltcp crate

d254f6e

Use EthernetAddress from smoltcp

53f5500

Add RTL8139 struct to implement smoltcp Device

c05266f

Save detected device

67496fc

Add kernel::mem::translate_addr

c2a2fac

Use physical address of rx_buffer

e7f3270

Add command to read raw network data

ad1da15

Parse packet header and length

c5893f0

vinc added 2 commits January 26, 2020 23:54

Fix missing ascii on last line

90d891a

Take CRC into account for packet length

495d6db

vinc added 4 commits January 27, 2020 10:17

Fix compilation error

cd905cb

Move buffer pointers after packet received

db9ad3b

Use buffer slice instead of clone in RxToken

39a3283

Add packet transmission and dhcp client

816c159

vinc added 20 commits January 30, 2020 20:47

Add State struct to Device struct

1ed3a52

Add subcommand config and dump to net command

aeb8910

Add MTU to RX_BUFFER_LEN when using WRAP

5b4c2a6

Fix first transmission index

acd922d

Refactor TxToken implementation

84fce93

Add user agent to http requests

c2c4cfe

Add more comments to code

756e5e6

Add llvm-tools-preview component to readme

b2e9aba

Add method to translate IRQ into system interrupt

dc62144

Clear IRQ mask in set_irq_handler

f202ad9

Refactor driver code

710a02b

Sleep less rather than more

750f083

Add rand32

34e4137

Disable RTL8139 interrupts

9ac659f

Use arrays instead of vectors for buffers

e32cc40

Add minimum sleep duration

526a62b

Add phy_addr to dry init

6e90792

Use CAPR and CBR to compute rx buffer offset

acc1a09

Add debug for alloc issue with continuous physical memory

a81ccbf

Fix timeout in loops

978544b

Add unused buffer to push the rx buffer into contiguous memory

5696652

vinc added 3 commits February 2, 2020 18:38

Add doc about network

7ab3231

Update readme

bde00f8

Add read /net/<proto>/<host>/<path> subcommand

edaba6b

vinc marked this pull request as ready for review February 2, 2020 17:54

vinc merged commit 4fd7d68 into master Feb 2, 2020

vinc deleted the feature/rtl8139 branch February 2, 2020 17:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add network stack #12

Add network stack #12

vinc commented Jan 25, 2020 •

edited

Loading

vinc commented Jan 26, 2020 •

edited

Loading

vinc commented Jan 26, 2020

vinc commented Jan 27, 2020

vinc commented Jan 28, 2020

vinc commented Feb 1, 2020

vinc commented Feb 2, 2020

vinc commented Feb 2, 2020

Add network stack #12

Add network stack #12

Conversation

vinc commented Jan 25, 2020 • edited Loading

vinc commented Jan 26, 2020 • edited Loading

vinc commented Jan 26, 2020

vinc commented Jan 27, 2020

vinc commented Jan 28, 2020

vinc commented Feb 1, 2020

vinc commented Feb 2, 2020

vinc commented Feb 2, 2020

vinc commented Jan 25, 2020 •

edited

Loading

vinc commented Jan 26, 2020 •

edited

Loading