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=-15.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable 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 54C67C4708F for ; Wed, 2 Jun 2021 12:15:44 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DA837613B1 for ; Wed, 2 Jun 2021 12:15:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA837613B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.136006.252396 (Exim 4.92) (envelope-from ) id 1loPmV-0005p8-HE; Wed, 02 Jun 2021 12:15:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 136006.252396; Wed, 02 Jun 2021 12:15:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1loPmV-0005p1-E1; Wed, 02 Jun 2021 12:15:31 +0000 Received: by outflank-mailman (input) for mailman id 136006; Wed, 02 Jun 2021 12:03:40 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1loPb2-0003rE-KK for xen-devel@lists.xenproject.org; Wed, 02 Jun 2021 12:03:40 +0000 Received: from mx0b-001b2d01.pphosted.com (unknown [148.163.158.5]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a1c8c13e-2a43-48e3-be4d-962896700a9a; Wed, 02 Jun 2021 12:03:39 +0000 (UTC) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 152C2cPO189409; Wed, 2 Jun 2021 08:03:00 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 38x7kr3h5n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Jun 2021 08:03:00 -0400 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 152C2cNZ189527; Wed, 2 Jun 2021 08:02:59 -0400 Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 38x7kr3h4k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Jun 2021 08:02:59 -0400 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 152BwHfr023191; Wed, 2 Jun 2021 12:02:57 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma05fra.de.ibm.com with ESMTP id 38ud87s9cx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Jun 2021 12:02:56 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 152C2r4H26280248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 2 Jun 2021 12:02:53 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A0364A405F; Wed, 2 Jun 2021 12:02:53 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 479C3A4040; Wed, 2 Jun 2021 12:02:52 +0000 (GMT) Received: from sig-9-145-17-43.uk.ibm.com (unknown [9.145.17.43]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 2 Jun 2021 12:02:52 +0000 (GMT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a1c8c13e-2a43-48e3-be4d-962896700a9a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : subject : from : to : cc : date : in-reply-to : references : content-type : mime-version : content-transfer-encoding; s=pp1; bh=7wC8Y59HiMIthB9xfz5dL+I0HD65zOwRPB4cvu5JQYY=; b=QRLGyPounpLaRIZgsSUK1LazhFSMWWWVFIpjfvUyvXqdSXI7p94FVQMtSFG3bMtHNL86 rLVrJ3SvpT994x2pe7o0yL3iXXDeNBst8Q4A8KEa89vx85ZQSTDkkYsEjLQaMo+eb8VZ +GFr8IfErHwDLNlYl+L0v9/qNIinOxFcyNlMJhpRMjSZcskv/o9bM0Y0jNVwjZETIKG0 IXpmjsLB5CkqOhxt84ImzKiTyn/t0QZlZGbbzTco4+M0nPgqtd7mDQbl31t9d+7DOxJc iYhombbX7dZq4eRMaB6F1ITduKcVH4H0X0f5lSV3QvlOH2CDPoe61GoP3QIOjHTOkYh/ DA== Message-ID: Subject: Re: [PATCH 27/30] scm_blk: use blk_mq_alloc_disk and blk_cleanup_disk From: Niklas Schnelle To: Christoph Hellwig , Jens Axboe Cc: Justin Sanders , Denis Efremov , Josef Bacik , Tim Waugh , Geoff Levand , Ilya Dryomov , "Md. Haris Iqbal" , Jack Wang , "Michael S. Tsirkin" , Jason Wang , Konrad Rzeszutek Wilk , Roger Pau =?ISO-8859-1?Q?Monn=E9?= , Mike Snitzer , Maxim Levitsky , Alex Dubov , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , dm-devel@redhat.com, linux-block@vger.kernel.org, nbd@other.debian.org, linuxppc-dev@lists.ozlabs.org, ceph-devel@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, linux-s390@vger.kernel.org Date: Wed, 02 Jun 2021 14:02:51 +0200 In-Reply-To: <20210602065345.355274-28-hch@lst.de> References: <20210602065345.355274-1-hch@lst.de> <20210602065345.355274-28-hch@lst.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 (3.28.5-16.el8) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 9Pi9MTQ_S8CJ1ewvOnGa4xYgtn5KH1ib X-Proofpoint-ORIG-GUID: -LAzjZA1VGIxMM3aVX5RPubiT3GLOjUz X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-02_06:2021-06-02,2021-06-02 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 clxscore=1011 suspectscore=0 phishscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106020078 On Wed, 2021-06-02 at 09:53 +0300, Christoph Hellwig wrote: > Use blk_mq_alloc_disk and blk_cleanup_disk to simplify the gendisk and > request_queue allocation. > > Signed-off-by: Christoph Hellwig > --- > drivers/s390/block/scm_blk.c | 21 ++++++--------------- > 1 file changed, 6 insertions(+), 15 deletions(-) > > diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c > index a4f6f2e62b1d..88cba6212ee2 100644 > --- a/drivers/s390/block/scm_blk.c > +++ b/drivers/s390/block/scm_blk.c > @@ -462,12 +462,12 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev) > if (ret) > goto out; > > - rq = blk_mq_init_queue(&bdev->tag_set); > - if (IS_ERR(rq)) { > - ret = PTR_ERR(rq); > + bdev->gendisk = blk_mq_alloc_disk(&bdev->tag_set, scmdev); > + if (IS_ERR(bdev->gendisk)) { > + ret = PTR_ERR(bdev->gendisk); > goto out_tag; > } > - bdev->rq = rq; > + rq = bdev->rq = bdev->gendisk->queue; > nr_max_blk = min(scmdev->nr_max_block, > (unsigned int) (PAGE_SIZE / sizeof(struct aidaw))); > > @@ -477,17 +477,11 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev) > blk_queue_flag_set(QUEUE_FLAG_NONROT, rq); > blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, rq); > > - bdev->gendisk = alloc_disk(SCM_NR_PARTS); > - if (!bdev->gendisk) { > - ret = -ENOMEM; > - goto out_queue; > - } > - rq->queuedata = scmdev; > bdev->gendisk->private_data = scmdev; > bdev->gendisk->fops = &scm_blk_devops; > - bdev->gendisk->queue = rq; > bdev->gendisk->major = scm_major; > bdev->gendisk->first_minor = devindex * SCM_NR_PARTS; > + bdev->gendisk->minors = SCM_NR_PARTS; > > len = snprintf(bdev->gendisk->disk_name, DISK_NAME_LEN, "scm"); > if (devindex > 25) { > @@ -504,8 +498,6 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev) > device_add_disk(&scmdev->dev, bdev->gendisk, NULL); > return 0; > > -out_queue: > - blk_cleanup_queue(rq); > out_tag: > blk_mq_free_tag_set(&bdev->tag_set); > out: > @@ -516,9 +508,8 @@ int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev) > void scm_blk_dev_cleanup(struct scm_blk_dev *bdev) > { > del_gendisk(bdev->gendisk); > - blk_cleanup_queue(bdev->gendisk->queue); > + blk_cleanup_disk(bdev->gendisk); > blk_mq_free_tag_set(&bdev->tag_set); > - put_disk(bdev->gendisk); > } > > void scm_blk_set_available(struct scm_blk_dev *bdev) Not an expert on SCM or this code but I gave this a quick test and it seems to work fine. Tested-by: Niklas Schnelle