From patchwork Mon Sep 21 13:13:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 7230191 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C6A3CBEEC1 for ; Mon, 21 Sep 2015 13:17:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0FF720764 for ; Mon, 21 Sep 2015 13:17:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D948520717 for ; Mon, 21 Sep 2015 13:17:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932310AbbIUNPh (ORCPT ); Mon, 21 Sep 2015 09:15:37 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35121 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932266AbbIUNPf (ORCPT ); Mon, 21 Sep 2015 09:15:35 -0400 Received: by pacfv12 with SMTP id fv12so119065930pac.2; Mon, 21 Sep 2015 06:15:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SOXyxvJbzVlISnacd1HHMb8zOF2nYWqHbAAn62RmpQQ=; b=Hu0V5C2PT3IJ3TQ3uoQC+Pz9wOv4tsGdnq+22iWVZsDbomfn0tWmQXWFHB5Z2x+NG5 cFUywPsYBGOj9LVeUu/v7cQych/si3vJXzvtxPZordTQx/DuRNHgg5gqhQ5R1jh4vEvh DjKPIjzCNE6/rfJvr9r6BW+JPfM56t+tc6BV1jh+KJJF1xhlhhPRWaFwyi3egewqCqt1 3L7y350CdTW3jwtGH2GA7hmMSBo1cdGFBclmyLQzhfNGTQ1Ko1W7l7F5CAx9uzqK0RbW dQH9LflPkFaNaNvH+79I5L2Om7iKF++t4kV6pCjIw/Poyc+yhjrmiCae62jhwtB/r5b7 bzRQ== X-Received: by 10.68.68.205 with SMTP id y13mr24401871pbt.99.1442841334555; Mon, 21 Sep 2015 06:15:34 -0700 (PDT) Received: from swordfish.localdomain ([112.168.75.135]) by smtp.gmail.com with ESMTPSA id c16sm24589770pbu.37.2015.09.21.06.15.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Sep 2015 06:15:34 -0700 (PDT) From: Sergey Senozhatsky To: Joonsoo Kim Cc: Andrew Morton , Minchan Kim , Herbert Xu , "David S. Miller" , Stephan Mueller , Joonsoo Kim , Sergey Senozhatsky , Sergey Senozhatsky , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC][PATCH 6/9] zram: make stream find and release functions static Date: Mon, 21 Sep 2015 22:13:46 +0900 Message-Id: <1442841229-8122-7-git-send-email-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1442841229-8122-1-git-send-email-sergey.senozhatsky@gmail.com> References: <1442553564-3476-1-git-send-email-iamjoonsoo.kim@lge.com> <1442841229-8122-1-git-send-email-sergey.senozhatsky@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hide (make static) zstrm find and release function and introduce zcomp_compress_begin()/zcomp_compress_end(). We will have begin and end functions around compression (this patch) and decompression (next patch). So the work flow is evolving to: zstrm = foo_begin(); foo(zstrm); foo_end(zstrm); where foo is compress or decompress zcomp functions. This patch is a preparation to make crypto API-powered zcomp possible. The reasoning is that some crypto compression backends require zstrm for decompression. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zcomp.c | 27 +++++++++++++++++++++++++-- drivers/block/zram/zcomp.h | 8 ++++++-- drivers/block/zram/zram_drv.c | 6 +++--- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c index 5cb13ca..52d5b04 100644 --- a/drivers/block/zram/zcomp.c +++ b/drivers/block/zram/zcomp.c @@ -296,16 +296,39 @@ bool zcomp_set_max_streams(struct zcomp *comp, int num_strm) return comp->set_max_streams(comp, num_strm); } -struct zcomp_strm *zcomp_strm_find(struct zcomp *comp) +static struct zcomp_strm *zcomp_strm_find(struct zcomp *comp) { return comp->strm_find(comp); } -void zcomp_strm_release(struct zcomp *comp, struct zcomp_strm *zstrm) +static void zcomp_strm_release(struct zcomp *comp, struct zcomp_strm *zstrm) { comp->strm_release(comp, zstrm); } +/* Never return NULL, may sleep */ +struct zcomp_strm *zcomp_compress_begin(struct zcomp *comp) +{ + return zcomp_strm_find(comp); +} + +void zcomp_compress_end(struct zcomp *comp, struct zcomp_strm *zstrm) +{ + zcomp_strm_release(comp, zstrm); +} + +/* May return NULL, may sleep */ +struct zcomp_strm *zcomp_decompress_begin(struct zcomp *comp) +{ + return NULL; +} + +void zcomp_decompress_end(struct zcomp *comp, struct zcomp_strm *zstrm) +{ + if (zstrm) + zcomp_strm_release(comp, zstrm); +} + int zcomp_compress(struct zcomp *comp, struct zcomp_strm *zstrm, const unsigned char *src, size_t *dst_len) { diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h index 46e2b9f..616e013 100644 --- a/drivers/block/zram/zcomp.h +++ b/drivers/block/zram/zcomp.h @@ -56,12 +56,16 @@ bool zcomp_available_algorithm(const char *comp); struct zcomp *zcomp_create(const char *comp, int max_strm); void zcomp_destroy(struct zcomp *comp); -struct zcomp_strm *zcomp_strm_find(struct zcomp *comp); -void zcomp_strm_release(struct zcomp *comp, struct zcomp_strm *zstrm); + +struct zcomp_strm *zcomp_compress_begin(struct zcomp *comp); +void zcomp_compress_end(struct zcomp *comp, struct zcomp_strm *zstrm); int zcomp_compress(struct zcomp *comp, struct zcomp_strm *zstrm, const unsigned char *src, size_t *dst_len); +struct zcomp_strm *zcomp_decompress_begin(struct zcomp *comp); +void zcomp_decompress_end(struct zcomp *comp, struct zcomp_strm *zstrm); + int zcomp_decompress(struct zcomp *comp, const unsigned char *src, size_t src_len, unsigned char *dst); diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index c93aeb8..7dda8a5 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -673,7 +673,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, goto out; } - zstrm = zcomp_strm_find(zram->comp); + zstrm = zcomp_compress_begin(zram->comp); user_mem = kmap_atomic(page); if (is_partial_io(bvec)) { @@ -744,7 +744,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, memcpy(cmem, src, clen); } - zcomp_strm_release(zram->comp, zstrm); + zcomp_compress_end(zram->comp, zstrm); zstrm = NULL; zs_unmap_object(meta->mem_pool, handle); @@ -764,7 +764,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, atomic64_inc(&zram->stats.pages_stored); out: if (zstrm) - zcomp_strm_release(zram->comp, zstrm); + zcomp_compress_end(zram->comp, zstrm); if (is_partial_io(bvec)) kfree(uncmem); return ret;