Changeset 1bc35b5 in mainline for uspace/lib

Timestamp:

2012-01-19T08:13:45Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8da56b

Parents:

3ea725e

Message:

Remove most use of packet_t from NIC drivers.

Location:

uspace/lib

Files:

• net/include/nil_remote.h (modified) (2 diffs)
• net/nil/nil_remote.c (modified) (1 diff)
• nic/include/nic.h (modified) (2 diffs)
• nic/include/nic_rx_control.h (modified) (1 diff)
• nic/src/nic_driver.c (modified) (9 diffs)
• nic/src/nic_rx_control.c (modified) (2 diffs)

uspace/lib/net/include/nil_remote.h

@@ -39 +39 @@
 #include <generic.h>
 #include <async.h>
+#include <sys/types.h>
 
 #define nil_bind_service(service, device_id, me, receiver) \
@@ -61 +62 @@
     size_t);
 extern int nil_device_state_msg(async_sess_t *, nic_device_id_t, sysarg_t);
-extern int nil_received_msg(async_sess_t *, nic_device_id_t, packet_id_t);
+extern int nil_received_msg(async_sess_t *, nic_device_id_t, void *, size_t);
 extern int nil_addr_changed_msg(async_sess_t *, nic_device_id_t,
     const nic_address_t *);

uspace/lib/net/nil/nil_remote.c

@@ -77 +77 @@
  */
 int nil_received_msg(async_sess_t *sess, nic_device_id_t device_id,
-    packet_id_t packet_id)
+    void *data, size_t size)
 {
-        return generic_received_msg_remote(sess, NET_NIL_RECEIVED,
-            device_id, packet_id, 0, 0);
+        async_exch_t *exch = async_exchange_begin(sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, NET_NIL_RECEIVED, (sysarg_t) device_id,
+            &answer);
+        sysarg_t retval = async_data_write_start(exch, data, size);
+
+        async_exchange_end(exch);
+
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+        return retval;
 }
 

uspace/lib/nic/include/nic.h

@@ -61 +61 @@
 
 /**
- * Simple structure for sending the allocated frames (packets) in a list.
+ * Simple structure for sending lists of frames.
  */
 typedef struct {
         link_t link;
-        packet_t *packet;
+        void *data;
+        size_t size;
 } nic_frame_t;
 
@@ -233 +234 @@
 extern int nic_report_poll_mode(nic_t *, nic_poll_mode_t, struct timeval *);
 extern void nic_query_address(nic_t *, nic_address_t *);
-extern void nic_received_packet(nic_t *, packet_t *);
 extern void nic_received_noneth_packet(nic_t *, packet_t *);
 extern void nic_received_frame(nic_t *, nic_frame_t *);

uspace/lib/nic/include/nic_rx_control.h

@@ -120 +120 @@
         const nic_address_t *prev_addr, const nic_address_t *curr_addr);
 extern int nic_rxc_check(const nic_rxc_t *rxc,
-        const packet_t *packet, nic_frame_type_t *frame_type);
+        const void *data, size_t size, nic_frame_type_t *frame_type);
 extern void nic_rxc_hw_filtering(nic_rxc_t *rxc,
         int unicast_exact, int multicast_exact, int vlan_exact);

uspace/lib/nic/src/nic_driver.c

@@ -290 +290 @@
  *
  *  @param nic_data     The NIC driver data
- *  @param packet_size  Size of packet
- *  @param offload_size Size of packet offload
+ *  @param size         Frame size in bytes
  *  @return pointer to allocated frame if success, NULL otherwise
  */
-nic_frame_t *nic_alloc_frame(nic_t *nic_data, size_t packet_size)
+nic_frame_t *nic_alloc_frame(nic_t *nic_data, size_t size)
 {
         nic_frame_t *frame;
@@ -313 +312 @@
         }
 
-        packet_t *packet = nic_alloc_packet(nic_data, packet_size);
-        if (!packet) {
+        frame->data = malloc(size);
+        if (frame->data == NULL) {
                 free(frame);
                 return NULL;
         }
 
-        frame->packet = packet;
+        frame->size = size;
         return frame;
 }
@@ -332 +331 @@
         if (!frame)
                 return;
-        if (frame->packet != NULL) {
-                nic_release_packet(nic_data, frame->packet);
-        }
+
+        if (frame->data != NULL) {
+                free(frame->data);
+                frame->data = NULL;
+                frame->size = 0;
+        }
+
         fibril_mutex_lock(&nic_globals.lock);
         if (nic_globals.frame_cache_size >= NIC_GLOBALS_MAX_CACHE_SIZE) {
@@ -622 +625 @@
 
 /**
- * Provided for correct naming conventions.
- * The packet is checked by filters and then sent up to the NIL layer or
- * discarded, the frame is released.
- *
- * @param nic_data
- * @param frame         The frame containing received packet
+ * This is the function that the driver should call when it receives a frame.
+ * The frame is checked by filters and then sent up to the NIL layer or
+ * discarded. The frame is released.
+ *
+ * @param nic_data
+ * @param frame         The received frame
  */
 void nic_received_frame(nic_t *nic_data, nic_frame_t *frame)
-{
-        nic_received_packet(nic_data, frame->packet);
-        frame->packet = NULL;
-        nic_release_frame(nic_data, frame);
-}
-
-/**
- * This is the function that the driver should call when it receives a packet.
- * The packet is checked by filters and then sent up to the NIL layer or
- * discarded.
- *
- * @param nic_data
- * @param packet                The received packet
- */
-void nic_received_packet(nic_t *nic_data, packet_t *packet)
 {
         /* Note: this function must not lock main lock, because loopback driver
          *               calls it inside write_packet handler (with locked main lock) */
-        packet_id_t pid = packet_get_id(packet);
-        
         fibril_rwlock_read_lock(&nic_data->rxc_lock);
         nic_frame_type_t frame_type;
-        int check = nic_rxc_check(&nic_data->rx_control, packet, &frame_type);
+        int check = nic_rxc_check(&nic_data->rx_control, frame->data,
+            frame->size, &frame_type);
         fibril_rwlock_read_unlock(&nic_data->rxc_lock);
         /* Update statistics */
@@ -659 +646 @@
         if (nic_data->state == NIC_STATE_ACTIVE && check) {
                 nic_data->stats.receive_packets++;
-                nic_data->stats.receive_bytes += packet_get_data_length(packet);
+                nic_data->stats.receive_bytes += frame->size;
                 switch (frame_type) {
                 case NIC_FRAME_MULTICAST:
@@ -671 +658 @@
                 }
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
-                nil_received_msg(nic_data->nil_session, nic_data->device_id, pid);
+                nil_received_msg(nic_data->nil_session, nic_data->device_id,
+                    frame->data, frame->size);
         } else {
                 switch (frame_type) {
@@ -685 +673 @@
                 }
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
-                nic_release_packet(nic_data, packet);
-        }
+        }
+        nic_release_frame(nic_data, frame);
 }
 
@@ -705 +693 @@
         
         nil_received_msg(nic_data->nil_session, nic_data->device_id,
-            packet_get_id(packet));
+            packet_get_data(packet), packet_get_data_length(packet));
 }
 
@@ -726 +714 @@
 
                 list_remove(&frame->link);
-                nic_received_packet(nic_data, frame->packet);
-                frame->packet = NULL;
-                nic_release_frame(nic_data, frame);
+                nic_received_frame(nic_data, frame);
         }
         nic_driver_release_frame_list(frames);

uspace/lib/nic/src/nic_rx_control.c

@@ -392 +392 @@
  *
  * @param rxc
- * @param packet        The probed frame
+ * @param frame     The probed frame
  *
  * @return True if the frame passes, false if it does not
  */
-int nic_rxc_check(const nic_rxc_t *rxc, const packet_t *packet,
+int nic_rxc_check(const nic_rxc_t *rxc, const void *data, size_t size,
         nic_frame_type_t *frame_type)
 {
         assert(frame_type != NULL);
-        uint8_t *dest_addr = (uint8_t *) packet + packet->data_start;
+        uint8_t *dest_addr = (uint8_t *) data;
         uint8_t *src_addr = dest_addr + ETH_ADDR;
+
+        if (size < 2 * ETH_ADDR)
+                return false;
 
         if (dest_addr[0] & 1) {
@@ -448 +451 @@
         if (!rxc->vlan_exact && rxc->vlan_mask != NULL) {
                 vlan_header_t *vlan_header = (vlan_header_t *)
-                        ((uint8_t *) packet + packet->data_start + 2 * ETH_ADDR);
+                        ((uint8_t *) data + 2 * ETH_ADDR);
                 if (vlan_header->tpid_upper == VLAN_TPID_UPPER &&
                         vlan_header->tpid_lower == VLAN_TPID_LOWER) {