From patchwork Wed Jun 3 10:39:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 5390 Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (8.14.3/8.13.4/Debian-3sarge3) with SMTP id n53AwCRq016431 for ; Wed, 3 Jun 2009 10:58:13 GMT Received: (qmail invoked by alias); 03 Jun 2009 10:40:15 -0000 Received: from i59F6B8A9.versanet.de (EHLO localhost) [89.246.184.169] by mail.gmx.net (mp038) with SMTP; 03 Jun 2009 12:40:15 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX19uJ6RDeuVuR5oOVOoEXhUAiCLfFZVQ5hU7q57FUK 9SbxULhRPfHKWV From: Sven Eckelmann To: b.a.t.m.a.n@open-mesh.net Date: Wed, 3 Jun 2009 12:39:26 +0200 Message-Id: <1244025566-13147-1-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.6.3.1 In-Reply-To: <1243965365-6526-1-git-send-email-sven.eckelmann@gmx.de> References: <1243965365-6526-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 X-FuHaFi: 0.49 Subject: [B.A.T.M.A.N.] [PATCHv2] [batman] Align pointers in hna list elements X-BeenThere: b.a.t.m.a.n@open-mesh.net X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jun 2009 10:58:13 -0000 Architectures like SuperARM or Xscale needs aligned data for multi-byte operations. GCC can create instructions sequences for packed data, but must know that something will not be aligned. Since list_add will operate on untyped data over void-pointers it cannot know that hna_global_entry is packed and will create only a fast and unsafe version for load and store operations. It is only important for the first 5 bytes of hna_global_entry to be packed we can force these elements to be aligned without changing the relative addresses of the first bytes. Signed-off-by: Sven Eckelmann --- batman/batman.h | 1 + batman/hna.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/batman/batman.h b/batman/batman.h index d6b00cf..23f8e9a 100644 --- a/batman/batman.h +++ b/batman/batman.h @@ -153,6 +153,7 @@ #define BATMANUNUSED(x) (x)__attribute__((unused)) #define ALIGN_WORD __attribute__ ((aligned(sizeof(TYPE_OF_WORD)))) +#define ALIGN_POINTER __attribute__ ((aligned(sizeof(void*)))) diff --git a/batman/hna.h b/batman/hna.h index 6063324..a046857 100644 --- a/batman/hna.h +++ b/batman/hna.h @@ -58,8 +58,8 @@ struct hna_global_entry { uint32_t addr; uint8_t netmask; - struct orig_node *curr_orig_node; - struct list_head_first orig_list; + struct orig_node *curr_orig_node ALIGN_POINTER; + struct list_head_first orig_list ALIGN_POINTER; } __attribute__((packed)); struct hna_orig_ptr