patch 'doc: replace code blocks with includes in security guide' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/08/23. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/de8bdca2b3b761a8833de512c695913c54a76fc8

Thanks.

Kevin

---
>From de8bdca2b3b761a8833de512c695913c54a76fc8 Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoobj at marvell.com>
Date: Fri, 18 Aug 2023 14:59:42 +0530
Subject: [PATCH] doc: replace code blocks with includes in security guide

[ upstream commit 03e3cfda1679998aa512464affb8dd293146364a ]

Add literal includes to copy code block while compiling. Having a copy
may lead to mismatch if code is updated without updating the doc.

Fixes: 40ff8c99ea99 ("doc: add details of security library")

Signed-off-by: Anoob Joseph <anoobj at marvell.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 doc/guides/prog_guide/rte_security.rst | 65 +++++---------------------
 lib/security/rte_security.h            |  6 +++
 2 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/doc/guides/prog_guide/rte_security.rst b/doc/guides/prog_guide/rte_security.rst
index 72ca0bd330..8619757e84 100644
--- a/doc/guides/prog_guide/rte_security.rst
+++ b/doc/guides/prog_guide/rte_security.rst
@@ -593,23 +593,8 @@ Security session configuration
 Security Session configuration structure is defined as ``rte_security_session_conf``
 
-.. code-block:: c
-
-    struct rte_security_session_conf {
-        enum rte_security_session_action_type action_type;
-        /**< Type of action to be performed on the session */
-        enum rte_security_session_protocol protocol;
-        /**< Security protocol to be configured */
-        union {
-                struct rte_security_ipsec_xform ipsec;
-                struct rte_security_macsec_xform macsec;
-                struct rte_security_pdcp_xform pdcp;
-                struct rte_security_docsis_xform docsis;
-        };
-        /**< Configuration parameters for security session */
-        struct rte_crypto_sym_xform *crypto_xform;
-        /**< Security Session Crypto Transformations */
-        void *userdata;
-        /**< Application specific userdata to be saved with session */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Structure rte_security_session_conf 8<
+   :end-before: >8 End of structure rte_security_session_conf.
 
 The configuration structure reuses the ``rte_crypto_sym_xform`` struct for crypto related
@@ -618,41 +603,15 @@ session is configured for Lookaside Protocol offload or Inline Crypto or Inline
 Offload.
 
-.. code-block:: c
-
-    enum rte_security_session_action_type {
-        RTE_SECURITY_ACTION_TYPE_NONE,
-        /**< No security actions */
-        RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO,
-        /**< Crypto processing for security protocol is processed inline
-         * during transmission
-         */
-        RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL,
-        /**< All security protocol processing is performed inline during
-         * transmission
-         */
-        RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
-        /**< All security protocol processing including crypto is performed
-         * on a lookaside accelerator
-         */
-        RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO
-        /**< Similar to ACTION_TYPE_NONE but crypto processing for security
-         * protocol is processed synchronously by a CPU.
-         */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Enumeration of rte_security_session_action_type 8<
+   :end-before: >8 End enumeration of rte_security_session_action_type.
 
 The ``rte_security_session_protocol`` is defined as
 
-.. code-block:: c
-
-    enum rte_security_session_protocol {
-        RTE_SECURITY_PROTOCOL_IPSEC = 1,
-        /**< IPsec Protocol */
-        RTE_SECURITY_PROTOCOL_MACSEC,
-        /**< MACSec Protocol */
-        RTE_SECURITY_PROTOCOL_PDCP,
-        /**< PDCP Protocol */
-        RTE_SECURITY_PROTOCOL_DOCSIS,
-        /**< DOCSIS Protocol */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Enumeration of rte_security_session_protocol 8<
+   :end-before: >8 End enumeration of rte_security_session_protocol.
 
 Currently the library defines configuration parameters for IPsec and PDCP only.
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index 1a15e95267..71af1bf3e3 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -454,4 +454,5 @@ struct rte_security_docsis_xform {
  * Security session action type.
  */
+/* Enumeration of rte_security_session_action_type 8<*/
 enum rte_security_session_action_type {
 	RTE_SECURITY_ACTION_TYPE_NONE,
@@ -474,6 +475,8 @@ enum rte_security_session_action_type {
 	 */
 };
+/* >8 End enumeration of rte_security_session_action_type. */
 
 /** Security session protocol definition */
+/* Enumeration of rte_security_session_protocol 8<*/
 enum rte_security_session_protocol {
 	RTE_SECURITY_PROTOCOL_IPSEC = 1,
@@ -486,8 +489,10 @@ enum rte_security_session_protocol {
 	/**< DOCSIS Protocol */
 };
+/* >8 End enumeration of rte_security_session_protocol. */
 
 /**
  * Security session configuration
  */
+/* Structure rte_security_session_conf 8< */
 struct rte_security_session_conf {
 	enum rte_security_session_action_type action_type;
@@ -508,4 +513,5 @@ struct rte_security_session_conf {
 	/**< Application specific userdata to be saved with session */
 };
+/* >8 End of structure rte_security_session_conf. */
 
 struct rte_security_session {
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.561249512 +0000
+++ 0028-doc-replace-code-blocks-with-includes-in-security-gu.patch	2023-11-02 13:09:40.824163371 +0000
@@ -1 +1 @@
-From 03e3cfda1679998aa512464affb8dd293146364a Mon Sep 17 00:00:00 2001
+From de8bdca2b3b761a8833de512c695913c54a76fc8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 03e3cfda1679998aa512464affb8dd293146364a ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 7418e35c1b..ae8b0aaef3 100644
+index 72ca0bd330..8619757e84 100644
@@ -23 +24 @@
-@@ -672,23 +672,8 @@ Security session configuration
+@@ -593,23 +593,8 @@ Security session configuration
@@ -51 +52 @@
-@@ -697,41 +682,15 @@ session is configured for Lookaside Protocol offload or Inline Crypto or Inline
+@@ -618,41 +603,15 @@ session is configured for Lookaside Protocol offload or Inline Crypto or Inline
@@ -102 +103 @@
-index 3f8abfef15..c6550f4d8d 100644
+index 1a15e95267..71af1bf3e3 100644
@@ -105 +106 @@
-@@ -623,4 +623,5 @@ struct rte_security_docsis_xform {
+@@ -454,4 +454,5 @@ struct rte_security_docsis_xform {
@@ -111 +112 @@
-@@ -643,6 +644,8 @@ enum rte_security_session_action_type {
+@@ -474,6 +475,8 @@ enum rte_security_session_action_type {
@@ -120 +121 @@
-@@ -655,8 +658,10 @@ enum rte_security_session_protocol {
+@@ -486,8 +489,10 @@ enum rte_security_session_protocol {
@@ -131 +132 @@
-@@ -676,4 +681,5 @@ struct rte_security_session_conf {
+@@ -508,4 +513,5 @@ struct rte_security_session_conf {
@@ -136 +137 @@
- /**
+ struct rte_security_session {