From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753291AbbJTPWi (ORCPT ); Tue, 20 Oct 2015 11:22:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34137 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752175AbbJTPWg (ORCPT ); Tue, 20 Oct 2015 11:22:36 -0400 From: Jeff Moyer To: Ming Lei Cc: Jens Axboe , linux-kernel@vger.kernel.org, Ming Lin , Kent Overstreet , Christoph Hellwig Subject: Re: [PATCH v2 6/7] blk-mq: fix for trace_block_plug() References: <1445354037-27000-1-git-send-email-ming.lei@canonical.com> <1445354037-27000-7-git-send-email-ming.lei@canonical.com> X-PGP-KeyID: 1F78E1B4 X-PGP-CertKey: F6FE 280D 8293 F72C 65FD 5A58 1FF8 A7CA 1F78 E1B4 X-PCLoadLetter: What the f**k does that mean? Date: Tue, 20 Oct 2015 11:22:34 -0400 In-Reply-To: <1445354037-27000-7-git-send-email-ming.lei@canonical.com> (Ming Lei's message of "Tue, 20 Oct 2015 23:13:56 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ming Lei writes: > The trace point is for tracing plug event of each request > queue instead of each task, so we should check the request > count in the plug list from current queue instead of > current task. > > Signed-off-by: Ming Lei Reviewed-by: Jeff Moyer > --- > block/blk-mq.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/block/blk-mq.c b/block/blk-mq.c > index edbc877..e00b0d8 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -1380,7 +1380,7 @@ static void blk_sq_make_request(struct request_queue *q, struct bio *bio) > plug = current->plug; > if (plug) { > blk_mq_bio_to_request(rq, bio); > - if (list_empty(&plug->mq_list)) > + if (!request_count) > trace_block_plug(q); > else if (request_count >= BLK_MAX_REQUEST_COUNT) { > blk_flush_plug_list(plug, false);