Changeset 00d7e1b in mainline for uspace/lib

Timestamp:

2011-10-07T20:20:33Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

49bd793b

Parents:

e2c50e1

Message:

networking improvements

• start the networking stack from init
• add loopback network interface driver (cherrypicked and sanitized from lp:~helenos-nicf/helenos/nicf)
• add libnic and various small pieces from lp:~helenos-nicf/helenos/nicf
• fix client side of NIC_GET_ADDRESS
• net binary overhaul

Note: "ping 127.0.0.1" works, but the first three pings timeout for some reason

Location:

uspace/lib

Files:

• c/Makefile (modified) (2 diffs)
• c/generic/device/hw_res_parsed.c (added)
• c/generic/device/nic.c (modified) (3 diffs)
• c/include/device/hw_res_parsed.h (added)
• c/include/net/device.h (modified) (6 diffs)
• net/generic/generic.c (modified) (1 diff)
• net/generic/net_checksum.c (modified) (2 diffs)
• net/il/ip_remote.c (modified) (1 diff)
• net/include/ip_interface.h (modified) (1 diff)
• net/include/ip_remote.h (modified) (1 diff)
• net/include/net_checksum.h (modified) (1 diff)
• net/tl/tl_skel.c (modified) (1 diff)
• nic/Makefile (added)
• nic/include/nic.h (added)
• nic/include/nic_addr_db.h (added)
• nic/include/nic_driver.h (added)
• nic/include/nic_impl.h (added)
• nic/include/nic_rx_control.h (added)
• nic/include/nic_wol_virtues.h (added)
• nic/src/nic_addr_db.c (added)
• nic/src/nic_driver.c (added)
• nic/src/nic_impl.c (added)
• nic/src/nic_rx_control.c (added)
• nic/src/nic_wol_virtues.c (added)

uspace/lib/c/Makefile

@@ -67 +67 @@
         generic/devman.c \
         generic/device/hw_res.c \
+        generic/device/hw_res_parsed.c \
         generic/device/char_dev.c \
         generic/device/nic.c \
@@ -104 +105 @@
         generic/adt/list.c \
         generic/adt/hash_table.c \
+        generic/adt/hash_set.c \
         generic/adt/dynamic_fifo.c \
         generic/adt/measured_strings.c \

uspace/lib/c/generic/device/nic.c

@@ -137 +137 @@
         
         async_exch_t *exch = async_exchange_begin(dev_sess);
-        
-        int rc = async_req_1_0(exch, DEV_IFACE_ID(NIC_DEV_IFACE), NIC_GET_ADDRESS);
-        if (rc != EOK) {
-                async_exchange_end(exch);
-                return rc;
-        }
-        
-        rc = async_data_read_start(exch, address, sizeof(nic_address_t));
-        
-        async_exchange_end(exch);
-        
-        return rc;
+        aid_t aid = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
+            NIC_GET_ADDRESS, NULL);
+        int rc = async_data_read_start(exch, address, sizeof(nic_address_t));
+        async_exchange_end(exch);
+        
+        sysarg_t res;
+        async_wait_for(aid, &res);
+        
+        if (rc != EOK)
+                return rc;
+        
+        return (int) res;
 }
 
@@ -164 +164 @@
         
         async_exch_t *exch = async_exchange_begin(dev_sess);
-        aid_t message_id = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
+        aid_t aid = async_send_1(exch, DEV_IFACE_ID(NIC_DEV_IFACE),
             NIC_SET_ADDRESS, NULL);
         int rc = async_data_write_start(exch, address, sizeof(nic_address_t));
@@ -170 +170 @@
         
         sysarg_t res;
-        async_wait_for(message_id, &res);
+        async_wait_for(aid, &res);
         
         if (rc != EOK)

uspace/lib/c/include/net/device.h

@@ -41 +41 @@
 #include <adt/int_map.h>
 #include <net/eth_phys.h>
+#include <bool.h>
 
 /** Ethernet address length. */
@@ -51 +52 @@
 #define ARGSMAC(__a) \
         (__a)[0], (__a)[1], (__a)[2], (__a)[3], (__a)[4], (__a)[5]
+
+/* Compare MAC address with specific value */
+#define MAC_EQUALS_VALUE(__a, __a0, __a1, __a2, __a3, __a4, __a5) \
+        ((__a)[0] == (__a0) && (__a)[1] == (__a1) && (__a)[2] == (__a2) \
+        && (__a)[3] == (__a3) && (__a)[4] == (__a4) && (__a)[5] == (__a5))
+
+#define MAC_IS_ZERO(__x) \
+        MAC_EQUALS_VALUE(__x, 0, 0, 0, 0, 0, 0)
 
 /** Device identifier to generic type map declaration. */
@@ -221 +230 @@
 } nic_device_stats_t;
 
+/** Errors corresponding to those in the nic_device_stats_t */
+typedef enum {
+        NIC_SEC_BUFFER_FULL,
+        NIC_SEC_ABORTED,
+        NIC_SEC_CARRIER_LOST,
+        NIC_SEC_FIFO_OVERRUN,
+        NIC_SEC_HEARTBEAT,
+        NIC_SEC_WINDOW_ERROR,
+        /* Error encountered during TX but with other type of error */
+        NIC_SEC_OTHER
+} nic_send_error_cause_t;
+
+/** Errors corresponding to those in the nic_device_stats_t */
+typedef enum {
+        NIC_REC_BUFFER_FULL,
+        NIC_REC_LENGTH,
+        NIC_REC_BUFFER_OVERFLOW,
+        NIC_REC_CRC,
+        NIC_REC_FRAME_ALIGNMENT,
+        NIC_REC_FIFO_OVERRUN,
+        NIC_REC_MISSED,
+        /* Error encountered during RX but with other type of error */
+        NIC_REC_OTHER
+} nic_receive_error_cause_t;
+
 /**
  * Information about the NIC that never changes - name, vendor, model,
@@ -246 +280 @@
 
 /**
+ * Type of the ethernet frame
+ */
+typedef enum nic_frame_type {
+        NIC_FRAME_UNICAST,
+        NIC_FRAME_MULTICAST,
+        NIC_FRAME_BROADCAST
+} nic_frame_type_t;
+
+/**
  * Specifies which unicast frames is the NIC receiving.
  */
