[PATCH dpdk] net: add more icmp types and code

[PATCH dpdk] net: add more icmp types and code

[Robin Jarry]

Add more ICMP message types and codes based on RFC 792. Change the
namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow differentiation
between types and codes.

Signed-off-by: Robin Jarry <rjarry@redhat.com>
---
 app/test-pmd/icmpecho.c | 10 +++++-----
 lib/net/rte_icmp.h      | 31 +++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c
index 68524484e305..4ef23ae67ac4 100644
--- a/app/test-pmd/icmpecho.c
+++ b/app/test-pmd/icmpecho.c
@@ -416,7 +416,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
 		icmp_h = (struct rte_icmp_hdr *) ((char *)ip_h +
 					      sizeof(struct rte_ipv4_hdr));
 		if (! ((ip_h->next_proto_id == IPPROTO_ICMP) &&
-		       (icmp_h->icmp_type == RTE_IP_ICMP_ECHO_REQUEST) &&
+		       (icmp_h->icmp_type == RTE_ICMP_TYPE_ECHO_REQUEST) &&
 		       (icmp_h->icmp_code == 0))) {
 			rte_pktmbuf_free(pkt);
 			continue;
@@ -440,7 +440,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
 		 *     - switch the request IP source and destination
 		 *       addresses in the reply IP header,
 		 *     - keep the IP header checksum unchanged.
-		 * - set RTE_IP_ICMP_ECHO_REPLY in ICMP header.
+		 * - set RTE_ICMP_TYPE_ECHO_REPLY in ICMP header.
 		 * ICMP checksum is computed by assuming it is valid in the
 		 * echo request and not verified.
 		 */
@@ -463,10 +463,10 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
 			ip_h->src_addr = ip_h->dst_addr;
 			ip_h->dst_addr = ip_addr;
 		}
-		icmp_h->icmp_type = RTE_IP_ICMP_ECHO_REPLY;
+		icmp_h->icmp_type = RTE_ICMP_TYPE_ECHO_REPLY;
 		cksum = ~icmp_h->icmp_cksum & 0xffff;
-		cksum += ~RTE_BE16(RTE_IP_ICMP_ECHO_REQUEST << 8) & 0xffff;
-		cksum += RTE_BE16(RTE_IP_ICMP_ECHO_REPLY << 8);
+		cksum += ~RTE_BE16(RTE_ICMP_TYPE_ECHO_REQUEST << 8) & 0xffff;
+		cksum += RTE_BE16(RTE_ICMP_TYPE_ECHO_REPLY << 8);
 		cksum = (cksum & 0xffff) + (cksum >> 16);
 		cksum = (cksum & 0xffff) + (cksum >> 16);
 		icmp_h->icmp_cksum = ~cksum;
diff --git a/lib/net/rte_icmp.h b/lib/net/rte_icmp.h
index 7a33280aa1e4..5ac165d8d40d 100644
--- a/lib/net/rte_icmp.h
+++ b/lib/net/rte_icmp.h
@@ -50,8 +50,35 @@ struct rte_icmp_hdr {
 } __rte_packed;
 
 /* ICMP packet types */
-#define RTE_IP_ICMP_ECHO_REPLY   0
-#define RTE_IP_ICMP_ECHO_REQUEST 8
+#define RTE_ICMP_TYPE_ECHO_REPLY 0
+#define RTE_IP_ICMP_ECHO_REPLY RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REPLY) RTE_ICMP_TYPE_ECHO_REPLY
+#define RTE_ICMP_TYPE_DEST_UNREACHABLE 3
+#define RTE_ICMP_TYPE_REDIRECT 5
+#define RTE_ICMP_TYPE_ECHO_REQUEST 8
+#define RTE_IP_ICMP_ECHO_REQUEST RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REQUEST) RTE_ICMP_TYPE_ECHO_REQUEST
+#define RTE_ICMP_TYPE_TTL_EXCEEDED 11
+#define RTE_ICMP_TYPE_PARAM_PROBLEM 12
+#define RTE_ICMP_TYPE_TIMESTAMP_REQUEST 13
+#define RTE_ICMP_TYPE_TIMESTAMP_REPLY 14
+
+/* Destination Unreachable codes */
+#define RTE_ICMP_CODE_UNREACH_NET 0
+#define RTE_ICMP_CODE_UNREACH_HOST 1
+#define RTE_ICMP_CODE_UNREACH_PROTO 2
+#define RTE_ICMP_CODE_UNREACH_PORT 3
+#define RTE_ICMP_CODE_UNREACH_FRAG 4
+#define RTE_ICMP_CODE_UNREACH_SRC 5
+
+/* Time Exceeded codes */
+#define RTE_ICMP_CODE_TTL_EXCEEDED 0
+#define RTE_ICMP_CODE_TTL_FRAG 1
+
+/* Redirect codes */
+#define RTE_ICMP_CODE_REDIRECT_NET 0
+#define RTE_ICMP_CODE_REDIRECT_HOST 1
+#define RTE_ICMP_CODE_REDIRECT_TOS_NET 2
+#define RTE_ICMP_CODE_REDIRECT_TOS_HOST 3
+
 #define RTE_ICMP6_ECHO_REQUEST 128
 #define RTE_ICMP6_ECHO_REPLY   129
 
