From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 99829A0C47; Wed, 3 Nov 2021 21:53:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6101B40E0F; Wed, 3 Nov 2021 21:53:45 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 8C2DF40689 for ; Wed, 3 Nov 2021 21:53:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635972823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aEGYwnMPC/Q32hipY8QH+TNBBeaOKzzmTGNjQ16d1bA=; b=Y/qE97mZ9rYvdqJEA6RbWZ56wLBRP/BCzROmAxb50cwLdGfaDpI2QRH18KxN44Qs7il4fL HJUumDKjy6gyRpnzb5bPbbz/NjlRR46OiFhd5+i7F/e4s04k/MK970RLwbODx6GDD3I3o5 36dNtwQROVD31/WShvrHpYmJwAs6uvA= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-436-uWQ3UL8YN2mMXeXcZQ_XfA-1; Wed, 03 Nov 2021 16:53:25 -0400 X-MC-Unique: uWQ3UL8YN2mMXeXcZQ_XfA-1 Received: by mail-lf1-f72.google.com with SMTP id br22-20020a056512401600b004017a0f5cc6so861670lfb.16 for ; Wed, 03 Nov 2021 13:53:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=aEGYwnMPC/Q32hipY8QH+TNBBeaOKzzmTGNjQ16d1bA=; b=2wvavMCPY/EHTrsj/8OBBEY98hqJNPJalZcnTcEU4Xi+WqGpuCpK/ZZz174jtPpqvH rAN4yFdxkeWS97NYfdRY+yiInYYg/0XuhLQmO3EoLbsZ/R/F5HYBcIbs41WY1dTDmg5e Me8DEa2KnlaeIlmp0p4Hk+AlvmupDsrJjsxwvO26JtDTQU5jAPuCsj+hgGKRT93MUMrJ S4GRHdAIpXhcCO6sf7CWeWy7EBhMFhb6DjHmsfKfkZVPIKI2z0i+0rO2NQOcM3ywoID5 erhWIC5BV3qLzUZBfi6233WGsQropYQxyBvFa5fHBBKWl7r43WUGU4EjSL1kqu+xvIfk GEPg== X-Gm-Message-State: AOAM531X8BBOVVpygo2mVT9gdMEEUGvX8ItkDE8cPKQrCVA1GbaFDmBa Hko7qiigJSXsF+Xr5M2pSdiamEt4ex4Z8nlVMfipNX8m923O57rd4BykMfKdKC6hhj3QB8Y1zlA 0+11pYQpCvWwMJZt4sxU= X-Received: by 2002:ac2:5d68:: with SMTP id h8mr42844411lft.217.1635972803796; Wed, 03 Nov 2021 13:53:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyla0+j9CNEDV42NVE2hhXUNcUK3QfhoRT4GwpRT5+HWHoMaN8PrfLvUpwLnTprOJCTTnpo0hNR5FRsnXw8SE= X-Received: by 2002:ac2:5d68:: with SMTP id h8mr42844383lft.217.1635972803481; Wed, 03 Nov 2021 13:53:23 -0700 (PDT) MIME-Version: 1.0 References: <20211003201110.10448-1-pbhagavatula@marvell.com> <20211003202448.10908-1-pbhagavatula@marvell.com> <20211003202448.10908-3-pbhagavatula@marvell.com> In-Reply-To: <20211003202448.10908-3-pbhagavatula@marvell.com> From: David Marchand Date: Wed, 3 Nov 2021 21:53:12 +0100 Message-ID: To: Pavan Nikhilesh Cc: Jerin Jacob Kollanukkaran , dev , "Ananyev, Konstantin" Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v4 3/3] examples/l3fwd: use reserved addresses for EM mode X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" On Sun, Oct 3, 2021 at 10:25 PM wrote: > > From: Pavan Nikhilesh > > The l3fwd example should use the reserved IPv4/v6 reserved address > ranges defined in RFC5735, RFC5180 and RFC863 discard protocol for > the port number in the exact match mode of L3 forwarding. > > Signed-off-by: Pavan Nikhilesh > --- > doc/guides/rel_notes/release_21_11.rst | 6 ++ > examples/l3fwd/l3fwd.h | 2 +- > examples/l3fwd/l3fwd_em.c | 142 ++++++++++++------------- > 3 files changed, 73 insertions(+), 77 deletions(-) > > diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst > index 37dc1a7786..ccdfa47baa 100644 > --- a/doc/guides/rel_notes/release_21_11.rst > +++ b/doc/guides/rel_notes/release_21_11.rst > @@ -125,6 +125,12 @@ New Features > * Added tests to validate packets hard expiry. > * Added tests to verify tunnel header verification in IPsec inbound. > > +* **Increase number of routes configured in l3fwd lpm, em and fib lookups.** > + > + * Increase number of routes from 8 to 16 for all lookup modes of l3fwd, this > + helps in validating SoC with more than 8 ethernet devices using l3fwd. It should be in patch1. > + * Update EM mode to use RFC2544 reserved IP address space. > + > > Removed Items > ------------- > diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h > index a808d60247..853a31d4c2 100644 > --- a/examples/l3fwd/l3fwd.h > +++ b/examples/l3fwd/l3fwd.h > @@ -54,7 +54,7 @@ > /* 32-bit has less address-space for hugepage memory, limit to 1M entries */ > #define L3FWD_HASH_ENTRIES (1024*1024*1) > #endif > -#define HASH_ENTRY_NUMBER_DEFAULT 4 > +#define HASH_ENTRY_NUMBER_DEFAULT 16 > > struct mbuf_table { > uint16_t len; > diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c > index 2a8ab6aab5..92998e26b2 100644 > --- a/examples/l3fwd/l3fwd_em.c > +++ b/examples/l3fwd/l3fwd_em.c > @@ -99,33 +99,64 @@ struct ipv6_l3fwd_em_route { > uint8_t if_out; > }; > > -static struct ipv4_l3fwd_em_route ipv4_l3fwd_em_route_array[] = { > - {{RTE_IPV4(101, 0, 0, 0), RTE_IPV4(100, 10, 0, 1), 101, 11, IPPROTO_TCP}, 0}, > - {{RTE_IPV4(201, 0, 0, 0), RTE_IPV4(200, 20, 0, 1), 102, 12, IPPROTO_TCP}, 1}, > - {{RTE_IPV4(111, 0, 0, 0), RTE_IPV4(100, 30, 0, 1), 101, 11, IPPROTO_TCP}, 2}, > - {{RTE_IPV4(211, 0, 0, 0), RTE_IPV4(200, 40, 0, 1), 102, 12, IPPROTO_TCP}, 3}, > +/* 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735). > + * Use RFC863 Discard Protocol. > + */ > +static const struct ipv4_l3fwd_em_route ipv4_l3fwd_em_route_array[] = { > + {{RTE_IPV4(198, 18, 0, 0), RTE_IPV4(198, 18, 0, 1), 9, 9, IPPROTO_UDP}, 0}, > + {{RTE_IPV4(198, 18, 1, 0), RTE_IPV4(198, 18, 1, 1), 9, 9, IPPROTO_UDP}, 1}, > + {{RTE_IPV4(198, 18, 2, 0), RTE_IPV4(198, 18, 2, 1), 9, 9, IPPROTO_UDP}, 2}, > + {{RTE_IPV4(198, 18, 3, 0), RTE_IPV4(198, 18, 3, 1), 9, 9, IPPROTO_UDP}, 3}, > + {{RTE_IPV4(198, 18, 4, 0), RTE_IPV4(198, 18, 4, 1), 9, 9, IPPROTO_UDP}, 4}, > + {{RTE_IPV4(198, 18, 5, 0), RTE_IPV4(198, 18, 5, 1), 9, 9, IPPROTO_UDP}, 5}, > + {{RTE_IPV4(198, 18, 6, 0), RTE_IPV4(198, 18, 6, 1), 9, 9, IPPROTO_UDP}, 6}, > + {{RTE_IPV4(198, 18, 7, 0), RTE_IPV4(198, 18, 7, 1), 9, 9, IPPROTO_UDP}, 7}, > + {{RTE_IPV4(198, 18, 8, 0), RTE_IPV4(198, 18, 8, 1), 9, 9, IPPROTO_UDP}, 8}, > + {{RTE_IPV4(198, 18, 9, 0), RTE_IPV4(198, 18, 9, 1), 9, 9, IPPROTO_UDP}, 9}, > + {{RTE_IPV4(198, 18, 10, 0), RTE_IPV4(198, 18, 10, 1), 9, 9, IPPROTO_UDP}, 10}, > + {{RTE_IPV4(198, 18, 11, 0), RTE_IPV4(198, 18, 11, 1), 9, 9, IPPROTO_UDP}, 11}, > + {{RTE_IPV4(198, 18, 12, 0), RTE_IPV4(198, 18, 12, 1), 9, 9, IPPROTO_UDP}, 12}, > + {{RTE_IPV4(198, 18, 13, 0), RTE_IPV4(198, 18, 13, 1), 9, 9, IPPROTO_UDP}, 13}, > + {{RTE_IPV4(198, 18, 14, 0), RTE_IPV4(198, 18, 14, 1), 9, 9, IPPROTO_UDP}, 14}, > + {{RTE_IPV4(198, 18, 15, 0), RTE_IPV4(198, 18, 15, 1), 9, 9, IPPROTO_UDP}, 15}, > }; > > -static struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = { > - {{ > - {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0}, > - {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05}, > - 101, 11, IPPROTO_TCP}, 0}, > - > - {{ > - {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0}, > - {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05}, > - 102, 12, IPPROTO_TCP}, 1}, > - > - {{ > - {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0}, > - {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05}, > - 101, 11, IPPROTO_TCP}, 2}, > - > - {{ > - {0xfe, 0xb0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0}, > - {0xfe, 0xb0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 0x38, 0x05}, > - 102, 12, IPPROTO_TCP}, 3}, > +/* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180). > + * Use RFC863 Discard Protocol. > + */ > +static const struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = { > + {{{32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 0}, > + {{{32, 1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 1}, > + {{{32, 1, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 2}, > + {{{32, 1, 2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 3}, > + {{{32, 1, 2, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 4}, > + {{{32, 1, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 5}, > + {{{32, 1, 2, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 6}, > + {{{32, 1, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 7}, > + {{{32, 1, 2, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 8}, > + {{{32, 1, 2, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 9}, > + {{{32, 1, 2, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 10}, > + {{{32, 1, 2, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 11}, > + {{{32, 1, 2, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 12}, > + {{{32, 1, 2, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 13}, > + {{{32, 1, 2, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 14}, > + {{{32, 1, 2, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0}, > + {32, 1, 2, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 1}, 9, 9, IPPROTO_UDP}, 15}, > }; > > struct rte_hash *ipv4_l3fwd_em_lookup_struct[NB_SOCKETS]; > @@ -405,7 +436,7 @@ populate_ipv6_few_flow_into_table(const struct rte_hash *h) > (uint64_t)IPV6_L3FWD_EM_NUM_ROUTES); > } > > -#define NUMBER_PORT_USED 4 > +#define NUMBER_PORT_USED 16 > static inline void > populate_ipv4_many_flow_into_table(const struct rte_hash *h, > unsigned int nr_flow) > @@ -416,36 +447,16 @@ populate_ipv4_many_flow_into_table(const struct rte_hash *h, > ALL_32_BITS, ALL_32_BITS} }; > > for (i = 0; i < nr_flow; i++) { > + uint8_t port = i % NUMBER_PORT_USED; > struct ipv4_l3fwd_em_route entry; > union ipv4_5tuple_host newkey; > > - uint8_t a = (uint8_t) > - ((i/NUMBER_PORT_USED)%BYTE_VALUE_MAX); > - uint8_t b = (uint8_t) > - (((i/NUMBER_PORT_USED)/BYTE_VALUE_MAX)%BYTE_VALUE_MAX); > - uint8_t c = (uint8_t) > - ((i/NUMBER_PORT_USED)/(BYTE_VALUE_MAX*BYTE_VALUE_MAX)); > + uint8_t a = (uint8_t)((port + 1) % BYTE_VALUE_MAX); > > /* Create the ipv4 exact match flow */ > memset(&entry, 0, sizeof(entry)); > - switch (i & (NUMBER_PORT_USED - 1)) { > - case 0: > - entry = ipv4_l3fwd_em_route_array[0]; > - entry.key.ip_dst = RTE_IPV4(101, c, b, a); > - break; > - case 1: > - entry = ipv4_l3fwd_em_route_array[1]; > - entry.key.ip_dst = RTE_IPV4(201, c, b, a); > - break; > - case 2: > - entry = ipv4_l3fwd_em_route_array[2]; > - entry.key.ip_dst = RTE_IPV4(111, c, b, a); > - break; > - case 3: > - entry = ipv4_l3fwd_em_route_array[3]; > - entry.key.ip_dst = RTE_IPV4(211, c, b, a); > - break; > - }; > + entry = ipv4_l3fwd_em_route_array[port]; > + entry.key.ip_dst = RTE_IPV4(198, 18, port, a); > convert_ipv4_5tuple(&entry.key, &newkey); > int32_t ret = rte_hash_add_key(h, (void *) &newkey); > > @@ -469,35 +480,14 @@ populate_ipv6_many_flow_into_table(const struct rte_hash *h, > mask2 = (rte_xmm_t){.u32 = {ALL_32_BITS, ALL_32_BITS, 0, 0} }; > > for (i = 0; i < nr_flow; i++) { > + uint8_t port = i % NUMBER_PORT_USED; > struct ipv6_l3fwd_em_route entry; > union ipv6_5tuple_host newkey; > > - uint8_t a = (uint8_t) > - ((i/NUMBER_PORT_USED)%BYTE_VALUE_MAX); > - uint8_t b = (uint8_t) > - (((i/NUMBER_PORT_USED)/BYTE_VALUE_MAX)%BYTE_VALUE_MAX); > - uint8_t c = (uint8_t) > - ((i/NUMBER_PORT_USED)/(BYTE_VALUE_MAX*BYTE_VALUE_MAX)); > - > /* Create the ipv6 exact match flow */ > memset(&entry, 0, sizeof(entry)); > - switch (i & (NUMBER_PORT_USED - 1)) { > - case 0: > - entry = ipv6_l3fwd_em_route_array[0]; > - break; > - case 1: > - entry = ipv6_l3fwd_em_route_array[1]; > - break; > - case 2: > - entry = ipv6_l3fwd_em_route_array[2]; > - break; > - case 3: > - entry = ipv6_l3fwd_em_route_array[3]; > - break; > - }; > - entry.key.ip_dst[13] = c; > - entry.key.ip_dst[14] = b; > - entry.key.ip_dst[15] = a; > + entry = ipv6_l3fwd_em_route_array[port]; > + entry.key.ip_dst[15] = (port + 1) % BYTE_VALUE_MAX; > convert_ipv6_5tuple(&entry.key, &newkey); > int32_t ret = rte_hash_add_key(h, (void *) &newkey); > > @@ -584,7 +574,7 @@ em_parse_ptype(struct rte_mbuf *m) > hdr_len = rte_ipv4_hdr_len(ipv4_hdr); > if (hdr_len == sizeof(struct rte_ipv4_hdr)) { > packet_type |= RTE_PTYPE_L3_IPV4; > - if (ipv4_hdr->next_proto_id == IPPROTO_TCP) > + if (ipv4_hdr->next_proto_id == IPPROTO_UDP) I don't understand the intention here. > packet_type |= RTE_PTYPE_L4_TCP; > else if (ipv4_hdr->next_proto_id == IPPROTO_UDP) > packet_type |= RTE_PTYPE_L4_UDP; > @@ -592,7 +582,7 @@ em_parse_ptype(struct rte_mbuf *m) > packet_type |= RTE_PTYPE_L3_IPV4_EXT; > } else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) { > ipv6_hdr = (struct rte_ipv6_hdr *)l3; > - if (ipv6_hdr->proto == IPPROTO_TCP) > + if (ipv6_hdr->proto == IPPROTO_UDP) > packet_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP; Idem. > else if (ipv6_hdr->proto == IPPROTO_UDP) > packet_type |= RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_UDP; > -- > 2.17.1 > -- David Marchand