From patchwork Tue May 23 23:02:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 766257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wXWK30Xd1z9rxj for ; Wed, 24 May 2017 09:03:03 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 95970BC2; Tue, 23 May 2017 23:02:29 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 8E103B5F for ; Tue, 23 May 2017 23:02:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id E446D185 for ; Tue, 23 May 2017 23:02:25 +0000 (UTC) Received: from mfilter11-d.gandi.net (mfilter11-d.gandi.net [217.70.178.131]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id B1B2F41C093 for ; Wed, 24 May 2017 01:02:24 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter11-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter11-d.gandi.net (mfilter11-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id 7koDfKRlTOmK for ; Wed, 24 May 2017 01:02:23 +0200 (CEST) X-Originating-IP: 64.134.227.17 Received: from archer.hil-sfofhhh02.sfo.wayport.net (ip-64-134-227-17.public.wayport.net [64.134.227.17]) (Authenticated sender: joe@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 96EFA41C092 for ; Wed, 24 May 2017 01:02:22 +0200 (CEST) From: Joe Stringer To: dev@openvswitch.org Date: Tue, 23 May 2017 16:02:12 -0700 Message-Id: <20170523230216.29696-2-joe@ovn.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170523230216.29696-1-joe@ovn.org> References: <20170523230216.29696-1-joe@ovn.org> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 1/5] odp-execute: Fix unaligned eth_addr pointers. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Clang 4.0 complains: ../lib/odp-execute.c:61:37: error: taking address of packed member 'eth_dst' of class or structure 'eth_header' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] ether_addr_copy_masked(&eh->eth_src, key->eth_src, mask->eth_src); ^~~~~~~~~~~ ../lib/odp-execute.c:62:37: error: taking address of packed member 'eth_dst' of class or structure 'eth_header' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] ether_addr_copy_masked(&eh->eth_dst, key->eth_dst, mask->eth_dst); Ethernet source addresses are 48 bits offset into the Ethernet header, so taking a pointer for this is not guaranteed to be valid on all architectures. Fix this by referencing the memory direct from the Ethernet header pointer. Signed-off-by: Joe Stringer --- lib/odp-execute.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/odp-execute.c b/lib/odp-execute.c index 08bc50a46a2e..f0dadf56c422 100644 --- a/lib/odp-execute.c +++ b/lib/odp-execute.c @@ -48,6 +48,21 @@ ether_addr_copy_masked(struct eth_addr *dst, const struct eth_addr src, } static void +ether_addrs_copy_masked(struct eth_header *hdr, + const struct eth_addr src, const struct eth_addr smask, + const struct eth_addr dst, const struct eth_addr dmask) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(src.be16); i++) { + hdr->eth_src.be16[i] = src.be16[i] + | (hdr->eth_src.be16[i] & ~smask.be16[i]); + hdr->eth_dst.be16[i] = dst.be16[i] + | (hdr->eth_dst.be16[i] & ~dmask.be16[i]); + } +} + +static void odp_eth_set_addrs(struct dp_packet *packet, const struct ovs_key_ethernet *key, const struct ovs_key_ethernet *mask) { @@ -58,8 +73,8 @@ odp_eth_set_addrs(struct dp_packet *packet, const struct ovs_key_ethernet *key, eh->eth_src = key->eth_src; eh->eth_dst = key->eth_dst; } else { - ether_addr_copy_masked(&eh->eth_src, key->eth_src, mask->eth_src); - ether_addr_copy_masked(&eh->eth_dst, key->eth_dst, mask->eth_dst); + ether_addrs_copy_masked(eh, key->eth_src, mask->eth_src, + key->eth_dst, mask->eth_dst); } } }