From patchwork Tue May 1 23:53:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 907248 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=208.118.235.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40bJDX01lcz9s1d for ; Wed, 2 May 2018 09:54:48 +1000 (AEST) Received: from localhost ([::1]:46665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDf6Y-0000ih-R4 for incoming@patchwork.ozlabs.org; Tue, 01 May 2018 19:54:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fDf61-0000iP-Go for qemu-devel@nongnu.org; Tue, 01 May 2018 19:54:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fDf5w-0002gV-HF for qemu-devel@nongnu.org; Tue, 01 May 2018 19:54:09 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:56867) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fDf5w-0002ei-6Q for qemu-devel@nongnu.org; Tue, 01 May 2018 19:54:04 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MGE0B-1fB87x18PH-00F9ya; Wed, 02 May 2018 01:53:54 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 2 May 2018 01:53:32 +0200 Message-Id: <20180501235332.31245-1-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 X-Provags-ID: V03:K1:0Z6QDLANe+lBNTTemSDO1gG71pAU5YMBqyj4kWyefkBxab0wtJb tn8Vq4UvpOlPp2rR8ijtgSIqyCPSpMemZ10/GKW2hN2d6o3NIlLcrqeNjRb3fuPhM1oqFs5 OHrafKnpZsQx63yLlUJfqwD9XpRUCJP+3ku6Mn0LGfZWME5S5YSv9TPKk5nBDMjjC+C/Na9 I3AEIgwtwp1PNIvI6bn1g== X-UI-Out-Filterresults: notjunk:1; V01:K0:jG1YooDAqhw=:uPMyO0NfrLyD0DTudgSnLz KZNIl8OlcOdNtYZzbB/7AK1I/52fIwABEgepEMgzNQvbzBt6vFRH2OGAIu45gbTUmctXVdFF+ pW4bt3jkm+tUFwRdCPTVXEJvyIhg7VVLk9+sOVBVJOM4M/FmpfOCpLUvhGu2Kw81KRBbCMoV+ HOTU6h+usn35Mxavdto+ckPZZPPgS2Bazf86pmhKLGLKg//57S8rSqN8lzM1xeN8R6BbgueRa ggeR4J6OzUJuxFbBSW8hiWNbJXfwgFtUqDTBrSbiG5zhQmrcEiY4iLyvmnARWJrtxydHvrsFq qPe8bBICtUidORzT2vSK0uGZlRzFv+r2gPK50oCrq6o/oweGe5esxyivUy2ZCnlfpcZn7Gcgb 2fwCbiJJT7u+mBZ4zRz4LcEJLaR69DnF2CN+BAUP3MS7oz3i7Ab0Qzu/IOGnqIBCO2XgLyQS2 UN+esAUOn4T2FZYV2UrTp03oJiU1NYBEhD6P6Za6G//XEWtuf3K4eBOwW0rnGRP0impCkXBBj ZDEOOYxpkXBZ64DASV3GQzpRgYwPYoB64mh9+gkz5TTCwoU6GU1rVToOI38LJy0WVGSWBVrf3 g/kBx3bnKZls1WAvFEiyjI8UYBEZqfoM0+RuNa0Yl/mxveoGK48QHn+v5HKbo7ju4+uPAaCIL jzQ4k5SRWDvF9YAtUv/xhG84VLPEClCSU+74vWGJLIXWLeQbaiv406nomZYBT2SIgRIg= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PATCH] linux-user: remove useless padding in flock64 structure 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: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since commit 8efb2ed5ec ("linux-user: Correct signedness of target_flock l_start and l_len fields"), flock64 structure uses abi_llong for l_start and l_len in place of "unsigned long long" this should force them to be aligned accordingly to the target rules. So we can remove the padding field and the QEMU_PACKED attribute. I have compared the result of the following program before and after the change: cat -> flock64_dump <l_type p/d &((struct target_flock64 *)0)->l_whence p/d &((struct target_flock64 *)0)->l_start p/d &((struct target_flock64 *)0)->l_len p/d &((struct target_flock64 *)0)->l_pid quit EOF for file in build/all/*-linux-user/qemu-* ; do echo $file gdb -batch -nx -x flock64_dump $file 2> /dev/null done The sizeof() changes because we remove the QEMU_PACKED. The new size is 32 (except for i386 and m68k) and this is the real size of "struct flock64" on the target architecture. The following architectures differ: aarch64_be, aarch64, alpha, armeb, arm, cris, hppa, nios2, or1k, riscv32, riscv64, s390x. For a subset of these architectures, I have checked with the following program the new structure is the correct one: #include #define __USE_LARGEFILE64 #include int main(void) { printf("struct flock64 %d\n", sizeof(struct flock64)); printf("l_type %d\n", &((struct flock64 *)0)->l_type); printf("l_whence %d\n", &((struct flock64 *)0)->l_whence); printf("l_start %d\n", &((struct flock64 *)0)->l_start); printf("l_len %d\n", &((struct flock64 *)0)->l_len); printf("l_pid %d\n", &((struct flock64 *)0)->l_pid); } [I have checked aarch64, alpha, arm, s390x] I have also fixed the alignment value for sh4 (to align llong on 4 bytes) (see c2e3dee6e0 "linux-user: Define target alignment size") Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- include/exec/user/abitypes.h | 2 +- linux-user/syscall_defs.h | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h index ba188608c2..743b8bb9ea 100644 --- a/include/exec/user/abitypes.h +++ b/include/exec/user/abitypes.h @@ -15,7 +15,7 @@ #define ABI_LLONG_ALIGNMENT 2 #endif -#if defined(TARGET_I386) && !defined(TARGET_X86_64) +#if (defined(TARGET_I386) && !defined(TARGET_X86_64)) || defined(TARGET_SH4) #define ABI_LLONG_ALIGNMENT 4 #endif diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 23f5bccf0e..df3847bc16 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2649,28 +2649,21 @@ struct target_flock { }; struct target_flock64 { - short l_type; - short l_whence; -#if defined(TARGET_PPC) || defined(TARGET_X86_64) || defined(TARGET_MIPS) \ - || defined(TARGET_SPARC) || defined(TARGET_HPPA) \ - || defined(TARGET_MICROBLAZE) || defined(TARGET_TILEGX) \ - || defined(TARGET_XTENSA) - int __pad; -#endif + abi_short l_type; + abi_short l_whence; abi_llong l_start; abi_llong l_len; - int l_pid; -} QEMU_PACKED; + abi_int l_pid; +}; #ifdef TARGET_ARM struct target_eabi_flock64 { - short l_type; - short l_whence; - int __pad; + abi_short l_type; + abi_short l_whence; abi_llong l_start; abi_llong l_len; - int l_pid; -} QEMU_PACKED; + abi_int l_pid; +}; #endif struct target_f_owner_ex {