svn commit: r256066 - head/sys/dev/virtio/network

[Kubilay Kocak]

On 6/10/2013 5:07 AM, Bryan Venteicher wrote:
> Author: bryanv
> Date: Sat Oct  5 18:07:24 2013
> New Revision: 256066
> URL: http://svnweb.freebsd.org/changeset/base/256066
> 
> Log:
>   Do not hold the vtnet Rx queue lock when calling up into the stack
>   
>   This matches other similar drivers and avoids various LOR warnings.
>   
>   Approved by:	re (marius)
> 
> Modified:
>   head/sys/dev/virtio/network/if_vtnet.c
> 
> Modified: head/sys/dev/virtio/network/if_vtnet.c
> ==============================================================================
> --- head/sys/dev/virtio/network/if_vtnet.c	Sat Oct  5 16:22:33 2013	(r256065)
> +++ head/sys/dev/virtio/network/if_vtnet.c	Sat Oct  5 18:07:24 2013	(r256066)
> @@ -1700,9 +1700,9 @@ vtnet_rxq_input(struct vtnet_rxq *rxq, s
>  	rxq->vtnrx_stats.vrxs_ipackets++;
>  	rxq->vtnrx_stats.vrxs_ibytes += m->m_pkthdr.len;
>  
> -	/* VTNET_RXQ_UNLOCK(rxq); */
> +	VTNET_RXQ_UNLOCK(rxq);
>  	(*ifp->if_input)(ifp, m);
> -	/* VTNET_RXQ_LOCK(rxq); */
> +	VTNET_RXQ_LOCK(rxq);
>  }
>  
>  static int
> @@ -1782,6 +1782,10 @@ vtnet_rxq_eof(struct vtnet_rxq *rxq)
>  		m_adj(m, adjsz);
>  
>  		vtnet_rxq_input(rxq, m, hdr);
> +
> +		/* Must recheck after dropping the Rx lock. */
> +		if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
> +			break;
>  	}
>  
>  	if (deq > 0)
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"
> 

Thanks Bryan, confirming no more LOR apparent after this commit :)

Is this a good MFC candidate?