[Differential] [Closed] D4977: hyperv/hn: Use m_copydata for chimney sending.

[Phabricator]

This revision was automatically updated to reflect the committed changes.
Closed by commit rS294701: hyperv/hn: Use m_copydata for chimney sending. (authored by sephe).

CHANGED PRIOR TO COMMIT
  https://reviews.freebsd.org/D4977?vs=12412&id=12669#toc

REPOSITORY
  rS FreeBSD src repository

CHANGES SINCE LAST UPDATE
  https://reviews.freebsd.org/D4977?vs=12412&id=12669

REVISION DETAIL
  https://reviews.freebsd.org/D4977

AFFECTED FILES
  head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c

CHANGE DETAILS
  diff --git a/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  --- a/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  +++ b/head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  @@ -756,7 +756,6 @@
   	struct hv_device *device_ctx = vmbus_get_devctx(sc->hn_dev);
   	netvsc_dev *net_dev = sc->net_dev;
   	netvsc_packet *packet;
  -	struct mbuf *m_head, *m;
   	struct ether_vlan_header *eh;
   	rndis_msg *rndis_mesg;
   	rndis_packet *rndis_pkt;
  @@ -767,8 +766,6 @@
   	int ether_len;
   	uint32_t rndis_msg_size = 0;
   	uint32_t trans_proto_type;
  -	uint32_t send_buf_section_idx =
  -	    NVSP_1_CHIMNEY_SEND_INVALID_SECTION_INDEX;
   
   	if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
   	    IFF_DRV_RUNNING)
  @@ -778,6 +775,7 @@
   		bus_dma_segment_t segs[HN_TX_DATA_SEGCNT_MAX];
   		int error, nsegs, i, send_failed = 0;
   		struct hn_txdesc *txd;
  +		struct mbuf *m_head;
   
   		IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
   		if (m_head == NULL)
  @@ -940,24 +938,21 @@
   
   		/* send packet with send buffer */
   		if (packet->tot_data_buf_len < sc->hn_tx_chimney_size) {
  +			uint32_t send_buf_section_idx;
  +
   			send_buf_section_idx =
   			    hv_nv_get_next_send_section(net_dev);
   			if (send_buf_section_idx !=
   			    NVSP_1_CHIMNEY_SEND_INVALID_SECTION_INDEX) {
  -				char *dest = ((char *)net_dev->send_buf +
  -				    send_buf_section_idx *
  -				    net_dev->send_section_size);
  +				uint8_t *dest = ((uint8_t *)net_dev->send_buf +
  +				    (send_buf_section_idx *
  +				     net_dev->send_section_size));
   
   				memcpy(dest, rndis_mesg, rndis_msg_size);
   				dest += rndis_msg_size;
  -				for (m = m_head; m != NULL; m = m->m_next) {
  -					if (m->m_len) {
  -						memcpy(dest,
  -						    (void *)mtod(m, vm_offset_t),
  -						    m->m_len);
  -						dest += m->m_len;
  -					}
  -				}
  +
  +				m_copydata(m_head, 0, m_head->m_pkthdr.len,
  +				    dest);
   
   				packet->send_buf_section_idx =
   				    send_buf_section_idx;

EMAIL PREFERENCES
  https://reviews.freebsd.org/settings/panel/emailpreferences/

To: sepherosa_gmail.com, royger, decui_microsoft.com, honzhan_microsoft.com, howard0su_gmail.com, delphij, adrian, network
Cc: freebsd-net-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D4977.12669.patch
Type: text/x-patch
Size: 1957 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-net/attachments/20160125/eb98e805/attachment.bin>