From patchwork Thu Feb 22 09:04:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 876544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zn7kn5x5sz9s7T for ; Thu, 22 Feb 2018 20:06:24 +1100 (AEDT) Received: from localhost ([::1]:36845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eompa-0006z9-8i for incoming@patchwork.ozlabs.org; Thu, 22 Feb 2018 04:06:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eomnf-00060N-Cl for qemu-devel@nongnu.org; Thu, 22 Feb 2018 04:04:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eomnZ-0003TX-MB for qemu-devel@nongnu.org; Thu, 22 Feb 2018 04:04:23 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42316 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eomnZ-0003Sq-GO for qemu-devel@nongnu.org; Thu, 22 Feb 2018 04:04:17 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BCBCD814DF58; Thu, 22 Feb 2018 09:04:15 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id B139F213AEE2; Thu, 22 Feb 2018 09:04:14 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Jason Wang , Dmitry Fleytman Date: Thu, 22 Feb 2018 10:04:13 +0100 Message-Id: <1519290253-23854-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 22 Feb 2018 09:04:15 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 22 Feb 2018 09:04:15 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] net: Move the toeplitz functions from checksum.h to net_rx_pkt.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The functions are only used in this single .c file, so there is no need to put all this code in a header that is included from multiple places. Signed-off-by: Thomas Huth --- hw/net/net_rx_pkt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/net/checksum.h | 44 -------------------------------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c index 98a5030..f66beb3 100644 --- a/hw/net/net_rx_pkt.c +++ b/hw/net/net_rx_pkt.c @@ -48,6 +48,50 @@ struct NetRxPkt { eth_l4_hdr_info l4hdr_info; }; +typedef struct toeplitz_key_st { + uint32_t leftmost_32_bits; + uint8_t *next_byte; +} net_toeplitz_key; + +static inline +void net_toeplitz_key_init(net_toeplitz_key *key, uint8_t *key_bytes) +{ + key->leftmost_32_bits = be32_to_cpu(*(uint32_t *)key_bytes); + key->next_byte = key_bytes + sizeof(uint32_t); +} + +static inline +void net_toeplitz_add(uint32_t *result, + uint8_t *input, + uint32_t len, + net_toeplitz_key *key) +{ + register uint32_t accumulator = *result; + register uint32_t leftmost_32_bits = key->leftmost_32_bits; + register uint32_t byte; + + for (byte = 0; byte < len; byte++) { + register uint8_t input_byte = input[byte]; + register uint8_t key_byte = *(key->next_byte++); + register uint8_t bit; + + for (bit = 0; bit < 8; bit++) { + if (input_byte & (1 << 7)) { + accumulator ^= leftmost_32_bits; + } + + leftmost_32_bits = + (leftmost_32_bits << 1) | ((key_byte & (1 << 7)) >> 7); + + input_byte <<= 1; + key_byte <<= 1; + } + } + + key->leftmost_32_bits = leftmost_32_bits; + *result = accumulator; +} + void net_rx_pkt_init(struct NetRxPkt **pkt, bool has_virt_hdr) { struct NetRxPkt *p = g_malloc0(sizeof *p); diff --git a/include/net/checksum.h b/include/net/checksum.h index 05a0d27..77a56c1 100644 --- a/include/net/checksum.h +++ b/include/net/checksum.h @@ -59,48 +59,4 @@ uint32_t net_checksum_add_iov(const struct iovec *iov, uint32_t iov_off, uint32_t size, uint32_t csum_offset); -typedef struct toeplitz_key_st { - uint32_t leftmost_32_bits; - uint8_t *next_byte; -} net_toeplitz_key; - -static inline -void net_toeplitz_key_init(net_toeplitz_key *key, uint8_t *key_bytes) -{ - key->leftmost_32_bits = be32_to_cpu(*(uint32_t *)key_bytes); - key->next_byte = key_bytes + sizeof(uint32_t); -} - -static inline -void net_toeplitz_add(uint32_t *result, - uint8_t *input, - uint32_t len, - net_toeplitz_key *key) -{ - register uint32_t accumulator = *result; - register uint32_t leftmost_32_bits = key->leftmost_32_bits; - register uint32_t byte; - - for (byte = 0; byte < len; byte++) { - register uint8_t input_byte = input[byte]; - register uint8_t key_byte = *(key->next_byte++); - register uint8_t bit; - - for (bit = 0; bit < 8; bit++) { - if (input_byte & (1 << 7)) { - accumulator ^= leftmost_32_bits; - } - - leftmost_32_bits = - (leftmost_32_bits << 1) | ((key_byte & (1 << 7)) >> 7); - - input_byte <<= 1; - key_byte <<= 1; - } - } - - key->leftmost_32_bits = leftmost_32_bits; - *result = accumulator; -} - #endif /* QEMU_NET_CHECKSUM_H */