From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by dpdk.org (Postfix) with ESMTP id F0C102C36 for ; Sun, 23 Jul 2017 21:08:33 +0200 (CEST) Received: by mail-pg0-f66.google.com with SMTP id s4so9837409pgr.5 for ; Sun, 23 Jul 2017 12:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1xnRwO8lNdRJjXP10xMwMVAiiiQlpTUrtMMYfqMHK8I=; b=zzhN0tsrRKU5FdzWRHYRLlb8MNB4BfbMjXxPpd0aHJfkDeLLmgbl6mUAwnY0U2t/AA 0m9U9TvE7z4f1uJNUTGy7laAuakuTuIxTl1r4ImniTbVADRAnB50dxPY6EAlXtmUNkTF B1TstWxYCRivsiQCupJ3wD0w7KDdCpO+laTqBpp1PXUJ/KIUe867K8ZnRiNGLqqMFRd1 iMoI02R4VCSwI5cCym319jkqgSBmEeNiySFsGM0vH/dPmgo8OuH2B6LZ5Zn/YoVJAZmP q7+v4PKkOqIgLqWM3pGeCKpCwEO65XP9+ybz2rqLMNnWRmvwsrvktSv6NSn4XIqmJUeF A+tw== 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=1xnRwO8lNdRJjXP10xMwMVAiiiQlpTUrtMMYfqMHK8I=; b=rTHxDZHoSu6HhJkC2xzbkycnee9uaDzpNzi8/OpvTpR4IWTydYJrdu7ch45RYIJ9lA D1BEfxGdjDcpNE/yHDf+mQrCuKrNnAEyx54couhTOAreEnzgXFBOe6MS71yLjJ6v38KV QWkvcf9q8FPQ2nS2nlr5eJTctGyuPPqGz7rL0jOts+Ss0gPjzB0/v6+HmFBeFBp+BE/x s1JzW/goeiV+n8+Dcdq1F8E2yB2f9pE0OiYlZ0/doirPBd33jfZod/eOqXHUZHhsU5/h 4HufvXDA3/uWgjrWxWi52KW3g4cIlogLUAOB5N/tHDvYWC6JGK1rV6yuC3MNdiEwEhHp l8mA== X-Gm-Message-State: AIVw110dE4gy99AWkXNRzRoT6ijRpmZRjtS6gmNxZyLiEdyGiF8AsxWz p4Scyk84Ydap4z+I X-Received: by 10.84.210.74 with SMTP id z68mr10116746plh.454.1500836913316; Sun, 23 Jul 2017 12:08:33 -0700 (PDT) Received: from localhost.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id h125sm16827454pfe.178.2017.07.23.12.08.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Jul 2017 12:08:32 -0700 (PDT) From: Yuanhan Liu To: Pablo de Lara Cc: Fan Zhang , dpdk stable Date: Mon, 24 Jul 2017 03:07:32 +0800 Message-Id: <1500836852-3563-7-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500836852-3563-1-git-send-email-yliu@fridaylinux.org> References: <1500836852-3563-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'examples/l2fwd-crypto: fix padding' has been queued to LTS release 16.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Jul 2017 19:08:34 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/27/17. So please shout if anyone has objections. Thanks. --yliu --- >>From db9af4dc38c3bced06ca4cb7a2fa8550071a2a79 Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Thu, 9 Feb 2017 12:27:45 +0000 Subject: [PATCH] examples/l2fwd-crypto: fix padding [ backported from upstream commit 5839fd20e7323850f3a411d9b5642d914fa2d3f0 ] L2fwd-crypto app was padding an incoming buffer, to be aligned with the algorithm block size, in all cases. This was not the right approach, as padding is only necessary when using block cipher algorithms, such as AES-CBC. In case of using a stream cipher algorithm, such as SNOW3G UEA2, there is no need to include padding and increase the buffer size. Fixes: 387259bd6c67 ("examples/l2fwd-crypto: add sample application") Signed-off-by: Pablo de Lara Acked-by: Fan Zhang --- examples/l2fwd-crypto/main.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index 91d2c41..b40c49c 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -432,7 +432,8 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m, struct ether_hdr *eth_hdr; struct ipv4_hdr *ip_hdr; - unsigned ipdata_offset, pad_len, data_len; + uint32_t ipdata_offset, data_len; + uint32_t pad_len = 0; char *padding; eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *); @@ -455,16 +456,32 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m, if (cparams->do_hash && cparams->hash_verify) data_len -= cparams->digest_length; - pad_len = data_len % cparams->block_size ? cparams->block_size - - (data_len % cparams->block_size) : 0; + if (cparams->do_cipher) { + /* + * Following algorithms are block cipher algorithms, + * and might need padding + */ + switch (cparams->cipher_algo) { + case RTE_CRYPTO_CIPHER_AES_CBC: + case RTE_CRYPTO_CIPHER_AES_ECB: + case RTE_CRYPTO_CIPHER_3DES_CBC: + case RTE_CRYPTO_CIPHER_3DES_ECB: + if (data_len % cparams->block_size) + pad_len = cparams->block_size - + (data_len % cparams->block_size); + break; + default: + pad_len = 0; + } - if (pad_len) { - padding = rte_pktmbuf_append(m, pad_len); - if (unlikely(!padding)) - return -1; + if (pad_len) { + padding = rte_pktmbuf_append(m, pad_len); + if (unlikely(!padding)) + return -1; - data_len += pad_len; - memset(padding, 0, pad_len); + data_len += pad_len; + memset(padding, 0, pad_len); + } } /* Set crypto operation data parameters */ -- 2.7.4