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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12DB1C433EF for ; Mon, 18 Oct 2021 22:26:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EAAF06113D for ; Mon, 18 Oct 2021 22:26:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229941AbhJRW2S (ORCPT ); Mon, 18 Oct 2021 18:28:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbhJRW2R (ORCPT ); Mon, 18 Oct 2021 18:28:17 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17F3CC06161C for ; Mon, 18 Oct 2021 15:26:06 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d5so3052714pfu.1 for ; Mon, 18 Oct 2021 15:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=/KX0SLCN9JGTsr4Xlvb3e/A4lZFXFVwZ96kte9RB91E=; b=nwO6lJosOiUFj3ZMT0ZvVElp7YDLIuXc+5o38bqsa8f0FBEjfV2YHYwom5kDR+NqXH 1GhOia34s6LoTl37AH8RmKphDlRVVizr6fAyXpadSJda3o2aecNL2j4cNY5ue9ofHURP MeCwo7ZaCwAuLgEqpbxrg/z/43GL1by+GYrPfyYKHkjgQkFIVk9Ucz8MHnuYOOKjq1Es vvyuY5v0JOB6LlByhnh/KSm1eR+4mMn0fAEJI7DX5fgqM3ymI1+8C0t4l6KEwb0D/KRY oW4VOGmPAlyM/UYfWzjiFtMM+bd4VGNGfCW9V9LAJH33Y3jSH0TT0WbG+1Mt4wLN2Zby nXQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=/KX0SLCN9JGTsr4Xlvb3e/A4lZFXFVwZ96kte9RB91E=; b=sFCCJyc1mfytvoT8OyCc9fQ20AKa7Po3TEVRT3wp2AZlBoJeXknge7KmPNe0uDYObq ubd0Um+7UslEEQDkrYrNPIP8RPu08oWXIeYJB7Ssxtu14ST45vRgnsGdq95u9hPx6UFD 2Kp/VdGSbf9dQWiyRtSdcX+JBSvoB53k1asjO2pB+aeZCV8yQIo5UgiOt2npbWNNp+1J nSbN9C/tsd7FuBX7RBrPTp0C9awNwwnyHqejK+IhFULLnrw5e1yFiS2dB23yuitYVeCH GViBrDjoVA3e5msHuvae5Loz7s1KfW9oROPSEASLQjv0t/DaiWB8o0LtfdjDCZLxZKcN 7G5g== X-Gm-Message-State: AOAM5330zGWeRVxi/XnZWwiygxIfW1sweRe3PxkZ2/4Kn1NsZogWLoic zqyqd7pukpPwgfF//YbZLT4= X-Google-Smtp-Source: ABdhPJzyD0nmqqDez7UBTgSViK5Sdvd9zgcG8zSj+E5P6SIC+Y21mdOAFhQ3ZRjO12rHcKGkLaIb0w== X-Received: by 2002:a63:f62:: with SMTP id 34mr25588223pgp.159.1634595965493; Mon, 18 Oct 2021 15:26:05 -0700 (PDT) Received: from [10.1.1.26] (222-155-4-20-adsl.sparkbb.co.nz. [222.155.4.20]) by smtp.gmail.com with ESMTPSA id d24sm13681971pgv.52.2021.10.18.15.26.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 15:26:05 -0700 (PDT) Subject: Re: [PATCH v2] ataflop: remove ataflop_probe_lock mutex To: Tetsuo Handa , linux-block@vger.kernel.org, linux-m68k@lists.linux-m68k.org, Christoph Hellwig , Luis Chamberlain , Finn Thain References: <1d9351dc-baeb-1a54-625c-04ce01b009b0@i-love.sakura.ne.jp> <6d26961c-3b51-d6e1-fb95-b72e720ed5d0@gmail.com> <5524e6ee-e469-9775-07c4-7baf5e330148@i-love.sakura.ne.jp> From: Michael Schmitz Message-ID: <84d43520-ff70-621f-4711-fe2be3df6c2b@gmail.com> Date: Tue, 19 Oct 2021 11:25:59 +1300 User-Agent: Mozilla/5.0 (X11; Linux ppc64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <5524e6ee-e469-9775-07c4-7baf5e330148@i-love.sakura.ne.jp> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Hi Tetsu, On 17/10/21 15:09, Tetsuo Handa wrote: > Commit bf9c0538e485b591 ("ataflop: use a separate gendisk for each media > format") introduced ataflop_probe_lock mutex, but forgot to unlock the > mutex when atari_floppy_init() (i.e. module loading) succeeded. This will > result in double lock deadlock if ataflop_probe() is called. Also, > unregister_blkdev() must not be called from atari_floppy_init() with > ataflop_probe_lock held when atari_floppy_init() failed, for > ataflop_probe() waits for ataflop_probe_lock with major_names_lock held > (i.e. AB-BA deadlock). > > __register_blkdev() needs to be called last in order to avoid calling > ataflop_probe() when atari_floppy_init() is about to fail, for memory for > completing already-started ataflop_probe() safely will be released as soon > as atari_floppy_init() released ataflop_probe_lock mutex. > > As with commit 8b52d8be86d72308 ("loop: reorder loop_exit"), > unregister_blkdev() needs to be called first in order to avoid calling > ataflop_alloc_disk() from ataflop_probe() after del_gendisk() from > atari_floppy_exit(). > > By relocating __register_blkdev() / unregister_blkdev() as explained above, > we can remove ataflop_probe_lock mutex, for probe function and __exit > function are serialized by major_names_lock mutex. > > Signed-off-by: Tetsuo Handa > Fixes: bf9c0538e485b591 ("ataflop: use a separate gendisk for each media format") > --- > Changes in v2: > Remove ataflop_probe_lock mutex than unlocking. > > Finn Thain wrote: >> So I wonder if it would have been possible to use Aranym to find the >> regression, or avoid it in the first place? > > OK, there is an emulator for testing this module. But I'm not familiar > with m68k environment. Luis Chamberlain is proposing patchset for adding > add_disk() error handling. I think that an answer would be to include > m68k's mailing list into a patch for this module in order to notify of > changes and expect m68k developers to review/test the patch. > > Michael Schmitz wrote: >> Not as a module, no. I use the Atari floppy driver built-in. Latest kernel version I ran was 5.13. > > Great. Can you try this patch alone? Works, after fixing the ataflop_queue_rq() breakage (separate patch sent). Tested-by: Michael Schmitz Thanks, Michael > > drivers/block/ataflop.c | 55 ++++++++++++++++++++--------------------- > 1 file changed, 27 insertions(+), 28 deletions(-) > > diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c > index a093644ac39f..adfe198e4699 100644 > --- a/drivers/block/ataflop.c > +++ b/drivers/block/ataflop.c > @@ -1986,8 +1986,6 @@ static int ataflop_alloc_disk(unsigned int drive, unsigned int type) > return 0; > } > > -static DEFINE_MUTEX(ataflop_probe_lock); > - > static void ataflop_probe(dev_t dev) > { > int drive = MINOR(dev) & 3; > @@ -1998,12 +1996,30 @@ static void ataflop_probe(dev_t dev) > > if (drive >= FD_MAX_UNITS || type >= NUM_DISK_MINORS) > return; > - mutex_lock(&ataflop_probe_lock); > if (!unit[drive].disk[type]) { > if (ataflop_alloc_disk(drive, type) == 0) > add_disk(unit[drive].disk[type]); > } > - mutex_unlock(&ataflop_probe_lock); > +} > + > +static void atari_floppy_cleanup(void) > +{ > + int i; > + int type; > + > + for (i = 0; i < FD_MAX_UNITS; i++) { > + for (type = 0; type < NUM_DISK_MINORS; type++) { > + if (!unit[i].disk[type]) > + continue; > + del_gendisk(unit[i].disk[type]); > + blk_cleanup_queue(unit[i].disk[type]->queue); > + put_disk(unit[i].disk[type]); > + } > + blk_mq_free_tag_set(&unit[i].tag_set); > + } > + > + del_timer_sync(&fd_timer); > + atari_stram_free(DMABuffer); > } > > static int __init atari_floppy_init (void) > @@ -2015,11 +2031,6 @@ static int __init atari_floppy_init (void) > /* Amiga, Mac, ... don't have Atari-compatible floppy :-) */ > return -ENODEV; > > - mutex_lock(&ataflop_probe_lock); > - ret = __register_blkdev(FLOPPY_MAJOR, "fd", ataflop_probe); > - if (ret) > - goto out_unlock; > - > for (i = 0; i < FD_MAX_UNITS; i++) { > memset(&unit[i].tag_set, 0, sizeof(unit[i].tag_set)); > unit[i].tag_set.ops = &ataflop_mq_ops; > @@ -2072,7 +2083,12 @@ static int __init atari_floppy_init (void) > UseTrackbuffer ? "" : "no "); > config_types(); > > - return 0; > + ret = __register_blkdev(FLOPPY_MAJOR, "fd", ataflop_probe); > + if (ret) { > + printk(KERN_ERR "atari_floppy_init: cannot register block device\n"); > + atari_floppy_cleanup(); > + } > + return ret; > > err: > while (--i >= 0) { > @@ -2081,9 +2097,6 @@ static int __init atari_floppy_init (void) > blk_mq_free_tag_set(&unit[i].tag_set); > } > > - unregister_blkdev(FLOPPY_MAJOR, "fd"); > -out_unlock: > - mutex_unlock(&ataflop_probe_lock); > return ret; > } > > @@ -2128,22 +2141,8 @@ __setup("floppy=", atari_floppy_setup); > > static void __exit atari_floppy_exit(void) > { > - int i, type; > - > - for (i = 0; i < FD_MAX_UNITS; i++) { > - for (type = 0; type < NUM_DISK_MINORS; type++) { > - if (!unit[i].disk[type]) > - continue; > - del_gendisk(unit[i].disk[type]); > - blk_cleanup_queue(unit[i].disk[type]->queue); > - put_disk(unit[i].disk[type]); > - } > - blk_mq_free_tag_set(&unit[i].tag_set); > - } > unregister_blkdev(FLOPPY_MAJOR, "fd"); > - > - del_timer_sync(&fd_timer); > - atari_stram_free( DMABuffer ); > + atari_floppy_cleanup(); > } > > module_init(atari_floppy_init) >