From patchwork Thu Aug 4 00:30:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaun Tancheff X-Patchwork-Id: 9262435 X-Patchwork-Delegate: snitzer@redhat.com 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 E711A6048B for ; Thu, 4 Aug 2016 00:34:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D516027F9E for ; Thu, 4 Aug 2016 00:34:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C72D72807E; Thu, 4 Aug 2016 00:34:43 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 32EB627F9E for ; Thu, 4 Aug 2016 00:34:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u740UxXb026356; Wed, 3 Aug 2016 20:31:00 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u740UrF8024531 for ; Wed, 3 Aug 2016 20:30:53 -0400 Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u740Uru5022120 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 3 Aug 2016 20:30:53 -0400 Received: from mx0a-000cda01.pphosted.com (mx0b-00003501.pphosted.com [67.231.152.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3DB0B821C7 for ; Thu, 4 Aug 2016 00:30:52 +0000 (UTC) Received: from pps.filterd (m0075028.ppops.net [127.0.0.1]) by mx0b-00003501.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u740RQwW047141 for ; Wed, 3 Aug 2016 20:30:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=seagate.com; h=mime-version : in-reply-to : references : from : date : message-id : subject : to : cc : content-type; s=s2016050306; bh=B7huOIrn4mLQTR7vic5j4jla/BHxWsyZon0JWV3Ygwg=; b=ph2J4kEKXzmXzUCO8APonKSctKYN8dCDeET7kK1KyRbQGxn8wjj1e/B2O9kKuWS5atUB sjpYRKoCTsAWfDZ4/Ptvfi/yH7mrtOZ9gK+4cAi65oks4rJ7q55/6kDLsCfVpGbWRn6p tcgYFQ6FZslLAg1C/mZIq3yUfSd/GIhV9UNS6fJ8jkmi4OlJonEb4ufi2tbqTJOE6mWh Fr4QoLiO4I6Mlc8XYVeUun61YdhoJxPX6vxtr9RuxhzmpU53ur63b2z3lYQw0A9rVYJ/ 1No8KCFRU1W9bwD/GB+b2kaKhV5BcCmoP+aP/VluD0oZ8Dknj/E9A4cVR4x3V2fvzs9u gA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=seagate.com; h=mime-version : in-reply-to : references : from : date : message-id : subject : to : cc : content-type; s=proofpoint; bh=B7huOIrn4mLQTR7vic5j4jla/BHxWsyZon0JWV3Ygwg=; b=Xen0YIEmhVbFRfzbhQFqduw2RcwMxgV7ED4Xvv7zaO1fONJV/ilfFJj4PxtEcYbFq8gO crda4tHySupkFKFFY19Ryu5O7S0RF39S/RuS5RHH+1qvTwU0/XrCnQANJncQjvIOB70I nDtqv+FgLNPU+S/sX27UUCdoP+BdE1x/yZulzF0VO6nQRtjxRmFg/tu/1nz/TrkK6B+H wq75hhq3vgKMuq+ySm27zQuZadPyKVfXx7Y/J+UYh0uEa4P4Vmp3Lu7FuIrNMQwnGmpu RNICSe7Kv0GWj13pkNKBTDyv9DAit++f347/zBrCBZq96Ld49OP7fnYwIOtGXv0widZD kg== Authentication-Results: seagate.com; dkim=pass header.s="google" header.d=seagate.com Received: from mail-qt0-f199.google.com (mail-qt0-f199.google.com [209.85.216.199]) by mx0b-00003501.pphosted.com with ESMTP id 24kkce2p1h-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 03 Aug 2016 20:30:51 -0400 Received: by mail-qt0-f199.google.com with SMTP id n6so384475907qtn.2 for ; Wed, 03 Aug 2016 17:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seagate.com; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=96g5QOCn2AsIXj134OpL/MPc89ZpHnFxQ4DAOdlTzL8=; b=JQM/f4YedCTl5dM02f0R8Oqexn8P1MyDm6C4MhqLuesuzmPprUEDsWLoFweN2G6ym+ gD3SKjMj/EXQ87I02Rjy+6rFuRGKyILaLLcLdDCkEE4rqwXobW5ZEAJzQkChf96+93Wm Fiyyr9nKnPXWWCWuDdWmClyQhvFIdogvdZzR7FRGw7Grc82BlXesHGNbNfN8c3XOFI7y nh1vfUzhSG4k6wpTCJ4x0FxFze6NTyxm5f6a9PwdsajxvCt+NAe6f6f4qz2GGOce/K8K 07/c3CvrHcJPZ7EEXLzq/fN1x51h+Sb5ga+ZnpcvopVt9FHrbuW4xvBRAf1dy9l7dKoK zxlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=96g5QOCn2AsIXj134OpL/MPc89ZpHnFxQ4DAOdlTzL8=; b=jI1IDIf2YAMXwznGqVjNZ6LCkkE1uCEUPbyPrTOxkc6WO7AgN7tdPH8AekrB5W1zht YKwb1+KirY0I5OrGmEd+X6toFFRAkUst8a5KIWmhRaWO4p7K++ZmNAvv9KlLDd2NPJGJ 328hCQHIKS9suTBBWcnh5MCvYkIxVGboSoKt8S4ykMZhOXFzr7VDID6nUHI0L5cdj9cc UUjUfXzgogh2hStQseu7Ao2Fqi/YokpKbWreU4YG9COF9MQpK/4U8zGQGxvRou/QOky5 kS9R9nw767dFOHzKHSbkMebG4LO27NKZcOscg8zhYelNjEiS9jD7ZPsP2rpN+6eICpF8 qoYA== X-Gm-Message-State: AEkooutPfCYtK9XWrhlUwZDqaH9jUULR/mQdMXJBtpKIW0+wWqhAtgOPOdxAIYNRRurvbM+5tZcuruIbZZwzhQpVtsS4OF/3FT6SceDXCRAqBlJ3Uo6J+X0CsIYAry8Mfd1sKcV7qDU7ck1mbf3o4ub2ytPUZmND4+F1Ew3BjHxxO450 X-Received: by 10.37.208.74 with SMTP id h71mr6092020ybg.146.1470270650374; Wed, 03 Aug 2016 17:30:50 -0700 (PDT) X-Received: by 10.37.208.74 with SMTP id h71mr6092000ybg.146.1470270650131; Wed, 03 Aug 2016 17:30:50 -0700 (PDT) MIME-Version: 1.0 Received: by 10.129.132.199 with HTTP; Wed, 3 Aug 2016 17:30:29 -0700 (PDT) In-Reply-To: <87fbe31f-27b3-ff7a-e381-34fc1aad337e@redhat.com> References: <1465155145-10812-1-git-send-email-mchristi@redhat.com> <1465155145-10812-38-git-send-email-mchristi@redhat.com> <87fbe31f-27b3-ff7a-e381-34fc1aad337e@redhat.com> From: Shaun Tancheff Date: Wed, 3 Aug 2016 19:30:29 -0500 Message-ID: To: Mike Christie X-Proofpoint-PolicyRoute: Outbound X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-03_16:, , signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 impostorscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608040003 X-Proofpoint-Spam-Policy: Default Domain Policy X-Greylist: Sender IP whitelisted by DNSRBL, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 04 Aug 2016 00:30:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 04 Aug 2016 00:30:52 +0000 (UTC) for IP:'67.231.152.68' DOMAIN:'mx0b-00003501.pphosted.com' HELO:'mx0a-000cda01.pphosted.com' FROM:'shaun.tancheff@seagate.com' RCPT:'' X-RedHat-Spam-Score: -0.021 (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 67.231.152.68 mx0b-00003501.pphosted.com 67.231.152.68 mx0b-00003501.pphosted.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.28 X-loop: dm-devel@redhat.com Cc: Dave Chinner , philipp.reisner@linbit.com, dm-devel@redhat.com, target-devel@vger.kernel.org, linux-mtd@lists.infradead.org, drbd-dev@lists.linbit.com, linux-scsi@vger.kernel.org, Ross Zwisler , linux-ext4 , konrad.wilk@oracle.com, XFS Developers , linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, linux-block@vger.kernel.org, osd-dev@open-osd.org, Ross Zwisler , Jens Axboe , LKML , linux-f2fs-devel@lists.sourceforge.net, ocfs2-devel@oss.oracle.com, linux-fsdevel , lars.ellenberg@linbit.com, linux-btrfs@vger.kernel.org Subject: Re: [dm-devel] [PATCH 37/45] drivers: use req op accessor X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP On Wed, Aug 3, 2016 at 6:47 PM, Mike Christie wrote: > On 08/03/2016 05:33 PM, Ross Zwisler wrote: >> On Sun, Jun 5, 2016 at 1:32 PM, wrote: >>> From: Mike Christie >>> >>> The req operation REQ_OP is separated from the rq_flag_bits >>> definition. This converts the block layer drivers to >>> use req_op to get the op from the request struct. >>> >>> Signed-off-by: Mike Christie >>> --- >>> drivers/block/loop.c | 6 +++--- >>> drivers/block/mtip32xx/mtip32xx.c | 2 +- >>> drivers/block/nbd.c | 2 +- >>> drivers/block/rbd.c | 4 ++-- >>> drivers/block/xen-blkfront.c | 8 +++++--- >>> drivers/ide/ide-floppy.c | 2 +- >>> drivers/md/dm.c | 2 +- >>> drivers/mmc/card/block.c | 7 +++---- >>> drivers/mmc/card/queue.c | 6 ++---- >> >> Dave Chinner reported a deadlock with XFS + DAX, which I reproduced >> and bisected to this commit: >> >> commit c2df40dfb8c015211ec55f4b1dd0587f875c7b34 >> Author: Mike Christie >> Date: Sun Jun 5 14:32:17 2016 -0500 >> drivers: use req op accessor >> >> Here are the steps to reproduce the deadlock with a BRD ramdisk: >> >> mkfs.xfs -f /dev/ram0 >> mount -o dax /dev/ram0 /mnt/scratch > > When using ramdisks, we need the attached patch like in your other bug > report. I think it will fix some hangs people are seeing. > > I do not think that it should cause the failure to run issue you saw > when doing generic/008 and ext2. > I think the translation in loop.c is suspicious here: "if use DIO && not (a flush_flag or discard_flag)" should translate to: "if use DIO && not ((a flush_flag) || op == discard)" But in the patch I read: "if use DIO && ((not a flush_flag) || op == discard) Which would have DIO && discards follow the AIO path? So I would humbly suggest something like the following (on top of commit c2df40dfb8c015211ec55f4b1dd0587f875c7b34): [Please excuse the messed up patch format ... gmail eats tabs] diff --git a/drivers/block/loop.c b/drivers/block/loop.c index b9b737c..0754d83 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1659,8 +1659,9 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx, if (lo->lo_state != Lo_bound) return -EIO; - if (lo->use_dio && (!(cmd->rq->cmd_flags & REQ_FLUSH) || - req_op(cmd->rq) == REQ_OP_DISCARD)) + if (lo->use_dio && !( + (cmd->rq->cmd_flags & REQ_FLUSH) || + req_op(cmd->rq) == REQ_OP_DISCARD)) cmd->use_aio = true; else cmd->use_aio = false;