From patchwork Wed Jul 27 20:09:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Snitzer X-Patchwork-Id: 9250367 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 70F5A6077C for ; Wed, 27 Jul 2016 20:09:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58CFD212DA for ; Wed, 27 Jul 2016 20:09:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 487E126253; Wed, 27 Jul 2016 20:09:18 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham 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 D7F68212DA for ; Wed, 27 Jul 2016 20:09:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757321AbcG0UJR (ORCPT ); Wed, 27 Jul 2016 16:09:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44470 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756830AbcG0UJQ (ORCPT ); Wed, 27 Jul 2016 16:09:16 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 A618785A06; Wed, 27 Jul 2016 20:09:15 +0000 (UTC) Received: from localhost (vpn-61-188.rdu2.redhat.com [10.10.61.188]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6RK9ET3032764 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 27 Jul 2016 16:09:15 -0400 Date: Wed, 27 Jul 2016 16:09:40 -0400 From: Mike Snitzer To: Bart Van Assche Cc: device-mapper development , "linux-scsi@vger.kernel.org" Subject: Re: dm-mq and end_clone_request() Message-ID: <20160727200939.GA82654@redhat.com> References: <4ed669ed-beae-76a8-b806-a284565b327a@sandisk.com> <20160720140815.GA19045@redhat.com> <20160720142727.GA57399@redhat.com> <1ca6d31d-f175-9daa-9ddd-17d653851ceb@sandisk.com> <20160720183321.GA20223@redhat.com> <84d9dc64-0c10-ed1a-7bc1-e656874853a5@sandisk.com> <20160725175344.GA23000@redhat.com> <20160725212325.GA23961@redhat.com> <1490356d-2c0e-d94a-7a88-5e8bc89953ef@sandisk.com> <20160726011607.GA77078@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160726011607.GA77078@redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 27 Jul 2016 20:09:15 +0000 (UTC) Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, Jul 25 2016 at 9:16pm -0400, Mike Snitzer wrote: > Hi Bart, > > Please try this patch to see if it fixes your issue, thanks. > > diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c > index 52baf8a..287caa7 100644 > --- a/drivers/md/dm-mpath.c > +++ b/drivers/md/dm-mpath.c > @@ -433,10 +433,17 @@ failed: > */ > static int must_push_back(struct multipath *m) > { > - return (test_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags) || > - ((test_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags) != > - test_bit(MPATHF_SAVED_QUEUE_IF_NO_PATH, &m->flags)) && > - dm_noflush_suspending(m->ti))); > + bool r; > + unsigned long flags; > + > + spin_lock_irqsave(&m->lock, flags); > + r = (test_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags) || > + ((test_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags) != > + test_bit(MPATHF_SAVED_QUEUE_IF_NO_PATH, &m->flags)) && > + dm_noflush_suspending(m->ti))); > + spin_unlock_irqrestore(&m->lock, flags); > + > + return r; > } > > /* In addition to the above patch, please apply this patch and retest your 4.7 kernel: --- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 287caa7..16583c1 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -1416,12 +1416,14 @@ static void multipath_postsuspend(struct dm_target *ti) static void multipath_resume(struct dm_target *ti) { struct multipath *m = ti->private; + unsigned long flags; + spin_lock_irqsave(&m->lock, flags); if (test_bit(MPATHF_SAVED_QUEUE_IF_NO_PATH, &m->flags)) set_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags); else clear_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags); - smp_mb__after_atomic(); + spin_unlock_irqrestore(&m->lock, flags); } /*