From owner-svn-src-head@freebsd.org Wed Jan 10 20:24:47 2018 Return-Path: Delivered-To: svn-src-head@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 5A2FEE748D5; Wed, 10 Jan 2018 20:24:47 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk0-x22e.google.com (mail-qk0-x22e.google.com [IPv6:2607:f8b0:400d:c09::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 128A16A362; Wed, 10 Jan 2018 20:24:47 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk0-x22e.google.com with SMTP id b76so731634qkc.1; Wed, 10 Jan 2018 12:24:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=VGvx1XGNiffxY602nqDUfObLUT3uUo9jL6Kfos3bBks=; b=EdkIivCh9xqp072ELJWTmfhWOgzbsb87Jv915yjzaGuWU8AQAlxJi3+eC84pjWZ1Ys URCATvIdPMbvHyFCXk8x88RGNRaTQiJk3D4uEO/4N/Vv8ek3KUUX+ECWCcwLn9Zrj1g7 GILv07+KUvxlZzmPWK7/DNLx9mLCRfWpR8GaNDxfIek/6072j5Teh8oGPkSpLIzd+Whe DKKJGSz+8dSMtt4Ay87YlM3/B5Gi2/hy1cu1ufNaP43QQRzYE4y1zGJzLJF4tl0n45vP c9m0gWpTHzDu3MuNDTNP8AiEJ7TMX/twqRQtjzQMvE8gwFchSRfm7vw55dFjBcsUFrca pR9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=VGvx1XGNiffxY602nqDUfObLUT3uUo9jL6Kfos3bBks=; b=cvEiAW0L8JzqO1TlfO6inNn/lLGYhUepXVyJNtcfGw3DE+UFP6NpFjDkT/AD3KUCwJ t4mmgJtEsL66AEylEbMFKw2/5tg2UmgVuIpmov5JNRAscH4suYzTLj6pxJRjke2h3T+u ItBAzBmSEoju6jY8tXSdv/J0rPtnK+6ytXFR1IzkD+5fS40D38MbkpNJVIu1tmfk1JO1 nATm2A7xLjv3AS2HiSjAFyfMNPovEqpSJojn7PI8kW+qfw3M0+8qpACGFCxTUuJ9EWvC 4bAo/ztgE9hDjF4vPfNrWZnazd3PIGOZ+6dQg8eOMsqlIj9NeTyEhAR3ClUlsDL1z2VN t+kg== X-Gm-Message-State: AKwxytfMnzLXH/M6SX/f6HtgglgtyXS4xkGifU4zw/UyrsYwGPE/iVff 9EXIACDpTVXb3O2IRXNZt4E7sw== X-Google-Smtp-Source: ACJfBotP+tj+YC3GE2Vaw7P+KiT+Lm7fApKFWXTJI2xATmPOHYTw8rAVQrtbjHjbkTKXQ0yFZX2qVQ== X-Received: by 10.237.62.205 with SMTP id o13mr4264308qtf.316.1515615885681; Wed, 10 Jan 2018 12:24:45 -0800 (PST) Received: from raichu (toroon0560w-lp140-02-70-49-169-112.dsl.bell.ca. [70.49.169.112]) by smtp.gmail.com with ESMTPSA id h55sm11376753qta.75.2018.01.10.12.24.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 12:24:44 -0800 (PST) Sender: Mark Johnston Date: Wed, 10 Jan 2018 15:24:42 -0500 From: Mark Johnston To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r326964 - head/sys/cam Message-ID: <20180110202442.GC78524@raichu> References: <201712190413.vBJ4DMY9090982@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201712190413.vBJ4DMY9090982@repo.freebsd.org> User-Agent: Mutt/1.9.2 (2017-12-15) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jan 2018 20:24:47 -0000 On Tue, Dec 19, 2017 at 04:13:22AM +0000, Warner Losh wrote: > Author: imp > Date: Tue Dec 19 04:13:22 2017 > New Revision: 326964 > URL: https://svnweb.freebsd.org/changeset/base/326964 > > Log: > When doing a dump, the scheduler is normally not running, so this > changed worked to capture dumps for me. However, the test for > SCHEDULER_STOPPED() isn't right. We can also call the dump routine > from ddb, in which case the scheduler is still running. This leads to > an assertion panic that we're sleeping when we shouldn't. Instead, use > the proper test for dumping or not. This brings us in line with other > places that do special things while we're doing polled I/O like this. > > Noticed by: pho@ > Differential Revision: https://reviews.freebsd.org/D13531 > > Modified: > head/sys/cam/cam_periph.c > > Modified: head/sys/cam/cam_periph.c > ============================================================================== > --- head/sys/cam/cam_periph.c Tue Dec 19 04:06:07 2017 (r326963) > +++ head/sys/cam/cam_periph.c Tue Dec 19 04:13:22 2017 (r326964) > @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include > @@ -1158,7 +1159,7 @@ cam_periph_runccb(union ccb *ccb, > struct bintime *starttime; > struct bintime ltime; > int error; > - bool sched_stopped; > + bool must_poll; > struct mtx *periph_mtx; > struct cam_periph *periph; > uint32_t timeout = 1; > @@ -1182,7 +1183,13 @@ cam_periph_runccb(union ccb *ccb, > devstat_start_transaction(ds, starttime); > } > > - sched_stopped = SCHEDULER_STOPPED(); > + /* > + * We must poll the I/O while we're dumping. The scheduler is normally > + * stopped for dumping, except when we call doadump from ddb. While the > + * scheduler is running in this case, we still need to poll the I/O to > + * avoid sleeping waiting for the ccb to complete. > + */ > + must_poll = dumping; Hmm, unfortunately this introduces a new problem: after a panic we call adashutdown() as part of the shutdown_post_sync event. This occurs before we call doadump(), so dumping == 0 and we don't poll for the spindown command's completion. But since we've panicked, the scheduler is stopped, and so we just hang.