From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B7BD7A0524 for ; Thu, 4 Feb 2021 14:13:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE3562406B0; Thu, 4 Feb 2021 14:13:05 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id DCDCA2406AC for ; Thu, 4 Feb 2021 14:13:03 +0100 (CET) Received: from mail-qv1-f72.google.com ([209.85.219.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7eRT-0005MO-J2 for stable@dpdk.org; Thu, 04 Feb 2021 13:13:03 +0000 Received: by mail-qv1-f72.google.com with SMTP id a12so2139337qvo.3 for ; Thu, 04 Feb 2021 05:13:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=4UOqYZmFBuUdJfSA57PcI7zTwBZmLpf/YStXOF3dWD8=; b=o1SYQ9T3aqEJYo1gt+2QfgZzhMu092mzBikGjf5GhtvH3xoiFp+xYaEZMQydlM443J FZMSoQSvgmoaHSIyb0hGy9+03D1Pd+xkWvIvnRvaAxfxVtM2AtOntlHPiolM42faOXCh kRue7mzL5Myipo9lpIiwJ8X4DceddlG9WBUfeFIcjJrjBLLPWL9hUyPcpLD5HM5jrFRU dgN5yDFrpL42GU+PWZLsXBPO94rt0OHqmXb3nKd8SAKGvg5XK/Jjxf4MtcW6yIjN8dnt Ifqpmo17fdsa1DsDbCAwGSWopJ3C6UYQevWRLg5epZ6RN/9M1vcQ0jeJv+msBpJWAvCa 51dA== X-Gm-Message-State: AOAM533/wQwJwII24Xanz+j3KOWqGAL3CSF/0rGzwyqULYM9YmUfEqzc lU0J5qcd7shyS07KwwKboLEoZhcJsnhIyAi1g4V5j/zjFtH8ziqc3b4WpAEbNhGWGYEUjflpIFJ 5pWfvXO6uePtXoUVFQxzX+3gsJ/a3K40IsvOJG7Zt X-Received: by 2002:ae9:eb95:: with SMTP id b143mr7409232qkg.442.1612444382514; Thu, 04 Feb 2021 05:13:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3t9M6LFP0JE9qfIaO7Hs0PycdIxtWXLOHGBBFif7SpiaGArP0E9bo5YCMh62PgemcqaMTkSIuJPzeqjWHL10= X-Received: by 2002:ae9:eb95:: with SMTP id b143mr7409204qkg.442.1612444382237; Thu, 04 Feb 2021 05:13:02 -0800 (PST) MIME-Version: 1.0 References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> <20210204112954.2488123-8-christian.ehrhardt@canonical.com> In-Reply-To: From: Christian Ehrhardt Date: Thu, 4 Feb 2021 14:12:36 +0100 Message-ID: To: "Zhang, Roy Fan" Cc: "Yigit, Ferruh" , dpdk stable Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-stable] patch 'app/crypto-perf: remove always true condition' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Thu, Feb 4, 2021 at 2:01 PM Zhang, Roy Fan wrote: > > Hi Christian, > > The queued change looks good. So do you think we need a patch on master to change this too? Hi, as you can derive from > > [ upstream commit 427ec3b7285d8e8b939f7e5db4976476c931c005 ] This already is on upstream/main branch as: http://git.dpdk.org/dpdk/commit/?id=427ec3b7285d8e8b939f7e5db4976476c931c005 All these mails are about patches that are on the main branch and do not contain "new code" but only "backported fixes". Therefore the answer will always be "it already is there". > Regards, > Fan > > > -----Original Message----- > > From: Christian Ehrhardt > > Sent: Thursday, February 4, 2021 11:28 AM > > To: Yigit, Ferruh > > Cc: Zhang, Roy Fan ; dpdk stable > > > > Subject: patch 'app/crypto-perf: remove always true condition' has been > > queued to stable release 19.11.7 > > > > Hi, > > > > FYI, your patch has been queued to stable release 19.11.7 > > > > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > > It will be pushed if I get no objections before 02/06/21. So please > > shout if anyone has objections. > > > > Also note that after the patch there's a diff of the upstream commit vs the > > patch applied to the branch. This will indicate if there was any rebasing > > needed to apply to the stable branch. If there were code changes for > > rebasing > > (ie: not only metadata diffs), please double check that the rebase was > > correctly done. > > > > Queued patches are on a temporary branch at: > > https://github.com/cpaelzer/dpdk-stable-queue > > > > This queued commit can be viewed at: > > https://github.com/cpaelzer/dpdk-stable- > > queue/commit/6c0a0f5e578eb67c9947d237eb5445f2c32511f8 > > > > Thanks. > > > > Christian Ehrhardt > > > > --- > > From 6c0a0f5e578eb67c9947d237eb5445f2c32511f8 Mon Sep 17 00:00:00 > > 2001 > > From: Ferruh Yigit > > Date: Thu, 19 Nov 2020 11:58:59 +0000 > > Subject: [PATCH] app/crypto-perf: remove always true condition > > > > [ upstream commit 427ec3b7285d8e8b939f7e5db4976476c931c005 ] > > > > This is already 'else' leg of the opposite comparison, simple 'else' > > will be logically same. > > > > Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test > > application") > > > > Signed-off-by: Ferruh Yigit > > Acked-by: Fan Zhang > > --- > > app/test-crypto-perf/main.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c > > index 7bb286ccbe..b065ab2acb 100644 > > --- a/app/test-crypto-perf/main.c > > +++ b/app/test-crypto-perf/main.c > > @@ -380,7 +380,7 @@ cperf_check_test_vector(struct cperf_options *opts, > > if (opts->cipher_algo == RTE_CRYPTO_CIPHER_NULL) { > > if (test_vec->plaintext.data == NULL) > > return -1; > > - } else if (opts->cipher_algo != RTE_CRYPTO_CIPHER_NULL) { > > + } else { > > if (test_vec->plaintext.data == NULL) > > return -1; > > if (test_vec->plaintext.length < opts- > > >max_buffer_size) > > @@ -430,7 +430,7 @@ cperf_check_test_vector(struct cperf_options *opts, > > return -1; > > if (test_vec->plaintext.length < opts- > > >max_buffer_size) > > return -1; > > - } else if (opts->cipher_algo != RTE_CRYPTO_CIPHER_NULL) { > > + } else { > > if (test_vec->plaintext.data == NULL) > > return -1; > > if (test_vec->plaintext.length < opts- > > >max_buffer_size) > > -- > > 2.30.0 > > > > --- > > Diff of the applied patch vs upstream commit (please double-check if non- > > empty: > > --- > > --- - 2021-02-04 12:04:28.540974655 +0100 > > +++ 0008-app-crypto-perf-remove-always-true-condition.patch 2021- > > 02-04 12:04:27.802789508 +0100 > > @@ -1 +1 @@ > > -From 427ec3b7285d8e8b939f7e5db4976476c931c005 Mon Sep 17 00:00:00 > > 2001 > > +From 6c0a0f5e578eb67c9947d237eb5445f2c32511f8 Mon Sep 17 00:00:00 > > 2001 > > @@ -5,0 +6,2 @@ > > +[ upstream commit 427ec3b7285d8e8b939f7e5db4976476c931c005 ] > > + > > @@ -10 +11,0 @@ > > -Cc: stable@dpdk.org > > @@ -19 +20 @@ > > -index 5f035519c3..99f86e9019 100644 > > +index 7bb286ccbe..b065ab2acb 100644 > > @@ -22 +23 @@ > > -@@ -390,7 +390,7 @@ cperf_check_test_vector(struct cperf_options *opts, > > +@@ -380,7 +380,7 @@ cperf_check_test_vector(struct cperf_options *opts, > > @@ -31 +32 @@ > > -@@ -440,7 +440,7 @@ cperf_check_test_vector(struct cperf_options *opts, > > +@@ -430,7 +430,7 @@ cperf_check_test_vector(struct cperf_options *opts, -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd