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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 A458CCA9ED5 for ; Mon, 4 Nov 2019 21:50:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7996B217F4 for ; Mon, 4 Nov 2019 21:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904201; bh=Rn0/Mi5LHX/GqRyJtr5QLbTHjuFr7bTB1sLx5GUORZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c8V+qGEx5Z5Mb8gAQqBpIdxCKOWC9rbMiXmNfpsu/ehxAWUa/dhnZnMZgloE94GOA bPafjaDKHGcf4LAHiO2ZKHsEc+pSCzNQoPq89n4lQ7iUfYSF6KbM+EKlCg+b+mB0sE WXQBtbnOumYsNPi6d+PLM8vkr6smRai/rOEwTgvY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387561AbfKDVuA (ORCPT ); Mon, 4 Nov 2019 16:50:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:41766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387579AbfKDVuA (ORCPT ); Mon, 4 Nov 2019 16:50:00 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4675920B7C; Mon, 4 Nov 2019 21:49:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904199; bh=Rn0/Mi5LHX/GqRyJtr5QLbTHjuFr7bTB1sLx5GUORZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RpZQSG5kTHUnurEAbb9jXOQE/gAalxzmODFx09uwj1ymRfCqgiqZnKBNmMRZjA3I4 BNjcuCVDedkfBq2spTLeNDfidGAYOJ6oM0ps5W6uuLlrS2nY/G7dK0ypVcRVSW2WTq wdtYVKxzbBZizE6ZUz636Up0ANoM5nDXqg9TBAyA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mikulas Patocka , Nikos Tsironis , Mike Snitzer , Sasha Levin Subject: [PATCH 4.9 02/62] dm snapshot: introduce account_start_copy() and account_end_copy() Date: Mon, 4 Nov 2019 22:44:24 +0100 Message-Id: <20191104211902.785967140@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104211901.387893698@linuxfoundation.org> References: <20191104211901.387893698@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mikulas Patocka [ Upstream commit a2f83e8b0c82c9500421a26c49eb198b25fcdea3 ] This simple refactoring moves code for modifying the semaphore cow_count into separate functions to prepare for changes that will extend these methods to provide for a more sophisticated mechanism for COW throttling. Signed-off-by: Mikulas Patocka Reviewed-by: Nikos Tsironis Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- drivers/md/dm-snap.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index e5b0e13f5c92d..ef51ab8a5dcb2 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -1399,6 +1399,16 @@ static void snapshot_dtr(struct dm_target *ti) kfree(s); } +static void account_start_copy(struct dm_snapshot *s) +{ + down(&s->cow_count); +} + +static void account_end_copy(struct dm_snapshot *s) +{ + up(&s->cow_count); +} + /* * Flush a list of buffers. */ @@ -1581,7 +1591,7 @@ static void copy_callback(int read_err, unsigned long write_err, void *context) } list_add(&pe->out_of_order_entry, lh); } - up(&s->cow_count); + account_end_copy(s); } /* @@ -1605,7 +1615,7 @@ static void start_copy(struct dm_snap_pending_exception *pe) dest.count = src.count; /* Hand over to kcopyd */ - down(&s->cow_count); + account_start_copy(s); dm_kcopyd_copy(s->kcopyd_client, &src, 1, &dest, 0, copy_callback, pe); } @@ -1625,7 +1635,7 @@ static void start_full_bio(struct dm_snap_pending_exception *pe, pe->full_bio = bio; pe->full_bio_end_io = bio->bi_end_io; - down(&s->cow_count); + account_start_copy(s); callback_data = dm_kcopyd_prepare_callback(s->kcopyd_client, copy_callback, pe); -- 2.20.1