From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752225Ab3IHJcp (ORCPT ); Sun, 8 Sep 2013 05:32:45 -0400 Received: from mail-ea0-f169.google.com ([209.85.215.169]:56237 "EHLO mail-ea0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752054Ab3IHJco (ORCPT ); Sun, 8 Sep 2013 05:32:44 -0400 Date: Sun, 8 Sep 2013 12:31:22 +0300 From: Sergey Senozhatsky To: Greg Kroah-Hartman Cc: Minchan Kim , Jerome Marchand , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] staging: zram: minimize `slot_free_lock' usage (v3) Message-ID: <20130908093122.GA2267@swordfish> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Calling handle_pending_slot_free() for every RW operation may cause unneccessary slot_free_lock locking, because most likely process will see NULL slot_free_rq. handle_pending_slot_free() only when current detects that slot_free_rq is not NULL. v3: do not acquire zram lock in zram_slot_free(). v2: protect handle_pending_slot_free() with zram rw_lock. Signed-off-by: Sergey Senozhatsky --- drivers/staging/zram/zram_drv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index 91d94b5..a8261b4 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -517,6 +517,7 @@ static void handle_pending_slot_free(struct zram *zram) { struct zram_slot_free *free_rq; + down_write(&zram->lock); spin_lock(&zram->slot_free_lock); while (zram->slot_free_rq) { free_rq = zram->slot_free_rq; @@ -525,6 +526,7 @@ static void handle_pending_slot_free(struct zram *zram) kfree(free_rq); } spin_unlock(&zram->slot_free_lock); + up_write(&zram->lock); } static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index, @@ -532,14 +534,15 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index, { int ret; + if (zram->slot_free_rq) + handle_pending_slot_free(zram); + if (rw == READ) { down_read(&zram->lock); - handle_pending_slot_free(zram); ret = zram_bvec_read(zram, bvec, index, offset, bio); up_read(&zram->lock); } else { down_write(&zram->lock); - handle_pending_slot_free(zram); ret = zram_bvec_write(zram, bvec, index, offset); up_write(&zram->lock); } @@ -753,9 +756,7 @@ static void zram_slot_free(struct work_struct *work) struct zram *zram; zram = container_of(work, struct zram, free_work); - down_write(&zram->lock); handle_pending_slot_free(zram); - up_write(&zram->lock); } static void add_slot_free(struct zram *zram, struct zram_slot_free *free_rq)