From patchwork Wed Oct 25 09:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 117025 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp606580qgn; Wed, 25 Oct 2017 02:02:18 -0700 (PDT) X-Google-Smtp-Source: ABhQp+REfMBSF4GIpEs2AUMUnDYI09WZuIlgrnPjNrzcWV95Ps/6VffhGMVEw5xmrB53Y1dFsjia X-Received: by 10.55.165.82 with SMTP id o79mr1945379qke.198.1508922138570; Wed, 25 Oct 2017 02:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508922138; cv=none; d=google.com; s=arc-20160816; b=jaAM36mWcquyyUK51W80K70SycHj5qCv0wsNz5Y9cvTxpOeMSjP8o1An8VXjwp9B/c Z8MtcQnxxYyNQZklIRB87V1YpfpZd5Gnp93DIqB75Vc1daE338xp9L5Zt04k3ss26rAt ISBF3a//VrjXT1HP8UlrOvN9mzAIXONFZpwFwOH1bWbxH6v/I/MbX4q0hLqAsNUfKSPV hYkFYgl9pONUvOhoxv+AmGquFvPFmNmvfU8SNSK4DEXwHZrUSG47+YGKgb/NaL11OSXc u6XPLfnh3WluG7uZD/zTBa7tVqlwR0IE4rHGP7MH6CWL1RzzgWazzxqsn6pPUmW1UaaO O+eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=swUUyq2GMd1X7cz9ncefnNgkRQb2+4oW7Fl3QUGkRE4=; b=NdCy2MQW2Juy6oZKRb7GbD4HbqIkOXJ4UjMtoLECYEf0IjzqrFCdoQfSkzroaPEKCv BAvbZhViEE3k/JJKTyS3EzfTL/ZurIkgVZvFzxEJDU4BaDgsqol5xO2b77TU0eVc0/Kz 784GkxEdT/wf7NDruAd3Md6Xe82Hj2MPWe8aWL6YpX6u34tEro1Cp+dVG9f5ezZNJwjG 3eSKTwZRG+wTX1npj9RLAvNffE/2/lFBQYC5NeItOp09ZUUs9865tm+mABJVzD0CN/B/ s5+s2dD0o0qv4qYGOqSzxWwk3cCJhfA27cWQ9MPZkOPE8XDTHXVsXr/5lRFfqUhEl3DO x+/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id k198si1260864qke.395.2017.10.25.02.02.18; Wed, 25 Oct 2017 02:02:18 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 4A7F761613; Wed, 25 Oct 2017 09:02:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 97ABA62951; Wed, 25 Oct 2017 09:00:53 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 55D4162295; Wed, 25 Oct 2017 09:00:40 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 8D6E561021 for ; Wed, 25 Oct 2017 09:00:33 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 11D691805952 for ; Wed, 25 Oct 2017 12:00:32 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id G57CiHoILe-0VYac0TY; Wed, 25 Oct 2017 12:00:32 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id XHnwxaWkV5-0VfimO4P; Wed, 25 Oct 2017 12:00:31 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 25 Oct 2017 12:00:05 +0300 Message-Id: <1508922007-30582-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508922007-30582-1-git-send-email-odpbot@yandex.ru> References: <1508922007-30582-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 256 Subject: [lng-odp] [PATCH API-NEXT v4 1/3] api: ipsec: rework ODP_IPSEC_SA_DISABLE into packet error X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov According to the discussion on mailing list, most of implementations will not be able to support odp_ipsec_sa_disable() status event directly. Instead they will submit a dummy packet to that SA. Then after receiving this packet after odp_ipsec_result() will detect this packet and will report it as a packet with odp_ipsec_error_t->sa_disabled bit set. Signed-off-by: Dmitry Eremin-Solenikov Cc: Nikhil Agarwal Cc: Balasubramanian Manoharan --- /** Email created from pull request 256 (lumag:ipsec_sa_disable_v2) ** https://github.com/Linaro/odp/pull/256 ** Patch: https://github.com/Linaro/odp/pull/256.patch ** Base sha: 825f75ed8644ef57c5648961e7982daf13cd9375 ** Merge commit sha: ba520d0a3f4c46777c7aedca029e9979a89c69e7 **/ include/odp/api/spec/ipsec.h | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 26e852fca..b9ad282ce 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -843,10 +843,12 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param); * * When in synchronous operation mode, the call will return when it's possible * to destroy the SA. In asynchronous mode, the same is indicated by an - * ODP_EVENT_IPSEC_STATUS event sent to the queue specified for the SA. The - * status event is guaranteed to be the last event for the SA, i.e. all - * in-progress operations have completed and resulting events (including status - * events) have been enqueued before it. + * artificial packet event sent to the queue specified for the SA having + * sa_disabled error bit set in the odp_ipsec_packet_result_t returned by + * odp_ipsec_result(). The packet is guaranteed to be the last event for + * the SA, i.e. all in-progress operations have completed and resulting events + * (including status events) have been enqueued before it. No packets will come + * from SA after this one. * * @param sa IPSEC SA to be disabled * @@ -914,6 +916,12 @@ typedef struct odp_ipsec_error_t { /** Hard lifetime expired: packets */ uint32_t hard_exp_packets : 1; + + /** + * SA is disabled, all packets are processed, it is + * safe to destroy it now. + */ + uint32_t sa_disabled : 1; }; /** All error bits @@ -927,7 +935,13 @@ typedef struct odp_ipsec_error_t { } odp_ipsec_error_t; -/** IPSEC warnings */ +/** + * IPSEC warnings + * + * For outbound SAs in ODP_IPSEC_OP_MODE_INLINE mode warnings can be reported + * only as status events. In all other cases warnings are reported as a part of + * IPsec packet result metadata. + */ typedef struct odp_ipsec_warn_t { /** IPSEC warnings */ union { @@ -1133,15 +1147,6 @@ typedef struct odp_ipsec_packet_result_t { * IPSEC status ID */ typedef enum odp_ipsec_status_id_t { - /** Response to SA disable command - * - * Following status event (odp_ipsec_status_t) fields have valid - * content, other fields must be ignored: - * - sa: The SA that was requested to be disabled - * - result: Operation result - */ - ODP_IPSEC_STATUS_SA_DISABLE = 0, - /** Warning from inline IPSEC processing * * Following status event (odp_ipsec_status_t) fields have valid @@ -1152,7 +1157,7 @@ typedef enum odp_ipsec_status_id_t { * This status event is generated only for outbound SAs in * ODP_IPSEC_OP_MODE_INLINE mode. */ - ODP_IPSEC_STATUS_WARN + ODP_IPSEC_STATUS_WARN = 0 } odp_ipsec_status_id_t; @@ -1166,13 +1171,6 @@ typedef struct odp_ipsec_status_t { /** IPSEC SA that was target of the operation */ odp_ipsec_sa_t sa; - /** Result of the operation - * - * 0: Success - * <0: Failure - */ - int result; - /** Warnings of an ODP_IPSEC_STATUS_WARN status event */ odp_ipsec_warn_t warn; @@ -1469,8 +1467,6 @@ int odp_ipsec_result(odp_ipsec_packet_result_t *result, odp_packet_t packet); * * @retval 0 On success * @retval <0 On failure - * - * @see odp_ipsec_sa_disable() */ int odp_ipsec_status(odp_ipsec_status_t *status, odp_event_t event); From patchwork Wed Oct 25 09:00:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 117024 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp605871qgn; Wed, 25 Oct 2017 02:01:35 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RlnwzKKwMy/JeDflzYjLZ7XVtYEVqKcpdpHj4Ka/JQz44EfConfeuJAjXDo8aedDEMESUc X-Received: by 10.200.24.231 with SMTP id o36mr7806865qtk.91.1508922094972; Wed, 25 Oct 2017 02:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508922094; cv=none; d=google.com; s=arc-20160816; b=XQNK9GNRjB/AvtPgTxn9HP03rmOEJ/Mw9ybRXCKH/4UhNHW1HPb/FwHtpYkTgk8UIu 72EAjBj7WGzDusOJB4Vbn7xn7ADn4KcE0ij0h1+aBg93fZ7vGP8rfGrzA9d5SUnHbRYS N5qMcQTCWz2BydlHzMaD5QDC2gpGRSfVHRPKfj9uLekGdlEhLFgfxaWQnxB/LT5JPdXg VrqpMMWwcraiw5yI1OqHeIJagv610EMPlojhc2akLJ7Ed926ypwdyzHngybW4DPODgFq 6P1tx4XrVks971sMWYwQ90s0kDCur5SEEE8eT82114WxwADhsk40xuWb83ZpDW/B3lxk JIaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=BNM/BEEgdCJq8AlFBupydt+u1+rgAS4r7Qhe9y/wuDg=; b=yEBLg8g+KP/NvNolRBLbrfCagVoCWb8TuVcme8+DuQoLAmbzrxtApJqLcD02Mr38LC 0nHyEPZ6LFjtIt+5Fo/svOBeTYOAmJhpUkF6zhTrhJVMs4iClYR5yUV7cQQyHmapZJji HqkC8iBwgs7cXNd3Xl9N1p76IAcK0e6v1vtTQelcvUpfeIFwx5+IriNHReO87RtZn4yB 5i9HBUPu9YBf41lDRCEgQLHBfBIyU+kBIWtGbjD145vBpKc+XvaFhhkl6ZnDEaInEC1B i9UJVA1R8hfniUE2/QcYJXqWHTk+Rov6xxAoL7I+rga78lkAnVd5oIUFS1AD14p834WB LsHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id w18si1936840qtj.11.2017.10.25.02.01.34; Wed, 25 Oct 2017 02:01:34 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id A2313615AC; Wed, 25 Oct 2017 09:01:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 32BD862875; Wed, 25 Oct 2017 09:00:46 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id F260A6227A; Wed, 25 Oct 2017 09:00:37 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 7F7C961018 for ; Wed, 25 Oct 2017 09:00:35 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward104p.mail.yandex.net (Yandex) with ESMTP id EB607186535 for ; Wed, 25 Oct 2017 12:00:33 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id tmslmfa9f6-0WaSYbia; Wed, 25 Oct 2017 12:00:33 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id XHnwxaWkV5-0Wf0WRkc; Wed, 25 Oct 2017 12:00:32 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 25 Oct 2017 12:00:06 +0300 Message-Id: <1508922007-30582-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508922007-30582-1-git-send-email-odpbot@yandex.ru> References: <1508922007-30582-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 256 Subject: [lng-odp] [PATCH API-NEXT v4 2/3] validation: ipsec: adapt to odp_ipsec_sa_disable() change X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 256 (lumag:ipsec_sa_disable_v2) ** https://github.com/Linaro/odp/pull/256 ** Patch: https://github.com/Linaro/odp/pull/256.patch ** Base sha: 825f75ed8644ef57c5648961e7982daf13cd9375 ** Merge commit sha: ba520d0a3f4c46777c7aedca029e9979a89c69e7 **/ test/validation/api/ipsec/ipsec.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index a8fdf2b14..ea385d2ae 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -315,7 +315,9 @@ void ipsec_sa_param_fill(odp_ipsec_sa_param_t *param, void ipsec_sa_destroy(odp_ipsec_sa_t sa) { odp_event_t event; - odp_ipsec_status_t status; + odp_packet_t packet; + odp_ipsec_packet_result_t result; + odp_event_subtype_t subtype; CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_sa_disable(sa)); @@ -324,14 +326,18 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa) event = odp_queue_deq(suite_context.queue); } while (event == ODP_EVENT_INVALID); - CU_ASSERT_EQUAL(ODP_EVENT_IPSEC_STATUS, odp_event_type(event)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET, + odp_event_types(event, &subtype)); + CU_ASSERT_EQUAL(ODP_EVENT_PACKET_IPSEC, + subtype); - CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_status(&status, event)); + packet = odp_ipsec_packet_from_event(event); - CU_ASSERT_EQUAL(ODP_IPSEC_STATUS_SA_DISABLE, status.id); - CU_ASSERT_EQUAL(sa, status.sa); - CU_ASSERT_EQUAL(0, status.result); - CU_ASSERT_EQUAL(0, status.warn.all); + CU_ASSERT_EQUAL(0, odp_ipsec_result(&result, packet)); + + CU_ASSERT_EQUAL(sa, result.sa); + CU_ASSERT_EQUAL(1, result.status.error.sa_disabled); + CU_ASSERT_EQUAL(0, result.status.warn.all); odp_event_free(event); } From patchwork Wed Oct 25 09:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 117026 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp607762qgn; Wed, 25 Oct 2017 02:03:27 -0700 (PDT) X-Google-Smtp-Source: ABhQp+R4XFjcmYDODoUr5ZOXMfnagb66Rm3uOTuDY6K/VzeS8Imn+dm4NLOjCMDfGmE/3QA7Q2P7 X-Received: by 10.55.221.198 with SMTP id u67mr1970007qku.174.1508922207100; Wed, 25 Oct 2017 02:03:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508922207; cv=none; d=google.com; s=arc-20160816; b=qyAXb4AjqWD6fsvY3UdzRetpqHsl5i2sRbofYn5agi/r1RpuYQ6A+ZRjE2Q526Hyps nIRVi/92axvzjIutPe4TcG7z8L4nZxUmHdeop8ijn8PvQgOOeE/ZJnQ5ix9SCeLFu01I TNX3z1WDeiyG0d7CeE7G1S3vHXN8oFVMADXkCH2MINO3nfaD3L28YcrlGtgxQDt/Ruce sHI8ai7wMbqgGfzzSl4wWMJ1f80c1mR+8eNpgTI8Mo1RvLpvZ+SxDL4eq2T4B15FasTB ORVs1l7nfGaWaaEB1xFksB6CyYhupb2L3osecBdRSWegDuL+wq/zwrbI0Gjc+kp34aGT mV2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=CWaGRk/ZC7e5jhZVflq5h+JLQldsNaSetzclcRfax0U=; b=YTn4T2sCf3r8ocyAEGFmKZhhgM/MiQRVrq7jQdWr+NCO6vzZ7Sa63KzOlnCTvmiwJ1 dvIWrfDTkzc+9yZiTEV0Mpp64A+qjzgXuvzpjn6ur9urYKiRuuEYgDMjukO+S+/53j81 yVUr+ts0C3ovZKfjZLWLcir+2rxlU9tS+rH+iZioNIvbRbLlMyQlf9PR2VOSc1WaB9lP p4Q6NFGdPQeneBgOXom4QNaMjN5feGRn0HcT5hCwFnnLt6+QrV3pFEvzJ1zJ9xGa24IQ Lso6Ieh3R2ppt8MpcsQEsxnZnQT1CJvAiyHUiktAIAt4AJ35It91sufRhpj2pmuSp+so Gsqg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id e125si1614428qkb.113.2017.10.25.02.03.26; Wed, 25 Oct 2017 02:03:27 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id BADD96298E; Wed, 25 Oct 2017 09:03:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id EC3116295C; Wed, 25 Oct 2017 09:00:56 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5C83A62951; Wed, 25 Oct 2017 09:00:49 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 98BC661613 for ; Wed, 25 Oct 2017 09:00:36 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 1F7F05607560 for ; Wed, 25 Oct 2017 12:00:35 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id GWKPdErMzx-0Z1m0IRr; Wed, 25 Oct 2017 12:00:35 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id XHnwxaWkV5-0YfuULEt; Wed, 25 Oct 2017 12:00:34 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 25 Oct 2017 12:00:07 +0300 Message-Id: <1508922007-30582-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508922007-30582-1-git-send-email-odpbot@yandex.ru> References: <1508922007-30582-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 256 Subject: [lng-odp] [PATCH API-NEXT v4 3/3] linux-gen: implement odp_ipsec_sa_disable() changes X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 256 (lumag:ipsec_sa_disable_v2) ** https://github.com/Linaro/odp/pull/256 ** Patch: https://github.com/Linaro/odp/pull/256.patch ** Base sha: 825f75ed8644ef57c5648961e7982daf13cd9375 ** Merge commit sha: ba520d0a3f4c46777c7aedca029e9979a89c69e7 **/ .../linux-generic/include/odp_ipsec_internal.h | 20 +++++++- platform/linux-generic/odp_ipsec.c | 18 ++++---- platform/linux-generic/odp_ipsec_events.c | 54 +++++++++++++++++++++- platform/linux-generic/odp_ipsec_sad.c | 16 ++----- 4 files changed, 84 insertions(+), 24 deletions(-) diff --git a/platform/linux-generic/include/odp_ipsec_internal.h b/platform/linux-generic/include/odp_ipsec_internal.h index 1340ca7bd..09a7ac126 100644 --- a/platform/linux-generic/include/odp_ipsec_internal.h +++ b/platform/linux-generic/include/odp_ipsec_internal.h @@ -74,9 +74,20 @@ void _odp_ipsec_status_free(ipsec_status_t status); int _odp_ipsec_status_send(odp_queue_t queue, odp_ipsec_status_id_t id, odp_ipsec_sa_t sa, - int result, odp_ipsec_warn_t warn); +/** + * @internal Send SA_DISABLED event + * + * Sends the packet notifying application that SA finished all processing and + * is now disabled. + * + * @param queue destination queue + * @param sa SA respective to the operation + */ +int _odp_ipsec_sa_disabled_send(odp_queue_t queue, + odp_ipsec_sa_t sa); + #define IPSEC_MAX_IV_LEN 32 /**< Maximum IV length in bytes */ #define IPSEC_MAX_SALT_LEN 4 /**< Maximum salt length in bytes */ @@ -191,6 +202,13 @@ int _odp_ipsec_sa_update_stats(ipsec_sa_t *ipsec_sa, uint32_t len, int _odp_ipsec_try_inline(odp_packet_t pkt); /** + * Return IPsec result instance connected to the IPsec packet + * + * @param packet packet of ODP_EVENT_PACKET_IPSEC subtype + */ +odp_ipsec_packet_result_t *_odp_ipsec_pkt_result(odp_packet_t packet); + +/** * @} */ diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index e57736c2a..e9bf88c17 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -93,7 +93,7 @@ int odp_ipsec_config(const odp_ipsec_config_t *config) return 0; } -static odp_ipsec_packet_result_t *ipsec_pkt_result(odp_packet_t packet) +odp_ipsec_packet_result_t *_odp_ipsec_pkt_result(odp_packet_t packet) { ODP_ASSERT(ODP_EVENT_PACKET_IPSEC == odp_event_subtype(odp_packet_to_event(packet))); @@ -902,7 +902,7 @@ int odp_ipsec_in(const odp_packet_t pkt_in[], int num_in, _odp_buffer_event_subtype_set(packet_to_buffer(pkt), ODP_EVENT_PACKET_IPSEC); - result = ipsec_pkt_result(pkt); + result = _odp_ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; if (NULL != ipsec_sa) @@ -966,7 +966,7 @@ int odp_ipsec_out(const odp_packet_t pkt_in[], int num_in, _odp_buffer_event_subtype_set(packet_to_buffer(pkt), ODP_EVENT_PACKET_IPSEC); - result = ipsec_pkt_result(pkt); + result = _odp_ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; result->sa = ipsec_sa->ipsec_sa_hdl; @@ -1014,7 +1014,7 @@ int odp_ipsec_in_enq(const odp_packet_t pkt_in[], int num_in, _odp_buffer_event_subtype_set(packet_to_buffer(pkt), ODP_EVENT_PACKET_IPSEC); - result = ipsec_pkt_result(pkt); + result = _odp_ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; if (NULL != ipsec_sa) { @@ -1075,7 +1075,7 @@ int odp_ipsec_out_enq(const odp_packet_t pkt_in[], int num_in, _odp_buffer_event_subtype_set(packet_to_buffer(pkt), ODP_EVENT_PACKET_IPSEC); - result = ipsec_pkt_result(pkt); + result = _odp_ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; result->sa = ipsec_sa->ipsec_sa_hdl; @@ -1115,7 +1115,7 @@ int _odp_ipsec_try_inline(odp_packet_t pkt) _odp_buffer_event_subtype_set(packet_to_buffer(pkt), ODP_EVENT_PACKET_IPSEC); - result = ipsec_pkt_result(pkt); + result = _odp_ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->status = status; result->sa = ipsec_sa->ipsec_sa_hdl; @@ -1192,7 +1192,7 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, _odp_buffer_event_subtype_set(packet_to_buffer(pkt), ODP_EVENT_PACKET_IPSEC); - result = ipsec_pkt_result(pkt); + result = _odp_ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->sa = ipsec_sa->ipsec_sa_hdl; result->status = status; @@ -1217,7 +1217,7 @@ int odp_ipsec_out_inline(const odp_packet_t pkt_in[], int num_in, buf = packet_to_buffer(pkt); _odp_buffer_event_subtype_set(buf, ODP_EVENT_PACKET_IPSEC); - result = ipsec_pkt_result(pkt); + result = _odp_ipsec_pkt_result(pkt); memset(result, 0, sizeof(*result)); result->sa = ipsec_sa->ipsec_sa_hdl; result->status = status; @@ -1246,7 +1246,7 @@ int odp_ipsec_result(odp_ipsec_packet_result_t *result, odp_packet_t packet) ODP_ASSERT(result != NULL); - res = ipsec_pkt_result(packet); + res = _odp_ipsec_pkt_result(packet); /* FIXME: maybe postprocess here, setting alg error in case of crypto * error instead of processing packet fully in ipsec_in/out_single */ diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c index 3a7ebd6e8..3a3a9f5f5 100644 --- a/platform/linux-generic/odp_ipsec_events.c +++ b/platform/linux-generic/odp_ipsec_events.c @@ -6,6 +6,8 @@ #include "config.h" +#include + #include #include @@ -13,6 +15,8 @@ #include #include #include +#include +#include #include typedef struct { @@ -23,6 +27,7 @@ typedef struct { } ipsec_status_hdr_t; static odp_pool_t ipsec_status_pool = ODP_POOL_INVALID; +static odp_pool_t ipsec_sa_disabled_pool = ODP_POOL_INVALID; #define IPSEC_EVENTS_POOL_BUF_COUNT 1024 @@ -43,8 +48,24 @@ int _odp_ipsec_events_init_global(void) goto err_status; } + odp_pool_param_init(¶m); + + param.pkt.seg_len = 16; + param.pkt.len = 16; + param.pkt.num = ODP_CONFIG_IPSEC_SAS; + param.type = ODP_POOL_PACKET; + + ipsec_sa_disabled_pool = odp_pool_create("ipsec_sa_disabled_pool", + ¶m); + if (ODP_POOL_INVALID == ipsec_sa_disabled_pool) { + ODP_ERR("Error: sa_disabled pool create failed.\n"); + goto err_sa_disabled; + } + return 0; +err_sa_disabled: + odp_pool_destroy(ipsec_status_pool); err_status: return -1; } @@ -54,6 +75,12 @@ int _odp_ipsec_events_term_global(void) int ret = 0; int rc = 0; + ret = odp_pool_destroy(ipsec_sa_disabled_pool); + if (ret < 0) { + ODP_ERR("sa_disabled pool destroy failed"); + rc = -1; + } + ret = odp_pool_destroy(ipsec_status_pool); if (ret < 0) { ODP_ERR("status pool destroy failed"); @@ -112,7 +139,6 @@ void _odp_ipsec_status_free(ipsec_status_t status) int _odp_ipsec_status_send(odp_queue_t queue, odp_ipsec_status_id_t id, odp_ipsec_sa_t sa, - int result, odp_ipsec_warn_t warn) { ipsec_status_t ipsec_ev = odp_ipsec_status_alloc(); @@ -125,7 +151,6 @@ int _odp_ipsec_status_send(odp_queue_t queue, status_hdr->status.id = id; status_hdr->status.sa = sa; - status_hdr->status.result = result; status_hdr->status.warn = warn; if (odp_queue_enq(queue, ipsec_status_to_event(ipsec_ev))) { @@ -154,3 +179,28 @@ int odp_ipsec_status(odp_ipsec_status_t *status, odp_event_t event) return 0; } + +int _odp_ipsec_sa_disabled_send(odp_queue_t queue, + odp_ipsec_sa_t sa) +{ + odp_packet_t packet; + odp_ipsec_packet_result_t *result; + + ODP_ASSERT(ODP_POOL_INVALID != ipsec_sa_disabled_pool); + packet = odp_packet_alloc(ipsec_sa_disabled_pool, 0); + ODP_ASSERT(ODP_PACKET_INVALID != packet); + + _odp_buffer_event_subtype_set(packet_to_buffer(packet), + ODP_EVENT_PACKET_IPSEC); + result = _odp_ipsec_pkt_result(packet); + memset(result, 0, sizeof(*result)); + result->status.error.sa_disabled = 1; + result->sa = sa; + + if (odp_queue_enq(queue, odp_ipsec_packet_to_event(packet))) { + odp_packet_free(packet); + return -1; + } + + return 0; +} diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c index f0b5b9e4a..a1eff8849 100644 --- a/platform/linux-generic/odp_ipsec_sad.c +++ b/platform/linux-generic/odp_ipsec_sad.c @@ -171,7 +171,6 @@ void _odp_ipsec_sa_unuse(ipsec_sa_t *ipsec_sa) { odp_queue_t queue; odp_ipsec_sa_t sa; - odp_ipsec_warn_t warn = { .all = 0 }; ODP_ASSERT(NULL != ipsec_sa); @@ -179,9 +178,7 @@ void _odp_ipsec_sa_unuse(ipsec_sa_t *ipsec_sa) sa = ipsec_sa->ipsec_sa_hdl; if (ipsec_sa_unlock(ipsec_sa) && ODP_QUEUE_INVALID != queue) - _odp_ipsec_status_send(queue, - ODP_IPSEC_STATUS_SA_DISABLE, - sa, 0, warn); + _odp_ipsec_sa_disabled_send(queue, sa); } void odp_ipsec_sa_param_init(odp_ipsec_sa_param_t *param) @@ -370,17 +367,12 @@ int odp_ipsec_sa_disable(odp_ipsec_sa_t sa) } if (ODP_QUEUE_INVALID != ipsec_sa->queue) { - odp_ipsec_warn_t warn = { .all = 0 }; - /* - * If there were not active state when we disabled SA, - * send the event. + * If there was no active state when we disabled SA, send the + * event. Otherwise it will be sent by _odp_ipsec_sa_unuse(). */ if (0 == state) - _odp_ipsec_status_send(ipsec_sa->queue, - ODP_IPSEC_STATUS_SA_DISABLE, - ipsec_sa->ipsec_sa_hdl, - 0, warn); + _odp_ipsec_sa_disabled_send(ipsec_sa->queue, sa); return 0; }