From patchwork Tue Oct 24 11:00:04 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: 116941 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5664651qgn; Tue, 24 Oct 2017 04:02:08 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Rjl2TCV/cuGNMXsUiZk/XPACSMfeLQRA2MvEVx5+lc+wLBKJKQ53JekvhnjInz2dXaQi2a X-Received: by 10.55.195.11 with SMTP id a11mr22058872qkj.222.1508842928138; Tue, 24 Oct 2017 04:02:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508842928; cv=none; d=google.com; s=arc-20160816; b=w4n9vA68cBSATq84Oo3Nf/7GYjicMRMHJQVfhjx+uImvbqrvGlCQbGXdxKRryCqfoD HtkHd5jF/ta6kURa9tOgj+4TVYWm31wDHzyW6bOLBmFcuuJjr3Io4e5WB0p+gOTvJdYl R7f17OiqTp7Zt/eEL+yiqHD0sPdljbITD8V9REH1ywkwCaj51QKUKj5K0Rc0c/0GYvst P1UYktI1f9QPEevqoG9ystM/u+jnRXCdzl3YzfbMKiYM9khqHioPE+z2KFayOjVWErVn aaUsci2MQcoIZgz6A4q7HOxcpaBNglt2uT5mw106emd26LsWKdERrL34Pv1PVhhRNJtz T6pg== 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=G2IoDO98ESTKohHSsQj9bkw2NCYZWJ4KaB2TDBor1NU=; b=eehvY/CcmiGHDfQGEwfD9TXYEOFcjkusmMMM0WsFPvBnxJoPreG+JmYy1nyXB1wcnA S090yLRqRNKXamUMyb3UgQ8qv2UYsZ3bjfQ+/kQHlsEYojTkndt3KHEbxk+2dkKdZB9V Y8GfjwTGCu3H0Rd8Nu+fmV9tvtW5U+azJ0QKYEdrfRfbBTvgkDWK5xNP2xfc9vJIEcIs nzGYXNGxluD5cGeOXFTEp1ysp7ZPxlJtGO96O3I+uVD4/8D8RCt6t2JK0xKMv0Y6k+hS UOVN8Nqcuxxxl7Xr1ZJH6i17CoK5bgDMxnz5suvszuqkk5VmWZgDrwcagnoGDADkjsSv spOQ== 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 q128si13194qkb.335.2017.10.24.04.02.07; Tue, 24 Oct 2017 04:02:08 -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 D0E12628B4; Tue, 24 Oct 2017 11:02:07 +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 A28FD628C0; Tue, 24 Oct 2017 11:00:50 +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 3815E628B4; Tue, 24 Oct 2017 11:00:36 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 7CBE4622CF for ; Tue, 24 Oct 2017 11:00:29 +0000 (UTC) Received: from mxback8j.mail.yandex.net (mxback8j.mail.yandex.net [IPv6:2a02:6b8:0:1619::111]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 010A756023E3 for ; Tue, 24 Oct 2017 14:00:28 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback8j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id czKHaxeKtz-0RiKq6sE; Tue, 24 Oct 2017 14:00:27 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id hdAvnRHsih-0RPCSZXp; Tue, 24 Oct 2017 14:00:27 +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: Tue, 24 Oct 2017 14:00:04 +0300 Message-Id: <1508842806-17934-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508842806-17934-1-git-send-email-odpbot@yandex.ru> References: <1508842806-17934-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 256 Subject: [lng-odp] [PATCH API-NEXT v1 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: 1bab6bb255422c8eb061c6482397eb498fc7b1cc **/ include/odp/api/spec/ipsec.h | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/include/odp/api/spec/ipsec.h b/include/odp/api/spec/ipsec.h index 26e852fca..f550b6bac 100644 --- a/include/odp/api/spec/ipsec.h +++ b/include/odp/api/spec/ipsec.h @@ -842,11 +842,12 @@ odp_ipsec_sa_t odp_ipsec_sa_create(const odp_ipsec_sa_param_t *param); * the SA and be processed successfully. * * 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 + * to destroy the SA. In asynchronous mode, the same is indicated by a packet + * event sent to the queue specified for the SA having sa_disabled error bit + * set. 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. + * events) have been enqueued before it. The will be no more packets coming + * from SA queue. * * @param sa IPSEC SA to be disabled * @@ -914,6 +915,8 @@ typedef struct odp_ipsec_error_t { /** Hard lifetime expired: packets */ uint32_t hard_exp_packets : 1; + + uint32_t sa_disabled : 1; }; /** All error bits @@ -927,7 +930,12 @@ 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 can be reported either as + * a part of packet result or via separate ODP status event. + */ typedef struct odp_ipsec_warn_t { /** IPSEC warnings */ union { @@ -1133,15 +1141,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 +1151,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 +1165,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 +1461,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 Tue Oct 24 11: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: 116939 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5663715qgn; Tue, 24 Oct 2017 04:01:23 -0700 (PDT) X-Google-Smtp-Source: ABhQp+R6EfJvPR0UAiQ/592Q0Fvp/jqVaVxL9A2QHNrvTsEMt1swJOj1YbTcBXj7BgKEAfZl2boQ X-Received: by 10.55.82.86 with SMTP id g83mr22744066qkb.342.1508842883787; Tue, 24 Oct 2017 04:01:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508842883; cv=none; d=google.com; s=arc-20160816; b=fY1VAMD+1WKBbcCX4AtArYAf/h9aw2X1Hw247kODX/GOcBEJE1R3/MSY4dIwN0ngiP p4r4RyI9MSxfURDq2amaEDRBHh4lgPfrERfIjID0daPkDkkmxilx8MbHnE93Jb1TfAVQ zuPobMQAmZVf1tPydzZmydGoMJsOqNgVWIvEgkQPhwvG/XNr1LaTQVuWvYaoF3dyI3nk 4l4PulLcOLV1GygCd27+vSbDx/kkVWweKrU3z7KzvEsgIMgLgY2eQSZPD8ISIihLe6Kc aVUlx18NKEcJ3OkEVNZJxmE/hEEVN5EwaL6YN3r5K7aM1j6IYkl9tG2pIqBkUJ1yaYlM tzWQ== 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=rg/rsJ6OZay3rQjK8ygXQtJj0nQpQzR7wDPsf8Fhd3o=; b=Opm8//K7cft8D7oi9VsiWhxnHkTtetWkZo5fuYoNbsmlp7mCqtmunhsh/FtR79BmWs xE7yp6vCr8Pp+1/hFs9D9Qwsvy9Cru/Tyase13XBQQq19L0ACVRL5F/B78rqK3IuiAwA R7mf1BD/eRkVauQeJzFdtk1ajGNMRI99hrqRHa8ArxxeA4qiruL7mvbPIJxZV3Pzu5sf eS8+WiZqjR1z5MmiKJ8BI9FRH3U6/NQ6eO9ejbI4+NcYjbOKofeh3nAeXqDXE0WkOWB3 nsj5YDQ7seuVv9oqFjxgaUJCW2BZr4RhyWQuGdYXZUgCEUPItR41X1Jl5Yz9t3RuHOGs 9IHA== 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 i127si18890qkf.196.2017.10.24.04.01.23; Tue, 24 Oct 2017 04:01:23 -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 6FD95622CF; Tue, 24 Oct 2017 11:01:23 +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_H4, 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 53C476286B; Tue, 24 Oct 2017 11:00:45 +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 E244B622D5; Tue, 24 Oct 2017 11:00:33 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 2A682622D5 for ; Tue, 24 Oct 2017 11:00:32 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 8C1235D81A25 for ; Tue, 24 Oct 2017 14:00:30 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id i5bx5C64tv-0U9q4jKf; Tue, 24 Oct 2017 14:00:30 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id hdAvnRHsih-0TPCCNEj; Tue, 24 Oct 2017 14:00:29 +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: Tue, 24 Oct 2017 14:00:05 +0300 Message-Id: <1508842806-17934-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508842806-17934-1-git-send-email-odpbot@yandex.ru> References: <1508842806-17934-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 256 Subject: [lng-odp] [PATCH API-NEXT v1 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: 1bab6bb255422c8eb061c6482397eb498fc7b1cc **/ 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 Tue Oct 24 11: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: 116942 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5665522qgn; Tue, 24 Oct 2017 04:02:51 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SkB0+K6FKQxVKCYKByan+h7vzMbYLnFLzvxIFDzfJKxsFYi9jtsYp5qFH07vgTw8+fOO+H X-Received: by 10.55.215.22 with SMTP id m22mr23392697qki.64.1508842970570; Tue, 24 Oct 2017 04:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508842970; cv=none; d=google.com; s=arc-20160816; b=PE/qSB274dQdwNGJUK0rJt3bfElCptjAb1XST/JN1/2ipZnuRrE6o7nc/W/AHI2gCV VARPHbNqoM2iDrZWc5v3/Qc/jP56QQvkW8GhWBn76e0JDDW/IQiBzOuQidW66pM+Srfn Eet3rU48AaL3srXRsWyvTYNsnwCxsI+R903IiQusGHEl13rF7s+F63vy9SFMf2yr6gDW xeGH0RFWKgqCUi1+Fpl6WGDe+KCx823g10UFDQnAGLTDALO1Nm7eC9BtlsPcBBGs5mDy Up0DRSYU7+TbeivdbYKK6DAWv3R19SxzB9ygOx3mMR4p9DtneyYNu9oiiVYZqnZDis71 uuzA== 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=nUWKwN4Q6BMv5yZneGyCzn3Xy6tq7H1t0LOzqKd+OKE=; b=HwBzc5lX88rXST/HBZ93pAvMG4X54T1UAwZCOEqxJOROxZbQuiNuSEg/HdJ6GcKEqL JaJBSDpvGgFlyKM9Ecc9MTdHb3z9mejfEBI0b/cDT2vWEoWYWRXmmLSCuGjZLUoCfTt9 Moq/Hc6v/2OTuPxiOKohvExy0LHafojSlv1P9Ic5+E168+wjI0Wo63Om2ZeweIHew/GY 55ZZd7kY9aZA8ZRg0gyHBXL9zCpYdjo66g0A3vrtIbRJ2Aqr3WL90mxOYgLO6o83wDLQ FC8tu2OSS127cf5xOqR9sx5POufFLZU4iBYRVhyy0yGtwXtG8in9Q3UoEyv7NH6dzV5K 0wgA== 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 q1si16167qkq.313.2017.10.24.04.02.50; Tue, 24 Oct 2017 04:02:50 -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 1A358628DE; Tue, 24 Oct 2017 11:02:50 +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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 CB4B5628C4; Tue, 24 Oct 2017 11: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 3C846628AC; Tue, 24 Oct 2017 11:00:38 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 867EB6204C for ; Tue, 24 Oct 2017 11:00:33 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 167A62184FEF for ; Tue, 24 Oct 2017 14:00:32 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id MwcW0nBA56-0VXSH71N; Tue, 24 Oct 2017 14:00:32 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id hdAvnRHsih-0VPSgk7p; Tue, 24 Oct 2017 14: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: Tue, 24 Oct 2017 14:00:06 +0300 Message-Id: <1508842806-17934-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508842806-17934-1-git-send-email-odpbot@yandex.ru> References: <1508842806-17934-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 256 Subject: [lng-odp] [PATCH API-NEXT v1 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: 1bab6bb255422c8eb061c6482397eb498fc7b1cc **/ .../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; }