@@ -292 +335 @@
 
 /**
+ * Structure passed as argument for virtue NIC_WV_MAGIC_PACKET.
+ */
+typedef struct nic_wv_magic_packet_data {
+        uint8_t password[6];
+} nic_wv_magic_packet_data_t;
+
+/**
+ * Structure passed as argument for virtue NIC_WV_DIRECTED_IPV4
+ */
+typedef struct nic_wv_ipv4_data {
+        uint8_t address[4];
+} nic_wv_ipv4_data_t;
+
+/**
+ * Structure passed as argument for virtue NIC_WV_DIRECTED_IPV6
+ */
+typedef struct nic_wv_ipv6_data {
+        uint8_t address[16];
+} nic_wv_ipv6_data_t;
+
+/**
  * WOL virtue types defining the interpretation of data passed to the virtue.
  * Those tagged with S can have only single virtue active at one moment, those
@@ -376 +440 @@
         NIC_POLL_SOFTWARE_PERIODIC
 } nic_poll_mode_t;
+
+/**
+ * Says if this virtue type is a multi-virtue (there can be multiple virtues of
+ * this type at once).
+ *
+ * @param type
+ *
+ * @return true or false
+ */
+static inline int nic_wv_is_multi(nic_wv_type_t type) {
+        switch (type) {
+        case NIC_WV_FULL_MATCH:
+        case NIC_WV_DESTINATION:
+        case NIC_WV_DIRECTED_IPV4:
+        case NIC_WV_DIRECTED_IPV6:
+                return true;
+        default:
+                return false;
+        }
+}
 
 static inline const char *nic_device_state_to_string(nic_device_state_t state)

uspace/lib/net/generic/generic.c

@@ -79 +79 @@
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_req_2_0(exch, message, (sysarg_t) device_id,
+        int rc = async_req_3_0(exch, message, (sysarg_t) device_id, 0,
             (sysarg_t) service);
         async_exchange_end(exch);

uspace/lib/net/generic/net_checksum.c

@@ -45 +45 @@
 #define CRC_DIVIDER_LE  0xedb88320
 
+/** Polynomial used in multicast address hashing */
+#define CRC_MCAST_POLYNOMIAL  0x04c11db6
+
 /** Compacts the computed checksum to the 16 bit number adding the carries.
  *
@@ -221 +224 @@
 }
 
+/** Compute the standard hash from MAC
+ *
+ * Hashing MAC into 64 possible values and using the value as index to
+ * 64bit number.
+ *
+ * The code is copied from qemu-0.13's implementation of ne2000 and rt8139
+ * drivers, but according to documentation there it originates in FreeBSD.
+ *
+ * @param[in] addr The 6-byte MAC address to be hashed
+ *
+ * @return 64-bit number with only single bit set to 1
+ *
+ */
+uint64_t multicast_hash(const uint8_t addr[6])
+{
+        uint32_t crc;
+    int carry, i, j;
+    uint8_t b;
+
+    crc = 0xffffffff;
+    for (i = 0; i < 6; i++) {
+        b = addr[i];
+        for (j = 0; j < 8; j++) {
+            carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
+            crc <<= 1;
+            b >>= 1;
+            if (carry)
+                crc = ((crc ^ CRC_MCAST_POLYNOMIAL) | carry);
+        }
+    }
+        
+    uint64_t one64 = 1;
+    return one64 << (crc >> 26);
+}
+
 /** @}
  */

uspace/lib/net/il/ip_remote.c

@@ -123 +123 @@
  *
  */
-int ip_device_req_remote(async_sess_t *sess, nic_device_id_t device_id,
+int ip_device_req(async_sess_t *sess, nic_device_id_t device_id,
     services_t service)
 {

uspace/lib/net/include/ip_interface.h

@@ -46 +46 @@
 #define ip_set_gateway_req     ip_set_gateway_req_remote
 #define ip_packet_size_req     ip_packet_size_req_remote
-#define ip_device_req          ip_device_req_remote
 #define ip_add_route_req       ip_add_route_req_remote
 #define ip_send_msg            ip_send_msg_remote

uspace/lib/net/include/ip_remote.h

@@ -48 +48 @@
 extern int ip_received_error_msg_remote(async_sess_t *, nic_device_id_t, packet_t *,
     services_t, services_t);
-extern int ip_device_req_remote(async_sess_t *, nic_device_id_t, services_t);
+extern int ip_device_req(async_sess_t *, nic_device_id_t, services_t);
 extern int ip_add_route_req_remote(async_sess_t *, nic_device_id_t, in_addr_t,
     in_addr_t, in_addr_t);

uspace/lib/net/include/net_checksum.h

@@ -67 +67 @@
 extern uint16_t flip_checksum(uint16_t);
 extern uint16_t ip_checksum(uint8_t *, size_t);
+extern uint64_t multicast_hash(const uint8_t addr[6]);
 
 #endif

uspace/lib/net/tl/tl_skel.c

@@ -123 +123 @@
                 goto out;
         
+        task_retval(0);
         async_manager();