From patchwork Mon Jul 24 11:37:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timofey Titovets X-Patchwork-Id: 9859289 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 244C860349 for ; Mon, 24 Jul 2017 11:37:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16D40284F4 for ; Mon, 24 Jul 2017 11:37:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BC0028565; Mon, 24 Jul 2017 11:37:32 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 40BA3284F4 for ; Mon, 24 Jul 2017 11:37:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754558AbdGXLh3 (ORCPT ); Mon, 24 Jul 2017 07:37:29 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33871 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751671AbdGXLhW (ORCPT ); Mon, 24 Jul 2017 07:37:22 -0400 Received: by mail-lf0-f67.google.com with SMTP id d80so1336490lfg.1 for ; Mon, 24 Jul 2017 04:37:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=K/z7qODONYQHcWdqKZSKwyy0x4a5xj67O6ONF7QZEiM=; b=ov9yXl0a0SFp5rxj4JZ/GeM0MfUdlLfEc6U0yVWtr0yCO3znyzR1Z+xPjyssDRyPCu cmL7DOouNjGEvMu9zvm05BnQWNFW+JjvgIoMzxT4YpHZB4fTP9h1mS67E+wrsRm7dF2I CwI28apQpmn3U9fAzhbVrZF8P8ZFIxvKGwb2OnzKy0GHWw9MBNMqTAWyxrlNv4WfKXdu gsS3s8ksNCeOD5ILgAowU9HG9ms82YtAppvHGMPSFHDVlKWBId0GVDcxqo8X7li8V8dP M0jpqJA0hpJS3sv84Ci/tKwsO5KB63YReSK+GbiBXMgLdBJRhK9ubiqej8iwxW7vuLzM 5nqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=K/z7qODONYQHcWdqKZSKwyy0x4a5xj67O6ONF7QZEiM=; b=TAgaB5Wgw+jgIir9toaO+iv/nXM+LubwY8fpyCEmFNkTybrsrMdDlNSrbo6lzvc5rA Hl8EcnUraTFG9GLJqdrssEc4p+PAbQPDJz1lYQ+X7JKWg7AeGxAEkl/3WtSqhZceDInz sRXoBfbrSXqPbtQ6ifHs1O5faAfh8yeN3i4giI1/SCxHOwKuwpsJFpWTJcsE/PkQ2xU/ OngmUXcTmHS+9N3nVP3cdAUlj935q8u+Ve1iFJKKwUGqJbdl5OONFN0N2mVd8gmC4h5K UgJgc2EN9vsy7w0rA6ak95J4x2eSgmhIjTkvx2U0/XOizyVx64vu2ddMifWvWjIy1ww1 f+YA== X-Gm-Message-State: AIVw113Y1WrzO+XvXPwLkWWCTCzEr4BYuuSSDGGPTy4X5YLe0xFSUnWA 7fHEWuwxsuOfFqdp X-Received: by 10.46.77.153 with SMTP id c25mr1218566ljd.163.1500896240358; Mon, 24 Jul 2017 04:37:20 -0700 (PDT) Received: from titovetst-beplan.itransition.corp ([93.171.6.183]) by smtp.gmail.com with ESMTPSA id f98sm1462385lfi.35.2017.07.24.04.37.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jul 2017 04:37:19 -0700 (PDT) From: Timofey Titovets To: linux-btrfs@vger.kernel.org Cc: Timofey Titovets Subject: [PATCH 3/3] Btrfs: heuristic add byte core set calculation Date: Mon, 24 Jul 2017 14:37:08 +0300 Message-Id: <20170724113708.18088-4-nefelim4ag@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170724113708.18088-1-nefelim4ag@gmail.com> References: <20170724113708.18088-1-nefelim4ag@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Calculate byte core set for data sample For low core set, data are easily compressible For high core set, data are not compressible Signed-off-by: Timofey Titovets --- fs/btrfs/compression.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/compression.h | 2 ++ 2 files changed, 62 insertions(+) diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index fee7808e3f15..e7f811d20fd8 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -1069,6 +1069,42 @@ static inline int byte_set_size(const struct heuristic_bucket_item *bucket) return byte_set_size; } +/* For bucket sorting */ +static inline int heuristic_bucket_compare(const void *lv, const void *rv) +{ + struct heuristic_bucket_item *l = (struct heuristic_bucket_item *)(lv); + struct heuristic_bucket_item *r = (struct heuristic_bucket_item *)(rv); + + return r->count - l->count; +} + +/* + * Byte Core set size + * How many bytes use 90% of sample + */ +static inline int byte_core_set_size(struct heuristic_bucket_item *bucket, + u32 core_set_threshold) +{ + int a = 0; + u32 coreset_sum = 0; + + for (; a < BTRFS_HEURISTIC_BYTE_CORE_SET_LOW; a++) + coreset_sum += bucket[a].count; + + if (coreset_sum > core_set_threshold) + return a; + + for (; a < BTRFS_HEURISTIC_BYTE_CORE_SET_HIGH; a++) { + if (bucket[a].count == 0) + break; + coreset_sum += bucket[a].count; + if (coreset_sum > core_set_threshold) + break; + } + + return a; +} + /* * Compression heuristic. * @@ -1092,6 +1128,8 @@ int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end) struct heuristic_bucket_item *bucket; int a, b, ret; u8 symbol, *input_data; + u32 core_set_threshold; + u64 input_size = start - end; ret = 1; @@ -1123,6 +1161,28 @@ int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end) goto out; } + for (a = 1; a < BTRFS_HEURISTIC_BUCKET_SIZE; a++) + bucket[a].symbol = a; + + /* Sort in reverse order */ + sort(bucket, BTRFS_HEURISTIC_BUCKET_SIZE, + sizeof(struct heuristic_bucket_item), &heuristic_bucket_compare, + NULL); + + core_set_threshold = input_size*90/BTRFS_HEURISTIC_ITERATOR_OFFSET/100; + core_set_threshold *= BTRFS_HEURISTIC_READ_SIZE; + + a = byte_core_set_size(bucket, core_set_threshold); + if (a <= BTRFS_HEURISTIC_BYTE_CORE_SET_LOW) { + ret = 2; + goto out; + } + + if (a >= BTRFS_HEURISTIC_BYTE_CORE_SET_HIGH) { + ret = 0; + goto out; + } + out: kfree(bucket); return ret; diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h index 6e5b2ce36b52..f323f464bb13 100644 --- a/fs/btrfs/compression.h +++ b/fs/btrfs/compression.h @@ -140,6 +140,8 @@ struct heuristic_bucket_item { #define BTRFS_HEURISTIC_ITERATOR_OFFSET PAGE_SIZE/BTRFS_HEURISTIC_READS_PER_PAGE #define BTRFS_HEURISTIC_BUCKET_SIZE 256 #define BTRFS_HEURISTIC_BYTE_SET_THRESHOLD (256/4) +#define BTRFS_HEURISTIC_BYTE_CORE_SET_LOW (256/5) +#define BTRFS_HEURISTIC_BYTE_CORE_SET_HIGH (256 - 256/5) int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end);