* [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS
@ 2018-08-20 14:40 Florian Weimer
2018-08-20 16:19 ` Adhemerval Zanella
2018-08-20 19:32 ` Joseph Myers
0 siblings, 2 replies; 7+ messages in thread
From: Florian Weimer @ 2018-08-20 14:40 UTC (permalink / raw)
To: libc-alpha
HAVE_INLINED_SYSCALLS is always defined on Linux.
2018-08-20 Florian Weimer <fweimer@redhat.com>
* sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove
HAVE_INLINED_SYSCALLS conditionals
diff --git a/sysdeps/unix/sysv/linux/generic/readlink_chk.c b/sysdeps/unix/sysv/linux/generic/readlink_chk.c
index 9240408a6b..5075e06dd1 100644
--- a/sysdeps/unix/sysv/linux/generic/readlink_chk.c
+++ b/sysdeps/unix/sysv/linux/generic/readlink_chk.c
@@ -19,10 +19,8 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/param.h>
-#ifdef HAVE_INLINED_SYSCALLS
# include <errno.h>
# include <sysdep.h>
-#endif
ssize_t
@@ -31,9 +29,5 @@ __readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
if (len > buflen)
__chk_fail ();
-#ifdef HAVE_INLINED_SYSCALLS
return INLINE_SYSCALL (readlinkat, 4, AT_FDCWD, path, buf, len);
-#else
- return __readlink (path, buf, len);
-#endif
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS
2018-08-20 14:40 [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS Florian Weimer
@ 2018-08-20 16:19 ` Adhemerval Zanella
2018-08-20 16:22 ` Adhemerval Zanella
2018-08-20 19:32 ` Joseph Myers
1 sibling, 1 reply; 7+ messages in thread
From: Adhemerval Zanella @ 2018-08-20 16:19 UTC (permalink / raw)
To: libc-alpha
On 20/08/2018 11:40, Florian Weimer wrote:
> HAVE_INLINED_SYSCALLS is always defined on Linux.
>
> 2018-08-20 Florian Weimer <fweimer@redhat.com>
>
> * sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove
> HAVE_INLINED_SYSCALLS conditionals
LGTM.
>
> diff --git a/sysdeps/unix/sysv/linux/generic/readlink_chk.c b/sysdeps/unix/sysv/linux/generic/readlink_chk.c
> index 9240408a6b..5075e06dd1 100644
> --- a/sysdeps/unix/sysv/linux/generic/readlink_chk.c
> +++ b/sysdeps/unix/sysv/linux/generic/readlink_chk.c
> @@ -19,10 +19,8 @@
> #include <unistd.h>
> #include <fcntl.h>
> #include <sys/param.h>
> -#ifdef HAVE_INLINED_SYSCALLS
> # include <errno.h>
> # include <sysdep.h>
> -#endif
>
>
> ssize_t
> @@ -31,9 +29,5 @@ __readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
> if (len > buflen)
> __chk_fail ();
>
> -#ifdef HAVE_INLINED_SYSCALLS
> return INLINE_SYSCALL (readlinkat, 4, AT_FDCWD, path, buf, len);
Maybe use INLINE_SYSCALL_CALL ?
> -#else
> - return __readlink (path, buf, len);
> -#endif
> }
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS
2018-08-20 16:19 ` Adhemerval Zanella
@ 2018-08-20 16:22 ` Adhemerval Zanella
2018-08-20 16:53 ` Florian Weimer
0 siblings, 1 reply; 7+ messages in thread
From: Adhemerval Zanella @ 2018-08-20 16:22 UTC (permalink / raw)
To: libc-alpha
On 20/08/2018 13:18, Adhemerval Zanella wrote:
>
>
> On 20/08/2018 11:40, Florian Weimer wrote:
>> HAVE_INLINED_SYSCALLS is always defined on Linux.
>>
>> 2018-08-20 Florian Weimer <fweimer@redhat.com>
>>
>> * sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove
>> HAVE_INLINED_SYSCALLS conditionals
>
> LGTM.
In fact, do we really need to have a duplicated Linux implementation
for this micro-optimization? Couldn't we just use default debug
one and call '__readlink' instead?
>
>>
>> diff --git a/sysdeps/unix/sysv/linux/generic/readlink_chk.c b/sysdeps/unix/sysv/linux/generic/readlink_chk.c
>> index 9240408a6b..5075e06dd1 100644
>> --- a/sysdeps/unix/sysv/linux/generic/readlink_chk.c
>> +++ b/sysdeps/unix/sysv/linux/generic/readlink_chk.c
>> @@ -19,10 +19,8 @@
>> #include <unistd.h>
>> #include <fcntl.h>
>> #include <sys/param.h>
>> -#ifdef HAVE_INLINED_SYSCALLS
>> # include <errno.h>
>> # include <sysdep.h>
>> -#endif
>>
>>
>> ssize_t
>> @@ -31,9 +29,5 @@ __readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
>> if (len > buflen)
>> __chk_fail ();
>>
>> -#ifdef HAVE_INLINED_SYSCALLS
>> return INLINE_SYSCALL (readlinkat, 4, AT_FDCWD, path, buf, len);
>
> Maybe use INLINE_SYSCALL_CALL ?
>
>> -#else
>> - return __readlink (path, buf, len);
>> -#endif
>> }
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS
2018-08-20 16:22 ` Adhemerval Zanella
@ 2018-08-20 16:53 ` Florian Weimer
2018-08-20 19:17 ` Adhemerval Zanella
0 siblings, 1 reply; 7+ messages in thread
From: Florian Weimer @ 2018-08-20 16:53 UTC (permalink / raw)
To: Adhemerval Zanella, libc-alpha
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
On 08/20/2018 06:21 PM, Adhemerval Zanella wrote:
>
>
> On 20/08/2018 13:18, Adhemerval Zanella wrote:
>>
>>
>> On 20/08/2018 11:40, Florian Weimer wrote:
>>> HAVE_INLINED_SYSCALLS is always defined on Linux.
>>>
>>> 2018-08-20 Florian Weimer <fweimer@redhat.com>
>>>
>>> * sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove
>>> HAVE_INLINED_SYSCALLS conditionals
>>
>> LGTM.
>
> In fact, do we really need to have a duplicated Linux implementation
> for this micro-optimization? Couldn't we just use default debug
> one and call '__readlink' instead?
Like this?
Thanks,
Florian
[-- Attachment #2: readlink_chk.patch --]
[-- Type: text/x-patch, Size: 2123 bytes --]
Subject: [PATCH] __readlink_chk: Remove micro-optimization
To: libc-alpha@sourceware.org
2018-08-20 Florian Weimer <fweimer@redhat.com>
* debug/readlink_chk.c (__readlink_chk): Always call __readlink.
* sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove file.
diff --git a/debug/readlink_chk.c b/debug/readlink_chk.c
index c44d1d8c37..e3204004d2 100644
--- a/debug/readlink_chk.c
+++ b/debug/readlink_chk.c
@@ -29,9 +29,5 @@ __readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
if (len > buflen)
__chk_fail ();
-#ifdef HAVE_INLINED_SYSCALLS
- return INLINE_SYSCALL (readlink, 3, path, buf, len);
-#else
return __readlink (path, buf, len);
-#endif
}
diff --git a/sysdeps/unix/sysv/linux/generic/readlink_chk.c b/sysdeps/unix/sysv/linux/generic/readlink_chk.c
deleted file mode 100644
index 52d1f5b522..0000000000
--- a/sysdeps/unix/sysv/linux/generic/readlink_chk.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2011-2018 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
-
- 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
- <http://www.gnu.org/licenses/>. */
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/param.h>
-# include <errno.h>
-# include <sysdep.h>
-
-
-ssize_t
-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-{
- if (len > buflen)
- __chk_fail ();
-
- return INLINE_SYSCALL_CALL (readlinkat, AT_FDCWD, path, buf, len);
-}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS
2018-08-20 16:53 ` Florian Weimer
@ 2018-08-20 19:17 ` Adhemerval Zanella
0 siblings, 0 replies; 7+ messages in thread
From: Adhemerval Zanella @ 2018-08-20 19:17 UTC (permalink / raw)
To: Florian Weimer, libc-alpha
On 20/08/2018 13:53, Florian Weimer wrote:
> On 08/20/2018 06:21 PM, Adhemerval Zanella wrote:
>>
>>
>> On 20/08/2018 13:18, Adhemerval Zanella wrote:
>>>
>>>
>>> On 20/08/2018 11:40, Florian Weimer wrote:
>>>> HAVE_INLINED_SYSCALLS is always defined on Linux.
>>>>
>>>> 2018-08-20 Florian Weimer <fweimer@redhat.com>
>>>>
>>>> Â Â Â Â * sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove
>>>> Â Â Â Â HAVE_INLINED_SYSCALLS conditionals
>>>
>>> LGTM.
>>
>> In fact, do we really need to have a duplicated Linux implementation
>> for this micro-optimization? Couldn't we just use default debug
>> one and call '__readlink' instead?
>
> Like this?
>
LGTM, thanks.
> Thanks,
> Florian
>
> readlink_chk.patch
>
>
> Subject: [PATCH] __readlink_chk: Remove micro-optimization
> To: libc-alpha@sourceware.org
>
> 2018-08-20 Florian Weimer <fweimer@redhat.com>
>
> * debug/readlink_chk.c (__readlink_chk): Always call __readlink.
> * sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove file.
>
> diff --git a/debug/readlink_chk.c b/debug/readlink_chk.c
> index c44d1d8c37..e3204004d2 100644
> --- a/debug/readlink_chk.c
> +++ b/debug/readlink_chk.c
> @@ -29,9 +29,5 @@ __readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
> if (len > buflen)
> __chk_fail ();
>
> -#ifdef HAVE_INLINED_SYSCALLS
> - return INLINE_SYSCALL (readlink, 3, path, buf, len);
> -#else
> return __readlink (path, buf, len);
> -#endif
> }
> diff --git a/sysdeps/unix/sysv/linux/generic/readlink_chk.c b/sysdeps/unix/sysv/linux/generic/readlink_chk.c
> deleted file mode 100644
> index 52d1f5b522..0000000000
> --- a/sysdeps/unix/sysv/linux/generic/readlink_chk.c
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -/* Copyright (C) 2011-2018 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
> -
> - 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
> - <http://www.gnu.org/licenses/>. */
> -
> -#include <unistd.h>
> -#include <fcntl.h>
> -#include <sys/param.h>
> -# include <errno.h>
> -# include <sysdep.h>
> -
> -
> -ssize_t
> -__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
> -{
> - if (len > buflen)
> - __chk_fail ();
> -
> - return INLINE_SYSCALL_CALL (readlinkat, AT_FDCWD, path, buf, len);
> -}
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS
2018-08-20 14:40 [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS Florian Weimer
2018-08-20 16:19 ` Adhemerval Zanella
@ 2018-08-20 19:32 ` Joseph Myers
2018-08-21 13:12 ` Florian Weimer
1 sibling, 1 reply; 7+ messages in thread
From: Joseph Myers @ 2018-08-20 19:32 UTC (permalink / raw)
To: Florian Weimer; +Cc: libc-alpha
On Mon, 20 Aug 2018, Florian Weimer wrote:
> -#ifdef HAVE_INLINED_SYSCALLS
> # include <errno.h>
> # include <sysdep.h>
> -#endif
Need to update the preprocessor indentation here for the removed #ifdef.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS
2018-08-20 19:32 ` Joseph Myers
@ 2018-08-21 13:12 ` Florian Weimer
0 siblings, 0 replies; 7+ messages in thread
From: Florian Weimer @ 2018-08-21 13:12 UTC (permalink / raw)
To: Joseph Myers; +Cc: libc-alpha
On 08/20/2018 09:32 PM, Joseph Myers wrote:
> On Mon, 20 Aug 2018, Florian Weimer wrote:
>
>> -#ifdef HAVE_INLINED_SYSCALLS
>> # include <errno.h>
>> # include <sysdep.h>
>> -#endif
> Need to update the preprocessor indentation here for the removed #ifdef.
Oops, right. The file is gone in the follow-up patch. But I see I
forgot to remove the #includes from debug/readlink_chk.c. I will fix
that too.
Florian
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-08-21 13:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-20 14:40 [PATCH] __readlink_chk: Assume HAVE_INLINED_SYSCALLS Florian Weimer
2018-08-20 16:19 ` Adhemerval Zanella
2018-08-20 16:22 ` Adhemerval Zanella
2018-08-20 16:53 ` Florian Weimer
2018-08-20 19:17 ` Adhemerval Zanella
2018-08-20 19:32 ` Joseph Myers
2018-08-21 13:12 ` Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).