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 3DB3645834; Wed, 21 Aug 2024 18:26:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C6F1F427C7; Wed, 21 Aug 2024 18:25:53 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id A92B1427B3 for ; Wed, 21 Aug 2024 18:25:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724257551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gmEY0w0ZBzOxxiCHBvpBe61X3QBX37Ssdbb4y59oMww=; b=Y0KrVTXQVDjB4sb7OKnn+yVGVNyJsh7cZWDGmH9H36Smrfk7Pd1oKV14Cs1+poRToJHygg +ihtdHp4R7fUrTMGdBvzpdz4qI2QSXWgdekPitgGyxYn1vXatiW2PAXr5umNrWtNuj3gWI 3NDM+rOwZ4+jhTa+yOzBeKXJTnpkmLk= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-YRy-DFjDNEOkYvBzQltTrg-1; Wed, 21 Aug 2024 12:25:50 -0400 X-MC-Unique: YRy-DFjDNEOkYvBzQltTrg-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0F92019560A6 for ; Wed, 21 Aug 2024 16:25:49 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.208.21]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E1E631955D42; Wed, 21 Aug 2024 16:25:47 +0000 (UTC) From: Robin Jarry To: dev@dpdk.org Subject: [PATCH dpdk v1 01/15] net: split raw checksum functions in separate header Date: Wed, 21 Aug 2024 18:25:18 +0200 Message-ID: <20240821162516.610624-18-rjarry@redhat.com> In-Reply-To: <20240821162516.610624-17-rjarry@redhat.com> References: <20240821162516.610624-17-rjarry@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 The checksum functions are used by both ipv4 and ipv6 functions. In preparation of moving ipv6 symbols to a new header, move the checksum related symbols to another dedicated header. Signed-off-by: Robin Jarry --- lib/net/meson.build | 1 + lib/net/rte_cksum.h | 189 ++++++++++++++++++++++++++++++++++++++++++++ lib/net/rte_ip.h | 148 +--------------------------------- 3 files changed, 191 insertions(+), 147 deletions(-) create mode 100644 lib/net/rte_cksum.h diff --git a/lib/net/meson.build b/lib/net/meson.build index 0b691389495a..2e65bd19b7d4 100644 --- a/lib/net/meson.build +++ b/lib/net/meson.build @@ -3,6 +3,7 @@ headers = files( 'rte_ip.h', + 'rte_cksum.h', 'rte_tcp.h', 'rte_udp.h', 'rte_tls.h', diff --git a/lib/net/rte_cksum.h b/lib/net/rte_cksum.h new file mode 100644 index 000000000000..8deceab51508 --- /dev/null +++ b/lib/net/rte_cksum.h @@ -0,0 +1,189 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. + * All rights reserved. + */ + +#ifndef _RTE_CKSUM_H_ +#define _RTE_CKSUM_H_ + +/** + * @file + * + * Protocol independent checksum utilities. + */ + +#include + +#ifdef RTE_EXEC_ENV_WINDOWS +#include +#else +#include +#include +#include +#include +#include +#include +#endif + +#include + +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * @internal Calculate a sum of all words in the buffer. + * Helper routine for the rte_raw_cksum(). + * + * @param buf + * Pointer to the buffer. + * @param len + * Length of the buffer. + * @param sum + * Initial value of the sum. + * @return + * sum += Sum of all words in the buffer. + */ +static inline uint32_t +__rte_raw_cksum(const void *buf, size_t len, uint32_t sum) +{ + const void *end; + + for (end = RTE_PTR_ADD(buf, RTE_ALIGN_FLOOR(len, sizeof(uint16_t))); + buf != end; buf = RTE_PTR_ADD(buf, sizeof(uint16_t))) { + uint16_t v; + + memcpy(&v, buf, sizeof(uint16_t)); + sum += v; + } + + /* if length is odd, keeping it byte order independent */ + if (unlikely(len % 2)) { + uint16_t left = 0; + + memcpy(&left, end, 1); + sum += left; + } + + return sum; +} + +/** + * @internal Reduce a sum to the non-complemented checksum. + * Helper routine for the rte_raw_cksum(). + * + * @param sum + * Value of the sum. + * @return + * The non-complemented checksum. + */ +static inline uint16_t +__rte_raw_cksum_reduce(uint32_t sum) +{ + sum = ((sum & 0xffff0000) >> 16) + (sum & 0xffff); + sum = ((sum & 0xffff0000) >> 16) + (sum & 0xffff); + return (uint16_t)sum; +} + +/** + * Process the non-complemented checksum of a buffer. + * + * @param buf + * Pointer to the buffer. + * @param len + * Length of the buffer. + * @return + * The non-complemented checksum. + */ +static inline uint16_t +rte_raw_cksum(const void *buf, size_t len) +{ + uint32_t sum; + + sum = __rte_raw_cksum(buf, len, 0); + return __rte_raw_cksum_reduce(sum); +} + +/** + * Compute the raw (non complemented) checksum of a packet. + * + * @param m + * The pointer to the mbuf. + * @param off + * The offset in bytes to start the checksum. + * @param len + * The length in bytes of the data to checksum. + * @param cksum + * A pointer to the checksum, filled on success. + * @return + * 0 on success, -1 on error (bad length or offset). + */ +static inline int +rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len, + uint16_t *cksum) +{ + const struct rte_mbuf *seg; + const char *buf; + uint32_t sum, tmp; + uint32_t seglen, done; + + /* easy case: all data in the first segment */ + if (off + len <= rte_pktmbuf_data_len(m)) { + *cksum = rte_raw_cksum(rte_pktmbuf_mtod_offset(m, + const char *, off), len); + return 0; + } + + if (unlikely(off + len > rte_pktmbuf_pkt_len(m))) + return -1; /* invalid params, return a dummy value */ + + /* else browse the segment to find offset */ + seglen = 0; + for (seg = m; seg != NULL; seg = seg->next) { + seglen = rte_pktmbuf_data_len(seg); + if (off < seglen) + break; + off -= seglen; + } + RTE_ASSERT(seg != NULL); + if (seg == NULL) + return -1; + seglen -= off; + buf = rte_pktmbuf_mtod_offset(seg, const char *, off); + if (seglen >= len) { + /* all in one segment */ + *cksum = rte_raw_cksum(buf, len); + return 0; + } + + /* hard case: process checksum of several segments */ + sum = 0; + done = 0; + for (;;) { + tmp = __rte_raw_cksum(buf, seglen, 0); + if (done & 1) + tmp = rte_bswap16((uint16_t)tmp); + sum += tmp; + done += seglen; + if (done == len) + break; + seg = seg->next; + buf = rte_pktmbuf_mtod(seg, const char *); + seglen = rte_pktmbuf_data_len(seg); + if (seglen > len - done) + seglen = len - done; + } + + *cksum = __rte_raw_cksum_reduce(sum); + return 0; +} + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_CKSUM_H_ */ diff --git a/lib/net/rte_ip.h b/lib/net/rte_ip.h index 0d103d4127e8..0ae7c0565047 100644 --- a/lib/net/rte_ip.h +++ b/lib/net/rte_ip.h @@ -30,6 +30,7 @@ #include #include +#include #ifdef __cplusplus extern "C" { @@ -144,153 +145,6 @@ rte_ipv4_hdr_len(const struct rte_ipv4_hdr *ipv4_hdr) RTE_IPV4_IHL_MULTIPLIER); } -/** - * @internal Calculate a sum of all words in the buffer. - * Helper routine for the rte_raw_cksum(). - * - * @param buf - * Pointer to the buffer. - * @param len - * Length of the buffer. - * @param sum - * Initial value of the sum. - * @return - * sum += Sum of all words in the buffer. - */ -static inline uint32_t -__rte_raw_cksum(const void *buf, size_t len, uint32_t sum) -{ - const void *end; - - for (end = RTE_PTR_ADD(buf, RTE_ALIGN_FLOOR(len, sizeof(uint16_t))); - buf != end; buf = RTE_PTR_ADD(buf, sizeof(uint16_t))) { - uint16_t v; - - memcpy(&v, buf, sizeof(uint16_t)); - sum += v; - } - - /* if length is odd, keeping it byte order independent */ - if (unlikely(len % 2)) { - uint16_t left = 0; - - memcpy(&left, end, 1); - sum += left; - } - - return sum; -} - -/** - * @internal Reduce a sum to the non-complemented checksum. - * Helper routine for the rte_raw_cksum(). - * - * @param sum - * Value of the sum. - * @return - * The non-complemented checksum. - */ -static inline uint16_t -__rte_raw_cksum_reduce(uint32_t sum) -{ - sum = ((sum & 0xffff0000) >> 16) + (sum & 0xffff); - sum = ((sum & 0xffff0000) >> 16) + (sum & 0xffff); - return (uint16_t)sum; -} - -/** - * Process the non-complemented checksum of a buffer. - * - * @param buf - * Pointer to the buffer. - * @param len - * Length of the buffer. - * @return - * The non-complemented checksum. - */ -static inline uint16_t -rte_raw_cksum(const void *buf, size_t len) -{ - uint32_t sum; - - sum = __rte_raw_cksum(buf, len, 0); - return __rte_raw_cksum_reduce(sum); -} - -/** - * Compute the raw (non complemented) checksum of a packet. - * - * @param m - * The pointer to the mbuf. - * @param off - * The offset in bytes to start the checksum. - * @param len - * The length in bytes of the data to checksum. - * @param cksum - * A pointer to the checksum, filled on success. - * @return - * 0 on success, -1 on error (bad length or offset). - */ -static inline int -rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len, - uint16_t *cksum) -{ - const struct rte_mbuf *seg; - const char *buf; - uint32_t sum, tmp; - uint32_t seglen, done; - - /* easy case: all data in the first segment */ - if (off + len <= rte_pktmbuf_data_len(m)) { - *cksum = rte_raw_cksum(rte_pktmbuf_mtod_offset(m, - const char *, off), len); - return 0; - } - - if (unlikely(off + len > rte_pktmbuf_pkt_len(m))) - return -1; /* invalid params, return a dummy value */ - - /* else browse the segment to find offset */ - seglen = 0; - for (seg = m; seg != NULL; seg = seg->next) { - seglen = rte_pktmbuf_data_len(seg); - if (off < seglen) - break; - off -= seglen; - } - RTE_ASSERT(seg != NULL); - if (seg == NULL) - return -1; - seglen -= off; - buf = rte_pktmbuf_mtod_offset(seg, const char *, off); - if (seglen >= len) { - /* all in one segment */ - *cksum = rte_raw_cksum(buf, len); - return 0; - } - - /* hard case: process checksum of several segments */ - sum = 0; - done = 0; - for (;;) { - tmp = __rte_raw_cksum(buf, seglen, 0); - if (done & 1) - tmp = rte_bswap16((uint16_t)tmp); - sum += tmp; - done += seglen; - if (done == len) - break; - seg = seg->next; - buf = rte_pktmbuf_mtod(seg, const char *); - seglen = rte_pktmbuf_data_len(seg); - if (seglen > len - done) - seglen = len - done; - } - - *cksum = __rte_raw_cksum_reduce(sum); - return 0; -} - /** * Process the IPv4 checksum of an IPv4 header. * -- 2.46.0