From patchwork Tue Feb 5 18:28:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 157524 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5566411jaa; Tue, 5 Feb 2019 11:45:28 -0800 (PST) X-Google-Smtp-Source: AHgI3IZHZuFQNm74TZD0CTNH/l9yzzeC3G/hE9MfYh4YdpgpxKmrBxmk/vSpAD2i+wd/NchPtHCW X-Received: by 2002:a0d:c9c5:: with SMTP id l188mr5406239ywd.408.1549395928005; Tue, 05 Feb 2019 11:45:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549395928; cv=none; d=google.com; s=arc-20160816; b=nDLprIzd7B0QrtlzzKgxfxefFmjVpP7eQWKJEV3fi6VSsNOBbiBAHxITB+cg9Pkjhn FLe2dLpzMM8/nLO3fF2ejKtobdZ4L1wvvUQVYnaD7GT4kd+h0CtP4qYeSOJEAQE3QcPj aKwi/rNwE+hU0y/tO3rc4bF+FcM3fI+buTizq9NA+SlByWZ7Z1Q22IAjzULrUKg6J2Sh 4SyzH2cr3TKMFr7S4p5/ow2WxdHJYGkIUDwOUu7+CFKwcko5anmpnrvJ1TIrYqOSLGs7 qD7Lkp5EzrdNG0loWaRDthVbIVvFygBVHTaafze4Zyb81KIuHmMQT45OvmMhA3nHik24 jOsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=KcCeF72dxSP15VPU3Umy6P5HvUDSDyyWy9IScFQfC/4=; b=xbscB7KXfQIgHassi2lP2Ca1nw770fwRUH0TicvC3L5czy64ZzhoV8GhSmjBciurzq dFIxw9e8jrbgZ1JJ8jf8rscJni8KqPeoIuZencSsY++Y4ZdcipH63x+6/uEyJ5ezqTJf aZoP14miHD1qeZ81gPgK2qy5d8ZKS9lvLPgGBvPYp3Flr+mviYmFqXcX9S1q7gpntt9F Coh6RkuKsqqz2jfHpajjnya155o3DDzU7eo2QSGYKPSdUNnq7bK1l6DPfaKVMt8pF1Ja kIKBbtbOKKizF9ussh3bgxnCk4BC76GdWWsHZESZbAuLcBhbMRjy8cpTqggCX6BGD8v+ Yp6Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r5si2453965yba.145.2019.02.05.11.45.27 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 11:45:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:39120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr6et-0007h8-A7 for patch@linaro.org; Tue, 05 Feb 2019 14:45:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5Sv-0004oC-C7 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5St-0005JK-Ts for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:01 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:34622) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr5St-0005F2-FX for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:28:59 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 16555C133; Tue, 5 Feb 2019 19:28:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1TISwDn4_lBN; Tue, 5 Feb 2019 19:28:54 +0100 (CET) Received: from function (unknown [188.164.201.34]) by hera.aquilenet.fr (Postfix) with ESMTPSA id EDFBFC10F; Tue, 5 Feb 2019 19:28:53 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1gr5Sj-0007nK-4H; Tue, 05 Feb 2019 19:28:49 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 5 Feb 2019 20:28:18 +0200 Message-Id: <20190205182848.29887-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205182848.29887-1-samuel.thibault@ens-lyon.org> References: <20190205182848.29887-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULLv3 02/32] slirp: Avoid marking naturally packed structs as QEMU_PACKED 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: , Cc: jan.kiszka@siemens.com, stefanha@redhat.com, Samuel Thibault Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Various ipv6 structs in the slirp headers are marked QEMU_PACKED, but they are actually naturally aligned and will have no padding in them. Instead of marking them with the 'packed' attribute, assert at compile time that they are the size we expect. This allows us to take the address of fields within the structs without risking undefined behaviour, and suppresses clang -Waddress-of-packed-member warnings. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Signed-off-by: Samuel Thibault --- slirp/ip6.h | 12 ++++++++++-- slirp/ip6_icmp.h | 20 +++++++++++++++----- 2 files changed, 25 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/slirp/ip6.h b/slirp/ip6.h index 14e9c78735..1e3e329ce6 100644 --- a/slirp/ip6.h +++ b/slirp/ip6.h @@ -133,7 +133,7 @@ struct ip6 { uint8_t ip_nh; /* next header */ uint8_t ip_hl; /* hop limit */ struct in6_addr ip_src, ip_dst; /* source and dest address */ -} QEMU_PACKED; +}; /* * IPv6 pseudo-header used by upper-layer protocols @@ -145,7 +145,15 @@ struct ip6_pseudohdr { uint16_t ih_zero_hi; /* zero */ uint8_t ih_zero_lo; /* zero */ uint8_t ih_nh; /* next header */ -} QEMU_PACKED; +}; +/* + * We don't want to mark these ip6 structs as packed as they are naturally + * correctly aligned; instead assert that there is no stray padding. + * If we marked the struct as packed then we would be unable to take + * the address of any of the fields in it. + */ +QEMU_BUILD_BUG_ON(sizeof(struct ip6) != 40); +QEMU_BUILD_BUG_ON(sizeof(struct ip6_pseudohdr) != 40); #endif diff --git a/slirp/ip6_icmp.h b/slirp/ip6_icmp.h index 32b0914055..2ad2b75e67 100644 --- a/slirp/ip6_icmp.h +++ b/slirp/ip6_icmp.h @@ -48,12 +48,16 @@ struct ndp_ra { /* Router Advertisement Message */ uint16_t lifetime; /* Router Lifetime */ uint32_t reach_time; /* Reachable Time */ uint32_t retrans_time; /* Retrans Timer */ -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct ndp_ra) != 12); struct ndp_ns { /* Neighbor Solicitation Message */ uint32_t reserved; struct in6_addr target; /* Target Address */ -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct ndp_ns) != 20); struct ndp_na { /* Neighbor Advertisement Message */ #if G_BYTE_ORDER == G_BIG_ENDIAN @@ -72,13 +76,17 @@ struct ndp_na { /* Neighbor Advertisement Message */ reserved_lo:24; #endif struct in6_addr target; /* Target Address */ -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct ndp_na) != 20); struct ndp_redirect { uint32_t reserved; struct in6_addr target; /* Target Address */ struct in6_addr dest; /* Destination Address */ -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct ndp_redirect) != 36); /* * Structure of an icmpv6 header. @@ -103,7 +111,9 @@ struct icmp6 { #define icmp6_nns icmp6_body.ndp_ns #define icmp6_nna icmp6_body.ndp_na #define icmp6_redirect icmp6_body.ndp_redirect -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(sizeof(struct icmp6) != 40); #define ICMP6_MINLEN 4 #define ICMP6_ERROR_MINLEN 8 From patchwork Tue Feb 5 18:28:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 157522 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp5546931jaa; Tue, 5 Feb 2019 11:24:47 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib6a1PkOa6mPcAL8MJekg9DI+6RLB3Dd+EnLRMMvNTJgyoRAIniZMEE2I87Rjas7+uYIhDi X-Received: by 2002:a0d:c484:: with SMTP id g126mr5374299ywd.151.1549394687444; Tue, 05 Feb 2019 11:24:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549394687; cv=none; d=google.com; s=arc-20160816; b=hqvRnNfnLzfgdkx8vFSVu1jhzix8yj2tX3kNKZG/N777s7QVgIYa/wHxssT0xmF3ZE 4dZOi3lW62EM+4C88DmdvlZ2RhDyoA7KuaeAHWQ5sQ6vvSfaH35TA0w3TcrabFfFkjLS 2xMQLfCuL9roSVNV/BIBaQ9CY1N1h2C3VfNaFeh7TpM53MkWKH3El+FyRbX1JpTcjni2 P6+oGBU6E4GWuOEYKFmXrPic9KN3GWcFqumUtdcTurUiFoFqWdfC2A6vJsmIagDHOsCR YPJOheIwQbRrvfip9y3qINU6e06lsvpqtWvCxnqAeDSXTTiYqRZQM9yUYEVUpKSjnrLX KsAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=c37Oo6eLvoOcn14oMVc6NjO4Og2IlcGPMnzcEwlvs00=; b=UlX8lGe5rUsGfXESKnfB0V9rdIXWuP8lc/Cd99fcPfrfK1Trb/hu8WuuNSMkcuLhpR CKAeVtUfKKqZXbsV7WdHBfKAI3NLJLJMLV7CBVLKkfWCVgYLMtQaHcnUSSgamjUOMiYc AHgYsrbuIgIlFtrKpp58JnA3vbcOPi+7jURKIbxsqKqcACz2rge7N49SBajQekXzFBNV 1Aq5+UE5vjRS0Jp0JHKjsRn33PWrkbd97WuU10LRb8ilhjgA6jc7wkikmtKbOpFB0Yw3 hPzp0B8CYsJer03RR9RyAktH0kNj5abVkG5HnDNuGVfmbvvPQUM7wQOvgXWK4WzhKaPZ MPgg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 1si143177ywm.10.2019.02.05.11.24.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 11:24:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:38546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr6Ks-0008Jv-UF for patch@linaro.org; Tue, 05 Feb 2019 14:24:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5Sv-0004nB-2F for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5St-0005Iy-Rx for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:29:00 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:34632) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gr5St-0005Fz-Gj for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:28:59 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B3EEAC10F; Tue, 5 Feb 2019 19:28:57 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PGdeSh55UkOH; Tue, 5 Feb 2019 19:28:57 +0100 (CET) Received: from function (unknown [188.164.201.34]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 197D2C112; Tue, 5 Feb 2019 19:28:53 +0100 (CET) Received: from samy by function with local (Exim 4.92-RC4) (envelope-from ) id 1gr5Sj-0007nM-5D; Tue, 05 Feb 2019 19:28:49 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 5 Feb 2019 20:28:19 +0200 Message-Id: <20190205182848.29887-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205182848.29887-1-samuel.thibault@ens-lyon.org> References: <20190205182848.29887-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULLv3 03/32] slirp: Don't mark struct ipq or struct ipasfrag as packed 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: , Cc: jan.kiszka@siemens.com, stefanha@redhat.com, Samuel Thibault Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell There is no reason to mark the struct ipq and struct ipasfrag as packed: they are naturally aligned anyway, and are not representing any on-the-wire packet format. Indeed they vary in size depending on the size of pointers on the host system, because the 'struct qlink' members include 'void *' fields. Dropping the 'packed' annotation fixes clang -Waddress-of-packed-member warnings and probably lets the compiler generate better code too. The only thing we do care about in the layout of the struct is that the frag_link matches up with the ipf_link of the struct ipasfrag, as documented in the comment on that struct; assert at build time that this is the case. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Signed-off-by: Samuel Thibault --- slirp/ip.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/slirp/ip.h b/slirp/ip.h index 243b6c8b24..20614f3b53 100644 --- a/slirp/ip.h +++ b/slirp/ip.h @@ -217,7 +217,7 @@ struct ipq { uint8_t ipq_p; /* protocol of this fragment */ uint16_t ipq_id; /* sequence id for reassembly */ struct in_addr ipq_src,ipq_dst; -} QEMU_PACKED; +}; /* * Ip header, when holding a fragment. @@ -227,7 +227,10 @@ struct ipq { struct ipasfrag { struct qlink ipf_link; struct ip ipf_ip; -} QEMU_PACKED; +}; + +QEMU_BUILD_BUG_ON(offsetof(struct ipq, frag_link) != + offsetof(struct ipasfrag, ipf_link)); #define ipf_off ipf_ip.ip_off #define ipf_tos ipf_ip.ip_tos