-- 
2.47.0

Re: [PATCH dpdk] net: add more icmp types and code

[Stephen Hemminger]

On Thu, 17 Oct 2024 10:33:22 +0200
Robin Jarry <rjarry@redhat.com> wrote:

> Add more ICMP message types and codes based on RFC 792. Change the
> namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow differentiation
> between types and codes.
> 
> Signed-off-by: Robin Jarry <rjarry@redhat.com>

Should add a release note for this

Acked-by: Stephen Hemminger <stephen@networkplumber.org>

Re: [PATCH dpdk] net: add more icmp types and code

[Ferruh Yigit]

On 10/17/2024 5:02 PM, Stephen Hemminger wrote:
> On Thu, 17 Oct 2024 10:33:22 +0200
> Robin Jarry <rjarry@redhat.com> wrote:
> 
>> Add more ICMP message types and codes based on RFC 792. Change the
>> namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow differentiation
>> between types and codes.
>>
>> Signed-off-by: Robin Jarry <rjarry@redhat.com>
> 
> Should add a release note for this
> 
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
>

+1 to get this in 24.11

Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>


@Thomas, probably it is better to get this for -rc1 and as next-net
already pulled can this directly go to main?


Btw, is following also required? Just because it is documented in RFC:
   15  Information Request
   16  Information Reply

Ack stands if above added or not.

Re: [PATCH dpdk] net: add more icmp types and code

[Robin Jarry]

Ferruh Yigit, Oct 18, 2024 at 00:22:
> On 10/17/2024 5:02 PM, Stephen Hemminger wrote:
>> On Thu, 17 Oct 2024 10:33:22 +0200
>> Robin Jarry <rjarry@redhat.com> wrote:
>> 
>>> Add more ICMP message types and codes based on RFC 792. Change the
>>> namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow differentiation
>>> between types and codes.
>>>
>>> Signed-off-by: Robin Jarry <rjarry@redhat.com>
>> 
>> Should add a release note for this
>> 
>> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
>>
>
> +1 to get this in 24.11
>
> Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
>
>
> @Thomas, probably it is better to get this for -rc1 and as next-net
> already pulled can this directly go to main?

I will probably send a v2 with a release note.

>
> Btw, is following also required? Just because it is documented in RFC:
>    15  Information Request
>    16  Information Reply

It seems some of the original codes have been deprecated:

https://www.rfc-editor.org/rfc/rfc6918#section-2.2


> Ack stands if above added or not.

Re: [PATCH dpdk] net: add more icmp types and code

[Ferruh Yigit]

On 10/17/2024 11:33 PM, Robin Jarry wrote:
> Ferruh Yigit, Oct 18, 2024 at 00:22:
>> On 10/17/2024 5:02 PM, Stephen Hemminger wrote:
>>> On Thu, 17 Oct 2024 10:33:22 +0200
>>> Robin Jarry <rjarry@redhat.com> wrote:
>>>
>>>> Add more ICMP message types and codes based on RFC 792. Change the
>>>> namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow
>>>> differentiation
>>>> between types and codes.
>>>>
>>>> Signed-off-by: Robin Jarry <rjarry@redhat.com>
>>>
>>> Should add a release note for this
>>>
>>> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
>>>
>>
>> +1 to get this in 24.11
>>
>> Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
>>
>>
>> @Thomas, probably it is better to get this for -rc1 and as next-net
>> already pulled can this directly go to main?
> 
> I will probably send a v2 with a release note.
> 
>>
>> Btw, is following also required? Just because it is documented in RFC:
>>    15  Information Request
>>    16  Information Reply
> 
> It seems some of the original codes have been deprecated:
> 
> https://www.rfc-editor.org/rfc/rfc6918#section-2.2
> 

