From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCCCDC433E2 for ; Sat, 16 May 2020 03:20:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A914320756 for ; Sat, 16 May 2020 03:20:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A914320756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 960A9900002; Fri, 15 May 2020 23:20:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 84AE580005; Fri, 15 May 2020 23:20:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EEDE900004; Fri, 15 May 2020 23:20:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0037.hostedemail.com [216.40.44.37]) by kanga.kvack.org (Postfix) with ESMTP id 50B47900002 for ; Fri, 15 May 2020 23:20:05 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 1FBB34DC8 for ; Sat, 16 May 2020 03:20:05 +0000 (UTC) X-FDA: 76821128370.03.deer37_1dcc06a15ed30 X-HE-Tag: deer37_1dcc06a15ed30 X-Filterd-Recvd-Size: 4539 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Sat, 16 May 2020 03:20:04 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id f15so1704353plr.3 for ; Fri, 15 May 2020 20:20:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5R02k+n3cdjio+bit0SkkAOewNF+56MtF6LzxgE/Yc4=; b=qMCKOizS68pX+dnJaiwh+ZsO5B1JlgN75hqzisf2l1W2qylY9khgGl8gTofFgKRliW y9QS6K7aoNRjvEPbOmUqxQI0FavFVNLRwBDsdT8pPzTQbjC2XGVSAlOFE8InABMcfvkY 7A+1aUVkxf44ttPtkW1YmMQgVxplKXHWv43zO/Uxmp1YqkNktakVJFFhFkXF2SeKAenK bwPI1ETbN9m7jnoMq4N7uL1fbzJU6KjD24i8uMM2u4wAYhDmbltqvFOcusKyybM3m7ez miz9mD/d2ThBcO6yczJrPbQ6GVHPcYO/nxiCX5iDuZfIHSAdX47OLBvCkcsHFrorpP4H tkxA== X-Gm-Message-State: AOAM532aO34LvkLDZHZtiiVF1747j0beLx8dKXZyLS/oVMGOyO8VAvUw UZ7YO80r3RgqZBU1KiiEcmk= X-Google-Smtp-Source: ABdhPJxH1a/0+wYkeQjawqSViebcCCHDKk4gr7Y6Fd5IRIO2nQhXkOGRxo0KxGldWnfbVVdS506+0g== X-Received: by 2002:a17:902:7402:: with SMTP id g2mr6609838pll.241.1589599203778; Fri, 15 May 2020 20:20:03 -0700 (PDT) Received: from 42.do-not-panic.com (42.do-not-panic.com. [157.230.128.187]) by smtp.gmail.com with ESMTPSA id e21sm2763562pga.71.2020.05.15.20.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 20:20:00 -0700 (PDT) Received: by 42.do-not-panic.com (Postfix, from userid 1000) id E676141D00; Sat, 16 May 2020 03:19:58 +0000 (UTC) From: Luis Chamberlain To: axboe@kernel.dk, viro@zeniv.linux.org.uk, bvanassche@acm.org, gregkh@linuxfoundation.org, rostedt@goodmis.org, mingo@redhat.com, jack@suse.cz, ming.lei@redhat.com, nstange@suse.de, akpm@linux-foundation.org Cc: mhocko@suse.com, yukuai3@huawei.com, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Luis Chamberlain , Christoph Hellwig Subject: [PATCH v5 2/7] block: clarify context for gendisk / request_queue refcount increment helpers Date: Sat, 16 May 2020 03:19:51 +0000 Message-Id: <20200516031956.2605-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20200516031956.2605-1-mcgrof@kernel.org> References: <20200516031956.2605-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Let us clarify the context under which the helpers to increment the refcount for the gendisk and request_queue can be called under. We make this explicit on the places where we may sleep with might_sleep(). We don't address the decrement context yet, as that needs some extra work and fixes, but will be addressed in the next patch. Reviewed-by: Christoph Hellwig Reviewed-by: Bart Van Assche Signed-off-by: Luis Chamberlain --- block/blk-core.c | 2 ++ block/genhd.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/block/blk-core.c b/block/blk-core.c index e438c3b0815b..94216fa16a05 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -610,6 +610,8 @@ EXPORT_SYMBOL(blk_alloc_queue); * @q: the request_queue structure to increment the refcount for * * Increment the refcount of the request_queue kobject. + * + * Context: Any context. */ bool blk_get_queue(struct request_queue *q) { diff --git a/block/genhd.c b/block/genhd.c index af910e6a0233..598bd32ad28c 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1017,11 +1017,15 @@ static ssize_t disk_badblocks_store(struct device= *dev, * * This function gets the structure containing partitioning * information for the given device @devt. + * + * Context: can sleep */ struct gendisk *get_gendisk(dev_t devt, int *partno) { struct gendisk *disk =3D NULL; =20 + might_sleep(); + if (MAJOR(devt) !=3D BLOCK_EXT_MAJOR) { struct kobject *kobj; =20 @@ -1785,6 +1789,8 @@ EXPORT_SYMBOL(__alloc_disk_node); * * This increments the refcount for the struct gendisk, and the gendisk'= s * fops module owner. + * + * Context: Any context. */ struct kobject *get_disk_and_module(struct gendisk *disk) { --=20 2.26.2