[dpdk-dev,04/11] lib/librte_net: add ESP header to generic flow steering
Checks
Commit Message
From: Boris Pismenny <borisp@mellanox.com>
The ESP header is required for IPsec crypto actions.
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
---
doc/api/doxy-api-index.md | 1 +
lib/librte_ether/rte_flow.h | 26 ++++++++++++++++++++
lib/librte_net/Makefile | 2 +-
lib/librte_net/rte_esp.h | 60 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 88 insertions(+), 1 deletion(-)
create mode 100644 lib/librte_net/rte_esp.h
Comments
Hi Boris,
On 9/14/2017 1:56 PM, Akhil Goyal wrote:
> From: Boris Pismenny <borisp@mellanox.com>
>
> The ESP header is required for IPsec crypto actions.
>
> Signed-off-by: Boris Pismenny <borisp@mellanox.com>
> Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
> ---
> doc/api/doxy-api-index.md | 1 +
> lib/librte_ether/rte_flow.h | 26 ++++++++++++++++++++
> lib/librte_net/Makefile | 2 +-
> lib/librte_net/rte_esp.h | 60 +++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 88 insertions(+), 1 deletion(-)
> create mode 100644 lib/librte_net/rte_esp.h
>
> diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
> index a3d39fc..23bafbc 100644
> --- a/doc/api/doxy-api-index.md
> +++ b/doc/api/doxy-api-index.md
> @@ -107,6 +107,7 @@ The public API headers are grouped by topics:
> [LPM IPv6 route] (@ref rte_lpm6.h),
> [ACL] (@ref rte_acl.h),
> [EFD] (@ref rte_efd.h)
> + [ESP] (@ref rte_esp.h)
>
> - **QoS**:
> [metering] (@ref rte_meter.h),
> diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
> index bba6169..ea08af6 100644
> --- a/lib/librte_ether/rte_flow.h
> +++ b/lib/librte_ether/rte_flow.h
> @@ -50,6 +50,7 @@
> #include <rte_tcp.h>
> #include <rte_udp.h>
> #include <rte_byteorder.h>
> +#include <rte_esp.h>
>
> #ifdef __cplusplus
> extern "C" {
> @@ -309,6 +310,13 @@ enum rte_flow_item_type {
> * See struct rte_flow_item_fuzzy.
> */
> RTE_FLOW_ITEM_TYPE_FUZZY,
> +
> + /**
> + * Matches a ESP header.
> + *
> + * See struct rte_flow_item_esp.
> + */
> + RTE_FLOW_ITEM_TYPE_ESP,
> };
will you please also add changes for rte_flow documentation in prog_guide?
Hi Hemant,
> On 9/15/2017 07:51 AM, Hemant Agrawal wrote:
> Hi Boris,
>
> On 9/14/2017 1:56 PM, Akhil Goyal wrote:
> > From: Boris Pismenny <borisp@mellanox.com>
> >
> > The ESP header is required for IPsec crypto actions.
> >
>
> > Signed-off-by: Boris Pismenny <borisp@mellanox.com>
> > Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
> > ---
> > doc/api/doxy-api-index.md | 1 +
> > lib/librte_ether/rte_flow.h | 26 ++++++++++++++++++++
> > lib/librte_net/Makefile | 2 +-
> > lib/librte_net/rte_esp.h | 60
> +++++++++++++++++++++++++++++++++++++++++++++
> > 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644
> > lib/librte_net/rte_esp.h
> >
> > diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
> > index a3d39fc..23bafbc 100644
> > --- a/doc/api/doxy-api-index.md
> > +++ b/doc/api/doxy-api-index.md
> > @@ -107,6 +107,7 @@ The public API headers are grouped by topics:
> > [LPM IPv6 route] (@ref rte_lpm6.h),
> > [ACL] (@ref rte_acl.h),
> > [EFD] (@ref rte_efd.h)
> > + [ESP] (@ref rte_esp.h)
> >
> > - **QoS**:
> > [metering] (@ref rte_meter.h),
> > diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
> > index bba6169..ea08af6 100644
> > --- a/lib/librte_ether/rte_flow.h
> > +++ b/lib/librte_ether/rte_flow.h
> > @@ -50,6 +50,7 @@
> > #include <rte_tcp.h>
> > #include <rte_udp.h>
> > #include <rte_byteorder.h>
> > +#include <rte_esp.h>
> >
> > #ifdef __cplusplus
> > extern "C" {
> > @@ -309,6 +310,13 @@ enum rte_flow_item_type {
> > * See struct rte_flow_item_fuzzy.
> > */
> > RTE_FLOW_ITEM_TYPE_FUZZY,
> > +
> > + /**
> > + * Matches a ESP header.
> > + *
> > + * See struct rte_flow_item_esp.
> > + */
> > + RTE_FLOW_ITEM_TYPE_ESP,
> > };
>
> will you please also add changes for rte_flow documentation in prog_guide?
>
Sure, I'll send the patches in the next couple of days.
@@ -107,6 +107,7 @@ The public API headers are grouped by topics:
[LPM IPv6 route] (@ref rte_lpm6.h),
[ACL] (@ref rte_acl.h),
[EFD] (@ref rte_efd.h)
+ [ESP] (@ref rte_esp.h)
- **QoS**:
[metering] (@ref rte_meter.h),
@@ -50,6 +50,7 @@
#include <rte_tcp.h>
#include <rte_udp.h>
#include <rte_byteorder.h>
+#include <rte_esp.h>
#ifdef __cplusplus
extern "C" {
@@ -309,6 +310,13 @@ enum rte_flow_item_type {
* See struct rte_flow_item_fuzzy.
*/
RTE_FLOW_ITEM_TYPE_FUZZY,
+
+ /**
+ * Matches a ESP header.
+ *
+ * See struct rte_flow_item_esp.
+ */
+ RTE_FLOW_ITEM_TYPE_ESP,
};
/**
@@ -735,6 +743,24 @@ static const struct rte_flow_item_fuzzy rte_flow_item_fuzzy_mask = {
#endif
/**
+ * RTE_FLOW_ITEM_TYPE_ESP
+ *
+ * Matches an ESP header.
+ */
+struct rte_flow_item_esp {
+ struct esp_hdr hdr; /**< ESP header definition. */
+};
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_ESP. */
+#ifndef __cplusplus
+static const struct rte_flow_item_esp rte_flow_item_esp_mask = {
+ .hdr = {
+ .spi = 0xffffffff,
+ },
+};
+#endif
+
+/**
* Matching pattern item definition.
*
* A pattern is formed by stacking items starting from the lowest protocol
@@ -42,7 +42,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c
SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c
# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h
+SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h rte_esp.h
SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_sctp.h rte_icmp.h rte_arp.h
SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ether.h rte_gre.h rte_net.h
SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_net_crc.h
new file mode 100644
@@ -0,0 +1,60 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Intel Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTE_ESP_H_
+#define _RTE_ESP_H_
+
+/**
+ * @file
+ *
+ * ESP-related defines
+ */
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * ESP Header
+ */
+struct esp_hdr {
+ uint32_t spi; /**< Security Parameters Index */
+ uint32_t seq; /**< packet sequence number */
+} __attribute__((__packed__));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RTE_ESP_H_ */