From owner-freebsd-net@freebsd.org Wed Mar 8 07:09:52 2017 Return-Path: Delivered-To: freebsd-net@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6FDE9D0260C for ; Wed, 8 Mar 2017 07:09:52 +0000 (UTC) (envelope-from sebastian.huber@embedded-brains.de) Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2462510A3 for ; Wed, 8 Mar 2017 07:09:51 +0000 (UTC) (envelope-from sebastian.huber@embedded-brains.de) Received: from [88.198.220.131] (helo=sslproxy02.your-server.de) by dedi548.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.85_2) (envelope-from ) id 1clVjI-0007tD-PO for freebsd-net@freebsd.org; Wed, 08 Mar 2017 08:09:48 +0100 Received: from [82.135.62.35] (helo=mail.embedded-brains.de) by sslproxy02.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.84_2) (envelope-from ) id 1clVjI-0004bK-I6 for freebsd-net@freebsd.org; Wed, 08 Mar 2017 08:09:48 +0100 Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id A7F292A1808 for ; Wed, 8 Mar 2017 08:09:58 +0100 (CET) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id EnxcRZ3OpXqu; Wed, 8 Mar 2017 08:09:58 +0100 (CET) Received: from localhost (localhost.localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 5F0962A1805; Wed, 8 Mar 2017 08:09:58 +0100 (CET) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id GyQCTC1IqvkY; Wed, 8 Mar 2017 08:09:58 +0100 (CET) Received: from huber-linux.eb.localhost (unknown [192.168.96.129]) by mail.embedded-brains.de (Postfix) with ESMTP id 3B7592A17F4; Wed, 8 Mar 2017 08:09:58 +0100 (CET) From: Sebastian Huber To: freebsd-net@freebsd.org Cc: Sebastian Huber Subject: [PATCH 2/2] if_tsec: Fix deadlock Date: Wed, 8 Mar 2017 08:09:46 +0100 Message-Id: <1488956986-12015-2-git-send-email-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1488956986-12015-1-git-send-email-sebastian.huber@embedded-brains.de> References: <1488956986-12015-1-git-send-email-sebastian.huber@embedded-brains.de> X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.99.2/23184/Wed Mar 8 06:06:56 2017) X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Mar 2017 07:09:52 -0000 The tsec_error_intr_locked() is called with the global lock owned (e.g. the transmit and the receive lock are both owned). We must not call tsec_receive_intr_locked() while owning the transmit lock. The normal receive interrupt takes care that frames are received, this is none of the business of the error interrupt. --- sys/dev/tsec/if_tsec.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c index 66ee130..0db552b 100644 --- a/sys/dev/tsec/if_tsec.c +++ b/sys/dev/tsec/if_tsec.c @@ -1576,9 +1576,6 @@ tsec_error_intr_locked(struct tsec_softc *sc, int count) /* Check for discarded frame due to a lack of buffers */ if (eflags & TSEC_IEVENT_BSY) { if_inc_counter(ifp, IFCOUNTER_IQDROPS, 1); - - /* Get data from RX buffers */ - tsec_receive_intr_locked(sc, count); } if (ifp->if_flags & IFF_DEBUG) -- 1.8.4.5