From patchwork Fri Oct 20 14:44:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10020435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E698560211 for ; Fri, 20 Oct 2017 14:45:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6BEA28E13 for ; Fri, 20 Oct 2017 14:45:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB2DE28EC3; Fri, 20 Oct 2017 14:45:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5278628E13 for ; Fri, 20 Oct 2017 14:45:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751694AbdJTOo6 (ORCPT ); Fri, 20 Oct 2017 10:44:58 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:47934 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751506AbdJTOo5 (ORCPT ); Fri, 20 Oct 2017 10:44:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=JehGp2fAk4unj2/riqxmURCJTkKrheS53YGxPFHCsMs=; b=gVG/AzU5ztymCnVierN30b2xL zAsXAc0BJyJLtn4eELFr0JAM2fTCDH6g1uTsTfRhBozmJ2HAL5jo9YBXc5xG3wtQbpsEMZgUGUu1R OqK2Z7LYsMrsSBUsc81SHUIiUvUGK8GLmF5sCZ/nily/VTqWwoEF8A4M7fOzu/z8/TX0RAfnnllSF qaPrsWWna2sG2odNlHztqt+01g0XHNJqi3GUQImORsFMZN+Usj8u2kMHhgFrqvz3rS7SM9QnP8pKW BRfOvUAvip5DiEmOs5ZHgM1mR1Tj/tJh9lIe7Cqfno5VWqqNlXWcVBUQnycJwdt6oSNiAmmsxCIUF v07q9TtEQ==; Received: from hch by bombadil.infradead.org with local (Exim 4.87 #1 (Red Hat Linux)) id 1e5YXb-0005QV-Eg; Fri, 20 Oct 2017 14:44:51 +0000 Date: Fri, 20 Oct 2017 07:44:51 -0700 From: Christoph Hellwig To: Byungchul Park Cc: peterz@infradead.org, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, tj@kernel.org, johannes.berg@intel.com, oleg@redhat.com, amir73il@gmail.com, david@fromorbit.com, darrick.wong@oracle.com, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, hch@infradead.org, idryomov@gmail.com, kernel-team@lge.com Subject: Re: [PATCH v2 4/4] lockdep: Assign a lock_class per gendisk used for wait_for_completion() Message-ID: <20171020144451.GA16793@infradead.org> References: <1508392531-11284-1-git-send-email-byungchul.park@lge.com> <1508396607-25362-1-git-send-email-byungchul.park@lge.com> <1508396607-25362-5-git-send-email-byungchul.park@lge.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1508396607-25362-5-git-send-email-byungchul.park@lge.com> User-Agent: Mutt/1.8.3 (2017-05-23) X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Subject prefix for this should be "block:". > @@ -945,7 +945,7 @@ int submit_bio_wait(struct bio *bio) > { > struct submit_bio_ret ret; > > - init_completion(&ret.event); > + init_completion_with_map(&ret.event, &bio->bi_disk->lockdep_map); FYI, I have an outstanding patch to simplify this a lot, which switches this to DECLARE_COMPLETION_ONSTACK. I can delay this or let you pick it up with your series, but we'll need a variant of DECLARE_COMPLETION_ONSTACK with the lockdep annotations. Patch below for reference: --- From d65b89843c9f82c0744643515ba51dd10e66e67b Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 5 Oct 2017 18:31:02 +0200 Subject: block: use DECLARE_COMPLETION_ONSTACK in submit_bio_wait Simplify the code by getting rid of the submit_bio_ret structure. Signed-off-by: Christoph Hellwig --- block/bio.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/block/bio.c b/block/bio.c index 8338304ea256..4e18e959fc0a 100644 --- a/block/bio.c +++ b/block/bio.c @@ -917,17 +917,9 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) } EXPORT_SYMBOL_GPL(bio_iov_iter_get_pages); -struct submit_bio_ret { - struct completion event; - int error; -}; - static void submit_bio_wait_endio(struct bio *bio) { - struct submit_bio_ret *ret = bio->bi_private; - - ret->error = blk_status_to_errno(bio->bi_status); - complete(&ret->event); + complete(bio->bi_private); } /** @@ -943,16 +935,15 @@ static void submit_bio_wait_endio(struct bio *bio) */ int submit_bio_wait(struct bio *bio) { - struct submit_bio_ret ret; + DECLARE_COMPLETION_ONSTACK(done); - init_completion(&ret.event); - bio->bi_private = &ret; + bio->bi_private = &done; bio->bi_end_io = submit_bio_wait_endio; bio->bi_opf |= REQ_SYNC; submit_bio(bio); - wait_for_completion_io(&ret.event); + wait_for_completion_io(&done); - return ret.error; + return blk_status_to_errno(bio->bi_status); } EXPORT_SYMBOL(submit_bio_wait);