From patchwork Fri Oct 2 21:16:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 525802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 7332D1402C4 for ; Sat, 3 Oct 2015 07:16:49 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 2CC9D22C49C; Fri, 2 Oct 2015 14:16:35 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 513FE22C49A for ; Fri, 2 Oct 2015 14:16:34 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id C49FD420150 for ; Fri, 2 Oct 2015 15:16:33 -0600 (MDT) X-ASG-Debug-ID: 1443820592-09eadd1418158050001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id omzEHX9nkkqEynVB (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 02 Oct 2015 15:16:32 -0600 (MDT) X-Barracuda-Envelope-From: joestringer@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pa0-f42.google.com) (209.85.220.42) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 2 Oct 2015 21:16:32 -0000 Received-SPF: unknown (mx1-pf1.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.42 Received: by padhy16 with SMTP id hy16so116348669pad.1 for ; Fri, 02 Oct 2015 14:16:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tJ447DV0iW9xDVWMlf9eb51vIc7GZR4ds0FO5c/tXeM=; b=LtOaRNSphuFJmswdZ29n0CXk48yuibJbYz5YK+FpulPNvybVVkJ/hGQTjgXEIM4wSj qyXRo7UAQw26bfVOUIRiyt/HM6a+zFAr3+W5WXA5ycLRcPXIpFgf9dz0Y0nRkc1nNwaA pkUtfI5v0V9VVpFeP32AWIrJGqD7oRVMXVNrhhskm5RpJght69MzYt9EtkUXJBk0JCbh dpVoBUGAA/bxP1swv94BTblz5uGeMk0yL4loZ41qBumZRvd7VC8vBMY+Eqjpdr1Pc4po WR3GL9JUmCPCQ2R7yzSGvIfg8W17GYGbjhABCH6JHRjnt5WCKaANDfxXOTiOTjlB4qXh vWEA== X-Gm-Message-State: ALoCoQmD7fKiJWEBKBEZKx1/uudPhHny3mFqUiELH48pZ9uaNBsEwG/7NfLR//omo4DhtDyDjOCK X-Received: by 10.68.190.5 with SMTP id gm5mr22531131pbc.25.1443820591647; Fri, 02 Oct 2015 14:16:31 -0700 (PDT) Received: from localhost.localdomain ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id z6sm13633900pbt.51.2015.10.02.14.16.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Oct 2015 14:16:31 -0700 (PDT) X-CudaMail-Envelope-Sender: joestringer@nicira.com X-Barracuda-Apparent-Source-IP: 208.91.2.4 From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-1001083966 X-CudaMail-DTE: 100215 X-CudaMail-Originating-IP: 209.85.220.42 Date: Fri, 2 Oct 2015 14:16:10 -0700 X-ASG-Orig-Subj: [##CM-E1-1001083966##][PATCHv4 03/11] types: Add big-endian 128-bit types and helpers. Message-Id: <1443820578-9287-4-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1443820578-9287-1-git-send-email-joestringer@nicira.com> References: <1443820578-9287-1-git-send-email-joestringer@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1443820592 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCHv4 03/11] types: Add big-endian 128-bit types and helpers. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" These types will be used by the following patches to ensure a consistent wire format for 128-bit connection tracking labels. Common functions for comparison, endian translation, etc. are provided. Signed-off-by: Joe Stringer Acked-by: Ben Pfaff --- v4: Reorder u128 elements rather than swapping in {ntoh,hton}128(). Add OVS_*128_MAX constants Add is_ones() function. --- include/openvswitch/types.h | 14 ++++++++++++++ lib/byte-order.h | 14 ++++++++++++++ lib/meta-flow.h | 1 + lib/util.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+) diff --git a/include/openvswitch/types.h b/include/openvswitch/types.h index c138b9c..64d9012 100644 --- a/include/openvswitch/types.h +++ b/include/openvswitch/types.h @@ -84,10 +84,24 @@ typedef struct { typedef union { uint32_t u32[4]; struct { +#ifdef WORDS_BIGENDIAN + uint64_t hi, lo; +#else uint64_t lo, hi; +#endif } u64; } ovs_u128; +typedef union { + ovs_be32 be32[4]; + struct { + ovs_be64 hi, lo; + } be64; +} ovs_be128; + +#define OVS_U128_MAX (ovs_u128) { .u64 = { UINT64_MAX, UINT64_MAX } } +#define OVS_BE128_MAX (ovs_be128) { .be64 = { OVS_BE64_MAX, OVS_BE64_MAX } } + /* A 64-bit value, in network byte order, that is only aligned on a 32-bit * boundary. */ typedef struct { diff --git a/lib/byte-order.h b/lib/byte-order.h index 544f46f..3f60698 100644 --- a/lib/byte-order.h +++ b/lib/byte-order.h @@ -42,6 +42,20 @@ ovs_be64 htonll(uint64_t); uint64_t ntohll(ovs_be64); #endif +static inline void +hton128(const ovs_u128 *src, ovs_be128 *dst) +{ + dst->be64.hi = htonll(src->u64.hi); + dst->be64.lo = htonll(src->u64.lo); +} + +static inline void +ntoh128(const ovs_be128 *src, ovs_u128 *dst) +{ + dst->u64.hi = ntohll(src->be64.hi); + dst->u64.lo = ntohll(src->be64.lo); +} + static inline uint32_t uint32_byteswap(uint32_t crc) { return (((crc & 0x000000ff) << 24) | diff --git a/lib/meta-flow.h b/lib/meta-flow.h index 02272ef..f9379f9 100644 --- a/lib/meta-flow.h +++ b/lib/meta-flow.h @@ -1742,6 +1742,7 @@ union mf_value { uint8_t tun_metadata[128]; struct in6_addr ipv6; struct eth_addr mac; + ovs_be128 be128; ovs_be64 be64; ovs_be32 be32; ovs_be16 be16; diff --git a/lib/util.h b/lib/util.h index 4186d49..340ef65 100644 --- a/lib/util.h +++ b/lib/util.h @@ -563,6 +563,36 @@ ovs_u128_equals(const ovs_u128 *a, const ovs_u128 *b) return (a->u64.hi == b->u64.hi) && (a->u64.lo == b->u64.lo); } +/* Returns true if 'val' is 0. */ +static inline bool +ovs_u128_is_zero(const ovs_u128 *val) +{ + return !(val->u64.hi || val->u64.lo); +} + +/* Returns true if 'val' is all ones. */ +static inline bool +ovs_u128_is_ones(const ovs_u128 *val) +{ + ovs_u128 ones = OVS_U128_MAX; + + return ovs_u128_equals(val, &ones); +} + +/* Returns non-zero if the parameters have equal value. */ +static inline int +ovs_be128_equals(const ovs_be128 *a, const ovs_be128 *b) +{ + return (a->be64.hi == b->be64.hi) && (a->be64.lo == b->be64.lo); +} + +/* Returns true if 'val' is 0. */ +static inline bool +ovs_be128_is_zero(const ovs_be128 *val) +{ + return !(val->be64.hi || val->be64.lo); +} + void xsleep(unsigned int seconds); #ifdef _WIN32