From patchwork Thu Dec 10 17:31:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikulas Patocka X-Patchwork-Id: 7820621 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E11129F3E6 for ; Thu, 10 Dec 2015 17:31:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1628C20576 for ; Thu, 10 Dec 2015 17:31:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3219920524 for ; Thu, 10 Dec 2015 17:31:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755208AbbLJRbS (ORCPT ); Thu, 10 Dec 2015 12:31:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37736 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752734AbbLJRbQ (ORCPT ); Thu, 10 Dec 2015 12:31:16 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 44ED1289B59; Thu, 10 Dec 2015 17:31:16 +0000 (UTC) Received: from file01.intranet.prod.int.rdu2.redhat.com (file01.intranet.prod.int.rdu2.redhat.com [10.11.5.7]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBAHVFf6011009 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 10 Dec 2015 12:31:15 -0500 Received: from file01.intranet.prod.int.rdu2.redhat.com (localhost [127.0.0.1]) by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4) with ESMTP id tBAHVFQx001381; Thu, 10 Dec 2015 12:31:15 -0500 Received: from localhost (mpatocka@localhost) by file01.intranet.prod.int.rdu2.redhat.com (8.14.4/8.14.4/Submit) with ESMTP id tBAHVFX2001378; Thu, 10 Dec 2015 12:31:15 -0500 X-Authentication-Warning: file01.intranet.prod.int.rdu2.redhat.com: mpatocka owned process doing -bs Date: Thu, 10 Dec 2015 12:31:15 -0500 (EST) From: Mikulas Patocka X-X-Sender: mpatocka@file01.intranet.prod.int.rdu2.redhat.com To: "James E.J. Bottomley" , "Martin K. Petersen" , Jens Axboe , Mike Snitzer , Jonathan Brassow cc: dm-devel@redhat.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH 14/15] dm kcopyd: change mutex to spinlock In-Reply-To: Message-ID: References: User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP job->lock is only taken for a finite amount of time and the process doesn't block while holding it, so change it from mutex to spinlock. This change is needed for the next patch that makes it possible to call segment_complete from an interrupt. Taking mutexes inside an interrupt is not allowed. Signed-off-by: Mikulas Patocka --- drivers/md/dm-kcopyd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-3.16-rc5/drivers/md/dm-kcopyd.c =================================================================== --- linux-3.16-rc5.orig/drivers/md/dm-kcopyd.c 2014-07-15 19:20:34.000000000 +0200 +++ linux-3.16-rc5/drivers/md/dm-kcopyd.c 2014-07-15 19:24:20.000000000 +0200 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -356,7 +356,7 @@ struct kcopyd_job { * These fields are only used if the job has been split * into more manageable parts. */ - struct mutex lock; + spinlock_t lock; atomic_t sub_jobs; sector_t progress; @@ -629,7 +629,7 @@ static void segment_complete(int read_er struct kcopyd_job *job = sub_job->master_job; struct dm_kcopyd_client *kc = job->kc; - mutex_lock(&job->lock); + spin_lock(&job->lock); /* update the error */ if (read_err) @@ -653,7 +653,7 @@ static void segment_complete(int read_er job->progress += count; } } - mutex_unlock(&job->lock); + spin_unlock(&job->lock); if (count) { int i; @@ -708,7 +708,7 @@ static void submit_job(struct kcopyd_job if (job->source.count <= SUB_JOB_SIZE) dispatch_job(job); else { - mutex_init(&job->lock); + spin_lock_init(&job->lock); job->progress = 0; split_job(job); }