From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751644AbdEPB7X (ORCPT <rfc822;w@1wt.eu>);
        Mon, 15 May 2017 21:59:23 -0400
Received: from LGEAMRELO12.lge.com ([156.147.23.52]:47441 "EHLO
        lgeamrelo12.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750713AbdEPB7W (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 15 May 2017 21:59:22 -0400
X-Original-SENDERIP: 156.147.1.121
X-Original-MAILFROM: minchan@kernel.org
X-Original-SENDERIP: 10.177.220.163
X-Original-MAILFROM: minchan@kernel.org
Date: Tue, 16 May 2017 10:59:19 +0900
From: Minchan Kim <minchan@kernel.org>
To: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
        linux-kernel@vger.kernel.org, Joonsoo Kim <iamjoonsoo.kim@lge.com>,
        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
        kernel-team <kernel-team@lge.com>
Subject: Re: [PATCH 2/2] zram: do not count duplicated pages as compressed
Message-ID: <20170516015919.GA5233@bbox>
References: <1494834068-27004-1-git-send-email-minchan@kernel.org>
 <1494834068-27004-2-git-send-email-minchan@kernel.org>
 <20170516013022.GB10262@jagdpanzerIV.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170516013022.GB10262@jagdpanzerIV.localdomain>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Sergey,

On Tue, May 16, 2017 at 10:30:22AM +0900, Sergey Senozhatsky wrote:
> On (05/15/17 16:41), Minchan Kim wrote:
> [..]
> > diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
> > index b885356551e9..8152e405117b 100644
> > --- a/drivers/block/zram/zram_drv.c
> > +++ b/drivers/block/zram/zram_drv.c
> > @@ -624,15 +624,22 @@ static void zram_free_page(struct zram *zram, size_t index)
> >  		return;
> >  	}
> >  
> > +	if (zram_dedup_enabled(zram) &&
> > +			zram_test_flag(zram, index, ZRAM_DUP)) {
> > +		zram_clear_flag(zram, index, ZRAM_DUP);
> > +		atomic64_sub(entry->len, &zram->stats.dup_data_size);
> > +		goto out;
> > +	}
> 
> so that `goto' there is to just jump over ->stats.compr_data_size?

Yub.

> can you sub ->stats.compr_data_size before the `if' and avoid labels?


> 
> >  	if (!entry)
> >  		return;
> 
> shouldn't this `if' be moved before `if (zram_dedup_enabled(zram)`?

You mean this?

static void zram_free_page(..) {
        if (zram_test_flag(zram, index, ZRAM_SAME))
                ...

        if (!entry)
                return;

        if (zram_dedup_enabled(zram) && xxxx)) {
                zram_clear_flag(ZRAM_DUP);
                atomic64_sub(entry->len, &zram->stats.dup_data_size);
        } else {
                atomic64_sub(zram_get_obj_size(zram, index),
                                        &zram->stats.compr_dat_size);
        }

        zram_entry_free
        zram_set_entry
        zram_set_obj_size
}

> 
> 
> [..]
> > @@ -794,7 +801,15 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index)
> >  	entry = zram_dedup_find(zram, page, &checksum);
> >  	if (entry) {
> >  		comp_len = entry->len;
> > -		goto found_dup;
> > +		zram_slot_lock(zram, index);
> > +		zram_free_page(zram, index);
> > +		zram_set_flag(zram, index, ZRAM_DUP);
> > +		zram_set_entry(zram, index, entry);
> > +		zram_set_obj_size(zram, index, comp_len);
> > +		zram_slot_unlock(zram, index);
> > +		atomic64_add(comp_len, &zram->stats.dup_data_size);
> > +		atomic64_inc(&zram->stats.pages_stored);
> > +		return 0;
> 
> hm. that's a somewhat big code duplication. isn't it?

Yub. 3 parts. above part,  zram_same_page_write and tail of __zram_bvec_write.

Do you have any idea? Feel free to suggest. :)
Thanks.