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 D82B7A0524 for ; Fri, 5 Feb 2021 12:36:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D1EF3188A3B; Fri, 5 Feb 2021 12:36:49 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 4DBBF18892B for ; Fri, 5 Feb 2021 12:36:49 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id g10so7355850wrx.1 for ; Fri, 05 Feb 2021 03:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gpZkkynsMam569bIfLxGaNPD0K6SVm6WQ7w7ngm0HJU=; b=KX7MLa3212kJq8HNcmY+aJqnp20fNOhGkALaMtMJC3yPPWZeilbm9Uc1UMDBpi2WPa PCrvo3F/f97oBZimx9rxmqKC7eB+/m8BCTKAkfCj/Jr8cSNjUTQhABR8YNgJjWUhmehm 3n2D1jfQiBpW61+Vfl73fCu+qJe1fW9OTOMdgvCA3Po4VNiWwtJCbu8zvdo8Kpq9VvKi Rn1PghGInQ3T045hTUkJQdOW9je6kMycC9RZlTMnIXxGeZbrYKwOpHLDq4GettWCUAXd iCT/jlz34IWev35v3M29SkLbOaYWbliqaFLMzxVgbAtiJMKzEv2dA5kLHCYHsrUK73Dz bMAw== 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:mime-version:content-transfer-encoding; bh=gpZkkynsMam569bIfLxGaNPD0K6SVm6WQ7w7ngm0HJU=; b=ulsksuTqMBe9y7++DLLHdIVtbtN6AASvdae4aL2yos8mnOu1E+N/uyJABwPx0EQBoK fAvNvSQ2q/RMD5E+IaBQbNxIZID9kmYdKao2EjAgGMYWAUmMOLY+m521aDzwKVd7vSsX qVibyS5WLE+7HytqMmrHVVzYl5XGY8NB2QfEzh6iNPFvG27x552iGYQdqT/8+Ace69+G lQTyidL9P7Pzuk32R0zvrulc/UHTSEqmp9Xjf6c+WGaKpsr7W6LlJWG5nbmzguMsZFWB ELmh2JHWdmbao1GC31mrR2ZyP691rPvpeBIerIJnr/B0aw+2Ae6S9FhvsktCqHQU7TS8 d2ew== X-Gm-Message-State: AOAM531yj6wnSY0lKBvWW4DfWO/svYhAvOgmlJUpwRiGgt19Z3ptqsGD xfY5ehw6dqNSfQtD6AwIqvI= X-Google-Smtp-Source: ABdhPJxZq8WDs+sRw8jUX4wOslVqG7PSaeBFLmZCsrsGAu44Zs8gaJVeNuPankfUy74CgN4v5I2UiQ== X-Received: by 2002:a05:6000:22a:: with SMTP id l10mr4696158wrz.131.1612525009121; Fri, 05 Feb 2021 03:36:49 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b13sm11524291wrt.31.2021.02.05.03.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:36:48 -0800 (PST) From: luca.boccassi@gmail.com To: Gagandeep Singh Cc: Akhil Goyal , dpdk stable Date: Fri, 5 Feb 2021 11:18:23 +0000 Message-Id: <20210205111920.1272063-217-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/ipsec: fix result code for not supported' has been queued to stable release 20.11.1 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" Hi, FYI, your patch has been queued to stable release 20.11.1 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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4b22a80a0286c74425d3211a4301714b930a62f6 Thanks. Luca Boccassi --- >From 4b22a80a0286c74425d3211a4301714b930a62f6 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Mon, 25 Jan 2021 16:15:33 +0800 Subject: [PATCH] test/ipsec: fix result code for not supported [ upstream commit 8dda080a0938e527c95ace0f3203a239edec48f5 ] During SA creation, if the required algorithm is not supported, drivers can return ENOTSUP. But in most of the IPsec test cases, if the SA creation does not success, it just returns TEST_FAILED. This patch fixes this issue by returning the actual return values from the driver to the application, so that it can make decisions whether the test case is passed, failed or unsupported. Fixes: 05fe65eb66b2 ("test/ipsec: introduce functional test") Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal --- app/test/test_ipsec.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c index 9ad07a1790..d18220a885 100644 --- a/app/test/test_ipsec.c +++ b/app/test/test_ipsec.c @@ -744,7 +744,7 @@ create_sa(enum rte_security_session_action_type action_type, ut->ss[j].type = action_type; rc = create_session(ut, &ts->qp_conf, ts->valid_dev, j); if (rc != 0) - return TEST_FAILED; + return rc; rc = rte_ipsec_sa_init(ut->ss[j].sa, &ut->sa_prm, sz); rc = (rc > 0 && (uint32_t)rc <= sz) ? 0 : -EINVAL; @@ -1247,7 +1247,7 @@ test_ipsec_crypto_inb_burst_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate test mbuf data */ @@ -1349,7 +1349,7 @@ test_ipsec_crypto_outb_burst_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate input mbuf data */ @@ -1458,7 +1458,7 @@ test_ipsec_inline_crypto_inb_burst_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate inbound mbuf data */ @@ -1536,7 +1536,7 @@ test_ipsec_inline_proto_inb_burst_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate inbound mbuf data */ @@ -1644,7 +1644,7 @@ test_ipsec_inline_crypto_outb_burst_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate test mbuf data */ @@ -1722,7 +1722,7 @@ test_ipsec_inline_proto_outb_burst_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate test mbuf data */ @@ -1798,7 +1798,7 @@ test_ipsec_lksd_proto_inb_burst_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate test mbuf data */ @@ -1911,7 +1911,7 @@ test_ipsec_replay_inb_inside_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate inbound mbuf data */ @@ -2004,7 +2004,7 @@ test_ipsec_replay_inb_outside_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate test mbuf data */ @@ -2104,7 +2104,7 @@ test_ipsec_replay_inb_repeat_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate test mbuf data */ @@ -2205,7 +2205,7 @@ test_ipsec_replay_inb_inside_burst_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* Generate inbound mbuf data */ @@ -2338,7 +2338,7 @@ test_ipsec_crypto_inb_burst_2sa_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa 0 failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* create second rte_ipsec_sa */ @@ -2348,7 +2348,7 @@ test_ipsec_crypto_inb_burst_2sa_null_null(int i) if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa 1 failed, cfg %d\n", i); destroy_sa(0); - return TEST_FAILED; + return rc; } /* Generate test mbuf data */ @@ -2424,7 +2424,7 @@ test_ipsec_crypto_inb_burst_2sa_4grp_null_null(int i) test_cfg[i].replay_win_sz, test_cfg[i].flags, 0); if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa 0 failed, cfg %d\n", i); - return TEST_FAILED; + return rc; } /* create second rte_ipsec_sa */ @@ -2434,7 +2434,7 @@ test_ipsec_crypto_inb_burst_2sa_4grp_null_null(int i) if (rc != 0) { RTE_LOG(ERR, USER1, "create_sa 1 failed, cfg %d\n", i); destroy_sa(0); - return TEST_FAILED; + return rc; } /* Generate test mbuf data */ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:38.771083063 +0000 +++ 0217-test-ipsec-fix-result-code-for-not-supported.patch 2021-02-05 11:18:29.174698119 +0000 @@ -1 +1 @@ -From 8dda080a0938e527c95ace0f3203a239edec48f5 Mon Sep 17 00:00:00 2001 +From 4b22a80a0286c74425d3211a4301714b930a62f6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8dda080a0938e527c95ace0f3203a239edec48f5 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org