From patchwork Wed Aug 23 00:26:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timofey Titovets X-Patchwork-Id: 9916409 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 3A218603F9 for ; Wed, 23 Aug 2017 00:27:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CE08287E3 for ; Wed, 23 Aug 2017 00:27:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 217DA2892C; Wed, 23 Aug 2017 00:27:15 +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 B48A3287E3 for ; Wed, 23 Aug 2017 00:27:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752849AbdHWA1L (ORCPT ); Tue, 22 Aug 2017 20:27:11 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34102 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752770AbdHWA1J (ORCPT ); Tue, 22 Aug 2017 20:27:09 -0400 Received: by mail-wr0-f193.google.com with SMTP id p14so152865wrg.1 for ; Tue, 22 Aug 2017 17:27:09 -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=epP6gwuuqVRDZ05qOKy/+fwRHRPqlS8rJSSk8V53ZJs=; b=Z6q83reLDVW8OqD+jbK+Mu1E4oY52P6kDUMDe4AS2AqbFsPH71/BzXCweQcHDN4tn4 1R7B7ih6vQA5ehsFHDRwmsaPHrskizBo2ivdkY3Cr/xbDEQW+IMFRVxz7C/Vs/3iCkla H07ykdUQe4cOtPaREaumrMOhhjax+2kNUhWFZd0JiRL6PkuH4v/glWqugky8J/wNklL3 Pu+V0gbnTOg429qhcjK5hHdE8qTZ/zmCJ6GT0cTLLxycyuvzXa/6yCsXNYHMp3M4OkZ8 c1uqbmpYFrOet7NvK8KMn9H7AVPL8eRFK+UuWFnjSN7L5SLJxOk1pTD8ekW55+9SDQTS mYHg== 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=epP6gwuuqVRDZ05qOKy/+fwRHRPqlS8rJSSk8V53ZJs=; b=iujCLOYMbtGHo/KeRKfa+pWxnMbjJ2EYXJz+boamq0acuCaf2hhEB81efnihiXneli nUCRNDtbl2uL5VN63pfautEOzqvnTmQb+jBUlY0vT41gCM3gHXvy2EnCT5SyvY/m/pOR Ch4RgNX8is4oZBxrLWDgiAgu5FKytetf4srKsR4abTFE02aAMwaowEuWfjLOlEBJwFAC DT6XWjDh+0N6S1YbBQA5T5IBwP8YILcwSaguB8LHUFUPVlCJbpUcE+eZTafwT8XC9Omp pZKV1fXY0K5kSpwQaez16JpGEf9lCWhTTNU1GlgcpioTrq1Ca67137ux8U/oaT39sTlX Ff/g== X-Gm-Message-State: AHYfb5iynq9vJIlmKX2t4rWqAkiICndXCInwrTdVTOBNBoXbhMQDtxEI eCMigMLILWGhdbJO X-Received: by 10.223.184.206 with SMTP id c14mr501769wrg.315.1503448028535; Tue, 22 Aug 2017 17:27:08 -0700 (PDT) Received: from titovetst-l.itransition.corp (nat3-minsk-pool-46-53-180-190.telecom.by. [46.53.180.190]) by smtp.gmail.com with ESMTPSA id k45sm136926wre.1.2017.08.22.17.27.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Aug 2017 17:27:07 -0700 (PDT) From: Timofey Titovets To: linux-btrfs@vger.kernel.org Cc: Timofey Titovets Subject: [PATCH v5 2/6] Btrfs: heuristic workspace add bucket and sample items Date: Wed, 23 Aug 2017 03:26:46 +0300 Message-Id: <20170823002650.3133-3-nefelim4ag@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170823002650.3133-1-nefelim4ag@gmail.com> References: <20170823002650.3133-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 Heuristic workspace: - Add bucket for storing byte type counters - Add sample array for storing partial copy of input data range - Add counter for store current sample size to workspace Signed-off-by: Timofey Titovets --- fs/btrfs/heuristic.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) -- 2.14.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/btrfs/heuristic.c b/fs/btrfs/heuristic.c index 96ae3e9334bc..2c2cadc9dfad 100644 --- a/fs/btrfs/heuristic.c +++ b/fs/btrfs/heuristic.c @@ -20,13 +20,36 @@ #include #include "compression.h" +#define READ_SIZE 16 +#define ITER_SHIFT 256 +#define BUCKET_SIZE 256 + +/* + * While mapping 128KiB range into pages (with 4k PAGE_SIZE as ex), + * and iterate that with index <= index_end + * code get 0-32 items, that a 33 pages + */ +#define MAX_INPUT_PAGES ((BTRFS_MAX_UNCOMPRESSED >> PAGE_SHIFT)+1) +#define MAX_SAMPLE_SIZE (MAX_INPUT_PAGES*PAGE_SIZE*READ_SIZE/ITER_SHIFT) + +struct bucket_item { + u32 count; +}; + struct workspace { + u8 *sample; + /* Partial copy of input data */ + u32 sample_size; + /* Bucket store counter for each byte type */ + struct bucket_item bucket[BUCKET_SIZE]; struct list_head list; }; static void heuristic_free_workspace(struct list_head *ws) { struct workspace *workspace = list_entry(ws, struct workspace, list); + + kvfree(workspace->sample); kfree(workspace); } @@ -38,9 +61,16 @@ static struct list_head *heuristic_alloc_workspace(void) if (!workspace) return ERR_PTR(-ENOMEM); + workspace->sample = kvmalloc(MAX_SAMPLE_SIZE, GFP_KERNEL); + if (!workspace->sample) + goto fail; + INIT_LIST_HEAD(&workspace->list); return &workspace->list; +fail: + heuristic_free_workspace(&workspace->list); + return ERR_PTR(-ENOMEM); } static int heuristic(struct list_head *ws, struct inode *inode,