From patchwork Tue Jul 24 15:05:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shally Verma X-Patchwork-Id: 43315 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4584C378B; Tue, 24 Jul 2018 17:06:15 +0200 (CEST) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0050.outbound.protection.outlook.com [104.47.33.50]) by dpdk.org (Postfix) with ESMTP id E122934EF for ; Tue, 24 Jul 2018 17:06:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A70Y0b+GqwE5rOD5p7nqaaPUS9k9NuKy9PWJLFJ4HC4=; b=QF9Xi6I5SxCz4SsowYmKhLBUYjk6zUHcVSoR17QvGpprr1OodkWC4Zkw4p1hrQPClKZPvyJAVXGPQ8lUR5vSJFFoYWUS2ZE/w/DngIbd4Sd5AOWwB7NblYogreDHXDTN1IKNgQBe60BttOuzNKom7Y79JYmAR6fkpitJBXpEESI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Shally.Verma@cavium.com; Received: from hyd1sverma-dt.caveonetworks.com (115.113.156.2) by SN4PR0701MB3646.namprd07.prod.outlook.com (2603:10b6:803:4d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.21; Tue, 24 Jul 2018 15:06:09 +0000 From: Shally Verma To: pablo.de.lara.guarch@intel.com Cc: dev@dpdk.org, pathreya@caviumnetworks.com, mchalla@caviumnetworks.com, Sunila Sahu , Sunila Sahu , Ashish Gupta Date: Tue, 24 Jul 2018 20:35:34 +0530 Message-Id: <1532444736-26801-4-git-send-email-shally.verma@caviumnetworks.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1532444736-26801-1-git-send-email-shally.verma@caviumnetworks.com> References: <1532444736-26801-1-git-send-email-shally.verma@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [115.113.156.2] X-ClientProxiedBy: BM1PR0101CA0014.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::24) To SN4PR0701MB3646.namprd07.prod.outlook.com (2603:10b6:803:4d::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 135a8367-6c40-45e3-9059-08d5f176fe4d X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600073)(711020)(2017052603328)(7153060)(7193020); SRVR:SN4PR0701MB3646; X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3646; 3:9p6FFG0YVTTM3OygM5Pn2p+QxBeVOzQETI/7Aujbg3g+6cTimmz4chNcaZ67da6InGDfwVZtyyuIJfT4eVtONIyZUeegr/4hfEGrWzbHXQaqP9lV25XL4uSKCvAJBf3jYINig346mJ4WSdCbJRmiLD8xTySk98AIq3i0AVZUkkJ7FSfyFmQM4xeevyCZcPtQS4FylPBJdqYcJCmYzWXUmgnmAqrb2CLhtsozQSN3KxyJMcJlnmElRvRfo3ARfYcU; 25:smw0IUBGjQJghe/fKz4L2suN51pvz3LLpKNocKjPWmPXW4ZODYdPQ45h9SJg8dx/4F4ywg9GB26IQ49tGnxD5PqSjAiRD6/YFmdP5YwF/psQVgtqzDGPyAbIctJjg2OVbc0Fh50NFnNWeVQU/It4XWmwmxlmR751waFMPhXcoWw1ZQj3YLoXI6HNUqDyO+nQvlYGqTVLnJIz5qDYcI1Bk5WfD+q62dvXIFx77NwSBsiVRJpikeIH22qGufYgWT8qL+RCS3s7+41u9LE22m6MK00S4pXAsjKmho8Jk8Wv1v7uJwSwDchxEk/UAA2lXXj+VGztwpEb48wb3Pv/+B2wJw==; 31:LCqyPyX7zSTRyQKNgru4bL7LowXBA/chZn3jiIZZEzvlp8w9vmtVq+leKs8TkBU7I2xURcsanNwdKaC+kW6cCeuse4BK0hZcG+mJT75nSW8GntyfHvdmPJ/ZuDZtCZZ2QCpTfcmcMMsBjnrnHRoqGgoUFGFYdcXREhEiaLjICJJoS/jChcVDrFyGSWEvwhlQfGFo+iOb8RYI6Nmkp+eLL5PaLiMytos1DVzxQmwGFZc= X-MS-TrafficTypeDiagnostic: SN4PR0701MB3646: X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3646; 20:SbiiPnY5klKOJ/tB1zTk0ivktEt4fig0BNU70z+0rz4mVrJ5XNB1YwipZVZ9NokLU7jRWSRCxuw1pcgRNMkQ+s88z7Cxq/nWSslMsqI9YEQ+MLa5q5w/GHYO4gJr09GEYhXXJtaHlIQ/yEKVoj5GvcLjBWn5+k5o/2nAokBXUrzjcXwjwaZ7URt90xCnIOVrOE3YAdANMRN0Dhv5jvoH9Ao12jS8q2IiZ75xgPlND9MpmLWBk3zGPOTs6J4PjlxfTpRXBs/p8MPinnRavECiiJhFXqEW3nuTyfSwhqU9Aw+qpWezxaM8cPWPdpvdecx+3EmADYhziXp5tdtBn0RsQrelupf69wCW3AFbajJAHZsiXoWWb/Kf9mVYoS595u7VzKS92xvh/aIZBleaX8T97QHHO2BTDHyrFgf8cXlzft+KieW4gtyhQubM7FW9PXZb2YvLiPAqiqR7iCvaMeA2ugvv+pSjLcDjDHHhU8riaIxyoRsr9urMETuOBq2ojesLSAGMAeOuG7ca0+K7V/JTjgOh68yl3jj/IXSAga0c1NNYKsMoHRniTTFITyM8eU8RR+iKE/2qI4WXsgY1bpQi41nVV7KtgGR0bCQUUcwCV7Y=; 4:MG8LRjqPuqtG88PjiNkvzb8fZgdfhdGhky6gB1Sa8Cxzs51H4N9Y6KPrxC9suHN4pNmdhougNDdHyxOLB8fwd3tkw0cslGJ4RWD7q25davlLFZgzA3H5VUFNdtvKItyzw6j/2FQaISaWMzjxopZFXMl9ncmrlYL69wmf1FXZ3SjvMoGzXAcly1yLI7rcu7zHQrWgoRr0WyE3dbjq14cmldedbTEHYV3wXZlpy4g+XoeRek7QP0iVnD5Hn5GoWrBeG+uYRf2laQjuVj+kF3RJWQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231311)(944501410)(52105095)(93006095)(3002001)(149027)(150027)(6041310)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:SN4PR0701MB3646; BCL:0; PCL:0; RULEID:; SRVR:SN4PR0701MB3646; X-Forefront-PRVS: 0743E8D0A6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(366004)(346002)(136003)(376002)(199004)(189003)(26005)(2361001)(6506007)(55236004)(386003)(486006)(2616005)(2906002)(3846002)(36756003)(16526019)(956004)(6116002)(186003)(50226002)(68736007)(5660300001)(11346002)(4326008)(107886003)(478600001)(53936002)(476003)(52116002)(76176011)(51416003)(446003)(72206003)(48376002)(6666003)(97736004)(25786009)(42882007)(305945005)(2351001)(69596002)(54906003)(105586002)(106356001)(44832011)(6486002)(53416004)(66066001)(6512007)(316002)(7736002)(47776003)(8676002)(8936002)(81166006)(50466002)(16586007)(6916009)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:SN4PR0701MB3646; H:hyd1sverma-dt.caveonetworks.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN4PR0701MB3646; 23:C90lyComDRJ46gZfeN40NqBwJfitFV6dfZZS2gx?= N4v5gnE9wWiV724Bb3aeLouOGQ5Jy5Oyxwx3PCFwCa/JocaiydEHxzMCP/Ifta7t4uzTTSLqKQFQ/jrx+8Zidy8jNt+7x753yypV8PLuNl+joKyOCBhw68njfyoO87bxD17wKG6idiymuuSrzwDoLk6PG2HI8OqbcnWIUk5tc3611R4U13/orlXdPRMS1kfOK1IqexzoT7vTuaYdNjOxzAL+57NODP+ibDQ0GubahwPgNa/SB1T+MIAUA1OjNCyY2KcwLr8TaZYGlBVBYrCkdFNjxybJmHNAD44Q9hQtMgfryhORFZ0zzWtz582dde+o+EbMsl48xs8+VrnT3m6IxLU26e9YnbG7XO5Qnix7t4E60zTJezwd9GzBQ/3UjwC9n3AoMwft2Y3ab47D2cwHfZdCOMDrm+vM2ySN6P6CHU54EcVIWK0n19sEKoXvQcvSLTNF2cpOXD2htmgBwqGb19tBuJITI6/6hV46A4pVtG38ZnuVmmmBTQ8uND5SyRr4/AGu9LPN8XQQi39PvEGZRtSl6MBstAbSgpTaIBFLZ14NsUp65RYf1eQ0ClM+CxUULHCUJc+rPcmKRG37P90mu47IMXAOywcipJ8fsvKHHbI04CaFYGa9FUAQra9kFsUXHAl7krt3MevM8iZCB/+2jUXSxGoK0wneQZ5GyrwSGGVIv/axATnwFiQsaGehNgz+RDpV57bOM48lUm5OfkxdRmZ8G+vpRVJZUefi4lIp3u/HVfFnC4+ZwiJ4z+ORmMAHRLTG5y8zt5rPKnZ3JReJTd0eDesM1mND1kPWPFYB72dZjeHCK2nPi0Zpylw+j8ZTXBwrvblsXLDq/T8YxojUzs3WUZaHonFjGwFEwCHb8BlTVz+QP4Dt1fKkDp8Gj9WG/9x8KDETwFm1uL9plAkVt9fPKxa0AbBEy93biPKrCz9AECcluLAzS+FE874Uzkt1KFm9W7Z88Ylct52wbHxF7dV6QeVo1+3wMyYXTU7TJgESZLAm6cTXxEkQ8LEwEx7v/swp7M0wlRnHMRXHy8Rj+oOIx2JXeZ0/gtxH2wSFkOiUD0UO6+6E9HPw0hfy+g6QbPzVOay8zOMpkMOabfWbhxnu4QRZoRUwqQs2VKYwsn02VcDKZU2LXzAUpC0RzWu/PsyWOeFbzuYiCOm+gbXxss9fKfmA2I/g6xWOr+XYRKWuzGwxpne83zGDQx8UeIHf9Yc5198PxpVcMKHW44SUondVNn+2ETNrNV6F5lpjPiOOkC1YP0/9jRtJ+BzTk+65Jfi1Lq0a17wQvtgr4x2/cLh8QsisXAhCbEqa1fUD7akNHMA== X-Microsoft-Antispam-Message-Info: SlnIWi0lxinViG4bBQ/IlWkmlqi7CWZiWjio1JT95oEDIBMgig2j4vb+JlQ7ldR+IyMetXHcU5gUbyAXH9oF6q3yFQq6nVTzxrUM3ezXWnl0SrvPvDLCsUz0L3U1EjWU8hdU+NgONQ5p6VbSt4zKYKOfeIk5aElJGGc2cvVFU3Z4ex13lnBWR3PrVn8hTctAivdJ4SMzr/RLFyaILu/1sk07VxQ/S7chYKcI4THoK06BaacQQ3GovNQ5dT4D9MppdMoapdSYM6mybPP6m/9ftdkV8k+HN9hLLe9V7HeJIXZtnwjSI8YjDUC0Q77oecyDX0laOxzR3BwHx0JXfJth7tuPzUFq1UCuQ4UisJ4EWnc= X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3646; 6:XXxUtZ3Gh2S0K33mAuVJTwT8aDY79fb1C6V1AH1xcsn7EMvUovVQ7It6pvJwkeGabWeGsn+dKafFjh8UhJE8iHRKEeUU8tFCLOSban4aG9Vo/jLQYwhK331gwu0/8NouX5cLA63d63vXc0tuGIvwP+jidaR9yovjbNZwkm86DuJQm/oEoP95D8kPtV2fmLL6ed33q3sBc74vSyWvAFCQvpwxA8hu6c7PW51rEPz3JGypvGCipWTz3FSDI3P6Sx+17CLc99XpOzUMVERCNBQcPqZGouYTNn6ISK6uMb0vGeIwI43gFh/1RQSejhCFdFvd3HSPd/vLQuWy/T7GiJW6Dm7SDpVG0SjOZlyEbezm8ymY/HQNkuUMrrPMdWJ1SUpoJHngfxhSDYqrcx+8zm4qjxMBXfVp3RVNoDiTOAODxD2L10MF8f8e5b/udhsmrqfHOzJHKsbEVZIl2aaeUDCB/w==; 5:3XAixWzkWY+J1w1Z9n3wIrX+rC59ul26I6VYCZ9eOJNwLUgGfrxBPv+bsklzG+x1elOrYhyekfVGDlEeVZ3Bx9PV+95Zwyd2LLOREG3I2teZQznkMGHQNwkGcKrKrmv68TA/9WIxwiUHuoLWrBSNj7u+5FG8y2wgLMS7yc/8JWw=; 7:bXvrkwQ6c7G3bJAAuRKWl8GiW0CBiReayslNWi/ZAL94gONgLbI5hO37GMmLlMQHJcMTnS/ZPdEtDm8dKUPklKpts887ksUDAYm85rYdmfxrd/uqEp12ZZudsj3IA7WgJhJxOuCtLcLYNaZ7hduiZDshjn+ZaZ0z770xnZ0c3qP28gvlSVYw7k9PghWocvBstzKvtmcU97rRLSH73E500ACx29y5atirH//0VEPrbgdSTbMIMa2BsSTnhLyIAKrB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2018 15:06:09.2736 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 135a8367-6c40-45e3-9059-08d5f176fe4d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR0701MB3646 Subject: [dpdk-dev] [PATCH v5 3/5] compress/zlib: create private xform X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Sunila Sahu Create non-shareable private xform for stateless operation processing Signed-off-by: Sunila Sahu Signed-off-by: Shally Verma Signed-off-by: Ashish Gupta --- drivers/compress/zlib/zlib_pmd.c | 94 ++++++++++++++++++++++++++++++++ drivers/compress/zlib/zlib_pmd_ops.c | 74 ++++++++++++++++++++++++- drivers/compress/zlib/zlib_pmd_private.h | 4 ++ 3 files changed, 170 insertions(+), 2 deletions(-) diff --git a/drivers/compress/zlib/zlib_pmd.c b/drivers/compress/zlib/zlib_pmd.c index 7aeef44..0d09c54 100644 --- a/drivers/compress/zlib/zlib_pmd.c +++ b/drivers/compress/zlib/zlib_pmd.c @@ -7,6 +7,100 @@ #include "zlib_pmd_private.h" +/** Parse comp xform and set private xform/stream parameters */ +int +zlib_set_stream_parameters(const struct rte_comp_xform *xform, + struct zlib_stream *stream) +{ + int strategy, level, wbits; + z_stream *strm = &stream->strm; + + /* allocate deflate state */ + strm->zalloc = Z_NULL; + strm->zfree = Z_NULL; + strm->opaque = Z_NULL; + + switch (xform->type) { + case RTE_COMP_COMPRESS: + /** Compression window bits */ + switch (xform->compress.algo) { + case RTE_COMP_ALGO_DEFLATE: + wbits = -(xform->compress.window_size); + break; + default: + ZLIB_PMD_ERR("Compression algorithm not supported\n"); + return -1; + } + /** Compression Level */ + switch (xform->compress.level) { + case RTE_COMP_LEVEL_PMD_DEFAULT: + level = Z_DEFAULT_COMPRESSION; + break; + case RTE_COMP_LEVEL_NONE: + level = Z_NO_COMPRESSION; + break; + case RTE_COMP_LEVEL_MIN: + level = Z_BEST_SPEED; + break; + case RTE_COMP_LEVEL_MAX: + level = Z_BEST_COMPRESSION; + break; + default: + level = xform->compress.level; + if (level < RTE_COMP_LEVEL_MIN || + level > RTE_COMP_LEVEL_MAX) { + ZLIB_PMD_ERR("Compression level %d " + "not supported\n", + level); + return -1; + } + break; + } + /** Compression strategy */ + switch (xform->compress.deflate.huffman) { + case RTE_COMP_HUFFMAN_DEFAULT: + strategy = Z_DEFAULT_STRATEGY; + break; + case RTE_COMP_HUFFMAN_FIXED: + strategy = Z_FIXED; + break; + case RTE_COMP_HUFFMAN_DYNAMIC: + strategy = Z_DEFAULT_STRATEGY; + break; + default: + ZLIB_PMD_ERR("Compression strategy not supported\n"); + return -1; + } + if (deflateInit2(strm, level, + Z_DEFLATED, wbits, + DEF_MEM_LEVEL, strategy) != Z_OK) { + ZLIB_PMD_ERR("Deflate init failed\n"); + return -1; + } + break; + + case RTE_COMP_DECOMPRESS: + /** window bits */ + switch (xform->decompress.algo) { + case RTE_COMP_ALGO_DEFLATE: + wbits = -(xform->decompress.window_size); + break; + default: + ZLIB_PMD_ERR("Compression algorithm not supported\n"); + return -1; + } + + if (inflateInit2(strm, wbits) != Z_OK) { + ZLIB_PMD_ERR("Inflate init failed\n"); + return -1; + } + break; + default: + return -1; + } + return 0; +} + static int zlib_create(const char *name, struct rte_vdev_device *vdev, diff --git a/drivers/compress/zlib/zlib_pmd_ops.c b/drivers/compress/zlib/zlib_pmd_ops.c index cf9c006..0a73aed 100644 --- a/drivers/compress/zlib/zlib_pmd_ops.c +++ b/drivers/compress/zlib/zlib_pmd_ops.c @@ -213,6 +213,76 @@ zlib_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, return -1; } +/** Configure stream */ +static int +zlib_pmd_stream_create(struct rte_compressdev *dev, + const struct rte_comp_xform *xform, + void **zstream) +{ + int ret = 0; + struct zlib_stream *stream; + struct zlib_private *internals = dev->data->dev_private; + + if (xform == NULL) { + ZLIB_PMD_ERR("invalid xform struct"); + return -EINVAL; + } + + if (rte_mempool_get(internals->mp, zstream)) { + ZLIB_PMD_ERR("Couldn't get object from session mempool"); + return -ENOMEM; + } + stream = *((struct zlib_stream **)zstream); + + ret = zlib_set_stream_parameters(xform, stream); + + if (ret < 0) { + ZLIB_PMD_ERR("failed configure session parameters"); + + memset(stream, 0, sizeof(struct zlib_stream)); + /* Return session to mempool */ + rte_mempool_put(internals->mp, stream); + return ret; + } + + return 0; +} + +/** Configure private xform */ +static int +zlib_pmd_private_xform_create(struct rte_compressdev *dev, + const struct rte_comp_xform *xform, + void **private_xform) +{ + return zlib_pmd_stream_create(dev, xform, private_xform); +} + +/** Clear the memory of stream so it doesn't leave key material behind */ +static int +zlib_pmd_stream_free(__rte_unused struct rte_compressdev *dev, + void *zstream) +{ + struct zlib_stream *stream = (struct zlib_stream *)zstream; + if (!stream) + return -EINVAL; + + stream->free(&stream->strm); + /* Zero out the whole structure */ + memset(stream, 0, sizeof(struct zlib_stream)); + struct rte_mempool *mp = rte_mempool_from_obj(stream); + rte_mempool_put(mp, stream); + + return 0; +} + +/** Clear the memory of stream so it doesn't leave key material behind */ +static int +zlib_pmd_private_xform_free(struct rte_compressdev *dev, + void *private_xform) +{ + return zlib_pmd_stream_free(dev, private_xform); +} + struct rte_compressdev_ops zlib_pmd_ops = { .dev_configure = zlib_pmd_config, .dev_start = zlib_pmd_start, @@ -227,8 +297,8 @@ struct rte_compressdev_ops zlib_pmd_ops = { .queue_pair_setup = zlib_pmd_qp_setup, .queue_pair_release = zlib_pmd_qp_release, - .private_xform_create = NULL, - .private_xform_free = NULL, + .private_xform_create = zlib_pmd_private_xform_create, + .private_xform_free = zlib_pmd_private_xform_free, .stream_create = NULL, .stream_free = NULL diff --git a/drivers/compress/zlib/zlib_pmd_private.h b/drivers/compress/zlib/zlib_pmd_private.h index 0e391a4..2c6e83d 100644 --- a/drivers/compress/zlib/zlib_pmd_private.h +++ b/drivers/compress/zlib/zlib_pmd_private.h @@ -61,6 +61,10 @@ struct zlib_priv_xform { struct zlib_stream stream; } __rte_cache_aligned; +int +zlib_set_stream_parameters(const struct rte_comp_xform *xform, + struct zlib_stream *stream); + /** Device specific operations function pointer structure */ extern struct rte_compressdev_ops *rte_zlib_pmd_ops;