From owner-cvs-src@FreeBSD.ORG Fri Oct 12 03:03:17 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A0C116A420; Fri, 12 Oct 2007 03:03:17 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C73B13C45A; Fri, 12 Oct 2007 03:03:17 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9C33HZa056856; Fri, 12 Oct 2007 03:03:17 GMT (envelope-from thompsa@repoman.freebsd.org) Received: (from thompsa@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9C33HYO056855; Fri, 12 Oct 2007 03:03:17 GMT (envelope-from thompsa) Message-Id: <200710120303.l9C33HYO056855@repoman.freebsd.org> From: Andrew Thompson Date: Fri, 12 Oct 2007 03:03:17 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/net if_lagg.c if_lagg.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Oct 2007 03:03:17 -0000 thompsa 2007-10-12 03:03:17 UTC FreeBSD src repository Modified files: sys/net if_lagg.c if_lagg.h Log: Fix two panics in lagg. 1. The locking was changed to shared but roundrobin mode still updated a pointer in the softc with the next tx interface to use. This will panic under high load. Change this to an atomically incremented sequence number in order to choose the tx port in round robin. 2. IFQ_HANDOFF will free the mbuf if the queue is full, this will then be freed again by lagg_start() and panic. Reorganised the error handling and freeing to fix this. MFC after: 3 days Revision Changes Path 1.20 +33 -36 src/sys/net/if_lagg.c 1.11 +1 -0 src/sys/net/if_lagg.h