From patchwork Fri May 8 19:25:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1286429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=sourceware.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=Q0DyS+rl; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49JgJs46XTz9sSc for ; Sat, 9 May 2020 05:25:17 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2778B3851C1F; Fri, 8 May 2020 19:25:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2778B3851C1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1588965912; bh=pPHmteSTh6SChzlEZuUH96CtqwwKUlLNMLnJGSIhmO4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Q0DyS+rlzin2P9Facua1jfPRc7Qh/YVnbJ0E2wEH1VmGWNWF3BRT11JR9L+S381XS LSiOxByjCqMzWw9AQTgkUdWWWVFbnD5QGgdkpKK+5w96ThqesB6EhD3LeAMbvI+2t8 D3KdyESiX0laIADjgGt5xrs6uxsYnHsWI9Jt8ILg= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by sourceware.org (Postfix) with ESMTPS id D4A683851C04 for ; Fri, 8 May 2020 19:25:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D4A683851C04 Received: by mail-qv1-xf44.google.com with SMTP id 59so1329570qva.13 for ; Fri, 08 May 2020 12:25:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pPHmteSTh6SChzlEZuUH96CtqwwKUlLNMLnJGSIhmO4=; b=V9+JgRuonxsA6KbQatX7tZDtgknp9l37NUa0gCQXGCt4yAwNvL72WmrEaNeJ1vY4Ve biR5CStz6zoxF9yNI1ThYy0laehk5Awk0hL816VDZH7WSG3HvEE9Y77bdolJDTG5Mg3B +LFCbxFdlmVtaGdxLzGZqd93Q6Z9RWWEFbHcWkcFkp3kkcAgBYRfOlbRG74+ypSb30b/ 2/kdDXDIijaeHWClE0oBq1wmKAUkFbQfyX6ck9IQvK8E0HX8fRpLirzq6Cxa51BF5Cef CEs2ajPcMaTh2fRRRNLg21Rmht1LnueP5sgaB506/HVX1dK6QQyF20/c6636c+QHJfmS kcVg== X-Gm-Message-State: AGi0PuaB/MVlZQGenUC+XVBZqzVMCIbouegjKgc9SX3S4yvf1alfeqpe p68D7Jj7CML5cjSnTLiQS3pncpHhhxM= X-Google-Smtp-Source: APiQypK9enh59Jgp42NmjUaiE5bs+Hr7Cs1Z98+03fQRQSCoKVS5cOpCaR1G8A/K+xaDoDLpyyKeJg== X-Received: by 2002:a0c:b5c4:: with SMTP id o4mr4149927qvf.229.1588965907610; Fri, 08 May 2020 12:25:07 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id d9sm2023295qtj.77.2020.05.08.12.25.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 12:25:07 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v2] linux: Remove assembly umount2 implementation Date: Fri, 8 May 2020 16:25:02 -0300 Message-Id: <20200508192502.3056018-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-16.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Changes from previous version: - Add a new umount2.c implementation and internal sys/mount.h header. Only alpha and ia64 do not support __NR_umount2 (defined as __NR_umount), but recent kernel fixes (74cd2184833f for ia64, and 12b57c5c70f39 for alpha) add the required alias. Checked with a build against all affected ABIs. Reviewed-by: Florian Weimer --- sysdeps/unix/sysv/linux/ia64/syscalls.list | 2 -- sysdeps/unix/sysv/linux/include/sys/mount.h | 31 +++++++++++++++++++++ sysdeps/unix/sysv/linux/umount.c | 8 ++---- sysdeps/unix/sysv/linux/umount2.S | 13 --------- sysdeps/unix/sysv/linux/umount2.c | 29 +++++++++++++++++++ 5 files changed, 63 insertions(+), 20 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/include/sys/mount.h delete mode 100644 sysdeps/unix/sysv/linux/umount2.S create mode 100644 sysdeps/unix/sysv/linux/umount2.c diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list index 56f4138c43..bd39441d3c 100644 --- a/sysdeps/unix/sysv/linux/ia64/syscalls.list +++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list @@ -1,7 +1,5 @@ # File name Caller Syscall name # args Strong name Weak names -umount2 - umount 2 __umount2 umount2 - getpriority - getpriority i:ii __getpriority getpriority # proper socket implementations: diff --git a/sysdeps/unix/sysv/linux/include/sys/mount.h b/sysdeps/unix/sysv/linux/include/sys/mount.h new file mode 100644 index 0000000000..6f6122cca3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/include/sys/mount.h @@ -0,0 +1,31 @@ +/* Internal declarations for sys/mount.h. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ + +#ifndef _INCLUDE_SYS_MOUNT_H +#define _INCLUDE_SYS_MOUNT_H 1 + +#include_next + +# ifndef _ISOMAC + +extern __typeof (umount) __umount __THROW; +extern __typeof (umount2) __umount2 __THROW; +libc_hidden_proto (__umount2) + +# endif /* _ISOMAC */ +#endif /* sys/sysinfo.h */ diff --git a/sysdeps/unix/sysv/linux/umount.c b/sysdeps/unix/sysv/linux/umount.c index ab6a20f596..2a75760dfa 100644 --- a/sysdeps/unix/sysv/linux/umount.c +++ b/sysdeps/unix/sysv/linux/umount.c @@ -16,12 +16,10 @@ License along with the GNU C Library. If not, see . */ -/* Since the generic Linux syscall ABI doesn't have an oldumount system call, - do what the kernel does down here. */ +#include +#include -extern long int __umount2 (const char *name, int flags); - -long int +int __umount (const char *name) { return __umount2 (name, 0); diff --git a/sysdeps/unix/sysv/linux/umount2.S b/sysdeps/unix/sysv/linux/umount2.S deleted file mode 100644 index 92241bbf97..0000000000 --- a/sysdeps/unix/sysv/linux/umount2.S +++ /dev/null @@ -1,13 +0,0 @@ -/* umount system call with two parameters. */ - -#include -#if defined __NR_oldumount || defined __NR_umount2 -#ifdef __NR_oldumount -PSEUDO (__umount2, umount, 2) -#else -PSEUDO (__umount2, umount2, 2) -#endif - ret -PSEUDO_END(__umount2) -weak_alias (__umount2, umount2) -#endif diff --git a/sysdeps/unix/sysv/linux/umount2.c b/sysdeps/unix/sysv/linux/umount2.c new file mode 100644 index 0000000000..a91fd50733 --- /dev/null +++ b/sysdeps/unix/sysv/linux/umount2.c @@ -0,0 +1,29 @@ +/* Unmount filesystem. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + +int +__umount2 (const char *special_file, int flags) +{ + return INLINE_SYSCALL_CALL (umount2, special_file, flags); +} +libc_hidden_def (__umount2) + +weak_alias (__umount2, umount2)