From patchwork Wed Nov 2 19:26:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 80543 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp292038qge; Wed, 2 Nov 2016 12:29:54 -0700 (PDT) X-Received: by 10.98.66.149 with SMTP id h21mr9749064pfd.32.1478114994681; Wed, 02 Nov 2016 12:29:54 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id d8si4775948pgc.59.2016.11.02.12.29.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Nov 2016 12:29:54 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-74329-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-74329-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-74329-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=Y2jNVzsSHZ93QReuIjHrvF85rJnO+pK K8IXYfTVVteCu3au5kD5FL2grXV6jxMVORleqI1/bee7mdrNH08p+c9HQHjUE/gu 2OXLyD8OlBH9O+roaQQ8TZtMLk6cj0oJIgM507A+y60z1llXE0nJQBPsfvA4BzwW vh8G1f/IAhgQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=Qqr95W01TJnSf2OilO00tcRiUWY=; b=WkHxZ zubRZpaKzEexXgTwEHk2wDCtIdS+BX/DdlbG2+CfAt8U56PnEERn7WFv8zDLymIS aIg4ZKwQEVvrZthkzOguvndClN1TS9lzamG7aQuLPCzcxxXdwKTQ86iYAavKW9tU hhMaqwr2XFwgywz2w2VVoFjXBMxFIVD4T8pJCo= Received: (qmail 65825 invoked by alias); 2 Nov 2016 19:27:29 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 65591 invoked by uid 89); 2 Nov 2016 19:27:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-ua0-f173.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=y1injdlc32Nt6gmVv4tpDTiYjXvApW+mnE4myfuUTQ8=; b=S3+N4zui+4K4inBg2c3DzE7kLTCH87eYV7MFJD+3Bj+4JPAHQNXy7MXoM582vrAZ/W TnUV4lvIPlYdXdhE5V98vsRcs0U75LvrOvlH3vjWE8VhkUaiK3mxWse83fIaPdBD9pIW RKUaId3bsOOKBjI+hsVIiRS7zYaoxi+gtlUAX+ZYAxn9IrmhrJfsZdoicQH7HuU7nHZH 2hqLeZvn7tpC8hzjncCzS5ZLVbXXeMQ9M8Ca3T/Yr2TLSBPHeMAA9VnpT+lwNAbMEJls nLZINWA/rnnrHtLd3pCBQE34FEPpHAjUvR911+mP9y+0DzNaulZUvF0e8D+n/ghO++a+ MG7Q== X-Gm-Message-State: ABUngvc7FSv2rIcKL2nQHNVGZn8BCWeJFxZM+lDOEEJzrSLXrzN6ro5TvBawmAzjFmypvYFx X-Received: by 10.176.82.71 with SMTP id j7mr3563652uaa.77.1478114836705; Wed, 02 Nov 2016 12:27:16 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 13/16] Consolidate Linux shmctl implementation Date: Wed, 2 Nov 2016 17:26:50 -0200 Message-Id: <1478114813-3526-14-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1478114813-3526-1-git-send-email-adhemerval.zanella@linaro.org> References: <1478114813-3526-1-git-send-email-adhemerval.zanella@linaro.org> Changes from previous version: - Use __ASSUME_SYSVIPC_SYSCALL instead of __NR_syscall to issue the wired syscall or the ipc one. -- This patch consolidates the shmctl Linux implementation in only one default file, sysdeps/unix/sysv/linux/shmctl.c. If tries to use the direct syscall if it is supported, otherwise will use the old ipc multiplex mechanism. The patch also simplify header inclusion and reorganize internal compat symbol to be built only if old ipc is defined. Checked on x86_64, i686, powerpc64le, aarch64, and armhf. * sysdeps/unix/sysv/linux/alpha/shmctl.c: Remove file. * sysdeps/unix/sysv/linux/arm/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/microblaze/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips64/shmctl.c: Use default implementation. * sysdeps/unix/sysv/linux/shmctl.c (__new_shmctl): Use shmctl syscall if it is defined. --- ChangeLog | 8 ++++ sysdeps/unix/sysv/linux/alpha/shmctl.c | 1 - sysdeps/unix/sysv/linux/arm/shmctl.c | 34 ----------------- sysdeps/unix/sysv/linux/microblaze/shmctl.c | 1 - sysdeps/unix/sysv/linux/mips/mips64/shmctl.c | 17 +-------- sysdeps/unix/sysv/linux/shmctl.c | 56 ++++++++++++---------------- 6 files changed, 34 insertions(+), 83 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/shmctl.c delete mode 100644 sysdeps/unix/sysv/linux/arm/shmctl.c delete mode 100644 sysdeps/unix/sysv/linux/microblaze/shmctl.c -- 2.7.4 diff --git a/sysdeps/unix/sysv/linux/alpha/shmctl.c b/sysdeps/unix/sysv/linux/alpha/shmctl.c deleted file mode 100644 index f73ed6f..0000000 --- a/sysdeps/unix/sysv/linux/alpha/shmctl.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/arm/shmctl.c b/sysdeps/unix/sysv/linux/arm/shmctl.c deleted file mode 100644 index 23c4b8d..0000000 --- a/sysdeps/unix/sysv/linux/arm/shmctl.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1995-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , August 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#include -#include -#include -#include -#include -#include - - -int -__new_shmctl (int shmid, int cmd, struct shmid_ds *buf) -{ - return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, buf); -} - -#include -versioned_symbol (libc, __new_shmctl, shmctl, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/microblaze/shmctl.c b/sysdeps/unix/sysv/linux/microblaze/shmctl.c deleted file mode 100644 index f73ed6f..0000000 --- a/sysdeps/unix/sysv/linux/microblaze/shmctl.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c b/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c index ea0fa94..8a82697 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c +++ b/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c @@ -15,18 +15,5 @@ License along with the GNU C Library. If not, see . */ -#include -#include -#include -#include - -int __shmctl (int shmid, int cmd, struct shmid_ds *buf); - -int -__shmctl (int shmid, int cmd, struct shmid_ds *buf) -{ - return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, buf); -} - -#include -versioned_symbol (libc, __shmctl, shmctl, GLIBC_2_0); +#define DEFAULT_VERSION GLIBC_2_0 +#include <./sysdeps/unix/sysv/linux/shmctl.c> diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index b2caf75..a411962 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -16,18 +16,35 @@ License along with the GNU C Library; if not, see . */ -#include #include +#include #include - #include -#include -#include -#include #include +#include + + +#ifndef DEFAULT_VERSION +# define DEFAULT_VERSION GLIBC_2_2 +#endif + + +/* Provide operations to control over shared memory segments. */ +int +__new_shmctl (int shmid, int cmd, struct shmid_ds *buf) +{ +#ifdef __ASSUME_SYSVIPC_SYSCALL + return INLINE_SYSCALL_CALL (shmctl, shmid, cmd | __IPC_64, buf); +#else + return INLINE_SYSCALL_CALL (ipc, IPCOP_shmctl, shmid, cmd | __IPC_64, 0, + buf); +#endif +} +versioned_symbol (libc, __new_shmctl, shmctl, DEFAULT_VERSION); -#include +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) \ + && defined (__NR_ipc) struct __old_shmid_ds { struct __old_ipc_perm shm_perm; /* operation permission struct */ @@ -43,36 +60,11 @@ struct __old_shmid_ds struct vm_area_struct *__attaches; /* descriptors for attaches */ }; -struct __old_shminfo -{ - int shmmax; - int shmmin; - int shmmni; - int shmseg; - int shmall; -}; - -/* Provide operations to control over shared memory segments. */ -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) -int __old_shmctl (int, int, struct __old_shmid_ds *); -#endif -int __new_shmctl (int, int, struct shmid_ds *); - -#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) int attribute_compat_text_section __old_shmctl (int shmid, int cmd, struct __old_shmid_ds *buf) { - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); + return INLINE_SYSCALL_CALL (ipc, IPCOP_shmctl, shmid, cmd, 0, buf); } compat_symbol (libc, __old_shmctl, shmctl, GLIBC_2_0); #endif - -int -__new_shmctl (int shmid, int cmd, struct shmid_ds *buf) -{ - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd | __IPC_64, 0, - buf); -} - -versioned_symbol (libc, __new_shmctl, shmctl, GLIBC_2_2);