[dpdk-stable] patch 'app/crypto-perf: remove always true condition' has been queued to stable release 19.11.7

[Christian Ehrhardt]

On Thu, Feb 4, 2021 at 2:01 PM Zhang, Roy Fan <roy.fan.zhang at intel.com> 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 <christian.ehrhardt at canonical.com>
> > Sent: Thursday, February 4, 2021 11:28 AM
> > To: Yigit, Ferruh <ferruh.yigit at intel.com>
> > Cc: Zhang, Roy Fan <roy.fan.zhang at intel.com>; dpdk stable
> > <stable at dpdk.org>
> > 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 <christian.ehrhardt at canonical.com>
> >
> > ---
> > From 6c0a0f5e578eb67c9947d237eb5445f2c32511f8 Mon Sep 17 00:00:00
> > 2001
> > From: Ferruh Yigit <ferruh.yigit at intel.com>
> > 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 <ferruh.yigit at intel.com>
> > Acked-by: Fan Zhang <roy.fan.zhang at intel.com>
> > ---
> >  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 at 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