From patchwork Wed Nov 18 19:55:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 41118 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C94BD3947407; Wed, 18 Nov 2020 19:56:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C94BD3947407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1605729390; bh=rAqekvWehT0r6RQrxQKsbFezUC5dyNNQtVO+CghHoVU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=evvuxJwn7A0QgdlRMhdZE7oc2PykLlYj9bv/gvXkP5QBYHlRlBIsHT4qNGipNmsL7 X5JkzQ97gASv4p2t3MWTk125BmyyfOkiVUH+2SXtWuh7HRbteP166LK4iCNuZLPHLJ Jv+f1kScElzOiEB+HBGBRzTiHNkSW5YERh58wMlo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 8C0A339450EA for ; Wed, 18 Nov 2020 19:56:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8C0A339450EA Received: by mail-qk1-x741.google.com with SMTP id q22so3083460qkq.6 for ; Wed, 18 Nov 2020 11:56:25 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rAqekvWehT0r6RQrxQKsbFezUC5dyNNQtVO+CghHoVU=; b=VM1GiHJWPNxreh8BREouJpwRCazZTTPkE2JgZoA95ohlRgG/YYZooB5Hz3YqBlBhHO PM3y1FVh049PcMdR6X3lg88D4BXrqnIE1vXBLMhw2dSPo118XO9bG7l/uwyLxk3SpU9F q2/CZoeA8sdVMf0m8vyGzwnSM2VfULbfX9RC6MGDn7fT8LqNN8AWmnUIZKM1qKxWKkWW Tipj/SeGfmj5u5k0auiAmurm0Uc87CkxYmq6ldTTv6Aax09bsyO4E2EseB7fEWiT24d+ SmxgSPXrgs4lGeoQds5RNZONLrBhFEZjw5bcAngp9tjCoD2mpRTEVr/4NcBwME37V5/j G08A== X-Gm-Message-State: AOAM533eX1XOTnzesMGZIz6R4lOZwp+M4lF3YHS4LvBpL1/yMnxKYKVs 2VvCF8YNx6MB/U6L2wWnq0iGJJ7YR7OQaQ== X-Google-Smtp-Source: ABdhPJyxhVTdfQMFJOyn2xegPrtkLd98Xbwld2oXCFKqw2Wjal9CIYC2kvMDA1qJifu3rV2GneEGUA== X-Received: by 2002:a37:ecb:: with SMTP id 194mr6417709qko.387.1605729384768; Wed, 18 Nov 2020 11:56:24 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id f27sm6538775qtv.95.2020.11.18.11.56.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 11:56:24 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 19/28] linux: Add fanotify_mark C implementation Date: Wed, 18 Nov 2020 16:55:43 -0300 Message-Id: <20201118195552.2687336-20-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201118195552.2687336-1-adhemerval.zanella@linaro.org> References: <20201118195552.2687336-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.9 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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Passing 64-bit arguments on syscalls.list is tricky: it requires to reimplement the expected kernel abi in each architecture. This is way to better to represent in C code where we already have macros for this (SYSCALL_LL64). Checked on x86_64-linux-gnu. --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/arm/syscalls.list | 2 -- sysdeps/unix/sysv/linux/fanotify_mark.c | 36 +++++++++++++++++++ .../linux/generic/wordsize-32/syscalls.list | 1 - sysdeps/unix/sysv/linux/hppa/fanotify_mark.c | 2 ++ sysdeps/unix/sysv/linux/hppa/syscalls.list | 1 - sysdeps/unix/sysv/linux/i386/syscalls.list | 2 -- sysdeps/unix/sysv/linux/m68k/syscalls.list | 1 - .../unix/sysv/linux/microblaze/syscalls.list | 1 - .../unix/sysv/linux/mips/mips32/syscalls.list | 2 -- .../sysv/linux/mips/mips64/n32/syscalls.list | 2 -- .../sysv/linux/mips/mips64/n64/syscalls.list | 2 -- .../linux/powerpc/powerpc32/syscalls.list | 1 - .../sysv/linux/s390/s390-32/syscalls.list | 1 - sysdeps/unix/sysv/linux/sh/fanotify_mark.c | 2 ++ sysdeps/unix/sysv/linux/sh/syscalls.list | 2 -- .../sysv/linux/sparc/sparc32/syscalls.list | 1 - .../unix/sysv/linux/wordsize-64/syscalls.list | 2 -- 18 files changed, 41 insertions(+), 22 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/fanotify_mark.c create mode 100644 sysdeps/unix/sysv/linux/hppa/fanotify_mark.c create mode 100644 sysdeps/unix/sysv/linux/sh/fanotify_mark.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 09604e128b..71bb4cbddd 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -61,7 +61,7 @@ sysdep_routines += adjtimex clone umount umount2 readahead sysctl \ open_by_handle_at mlock2 pkey_mprotect pkey_set pkey_get \ timerfd_gettime timerfd_settime prctl \ process_vm_readv process_vm_writev clock_adjtime \ - time64-support pselect32 + time64-support pselect32 fanotify_mark CFLAGS-gethostid.c = -fexceptions CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/arm/syscalls.list b/sysdeps/unix/sysv/linux/arm/syscalls.list index 742ed64ec9..ef35963e82 100644 --- a/sysdeps/unix/sysv/linux/arm/syscalls.list +++ b/sysdeps/unix/sysv/linux/arm/syscalls.list @@ -16,5 +16,3 @@ setfsgid - setfsgid32 Ei:i setfsgid setfsuid - setfsuid32 Ei:i setfsuid prlimit64 EXTRA prlimit64 i:iipp prlimit64 - -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/fanotify_mark.c b/sysdeps/unix/sysv/linux/fanotify_mark.c new file mode 100644 index 0000000000..6f8fd2e9cf --- /dev/null +++ b/sysdeps/unix/sysv/linux/fanotify_mark.c @@ -0,0 +1,36 @@ +/* Add, remove, or modify an fanotify mark on a filesystem object. + Linux specific syscall. + 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 +__fanotify_mark (int fd, unsigned int flags, uint64_t mask, int dirfd, + const char *pathname) +{ + return INLINE_SYSCALL_CALL (fanotify_mark, fd, flags, SYSCALL_LL64 (mask), + dirfd, pathname); +} +#ifdef VERSION_fanotify_mark +# include +versioned_symbol (libc, __fanotify_mark, fanotify_mark, + VERSION_fanotify_mark); +#else +weak_alias (__fanotify_mark, fanotify_mark) +#endif diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list b/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list index b775008a37..736edbe654 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list +++ b/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list @@ -2,4 +2,3 @@ # rlimit APIs prlimit64 EXTRA prlimit64 i:iipp prlimit64 -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c b/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c new file mode 100644 index 0000000000..ce347a4261 --- /dev/null +++ b/sysdeps/unix/sysv/linux/hppa/fanotify_mark.c @@ -0,0 +1,2 @@ +#define VERSION_fanotify_mark GLIBC_2_19 +#include diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list index 11fada447c..a20bdc7726 100644 --- a/sysdeps/unix/sysv/linux/hppa/syscalls.list +++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list @@ -1,4 +1,3 @@ # File name Caller Syscall name # args Strong name Weak names prlimit64 EXTRA prlimit64 i:iipp __prlimit64 prlimit64@@GLIBC_2.17 -fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.19 diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list index 191081b949..a20d6ebf24 100644 --- a/sysdeps/unix/sysv/linux/i386/syscalls.list +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list @@ -20,5 +20,3 @@ vm86old EXTRA vm86old i:p __vm86old vm86@GLIBC_2.0 vm86 - vm86 i:ip __vm86 vm86@@GLIBC_2.3.4 prlimit64 EXTRA prlimit64 i:iipp prlimit64 - -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/m68k/syscalls.list b/sysdeps/unix/sysv/linux/m68k/syscalls.list index aba75b59e0..e28ccc2c45 100644 --- a/sysdeps/unix/sysv/linux/m68k/syscalls.list +++ b/sysdeps/unix/sysv/linux/m68k/syscalls.list @@ -17,4 +17,3 @@ setfsuid - setfsuid32 Ei:i setfsuid cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush prlimit64 EXTRA prlimit64 i:iipp prlimit64 -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/microblaze/syscalls.list b/sysdeps/unix/sysv/linux/microblaze/syscalls.list index 4ff1c9da7e..f479ef0826 100644 --- a/sysdeps/unix/sysv/linux/microblaze/syscalls.list +++ b/sysdeps/unix/sysv/linux/microblaze/syscalls.list @@ -3,4 +3,3 @@ cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush prlimit64 EXTRA prlimit64 i:iipp prlimit64 -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list index f357b5c918..dbeb184d73 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list +++ b/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list @@ -1,5 +1,3 @@ # File name Caller Syscall name # args Strong name Weak names prlimit64 EXTRA prlimit64 i:iipp prlimit64 - -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list index e6c511fecb..6135436182 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list @@ -5,5 +5,3 @@ lseek64 - lseek i:iii __lseek64 __libc_lseek64 lseek64@@GLIBC_2.2 llseek@GLIBC_2.0:GLIBC_2.28 prlimit64 EXTRA prlimit64 i:iipp prlimit64 - -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list index 8e7d516a2a..ecf9d80ed4 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/syscalls.list @@ -2,8 +2,6 @@ prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark - fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64 statfs - statfs i:sp __statfs statfs statfs64 __statfs64 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list index 966856e64a..d31303250d 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list @@ -4,4 +4,3 @@ chown - chown i:sii __chown chown@@GLIBC_2.1 lchown - lchown i:sii __lchown lchown@@GLIBC_2.0 chown@GLIBC_2.0 prlimit64 EXTRA prlimit64 i:iipp prlimit64 -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list index 5c267744db..1c565e9ba5 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list +++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list @@ -16,4 +16,3 @@ setfsgid - setfsgid32 Ei:i setfsgid setfsuid - setfsuid32 Ei:i setfsuid prlimit64 EXTRA prlimit64 i:iipp prlimit64 -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/sh/fanotify_mark.c b/sysdeps/unix/sysv/linux/sh/fanotify_mark.c new file mode 100644 index 0000000000..3662f21b60 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sh/fanotify_mark.c @@ -0,0 +1,2 @@ +#define VERSION_fanotify_mark GLIBC_2_16 +#include diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list index 6c2d2c6535..ef35963e82 100644 --- a/sysdeps/unix/sysv/linux/sh/syscalls.list +++ b/sysdeps/unix/sysv/linux/sh/syscalls.list @@ -16,5 +16,3 @@ setfsgid - setfsgid32 Ei:i setfsgid setfsuid - setfsuid32 Ei:i setfsuid prlimit64 EXTRA prlimit64 i:iipp prlimit64 - -fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.16 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list index 0b6095ffab..4fcae65451 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list @@ -16,4 +16,3 @@ setfsgid - setfsgid32 Ei:i setfsgid setfsuid - setfsuid32 Ei:i setfsuid prlimit64 EXTRA prlimit64 i:iipp prlimit64 -fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index 9316778dae..0404a1c0d7 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -4,5 +4,3 @@ fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64 statfs - statfs i:sp __statfs statfs statfs64 sendfile - sendfile i:iipi sendfile sendfile64 prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 - -fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark