issue: 1792164 Add PBUF_ZEROCOPY type of allocated pbuf

Extend pbuf allocation functions with new parameter as pbuf_type
to by pass requested type of memory to socket.
Socket layer needs this information to manage different types
of mem_buf_desc_t elements.

Signed-off-by: Igor Ivanov <[email protected]>

Author: igor-ivanov

src/vma/lwip/pbuf.h

@@ -57,7 +57,8 @@ typedef enum {
   PBUF_RAM, /* pbuf data is stored in RAM */
   PBUF_ROM, /* pbuf data is stored in ROM */
   PBUF_REF, /* pbuf comes from the pbuf pool */
-  PBUF_POOL /* pbuf payload refers to RAM */
+  PBUF_POOL, /* pbuf payload refers to RAM */
+  PBUF_ZEROCOPY /* pbuf data used directly from user */
 } pbuf_type;
 
 

src/vma/lwip/tcp.c

@@ -1084,10 +1084,10 @@ tcp_tx_pbuf_alloc(struct tcp_pcb * pcb, u16_t length, pbuf_type type)
 {
 	struct pbuf * p;
 
-	if (!pcb->pbuf_alloc) {
+	if (!pcb->pbuf_alloc || pcb->pbuf_alloc->type != type) {
 
 		// pbuf_alloc is not valid, we should allocate a new pbuf.
-		p = external_tcp_tx_pbuf_alloc(pcb);
+		p = external_tcp_tx_pbuf_alloc(pcb, type);
 		if (!p) return NULL;
 
 		p->next = NULL;
@@ -1129,7 +1129,7 @@ tcp_tx_pbuf_free(struct tcp_pcb * pcb, struct pbuf * p)
 	while (p) {
 		p_next = p->next;
 		p->next = NULL;
-		if (p->type  == PBUF_RAM) {
+		if (p->type == PBUF_RAM || p->type == PBUF_ZEROCOPY) {
 			external_tcp_tx_pbuf_free(pcb, p);
 		} else {
 			pbuf_free(p);

src/vma/lwip/tcp.h

@@ -66,7 +66,7 @@ void register_sys_readv(sys_readv_fn fn);
 #endif
 
 #if LWIP_3RD_PARTY_BUFS
-typedef struct pbuf * (*tcp_tx_pbuf_alloc_fn)(void* p_conn);
+typedef struct pbuf * (*tcp_tx_pbuf_alloc_fn)(void* p_conn, pbuf_type type);
 
 void register_tcp_tx_pbuf_alloc(tcp_tx_pbuf_alloc_fn fn);
 

src/vma/lwip/tcp_in.c

@@ -820,7 +820,7 @@ tcp_shrink_segment(struct tcp_pcb *pcb, struct tcp_seg *seg, u32_t ackno)
       seg->p->next = cur_p;
       p->next = NULL;
 
-      if (p->type  == PBUF_RAM) {
+      if (p->type == PBUF_RAM || p->type == PBUF_ZEROCOPY) {
         external_tcp_tx_pbuf_free(pcb, p);
       } else {
         pbuf_free(p);
@@ -844,7 +844,7 @@ tcp_shrink_segment(struct tcp_pcb *pcb, struct tcp_seg *seg, u32_t ackno)
     seg->p->next = cur_p;
     p->next = NULL;
 
-    if (p->type  == PBUF_RAM) {
+    if (p->type == PBUF_RAM || p->type == PBUF_ZEROCOPY) {
       external_tcp_tx_pbuf_free(pcb, p);
     } else {
       pbuf_free(p);

src/vma/lwip/tcp_out.c

@@ -286,7 +286,7 @@ tcp_create_segment(struct tcp_pcb *pcb, struct pbuf *p, u8_t flags, u32_t seqno,
  */
 static struct pbuf *
 tcp_pbuf_prealloc(u16_t length, u16_t max_length,
-                  u16_t *oversize, struct tcp_pcb *pcb, u8_t tcp_write_flag_more,
+                  u16_t *oversize, struct tcp_pcb *pcb, pbuf_type type, u8_t tcp_write_flag_more,
                   u8_t first_seg)
 {
   struct pbuf *p;
@@ -310,7 +310,7 @@ tcp_pbuf_prealloc(u16_t length, u16_t max_length,
           alloc = LWIP_MIN(max_length, LWIP_MEM_ALIGN_SIZE(length + pcb->tcp_oversize_val));
     }
   }
-  p = tcp_tx_pbuf_alloc(pcb, alloc, PBUF_RAM);
+  p = tcp_tx_pbuf_alloc(pcb, alloc, type);
   if (p == NULL) {
     return NULL;
   }
@@ -440,6 +440,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u32_t len, u8_t apiflags)
   struct iovec piov[piov_max_size];
   int piov_cur_index = 0;
   int piov_cur_len = 0;
+  pbuf_type type = PBUF_RAM;
 
   int byte_queued = pcb->snd_nxt - pcb->lastack;
   if ( len < pcb->mss && !(apiflags & TCP_WRITE_DUMMY))
@@ -567,7 +568,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u32_t len, u8_t apiflags)
        * can use PBUF_RAW here since the data appears in the middle of
        * a segment. A header will never be prepended. */
       /* Data is copied */
-      if ((concat_p = tcp_pbuf_prealloc(seglen, space, &oversize, pcb, TCP_WRITE_FLAG_MORE, 1)) == NULL) {
+      if ((concat_p = tcp_pbuf_prealloc(seglen, space, &oversize, pcb, type, TCP_WRITE_FLAG_MORE, 1)) == NULL) {
     	  LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2,
     			  ("tcp_write : could not allocate memory for pbuf copy size %"U16_F"\n",
     					  seglen));
@@ -606,7 +607,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u32_t len, u8_t apiflags)
 
     /* If copy is set, memory should be allocated and data copied
      * into pbuf */
-    if ((p = tcp_pbuf_prealloc(seglen + optlen, max_len, &oversize, pcb, TCP_WRITE_FLAG_MORE, queue == NULL)) == NULL) {
+    if ((p = tcp_pbuf_prealloc(seglen + optlen, max_len, &oversize, pcb, type, TCP_WRITE_FLAG_MORE, queue == NULL)) == NULL) {
     	LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_write : could not allocate memory for pbuf copy size %"U16_F"\n", seglen));
     	goto memerr;
     }
@@ -1058,6 +1059,7 @@ tcp_split_one_segment(struct tcp_pcb *pcb, struct tcp_seg *seg, u32_t lentosend,
   struct pbuf *cur_p = NULL;
   u16_t max_length = 0;
   u16_t oversize = 0;
+  pbuf_type type = PBUF_RAM;
 
   cur_seg = seg;
   max_length = cur_seg->p->len;
@@ -1066,7 +1068,7 @@ tcp_split_one_segment(struct tcp_pcb *pcb, struct tcp_seg *seg, u32_t lentosend,
     u32_t lentoqueue = cur_seg->len - lentosend;
 
     /* Allocate memory for p_buf and fill in fields. */
-    if (NULL == (cur_p = tcp_pbuf_prealloc(lentoqueue + optlen, max_length, &oversize, pcb, 0, 0))) {
+    if (NULL == (cur_p = tcp_pbuf_prealloc(lentoqueue + optlen, max_length, &oversize, pcb, type, 0, 0))) {
       LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_split_one_segment: could not allocate memory for pbuf copy size %"U16_F"\n", (lentoqueue + optlen)));
       goto out;
     }
@@ -1264,6 +1266,7 @@ tcp_split_segment(struct tcp_pcb *pcb, struct tcp_seg *seg, u32_t wnd)
   u16_t oversize = 0;
   u8_t  optlen = 0, optflags = 0;
   u16_t mss_local = 0;
+  pbuf_type type = PBUF_RAM;
 
   LWIP_ASSERT("tcp_split_segment: sanity check", (seg && seg->p));
 
@@ -1294,7 +1297,7 @@ tcp_split_segment(struct tcp_pcb *pcb, struct tcp_seg *seg, u32_t wnd)
   if (seg->p->len > ((TCP_HLEN + optlen) + lentosend)) {/* First buffer is too big, split it */
     u32_t lentoqueue = seg->p->len - (TCP_HLEN + optlen) - lentosend;
 
-    if (NULL == (p = tcp_pbuf_prealloc(lentoqueue + optlen, mss_local, &oversize, pcb, 0, 0))) {
+    if (NULL == (p = tcp_pbuf_prealloc(lentoqueue + optlen, mss_local, &oversize, pcb, type, 0, 0))) {
       LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 2, ("tcp_split_segment: could not allocate memory for pbuf copy size %"U16_F"\n", (lentoqueue + optlen)));
       return;
     }

src/vma/sock/sockinfo_tcp.cpp

@@ -4534,11 +4534,13 @@ int sockinfo_tcp::free_buffs(uint16_t len)
 	return 0;
 }
 
-struct pbuf * sockinfo_tcp::tcp_tx_pbuf_alloc(void* p_conn)
+struct pbuf * sockinfo_tcp::tcp_tx_pbuf_alloc(void* p_conn, pbuf_type type)
 {
 	sockinfo_tcp *p_si_tcp = (sockinfo_tcp *)(((struct tcp_pcb*)p_conn)->my_container);
 	dst_entry_tcp *p_dst = (dst_entry_tcp *)(p_si_tcp->m_p_connected_dst_entry);
 	mem_buf_desc_t* p_desc = NULL;
+
+	NOT_IN_USE(type);
 	if (likely(p_dst)) {
 		p_desc = p_dst->get_buffer();
 	}

src/vma/sock/sockinfo_tcp.h

@@ -180,7 +180,7 @@ class sockinfo_tcp : public sockinfo, public timer_handler
 	virtual void update_header_field(data_updater *updater);
 	virtual bool rx_input_cb(mem_buf_desc_t* p_rx_pkt_mem_buf_desc_info, void* pv_fd_ready_array);
 
-	static struct pbuf * tcp_tx_pbuf_alloc(void* p_conn);
+	static struct pbuf * tcp_tx_pbuf_alloc(void* p_conn, pbuf_type type);
 	static void tcp_tx_pbuf_free(void* p_conn, struct pbuf *p_buff);
 	static struct tcp_seg * tcp_seg_alloc(void* p_conn);
 	static void tcp_seg_free(void* p_conn, struct tcp_seg * seg);