Ack

[PATCH dpdk v2] net: add more icmp types and code

[Robin Jarry]

Add more ICMP message types and codes based on RFC 792. Change the
namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow differentiation
between types and codes.

Do not include deprecated message types as described in RFC 6918.

Link: https://www.rfc-editor.org/rfc/rfc792
Link: https://www.rfc-editor.org/rfc/rfc6918
Signed-off-by: Robin Jarry <rjarry@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---

Notes:
    v2: added release note

 app/test-pmd/icmpecho.c                | 10 ++++----
 doc/guides/rel_notes/release_24_11.rst |  6 +++++
 lib/net/rte_icmp.h                     | 33 ++++++++++++++++++++++++--
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c
index 68524484e305..4ef23ae67ac4 100644
--- a/app/test-pmd/icmpecho.c
+++ b/app/test-pmd/icmpecho.c
@@ -416,7 +416,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
 		icmp_h = (struct rte_icmp_hdr *) ((char *)ip_h +
 					      sizeof(struct rte_ipv4_hdr));
 		if (! ((ip_h->next_proto_id == IPPROTO_ICMP) &&
-		       (icmp_h->icmp_type == RTE_IP_ICMP_ECHO_REQUEST) &&
+		       (icmp_h->icmp_type == RTE_ICMP_TYPE_ECHO_REQUEST) &&
 		       (icmp_h->icmp_code == 0))) {
 			rte_pktmbuf_free(pkt);
 			continue;
@@ -440,7 +440,7 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
 		 *     - switch the request IP source and destination
 		 *       addresses in the reply IP header,
 		 *     - keep the IP header checksum unchanged.
-		 * - set RTE_IP_ICMP_ECHO_REPLY in ICMP header.
+		 * - set RTE_ICMP_TYPE_ECHO_REPLY in ICMP header.
 		 * ICMP checksum is computed by assuming it is valid in the
 		 * echo request and not verified.
 		 */
@@ -463,10 +463,10 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs)
 			ip_h->src_addr = ip_h->dst_addr;
 			ip_h->dst_addr = ip_addr;
 		}
-		icmp_h->icmp_type = RTE_IP_ICMP_ECHO_REPLY;
+		icmp_h->icmp_type = RTE_ICMP_TYPE_ECHO_REPLY;
 		cksum = ~icmp_h->icmp_cksum & 0xffff;
-		cksum += ~RTE_BE16(RTE_IP_ICMP_ECHO_REQUEST << 8) & 0xffff;
-		cksum += RTE_BE16(RTE_IP_ICMP_ECHO_REPLY << 8);
+		cksum += ~RTE_BE16(RTE_ICMP_TYPE_ECHO_REQUEST << 8) & 0xffff;
+		cksum += RTE_BE16(RTE_ICMP_TYPE_ECHO_REPLY << 8);
 		cksum = (cksum & 0xffff) + (cksum >> 16);
 		cksum = (cksum & 0xffff) + (cksum >> 16);
 		icmp_h->icmp_cksum = ~cksum;
diff --git a/doc/guides/rel_notes/release_24_11.rst b/doc/guides/rel_notes/release_24_11.rst
index d2301461ce35..0e9c81b32b20 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -238,6 +238,12 @@ New Features
   Added ability for node to advertise and update multiple xstat counters,
   that can be retrieved using ``rte_graph_cluster_stats_get``.
 
+* **Added new ICMP message types and codes.**
+
+  New ICMP message types and codes from RFC 792 are available in ``rte_icmp.h``.
+  Message types now use the ``RTE_ICMP_TYPE_`` prefix.
+  Message codes use the ``RTE_ICMP_CODE_`` prefix.
+
 
 Removed Items
 -------------
