1. 03 8月, 2019 1 次提交
    • R
      clock_gettime: add support for 32-bit vdso with 64-bit time_t · 0705fe93
      Rich Felker 提交于
      this fixes a major upcoming performance regression introduced by
      commit 72f50245, whereby 32-bit archs
      would lose vdso clock_gettime after switching to 64-bit time_t, unless
      the kernel supports time64 and provides a time64 version of the vdso
      function. this would incur not just one but two syscalls: first, the
      failed time64 syscall, then the fallback time32 one.
      
      overflow of the 32-bit result is detected and triggers a revert to
      syscalls. normally, on a system that's not Y2038-ready, this would
      still overflow, but if the process has been migrated to a
      time64-capable kernel or if the kernel has been hot-patched to add
      time64 syscalls, it may conceivably work.
      0705fe93
  2. 02 8月, 2019 5 次提交
    • R
      move IPC_STAT definition to a new bits/ipcstat.h file · 006a75a9
      Rich Felker 提交于
      otherwise, 32-bit archs that could otherwise share the generic
      bits/ipc.h would need to duplicate the struct ipc_perm definition,
      obscuring the fact that it's the same. sysvipc is not widely used and
      these headers are not commonly included, so there is no performance
      gain to be had by limiting the number of indirectly included files
      here.
      
      files with the existing time32 definition of IPC_STAT are added to all
      current 32-bit archs now, so that when it's changed the change will
      show up as a change rather than addition of a new file where it's less
      obvious that the value is changing vs the generic one that was used
      before.
      006a75a9
    • R
      fix missing declarations for pthread_join extensions in source file · 3541925f
      Rich Felker 提交于
      per policy, define the feature test macro to get declarations for the
      pthread_tryjoin_np and pthread_timedjoin_np functions. in the past
      this has been only for checking; with 32-bit archs getting 64-bit
      time_t it will also be necessary for symbols to get redirected
      correctly.
      3541925f
    • R
      allow archs to define IPC_STAT, propagate time64 bit to other macros · 3c02bacf
      Rich Felker 提交于
      to make use of {sem,shm,msg}ctl IPC_STAT functionality to provide
      64-bit time_t on 32-bit archs, IPC_STAT and related macros must be
      defined with bit 8 (0x100) set. allow archs to define IPC_STAT in
      bits/ipc.h, and define the other macros in terms of it so that they
      all get the same value of the time64 bit.
      3c02bacf
    • R
      clock_gettime: add time64 syscall support, decouple 32-bit time_t · 72f50245
      Rich Felker 提交于
      the time64 syscall has to be used if time_t is 64-bit, since there's
      no way of knowing before making a syscall whether the result will fit
      in 32 bits, and the 32-bit syscalls do not report overflow as an
      error.
      
      on 64-bit archs, there is no change to the code after preprocessing.
      on current 32-bit archs, the result is now read from the kernel
      through long[2] array, then copied into the timespec, to remove the
      assumption that time_t is the same as long.
      
      vdso clock_gettime is still used in place of a syscall if available.
      32-bit archs with 64-bit time_t must use the time64 version of the
      vdso function; if it's not available, performance will significantly
      suffer. support for both vdso functions could be added, but would
      break the ability to move a long-lived process from a pre-time64
      kernel to one that can outlast Y2038 with checkpoint/resume, at least
      without added hacks to identify that the 32-bit function is no longer
      usable and stop using it (e.g. by seeing negative tv_sec). this
      possibility may be explored in future work on the function.
      72f50245
    • R
      clock_adjtime: add time64 support, decouple 32-bit time_t, fix x32 · 2b4fd6f7
      Rich Felker 提交于
      the 64-bit/time64 version of the syscall is not API-compatible with
      the userspace timex structure definition; fields specified as long
      have type long long. so when using the time64 syscall, we have to
      convert the entire structure. this was always the case for x32 as
      well, but went unnoticed, meaning that clock_adjtime just passed junk
      to the kernel on x32. it should be fixed now.
      
      for the fallback case, we avoid encoding any assumptions about the new
      location of the time member or naming of the legacy slots by accessing
      them through a union of the kernel type and the new userspace type.
      the only assumption is that the non-time members live at the same
      offsets as in the (non-time64, long-based) kernel timex struct. this
      property saves us from having to convert the whole thing, and avoids a
      lot of additional work in compat shims.
      
      the new code is statically unreachable for now except on x32, where it
      fixes major brokenness. it is permanently unreachable on 64-bit.
      2b4fd6f7
  3. 01 8月, 2019 5 次提交
    • R
      ioctl: add fallback for new time64 SIOCGSTAMP[NS] · 2e554617
      Rich Felker 提交于
      without this, the SIOCGSTAMP and SIOCGSTAMPNS ioctl commands, for
      obtaining timestamps, would stop working on pre-5.1 kernels after
      time_t is switched to 64-bit and their values are changed to the new
      time64 versions.
      
      new code is written such that it's statically unreachable on 64-bit
      archs, and on existing 32-bit archs until the macro values are changed
      to activate 64-bit time_t.
      2e554617
    • R
      get/setsockopt: add fallback for new time64 SO_RCVTIMEO/SO_SNDTIMEO · 51fd67fc
      Rich Felker 提交于
      without this, the SO_RCVTIMEO and SO_SNDTIMEO socket options would
      stop working on pre-5.1 kernels after time_t is switched to 64-bit and
      their values are changed to the new time64 versions.
      
      new code is written such that it's statically unreachable on 64-bit
      archs, and on existing 32-bit archs until the macro values are changed
      to activate 64-bit time_t.
      51fd67fc
    • R
      make __socketcall analogous to __syscall, error-returning · 59324c8b
      Rich Felker 提交于
      the __socketcall and __socketcall_cp macros are remnants from a really
      old version of the syscall-mechanism infrastructure, and don't follow
      the pattern that the "__" version of the macro returns the raw negated
      error number rather than setting errno and returning -1.
      
      for time64 purposes, some socket syscalls will need to operate on the
      error value rather than returning immediately, so fix this up so they
      can use it.
      59324c8b
    • R
      sysvipc: overhaul {sem,shm,msg}ctl for time64 · 8b249704
      Rich Felker 提交于
      being "ctl" functions that take command numbers, these will be handled
      like ioctl/sockopt/etc., using new command numbers for the time64
      variants with an "IPC_TIME64" bit added to their values. to obtain
      such a reserved bit, we reuse the IPC_64 bit, 0x100, which served only
      as part of the libc-to-kernel interface, not as a public interface of
      the libc functions.
      
      using new command numbers avoids the need for compat shims (in ABIs
      doing time64 through symbol redirection and compat shims) and, by
      virtue of having a fixed time64 bit for all commands, we can ensure
      that libc can perform the appropriate translations, even if the
      application is using new commands from a newer version of the libc
      headers than the libc available at runtime.
      
      for the vast majority of 32-bit archs, the kernel {sem,shm,msq}id64_ds
      definitions left padding space intended for expanding their time_t
      fields to 64 bits in-place, and it would have been really nice to be
      able to do time64 support that way. however the padding was almost
      always in little-endian order (except on powerpc, and for msqid_ds
      only on mips, where it matched the arch's byte order), and more
      importantly, the alignment was overlooked. in semid_ds and msqid_ds,
      the time_t members were not suitably aligned to be expanded to 64-bit,
      due to the ipc_perm header consisting of 9 32-bit words -- except on
      powerpc where ipc_perm contains an extra padding word. in shmid_ds,
      the time_t members were suitably aligned, except that mips
      (accidentally?) omitted the padding for them alltogether.
      
      as a result, we're stuck with adding new time_t fields on the end of
      the structures, and assembling the 32-bit lo/hi parts (or 16-bit hi
      parts, for mips shmid_ds, which lacked sufficient reserved space for
      full 32-bit hi parts) to fill them in.
      
      all of the functional changes here are conditional on the IPC_TIME64
      macro having a nonzero definition, which will only happen when
      IPC_STAT is redefined for 32-bit archs, and on time_t being larger
      than long, so for now the new code is all dead code.
      8b249704
    • R
      fix semctl with SEM_STAT_ANY · fe5e72ae
      Rich Felker 提交于
      due to the variadic signature, semctl needs to be made aware of any
      new commands that take arguments. this was overlooked when commit
      af55070e added SEM_STAT_ANY.
      fe5e72ae
  4. 31 7月, 2019 4 次提交
    • R
      remove gratuitously-different arch-specific bits/ipc.h files · 319b2d02
      Rich Felker 提交于
      these differ from generic only in using endian-matched padding with a
      short __ipc_perm_seq field in place of the int field in generic. this
      is not a documented public interface anyway, and the original intent
      was to use int here. some ports just inadvertently slipped in the
      kernel short+padding form.
      319b2d02
    • R
      remove arch-specific bits/ipc.h that are identical to generic · 2a0bb9e0
      Rich Felker 提交于
      previously these differed from generic because they needed their own
      definitions of IPC_64. now that it's no longer in public header,
      they're identical.
      2a0bb9e0
    • R
      move IPC_64 from public bits/ipc.h to syscall_arch.h · f56d57f8
      Rich Felker 提交于
      the definition of the IPC_64 macro controls the interface between libc
      and the kernel through syscalls; it's not a public API. the meaning is
      rather obscure. long ago, Linux's sysvipc *id_ds structures used
      16-bit uids/gids and wrong types for a few other fields. this was in
      the libc5 era, before glibc. the IPC_64 flag (64 is a misnomer; it's
      more like 32) tells the kernel to use the modern[-ish] versions of the
      structures.
      
      the definition of IPC_64 has nothing to do with whether the arch is
      32- or 64-bit. rather, due to either historical accident or
      intentional obnoxiousness, the kernel only accepts and masks off the
      0x100 IPC_64 flag conditional on CONFIG_ARCH_WANT_IPC_PARSE_VERSION,
      i.e. for archs that want to provide, or that accidentally provided,
      both. for archs which don't define this option, no masking is
      performed and commands with the 0x100 bit set will fail as invalid. so
      ultimately, the definition is just a matter of matching an arbitrary
      switch defined per-arch in the kernel.
      f56d57f8
    • R
      select: overhaul for time64 · 722a1ae3
      Rich Felker 提交于
      major changes are made alongside adding time64 syscall support to
      account for issues found during research. select historically accepts
      non-normalized (tv_usec not restricted to less than 1000000) timeouts,
      and the kernel normalizes them, but the normalization code is buggy
      and subject to integer overflows. since normalization is needed anyway
      when using SYS_pselect6 or SYS_pselect6_time64 as the backend, simply
      do it up-front to eliminate both code path complexity and the
      possibility of kernel bugs.
      
      as a side effect, select no longer updates the caller's timeout
      timeval with the remaining time. previously, archs that used
      SYS_select updated it and archs that used SYS_pselect6 didn't. this
      change may turn out to be controversial and may need revisiting, but
      in any case the old behavior was not strictly conforming.
      
      POSIX allows modification of the timeout "upon successful completion",
      but the Linux syscall modifies it upon unsuccessful completion (EINTR)
      as well (and presumably each time the syscall stops and restarts
      before it's known whether completion will be successful). it's
      possible that this language does not reflect the actual intent of the
      standard, since other historical implementations probably behaved like
      Linux, but that should be clarified if there's a desire to bring the
      old behavior back. regardless, programs that are depending on this are
      not correct and are already broken on some archs we support.
      722a1ae3
  5. 30 7月, 2019 17 次提交
    • R
      recvmmsg: add time64 syscall support, decouple 32-bit time_t · 6a4a1691
      Rich Felker 提交于
      the time64 syscall is used only if the timeout does not fit in 32
      bits. after preprocessing, the code is unchanged on 64-bit archs. for
      32-bit archs, the timeout now goes through an intermediate copy,
      meaning that the caller does not get back the updated timeout. this is
      based on my reading of the documentation, which does not document the
      updating as a contract you can rely on, and mentions that the whole
      recvmmsg timeout mechanism is buggy and unlikely to be useful. if it
      turns out that there's interest in making the remaining time
      officially available to callers, such functionality could be added
      back later.
      6a4a1691
    • R
      setitimer, getitimer: decouple time_t from long · 558c0133
      Rich Felker 提交于
      these functions have no new time64 syscall, so the existence of a
      time64 syscall cannot be used as the condition for the new code.
      instead, assume the syscall takes timevals as longs, which is true
      everywhere but x32, and interface with the kernel through long[4]
      objects.
      
      rather than adding new hacks to special-case x32 here, just add
      x32-specific source files since a trivial syscall wrapper suffices
      there.
      
      the new code paths added in this commit are statically unreachable on
      all current archs, but will become reachable when 32-bit archs get
      64-bit time_t.
      558c0133
    • R
      remove duplicates of new generic bits/msg.h · b74b3eb4
      Rich Felker 提交于
      b74b3eb4
    • R
      use 64-bit msqid_ds layout in the generic version of bits/msg.h · c375585c
      Rich Felker 提交于
      this layout is more common already than the old generic, and should
      become even more common in the future with new archs added and with
      64-bit time_t on 32-bit archs.
      c375585c
    • R
    • R
      remove duplicates of new generic bits/sem.h · de5e56ce
      Rich Felker 提交于
      some of these were not exact duplicates, but had gratuitously
      different naming for padding, or omitted the endian checks because the
      arch is fixed-endian.
      de5e56ce
    • R
      use 64-bit semid_ds layout in the generic version of bits/sem.h · 5bb4d717
      Rich Felker 提交于
      this layout is slightly less common than the old generic one, but only
      because x86_64 and x32 wrongly (according to comments in the kernel
      headers) copied the i386 padding. for future archs, and with 64-bit
      time_t on 32-bit archs, the new layout here will become the most
      common, and it makes sense to treat it as the generic.
      5bb4d717
    • R
      collapse out byte order conditions in bits/sem.h for fixed-endian archs · 28637bc4
      Rich Felker 提交于
      having preprocessor conditionals on byte order in the bits headers for
      fixed-endian archs is confusing at best. remove them.
      28637bc4
    • R
    • R
      extricate bits/sem.h from x32 time_t hack · 1afe5f3e
      Rich Felker 提交于
      various padding fields in the generic bits/sem.h were defined in terms
      of time_t as a cheap hack standing in for "kernel long", to allow x32
      to use the generic version of the file. this was a really bad idea, as
      it ended up getting copied into lots of arch-specific versions of the
      bits file, and is a blocker to changing time_t to 64-bit on 32-bit
      archs.
      
      this commit adds an x32-specific version of the header, and changes
      padding type back from time_t to long (currently the same type on all
      archs but x32) in the generic header and all the others the hack got
      copied into.
      1afe5f3e
    • R
      7f797b5e
    • R
      remove duplicates of new generic bits/shm.h · 484c34fe
      Rich Felker 提交于
      484c34fe
    • R
      use 64-bit shmid_ds layout in the generic version of bits/shm.h · 0bf7c65a
      Rich Felker 提交于
      this layout is more common already than the old generic, and should
      become even more common in the future with new archs added and with
      64-bit time_t on 32-bit archs.
      
      the duplicate arch-specific copies are not removed yet in this commit,
      so as to assist git tooling in copy/rename tracking.
      0bf7c65a
    • R
      duplicate generic bits/shm.h for each arch using it, in prep to change · 6ed37ccd
      Rich Felker 提交于
      there are more archs sharing the generic 64-bit version of the struct,
      which is uniform and much more reasonable, than sharing the current
      "generic" one, and depending on how time64 sysvipc is done for 32-bit
      archs, even more may be sharing the "64-bit version" in the future.
      
      so, duplicate the current generic to all archs using it (arm, i386,
      m68k, microblaze, or1k) so that the generic can be changed freely.
      
      this is recorded as its own commit mainly as a hint to git tooling, to
      assist in copy/move tracking.
      6ed37ccd
    • R
      timerfd: add time64 syscall support, decouple 32-bit time_t · 89c5016c
      Rich Felker 提交于
      the changes here are semantically and structurally identical to those
      made to timer_settime and timer_gettime for time64 support.
      89c5016c
    • R
      sched_rr_get_interval: don't assume time_t is 32-bit on 32-bit archs · 1d4471b1
      Rich Felker 提交于
      as with clock_getres, the time64 syscall for this is not necessary or
      useful, this time since scheduling timeslices are not on the order 68
      years. if there's a 32-bit syscall, use it and expand the result into
      timespec; otherwise there is only one syscall and it does the right
      thing to store to timespec directly.
      
      on 64-bit archs, there is no change to the code after preprocessing.
      1d4471b1
    • R
      clock_getres: don't assume time_t is 32-bit on 32-bit archs · 24485855
      Rich Felker 提交于
      the time64 syscall for this is not necessary or useful, since clock
      resolution is generally better than 68-year granularity. if there's a
      32-bit syscall, use it and expand the result into timespec; otherwise
      there is only one syscall and it does the right thing to store to
      timespec directly.
      
      on 64-bit archs, there is no change to the code after preprocessing.
      24485855
  6. 29 7月, 2019 8 次提交
    • R
      timer_gettime: add time64 syscall support, decouple 32-bit time_t · a02bd528
      Rich Felker 提交于
      the time64 syscall has to be used if time_t is 64-bit, since there's
      no way of knowing before making a syscall whether the result will fit
      in 32 bits, and the 32-bit syscalls do not report overflow as an
      error.
      
      on 64-bit archs, there is no change to the code after preprocessing.
      on current 32-bit archs, the result is now read from the kernel
      through long[4] array, then copied into the timespec, to remove the
      assumption that time_t is the same as long.
      a02bd528
    • R
      remove x32 syscall timespec fixup hacks · 4c307bed
      Rich Felker 提交于
      the x32 syscall interfaces treat timespec's tv_nsec member as 64-bit
      despite the API type being long and long being 32-bit in the ABI. this
      is no problem for syscalls that store timespecs to userspace as
      results, but caused uninitialized padding to be misinterpreted as the
      high bits in syscalls that take timespecs as input.
      
      since the beginning of the port, we've dealt with this situation with
      hacks in syscall_arch.h, and injected between __syscall_cp_c and
      __syscall_cp_asm, to special-case the syscall numbers that involve
      timespecs as inputs and copy them to a form suitable to pass to the
      kernel.
      
      commit 40aa18d5 set the stage for
      removal of these hacks by letting us treat the "normal" x32 syscalls
      dealing with timespec as if they're x32's "time64" syscalls,
      effectively making x32 ax "time64-only 32-bit arch" like riscv32 will
      be when it's added. since then, all users of syscalls that x32's
      syscall_arch.h had hacks for have been updated to use time64 syscalls,
      so the hacks can be removed.
      
      there are still at least a few other timespec-related syscalls broken
      on x32, which were overlooked when the x32 hacks were done or added
      later. these include at least recvmmsg, adjtimex/clock_adjtime, and
      timerfd_settime, and they will be fixed independently later on.
      4c307bed
    • R
      utimensat: add time64 syscall support, decouple 32-bit time_t · 01f3480d
      Rich Felker 提交于
      time64 syscall is used only if it's the only one defined for the arch,
      or if either of the requested times does not fit in 32 bits. care is
      taken to normalize the inputs to account for UTIME_NOW or UTIME_OMIT
      in tv_nsec, in which case tv_sec should be ignored. this is needed not
      only to avoid spurious time64 syscalls that might waste time failing
      with ENOSYS, but also to accurately decide whether fallback is
      possible.
      
      if the requested time cannot be represented, the function fails with
      ENOTSUP, defined in general as "The implementation does not support
      the requested feature or value". neither the time64 syscall, nor this
      error, can happen on current 32-bit archs where time_t is a 32-bit
      type, and both are statically unreachable.
      
      on 64-bit archs, there are only superficial changes to the
      SYS_futimesat fallback path, which has been modified to pass long[4]
      instead of struct timeval[2] to the kernel, making it suitable for use
      on 32-bit archs even once time_t is changed to 64-bit. for 32-bit
      archs, the call to SYS_utimensat has also been changed to copy the
      timespecs through an array of long[4] rather than passing the
      timespec[2] in-place.
      01f3480d
    • R
      clock_settime: add time64 syscall support, decouple 32-bit time_t · 7aeecf3e
      Rich Felker 提交于
      time64 syscall is used only if it's the only one defined for the arch,
      or if the requested time does not fit in 32 bits. on current 32-bit
      archs where time_t is a 32-bit type, this makes it statically
      unreachable.
      
      if the time64 syscall is needed because the requested time does not
      fit in 32 bits, we define this as an error ENOTSUP, for "The
      implementation does not support the requested feature or value".
      
      on 64-bit archs, there is no change to the code after preprocessing.
      on current 32-bit archs, the time is moved through an intermediate
      copy to remove the assumption that time_t is a 32-bit type.
      7aeecf3e
    • R
      timer_settime: add support for time64 syscall, decouple 32-bit time_t · e1501091
      Rich Felker 提交于
      time64 syscall is used only if it's the only one defined for the arch,
      if either component of the itimerspec does not fit in 32 bits, or if
      time_t is 64-bit and the caller requested the old value, in which case
      there's a possibility that the old value might not fit in 32 bits. on
      current 32-bit archs where time_t is a 32-bit type, this makes it
      statically unreachable.
      
      on 64-bit archs, there is no change to the code after preprocessing.
      on current 32-bit archs, the time is moved through an intermediate
      copy to remove the assumption that time_t is a 32-bit type.
      e1501091
    • R
      pselect, ppoll: add time64 syscall support, decouple 32-bit time_t · 22276671
      Rich Felker 提交于
      time64 syscall is used only if it's the only one defined for the arch,
      or if the requested timeout length does not fit in 32 bits. on current
      32-bit archs where time_t is a 32-bit type, this makes it statically
      unreachable.
      
      on 64-bit archs, there are only superficial changes to the code after
      preprocessing. both before and after these changes, these functions
      copied their timeout arguments to avoid letting the kernel clobber the
      caller's copies. now, the copying also serves to change the type from
      userspace timespec to a pair of longs, which makes a difference only
      in the 32-bit fallback case, not on 64-bit.
      22276671
    • R
      futex wait operations: add time64 syscall support, decouple 32-bit time_t · 1492bdf5
      Rich Felker 提交于
      thanks to the original factorization using the __timedwait function,
      there are no FUTEX_WAIT calls anywhere else, giving us a single point
      of change to make nearly all the timed thread primitives time64-ready.
      the one exception is the FUTEX_LOCK_PI command for PI mutex timedlock.
      I haven't tried to make these two points share code, since they have
      different fallbacks (no non-private fallback needed for PI since PI
      was added later) and FUTEX_LOCK_PI isn't a cancellation point (thus
      allowing the whole code path to inline into pthread_mutex_timedlock).
      
      as for other changes in this series, the time64 syscall is used only
      if it's the only one defined for the arch, or if the requested timeout
      does not fit in 32 bits. on current 32-bit archs where time_t is a
      32-bit type, this makes it statically unreachable.
      
      on 64-bit archs, there are only superficial changes to the code after
      preprocessing. on current 32-bit archs, the time is passed via an
      intermediate copy to remove the assumption that time_t is a 32-bit
      type.
      1492bdf5
    • R
      semtimedop: add time64 syscall support, decouple 32-bit time_t · eb2e298c
      Rich Felker 提交于
      time64 syscall is used only if it's the only one defined for the arch,
      or if the requested timeout does not fit in 32 bits. on current 32-bit
      archs where time_t is a 32-bit type, this makes it statically
      unreachable.
      
      on 64-bit archs, there is no change to the code after preprocessing.
      on current 32-bit archs, the time is passed via an intermediate copy
      to remove the assumption that time_t is a 32-bit type.
      
      to avoid duplicating SYS_ipc/SYS_semtimedop choice logic, the code for
      32-bit archs "falls through" after updating the timeout argument ts to
      point to a [compound literal] array of longs. in preparation for
      "time64-only" 32-bit archs, an extra case is added for neither SYS_ipc
      nor the non-time64 SYS_semtimedop existing; the ENOSYS failure path
      here should never be reachable, and is added just in case a compiler
      can't see that it's not reachable, to avoid spurious static analysis
      complaints.
      eb2e298c