From patchwork Sun Apr 1 20:36:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 10319227 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9BFA160380 for ; Sun, 1 Apr 2018 20:37:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B5C2268AE for ; Sun, 1 Apr 2018 20:37:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F24D28D4B; Sun, 1 Apr 2018 20:37:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, FROM_LOCAL_NOVOWEL, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F33E2268AE for ; Sun, 1 Apr 2018 20:37:50 +0000 (UTC) Received: from localhost ([::1]:33364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2jjZ-0006ty-K6 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 01 Apr 2018 16:37:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2jiq-0006VZ-Nb for qemu-devel@nongnu.org; Sun, 01 Apr 2018 16:37:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f2jip-0003u1-Lu for qemu-devel@nongnu.org; Sun, 01 Apr 2018 16:37:04 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:46959) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f2jip-0003tt-DQ for qemu-devel@nongnu.org; Sun, 01 Apr 2018 16:37:03 -0400 Received: by mail-lf0-x243.google.com with SMTP id j68-v6so18237006lfg.13 for ; Sun, 01 Apr 2018 13:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=SZgj4PhTHS91a0lRctvObDiUI6JBB1TzzCX7WZraU8c=; b=AqJ4CfPI4VG0cC8x42vdSo6IlHAiVj6Thgrb9O74q8vyuMYgQqbrCoXCBfTtP7k4BO OtglyNkMqH1fdhCRhFcKoZGA4yz9yK5ybfHQ33hiuD8Begia30QJr0demn7XD3NahNkc PKk8hX3cP75llJlBFet95xTMBFcpLYTwGbw8/28QRwIRX0QZI2Tm7ZAAVRRKRHTQvXD5 bpJATTYxM9K1f9MdGzcCpokYjUM/OZpkRLCQhwQ1nxK3XeAAtemeoiXDiwsXfdGWN+yz vI8F8pFPoIpIZQa/6KPuxh0PfQTnfH8t2D8mVIDYdr9E5oTYYdQfQjrvKSKDVam47Ug1 1Hqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SZgj4PhTHS91a0lRctvObDiUI6JBB1TzzCX7WZraU8c=; b=INlcZtzHD8gU/eQSmVFjGu1RY0kTJkBWYlX7EoCTt2yCpMwdSd7NvypppiJ2niaYTV qnEXhrTrwGBdU6McnXNSPFPim2nC/huD1ch/cxx20Xkk81hmNE/9XrU3sUJ8pGzLO8yq S6MLgBW/+Nq9Aynsz9tIygsCfcHbzWIzKESalX9Mx9wSSYPcLFDzh745hREtSl8mjFy5 cWY4KrpuPJcJejf4vCqiT0b9YzO4QXORC0BtGWhvKk9rm2CmBzNQ5NthWIVjx0X3pq7P 0meRb7UqLgPAR782kJOlZPpTubGFCS2weIMa5G+Ow8A8nsfKoxoLHUQY/eKYyeB/bfAY BCsA== X-Gm-Message-State: AElRT7E9acgC1UWd61kawQq+Y2GQ4CV7K3UyEt9nwyLZcU0XIsM4Qg+B D0kkeCnjwVdLFMshi4aa5cUxHw== X-Google-Smtp-Source: AIpwx4/Qf3P2N4bJGbM6qMNbHsxwuM/DQk5aIJStMTbOSilBF3gCQMSJ8RNHjAkeJ7/RX6J54SbNgQ== X-Received: by 10.46.128.90 with SMTP id p26mr4587644ljg.141.1522615021741; Sun, 01 Apr 2018 13:37:01 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net. (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id m18-v6sm2147250lfj.32.2018.04.01.13.36.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Apr 2018 13:37:01 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Sun, 1 Apr 2018 13:36:40 -0700 Message-Id: <20180401203640.31617-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::243 Subject: [Qemu-devel] [PATCH v2] target/xtensa: linux-user: fix sysv IPC structures 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: Max Filippov , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP - make target_ipc_perm fields match kernel definitions for xtensa; - add target_semid64_ds with proper order of times and reserved fields for little/big endian specific for xtensa; - add missing reserved fields after time fields to the target_shmid_ds; - fix types of shm_cpid, shm_lpid and shm_nattch fields of target_shmid_ds to match kernel definitions for xtensa. These changes fix guest ipcs output and fix glibc testsuite tests sysvipc/test-sysvsem and sysvipc/test-sysvshm. Signed-off-by: Max Filippov Reviewed-by: Laurent Vivier --- Changes v1->v2: - remove little/big endian versions of target_shmid_ds layout to match kernel definition. linux-user/xtensa/target_structs.h | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_structs.h index 020e20e242fc..1b3d9ca314ff 100644 --- a/linux-user/xtensa/target_structs.h +++ b/linux-user/xtensa/target_structs.h @@ -8,21 +8,44 @@ struct target_ipc_perm { abi_uint cuid; /* Creator's user ID. */ abi_uint cgid; /* Creator's group ID. */ abi_uint mode; /* Read/write permission. */ - abi_ushort __seq; /* Sequence number. */ + abi_ulong __seq; /* Sequence number. */ + abi_ulong __unused1; + abi_ulong __unused2; +}; + +struct target_semid64_ds { + struct target_ipc_perm sem_perm; +#ifdef TARGET_WORDS_BIGENDIAN + abi_ulong __unused1; + abi_ulong sem_otime; + abi_ulong __unused2; + abi_ulong sem_ctime; +#else + abi_ulong sem_otime; + abi_ulong __unused1; + abi_ulong sem_ctime; + abi_ulong __unused2; +#endif + abi_ulong sem_nsems; + abi_ulong __unused3; + abi_ulong __unused4; }; +#define TARGET_SEMID64_DS struct target_shmid_ds { struct target_ipc_perm shm_perm; /* operation permission struct */ - abi_int shm_segsz; /* size of segment in bytes */ + abi_long shm_segsz; /* size of segment in bytes */ abi_long shm_atime; /* time of last shmat() */ + abi_ulong __unused1; abi_long shm_dtime; /* time of last shmdt() */ - abi_long shm_ctime; /* time of last change by shmctl() */ - abi_ushort shm_cpid; /* pid of creator */ - abi_ushort shm_lpid; /* pid of last shmop */ - abi_ushort shm_nattch; /* number of current attaches */ - abi_ushort shm_unused; /* compatibility */ abi_ulong __unused2; + abi_long shm_ctime; /* time of last change by shmctl() */ abi_ulong __unused3; + abi_uint shm_cpid; /* pid of creator */ + abi_uint shm_lpid; /* pid of last shmop */ + abi_ulong shm_nattch; /* number of current attaches */ + abi_ulong __unused4; + abi_ulong __unused5; }; #endif