From owner-svn-src-all@freebsd.org Sat Oct 24 23:45:22 2015 Return-Path: Delivered-To: svn-src-all@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 E32CEA1EC49; Sat, 24 Oct 2015 23:45:22 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 A9C79ECF; Sat, 24 Oct 2015 23:45:22 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9ONjLea011862; Sat, 24 Oct 2015 23:45:21 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9ONjL52011861; Sat, 24 Oct 2015 23:45:21 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201510242345.t9ONjL52011861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: "Conrad E. Meyer" Date: Sat, 24 Oct 2015 23:45:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289906 - head/sys/dev/ioat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Oct 2015 23:45:23 -0000 Author: cem Date: Sat Oct 24 23:45:21 2015 New Revision: 289906 URL: https://svnweb.freebsd.org/changeset/base/289906 Log: ioat: When queueing operations, assert the submit lock Callers should have acquired this lock when they invoked ioat_acquire() before issuing operations. Assert it is held. Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/ioat/ioat.c Modified: head/sys/dev/ioat/ioat.c ============================================================================== --- head/sys/dev/ioat/ioat.c Sat Oct 24 23:45:10 2015 (r289905) +++ head/sys/dev/ioat/ioat.c Sat Oct 24 23:45:21 2015 (r289906) @@ -641,6 +641,7 @@ ioat_null(bus_dmaengine_t dmaengine, bus flags & ~DMA_ALL_FLAGS)); ioat = to_ioat_softc(dmaengine); + mtx_assert(&ioat->submit_lock, MA_OWNED); if (ioat_reserve_space_and_lock(ioat, 1) != 0) return (NULL); @@ -681,6 +682,7 @@ ioat_copy(bus_dmaengine_t dmaengine, bus flags & ~DMA_ALL_FLAGS)); ioat = to_ioat_softc(dmaengine); + mtx_assert(&ioat->submit_lock, MA_OWNED); if (len > ioat->max_xfer_size) { ioat_log_message(0, "%s: max_xfer_size = %d, requested = %d\n",