From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 68E154CBB for ; Thu, 31 May 2018 15:19:10 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 May 2018 06:19:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,463,1520924400"; d="scan'208";a="59236018" Received: from irsmsx151.ger.corp.intel.com ([163.33.192.59]) by fmsmga004.fm.intel.com with ESMTP; 31 May 2018 06:19:08 -0700 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.126]) by IRSMSX151.ger.corp.intel.com ([169.254.4.216]) with mapi id 14.03.0319.002; Thu, 31 May 2018 14:19:08 +0100 From: "Ananyev, Konstantin" To: Alex Kiselev , "dev@dpdk.org" , "Burakov, Anatoly" Thread-Topic: [dpdk-dev] [PATCH 2/2] librte_ip_frag: add mbuf counter Thread-Index: AQHT7QXE8o57scKy9E24rC4+4R93W6RJ5zSQ Date: Thu, 31 May 2018 13:19:07 +0000 Message-ID: <2601191342CEEE43887BDE71AB977258C0C36A9C@irsmsx105.ger.corp.intel.com> References: <20180516110425.D01821B219@dpdk.org> In-Reply-To: <20180516110425.D01821B219@dpdk.org> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMWFiMGEwNmQtMGYxNC00OGYyLTgxMWUtZjhjYjMxODNkOWM4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoidkJCS29Jd3Y5cFdWNzQ5U1wvcUVqYVRKUFZQWXJMNVQrREpkc1V5MlJqejdYaEdDQW5aSFJyMjBIOCtXQ0JhQTkifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH 2/2] librte_ip_frag: add mbuf counter 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: , X-List-Received-Date: Thu, 31 May 2018 13:19:12 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Alex Kiselev > Sent: Wednesday, May 16, 2018 12:04 PM > To: dev@dpdk.org; Burakov, Anatoly > Subject: [dpdk-dev] [PATCH 2/2] librte_ip_frag: add mbuf counter >=20 > add new function rte_frag_table_mbuf_count() that returns > number of mbufs holded in the fragmentation table. >=20 > There might be situations (kind of attack when a lot of > fragmented packets are sent to a dpdk application in order > to flood the fragmentation table) when no additional mbufs > must be added to the fragmentations table since it already > contains to many of them. Currently there is no way to > determine the number of mbufs holded int the fragmentation > table. This patch allows to keep track of the number of mbufs > holded in the fragmentation table. >=20 > Signed-off-by: Alex Kiselev > --- > lib/librte_ip_frag/ip_frag_common.h | 12 +++++++----- > lib/librte_ip_frag/ip_frag_internal.c | 15 +++++++++------ > lib/librte_ip_frag/rte_ip_frag.h | 16 ++++++++++++++++ > lib/librte_ip_frag/rte_ip_frag_common.c | 1 + > lib/librte_ip_frag/rte_ip_frag_version.map | 1 + > lib/librte_ip_frag/rte_ipv4_reassembly.c | 2 +- > lib/librte_ip_frag/rte_ipv6_reassembly.c | 2 +- > 7 files changed, 36 insertions(+), 13 deletions(-) Do we really need it? It's quite significant code changes and the advantage looks quite small to = me... We already have use_entries, right? That can be used to get some estimation for a number of mbufs in the table. Konstantin >=20 > diff --git a/lib/librte_ip_frag/ip_frag_common.h b/lib/librte_ip_frag/ip_= frag_common.h > index 0fdcc7d0f..d04e69de6 100644 > --- a/lib/librte_ip_frag/ip_frag_common.h > +++ b/lib/librte_ip_frag/ip_frag_common.h > @@ -32,9 +32,9 @@ > #endif /* IP_FRAG_TBL_STAT */ >=20 > /* internal functions declarations */ > -struct rte_mbuf * ip_frag_process(struct ip_frag_pkt *fp, > - struct rte_ip_frag_death_row *dr, struct rte_mbuf *mb, > - uint16_t ofs, uint16_t len, uint16_t more_frags); > +struct rte_mbuf * ip_frag_process(struct rte_ip_frag_tbl *tbl, > + struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr, > + struct rte_mbuf *mb, uint16_t ofs, uint16_t len, uint16_t more_frags); >=20 > struct ip_frag_pkt * ip_frag_find(struct rte_ip_frag_tbl *tbl, > struct rte_ip_frag_death_row *dr, > @@ -91,7 +91,8 @@ ip_frag_key_cmp(const struct ip_frag_key * k1, const st= ruct ip_frag_key * k2) >=20 > /* put fragment on death row */ > static inline void > -ip_frag_free(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr) > +ip_frag_free(struct rte_ip_frag_tbl *tbl, struct ip_frag_pkt *fp, > + struct rte_ip_frag_death_row *dr) > { > uint32_t i, k; >=20 > @@ -100,6 +101,7 @@ ip_frag_free(struct ip_frag_pkt *fp, struct rte_ip_fr= ag_death_row *dr) > if (fp->frags[i].mb !=3D NULL) { > dr->row[k++] =3D fp->frags[i].mb; > fp->frags[i].mb =3D NULL; > + tbl->nb_mbufs --; > } > } >=20 > @@ -160,7 +162,7 @@ static inline void > ip_frag_tbl_del(struct rte_ip_frag_tbl *tbl, struct rte_ip_frag_death_ro= w *dr, > struct ip_frag_pkt *fp) > { > - ip_frag_free(fp, dr); > + ip_frag_free(tbl, fp, dr); > ip_frag_key_invalidate(&fp->key); > TAILQ_REMOVE(&tbl->lru, fp, lru); > tbl->use_entries--; > diff --git a/lib/librte_ip_frag/ip_frag_internal.c b/lib/librte_ip_frag/i= p_frag_internal.c > index 97470a872..eea871b7e 100644 > --- a/lib/librte_ip_frag/ip_frag_internal.c > +++ b/lib/librte_ip_frag/ip_frag_internal.c > @@ -29,14 +29,13 @@ static inline void > ip_frag_tbl_reuse(struct rte_ip_frag_tbl *tbl, struct rte_ip_frag_death_= row *dr, > struct ip_frag_pkt *fp, uint64_t tms) > { > - ip_frag_free(fp, dr); > + ip_frag_free(tbl, fp, dr); > ip_frag_reset(fp, tms); > TAILQ_REMOVE(&tbl->lru, fp, lru); > TAILQ_INSERT_TAIL(&tbl->lru, fp, lru); > IP_FRAG_TBL_STAT_UPDATE(&tbl->stat, reuse_num, 1); > } >=20 > - > static inline void > ipv4_frag_hash(const struct ip_frag_key *key, uint32_t *v1, uint32_t *v2= ) > { > @@ -88,8 +87,9 @@ ipv6_frag_hash(const struct ip_frag_key *key, uint32_t = *v1, uint32_t *v2) > } >=20 > struct rte_mbuf * > -ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip_frag_death_row *dr= , > - struct rte_mbuf *mb, uint16_t ofs, uint16_t len, uint16_t more_frags) > +ip_frag_process(struct rte_ip_frag_tbl *tbl, struct ip_frag_pkt *fp, > + struct rte_ip_frag_death_row *dr, struct rte_mbuf *mb, uint16_t ofs, > + uint16_t len, uint16_t more_frags) > { > uint32_t idx; >=20 > @@ -147,7 +147,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip= _frag_death_row *dr, > fp->frags[IP_LAST_FRAG_IDX].len); >=20 > /* free all fragments, invalidate the entry. */ > - ip_frag_free(fp, dr); > + ip_frag_free(tbl, fp, dr); > ip_frag_key_invalidate(&fp->key); > IP_FRAG_MBUF2DR(dr, mb); >=20 > @@ -157,6 +157,7 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_ip= _frag_death_row *dr, > fp->frags[idx].ofs =3D ofs; > fp->frags[idx].len =3D len; > fp->frags[idx].mb =3D mb; > + tbl->nb_mbufs++; >=20 > mb =3D NULL; >=20 > @@ -205,8 +206,10 @@ ip_frag_process(struct ip_frag_pkt *fp, struct rte_i= p_frag_death_row *dr, > fp->frags[IP_LAST_FRAG_IDX].len); >=20 > /* free associated resources. */ > - ip_frag_free(fp, dr); > + ip_frag_free(tbl, fp, dr); > } > + else > + tbl->nb_mbufs -=3D fp->last_idx; >=20 > /* we are done with that entry, invalidate it. */ > ip_frag_key_invalidate(&fp->key); > diff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/librte_ip_frag/rte_ip= _frag.h > index 3c694df92..4aba8a064 100644 > --- a/lib/librte_ip_frag/rte_ip_frag.h > +++ b/lib/librte_ip_frag/rte_ip_frag.h > @@ -96,6 +96,7 @@ struct rte_ip_frag_tbl { > uint32_t bucket_entries; /**< hash associativity. */ > uint32_t nb_entries; /**< total size of the table. */ > uint32_t nb_buckets; /**< num of associativity lines. = */ > + uint32_t nb_mbufs; /**< num of mbufs holded in the t= bl. */ > struct ip_frag_pkt *last; /**< last used entry. */ > struct ip_pkt_list lru; /**< LRU list for table entries. */ > struct ip_frag_tbl_stat stat; /**< statistics counters. */ > @@ -328,6 +329,21 @@ void rte_ip_frag_free_death_row(struct rte_ip_frag_d= eath_row *dr, > void > rte_ip_frag_table_statistics_dump(FILE * f, const struct rte_ip_frag_tbl= *tbl); >=20 > +/** > + * Number of mbufs holded in the fragmentation table. > + * > + * @param tbl > + * Fragmentation table > + * > + * @return > + * Number of mbufs holded in the fragmentation table. > + */ > +static inline uint32_t __rte_experimental > +rte_frag_table_mbuf_count(const struct rte_ip_frag_tbl *tbl) > +{ > + return tbl->nb_mbufs; > +} > + > /** > * Delete expired fragments > * > diff --git a/lib/librte_ip_frag/rte_ip_frag_common.c b/lib/librte_ip_frag= /rte_ip_frag_common.c > index f62b5d169..6e7aaac45 100644 > --- a/lib/librte_ip_frag/rte_ip_frag_common.c > +++ b/lib/librte_ip_frag/rte_ip_frag_common.c > @@ -75,6 +75,7 @@ rte_ip_frag_table_create(uint32_t bucket_num, uint32_t = bucket_entries, > tbl->nb_buckets =3D bucket_num; > tbl->bucket_entries =3D bucket_entries; > tbl->entry_mask =3D (tbl->nb_entries - 1) & ~(tbl->bucket_entries - 1)= ; > + tbl->nb_mbufs =3D 0; >=20 > TAILQ_INIT(&(tbl->lru)); > return tbl; > diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_f= rag/rte_ip_frag_version.map > index d40d5515f..f4700f460 100644 > --- a/lib/librte_ip_frag/rte_ip_frag_version.map > +++ b/lib/librte_ip_frag/rte_ip_frag_version.map > @@ -23,4 +23,5 @@ EXPERIMENTAL { > global: >=20 > rte_frag_table_del_expired_entries; > + rte_frag_table_mbuf_count; > }; > diff --git a/lib/librte_ip_frag/rte_ipv4_reassembly.c b/lib/librte_ip_fra= g/rte_ipv4_reassembly.c > index 4956b99ea..fbdfd860a 100644 > --- a/lib/librte_ip_frag/rte_ipv4_reassembly.c > +++ b/lib/librte_ip_frag/rte_ipv4_reassembly.c > @@ -146,7 +146,7 @@ rte_ipv4_frag_reassemble_packet(struct rte_ip_frag_tb= l *tbl, >=20 >=20 > /* process the fragmented packet. */ > - mb =3D ip_frag_process(fp, dr, mb, ip_ofs, ip_len, ip_flag); > + mb =3D ip_frag_process(tbl, fp, dr, mb, ip_ofs, ip_len, ip_flag); > ip_frag_inuse(tbl, fp); >=20 > IP_FRAG_LOG(DEBUG, "%s:%d:\n" > diff --git a/lib/librte_ip_frag/rte_ipv6_reassembly.c b/lib/librte_ip_fra= g/rte_ipv6_reassembly.c > index db249fe60..dda5a57b7 100644 > --- a/lib/librte_ip_frag/rte_ipv6_reassembly.c > +++ b/lib/librte_ip_frag/rte_ipv6_reassembly.c > @@ -186,7 +186,7 @@ rte_ipv6_frag_reassemble_packet(struct rte_ip_frag_tb= l *tbl, >=20 >=20 > /* process the fragmented packet. */ > - mb =3D ip_frag_process(fp, dr, mb, ip_ofs, ip_len, > + mb =3D ip_frag_process(tbl, fp, dr, mb, ip_ofs, ip_len, > MORE_FRAGS(frag_hdr->frag_data)); > ip_frag_inuse(tbl, fp); >=20 > -- > 2.16.1.windows.1