diff --git a/lib/net/rte_icmp.h b/lib/net/rte_icmp.h
index 7a33280aa1e4..e69d68ab6e22 100644
--- a/lib/net/rte_icmp.h
+++ b/lib/net/rte_icmp.h
@@ -50,8 +50,37 @@ struct rte_icmp_hdr {
 } __rte_packed;
 
 /* ICMP packet types */
-#define RTE_IP_ICMP_ECHO_REPLY   0
-#define RTE_IP_ICMP_ECHO_REQUEST 8
+#define RTE_ICMP_TYPE_ECHO_REPLY 0
+#define RTE_IP_ICMP_ECHO_REPLY \
+	(RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REPLY) RTE_ICMP_TYPE_ECHO_REPLY)
+#define RTE_ICMP_TYPE_DEST_UNREACHABLE 3
+#define RTE_ICMP_TYPE_REDIRECT 5
+#define RTE_ICMP_TYPE_ECHO_REQUEST 8
+#define RTE_IP_ICMP_ECHO_REQUEST \
+	(RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REQUEST) RTE_ICMP_TYPE_ECHO_REQUEST)
+#define RTE_ICMP_TYPE_TTL_EXCEEDED 11
+#define RTE_ICMP_TYPE_PARAM_PROBLEM 12
+#define RTE_ICMP_TYPE_TIMESTAMP_REQUEST 13
+#define RTE_ICMP_TYPE_TIMESTAMP_REPLY 14
+
+/* Destination Unreachable codes */
+#define RTE_ICMP_CODE_UNREACH_NET 0
+#define RTE_ICMP_CODE_UNREACH_HOST 1
+#define RTE_ICMP_CODE_UNREACH_PROTO 2
+#define RTE_ICMP_CODE_UNREACH_PORT 3
+#define RTE_ICMP_CODE_UNREACH_FRAG 4
+#define RTE_ICMP_CODE_UNREACH_SRC 5
+
+/* Time Exceeded codes */
+#define RTE_ICMP_CODE_TTL_EXCEEDED 0
+#define RTE_ICMP_CODE_TTL_FRAG 1
+
+/* Redirect codes */
+#define RTE_ICMP_CODE_REDIRECT_NET 0
+#define RTE_ICMP_CODE_REDIRECT_HOST 1
+#define RTE_ICMP_CODE_REDIRECT_TOS_NET 2
+#define RTE_ICMP_CODE_REDIRECT_TOS_HOST 3
+
 #define RTE_ICMP6_ECHO_REQUEST 128
 #define RTE_ICMP6_ECHO_REPLY   129
 
-- 
2.47.0

RE: [PATCH dpdk v2] net: add more icmp types and code

[Morten Brørup]

> From: Robin Jarry [mailto:rjarry@redhat.com]
> Sent: Friday, 18 October 2024 00.42
> 
> Add more ICMP message types and codes based on RFC 792. Change the
> namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow
> differentiation
> between types and codes.
> 
> Do not include deprecated message types as described in RFC 6918.
> 
> Link: https://www.rfc-editor.org/rfc/rfc792
> Link: https://www.rfc-editor.org/rfc/rfc6918
> Signed-off-by: Robin Jarry <rjarry@redhat.com>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
> Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
> ---

Acked-by: Morten Brørup <mb@smartsharesystems.com>

Re: [PATCH dpdk v2] net: add more icmp types and code

[Thomas Monjalon]

18/10/2024 02:39, Morten Brørup:
> > From: Robin Jarry [mailto:rjarry@redhat.com]
> > Sent: Friday, 18 October 2024 00.42
> > 
> > Add more ICMP message types and codes based on RFC 792. Change the
> > namespace prefix from RTE_IP_ICMP_ to RTE_ICMP_ to allow
> > differentiation
> > between types and codes.
> > 
> > Do not include deprecated message types as described in RFC 6918.
> > 
> > Link: https://www.rfc-editor.org/rfc/rfc792
> > Link: https://www.rfc-editor.org/rfc/rfc6918
> > Signed-off-by: Robin Jarry <rjarry@redhat.com>
> > Acked-by: Stephen Hemminger <stephen@networkplumber.org>
> > Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
> 
> Acked-by: Morten Brørup <mb@smartsharesystems.com>

Highlighted the API changes in the release notes,
and applied, thanks.