From patchwork Mon Dec 11 14:04:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 32076 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4A8751ADD3; Mon, 11 Dec 2017 15:04:15 +0100 (CET) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id D6A7F7CDE for ; Mon, 11 Dec 2017 15:04:12 +0100 (CET) Received: by mail-wr0-f194.google.com with SMTP id x49so17666450wrb.13 for ; Mon, 11 Dec 2017 06:04:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=MqgiRkvdx1za6Fq+K2Ppk9DEHcvBCo+1BjrUqsK0m6A=; b=1whmu+y4+uPZEhq27W9l6iy3AnG16Hk7LNchTs1qZNDsuwwLg8K/XmeBNnUw53CR27 iHLDs0hMDec8IXdwleW9lwFVXWh2/gkIn25tWvdjrHvuAInDTC3gi5PATHcWIx1RUSn7 bInvv/8LnvoqZVBAXJcKrBngmpmzLBNOdjZL3mpetsu9yW/yWmj2LGN6q1bCRVX1Bz9F ereR/QUwESYCEESKND0m1PmRneDADUSgV3wpoqWDtM0OYVwfmgbxD+b1G6By3AlaHMQl uw4Qv0b7Z829aCZgevNdtCJlkmWsDfsM4NmbsPFX196i1taNGPmcUtwfgyKTVqQIqtxS d3wg== 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:in-reply-to:references; bh=MqgiRkvdx1za6Fq+K2Ppk9DEHcvBCo+1BjrUqsK0m6A=; b=E1+sGaE/VFhxAtRaum/DXRbI75xwn75XLTSLiYpoZp9pRxxpqvzupKUO/X6z4dTrT5 kHAX42gMsTOHaKpAMXNZOH3PmE9JBlf93Q3xNs9bTuHr10fkwWVnPoY9XqxDhDtD6+K3 Mx0S2RfVFD8z/Uh0mnxD/wnK3rsKseTP9H3FMhatHRBWnHxF6+FfqrXZaIdhdnYU70lK VteBYTm/m3ZlZF3p3TDZ/htliyGHwSNJUYqIMk4orumkcnV/gQgrgbv+IcYqRL4Dfaid a3F32dMjgiSrqHakhOo4Q4fzFN+fwndSYjKQ0/U60uzbkKD40PcKpfIXnkw/6ZTCbFS9 m+SQ== X-Gm-Message-State: AKGB3mLkLjlugn8Q6Khmv3PLwSW1R39bR7o0cJ6VG3yVEOHEk9Smm51v ClTjruR9weehRv+jNPPwDks8CrU2+Q== X-Google-Smtp-Source: ACJfBos5OapKr2xvC0yvZvOKpKqPsZTHniohAFN0e4RHz0JLzWqJJ9unAlTeP4rInmYMgcEXlwD1Ow== X-Received: by 10.223.149.6 with SMTP id 6mr502329wrs.112.1513001052492; Mon, 11 Dec 2017 06:04:12 -0800 (PST) Received: from laranjeiro-vm.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id a5sm16551079wra.87.2017.12.11.06.04.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Dec 2017 06:04:11 -0800 (PST) From: Nelio Laranjeiro To: Sergio Gonzalez Monroy , Radu Nicolau , Anoob Joseph Cc: dev@dpdk.org Date: Mon, 11 Dec 2017 15:04:29 +0100 Message-Id: <5d3fdd0c05d5f8afd3f8e38ca03eaf25187d5c98.1513000931.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <89964464de4bf623ba27b88d47af1f1b9e8a64d1.1513000931.git.nelio.laranjeiro@6wind.com> References: <89964464de4bf623ba27b88d47af1f1b9e8a64d1.1513000931.git.nelio.laranjeiro@6wind.com> In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 2/2] examples/ipsec-secgw: add target queues in flow actions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Mellanox INNOVA NIC needs to have final target queue actions to perform inline crypto. Signed-off-by: Nelio Laranjeiro --- Changes in v3: * removed PASSTHRU test for ingress. * removed check on configured queues for the queue action. Changes in v2: * Test the rule by PASSTHRU/RSS/QUEUE and apply the first one validated. --- examples/ipsec-secgw/ipsec.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- examples/ipsec-secgw/ipsec.h | 2 +- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c index 17bd7620d..1b8b251c8 100644 --- a/examples/ipsec-secgw/ipsec.c +++ b/examples/ipsec-secgw/ipsec.c @@ -142,6 +142,7 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa) rte_eth_dev_get_sec_ctx( sa->portid); const struct rte_security_capability *sec_cap; + int ret = 0; sa->sec_session = rte_security_session_create(ctx, &sess_conf, ipsec_ctx->session_pool); @@ -201,15 +202,67 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa) sa->action[0].type = RTE_FLOW_ACTION_TYPE_SECURITY; sa->action[0].conf = sa->sec_session; - sa->action[1].type = RTE_FLOW_ACTION_TYPE_END; - sa->attr.egress = (sa->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS); sa->attr.ingress = (sa->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS); + if (sa->attr.ingress) { + uint8_t rss_key[40]; + struct rte_eth_rss_conf rss_conf = { + .rss_key = rss_key, + .rss_key_len = 40, + }; + struct rte_eth_dev *eth_dev; + union { + struct rte_flow_action_rss rss; + struct { + const struct rte_eth_rss_conf *rss_conf; + uint16_t num; + uint16_t queue[RTE_MAX_QUEUES_PER_PORT]; + } local; + } action_rss; + unsigned int i; + unsigned int j; + + sa->action[2].type = RTE_FLOW_ACTION_TYPE_END; + /* Try RSS. */ + sa->action[1].type = RTE_FLOW_ACTION_TYPE_RSS; + sa->action[1].conf = &action_rss; + eth_dev = ctx->device; + rte_eth_dev_rss_hash_conf_get(sa->portid, + &rss_conf); + for (i = 0, j = 0; + i < eth_dev->data->nb_rx_queues; ++i) + if (eth_dev->data->rx_queues[i]) + action_rss.local.queue[j++] = i; + action_rss.local.num = j; + action_rss.local.rss_conf = &rss_conf; + ret = rte_flow_validate(sa->portid, &sa->attr, + sa->pattern, sa->action, + &err); + if (!ret) + goto flow_create; + /* Try Queue. */ + sa->action[1].type = RTE_FLOW_ACTION_TYPE_QUEUE; + sa->action[1].conf = + &(struct rte_flow_action_queue){ + .index = 0, + }; + ret = rte_flow_validate(sa->portid, &sa->attr, + sa->pattern, sa->action, + &err); + if (ret) + goto flow_create_failure; + } else { + sa->action[1].type = + RTE_FLOW_ACTION_TYPE_PASSTHRU; + sa->action[2].type = RTE_FLOW_ACTION_TYPE_END; + } +flow_create: sa->flow = rte_flow_create(sa->portid, &sa->attr, sa->pattern, sa->action, &err); if (sa->flow == NULL) { +flow_create_failure: RTE_LOG(ERR, IPSEC, "Failed to create ipsec flow msg: %s\n", err.message); diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h index 775b316ff..3c367d392 100644 --- a/examples/ipsec-secgw/ipsec.h +++ b/examples/ipsec-secgw/ipsec.h @@ -133,7 +133,7 @@ struct ipsec_sa { uint32_t ol_flags; #define MAX_RTE_FLOW_PATTERN (4) -#define MAX_RTE_FLOW_ACTIONS (2) +#define MAX_RTE_FLOW_ACTIONS (3) struct rte_flow_item pattern[MAX_RTE_FLOW_PATTERN]; struct rte_flow_action action[MAX_RTE_FLOW_ACTIONS]; struct rte_flow_attr attr;