Re: [RFC PATCH 3/7] sound: core: Avoid using timespec for struct snd_pcm_sync_ptr

From: Arnd Bergmann
Date: Thu Sep 21 2017 - 08:50:57 EST

Next message: Geert Uytterhoeven: "[PATCH] [trivial] dt-bindings: i2c: i2c-mux: Spelling s/required is/required if/"
Previous message: Pierre Yves MORDRET: "Re: [PATCH v4 2/4] dmaengine: Add STM32 DMAMUX driver"
In reply to: Baolin Wang: "[RFC PATCH 3/7] sound: core: Avoid using timespec for struct snd_pcm_sync_ptr"
Next in thread: Baolin Wang: "Re: [RFC PATCH 3/7] sound: core: Avoid using timespec for struct snd_pcm_sync_ptr"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Thu, Sep 21, 2017 at 8:18 AM, Baolin Wang <baolin.wang@xxxxxxxxxx> wrote:
> The struct snd_pcm_sync_ptr will use 'timespec' type variables to record
> timestamp, which is not year 2038 safe on 32bits system.
>
> Thus we introduced 'struct snd_pcm_sync_ptr32' and 'struct snd_pcm_sync_ptr64'
> to handle 32bit time_t and 64bit time_t in native mode, which replace
> timespec with s64 type.
>
> In compat mode, we renamed or introduced new structures to handle 32bit/64bit
> time_t in compatible mode. The 'struct compat_snd_pcm_sync_ptr32' and
> snd_pcm_ioctl_sync_ptr_compat() are used to handle 32bit time_t in compat mode.
> 'struct compat_snd_pcm_sync_ptr64' and snd_pcm_ioctl_sync_ptr_compat64() are used
> to handle 64bit time_t with 64bit alignment. 'struct compat_snd_pcm_sync_ptr64_x86_32'
> and snd_pcm_ioctl_sync_ptr_compat64_x86_32() are used to handle 64bit time_t with
> 32bit alignment.
>
> When glibc changes time_t to 64bit, any recompiled program will issue ioctl
> commands that the kernel does not understand without this patch.
>
> Signed-off-by: Baolin Wang <baolin.wang@xxxxxxxxxx>
> ---
> include/sound/pcm.h | 46 +++++++++-
> sound/core/pcm.c | 6 +-
> sound/core/pcm_compat.c | 228 ++++++++++++++++++++++++++++++++++++++---------
> sound/core/pcm_lib.c | 9 +-
> sound/core/pcm_native.c | 113 ++++++++++++++++++-----
> 5 files changed, 329 insertions(+), 73 deletions(-)
>
> diff --git a/include/sound/pcm.h b/include/sound/pcm.h
> index 114cc29..c253cbf 100644
> --- a/include/sound/pcm.h
> +++ b/include/sound/pcm.h
> @@ -64,6 +64,15 @@ struct snd_pcm_hardware {
> struct snd_pcm_audio_tstamp_config; /* definitions further down */
> struct snd_pcm_audio_tstamp_report;
>
> +struct snd_pcm_mmap_status64 {
> + snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */
> + int pad1; /* Needed for 64 bit alignment */
> + snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */
> + struct { s64 tv_sec; s64 tv_nsec; } tstamp; /* Timestamp */
> + snd_pcm_state_t suspended_state; /* RO: suspended stream state */
> + struct { s64 tv_sec; s64 tv_nsec; } audio_tstamp; /* from sample counter or wall clock */
> +};

This looks correct, but there is a subtlety here to note about x86-32
that we discussed in a previous (private) review. To recall my earlier
thoughts:

Normal architectures insert 32 bit padding after 'suspended_state',
and 32-bit architectures (including x32) also after hw_ptr,
but x86-32 does not. You make that explicit in the compat code,
this version just relies on the compiler using identical padding
in user and kernel space. We could make that explicit using

struct snd_pcm_mmap_status64 {
snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */
int pad1; /* Needed for 64 bit alignment */
snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */
#if !defined(CONFIG_64BIT) && !defined(CONFIG_X86_32)
int pad2;
#endif
struct { s64 tv_sec; s64 tv_nsec; } tstamp; /* Timestamp */
snd_pcm_state_t suspended_state; /* RO: suspended stream state */
#if !defined(CONFIG_X86_32)
int pad3;
#endif
struct { s64 tv_sec; s64 tv_nsec; } audio_tstamp; /* from
sample counter or wall clock */
};

To make it clear that the layout is architecture specific. As a third
alternative, we could define binary version of the structure explicitly,
and have handlers for each layout, then call the correct handlers for
both native and compat mode. This could use e.g.

struct snd_pcm_mmap_status_time32 {
u32 state;
u32 pad1;
u32 hw_ptr;
s32 tstamp_sec;
s32 tstamp_usec;
u32 suspended_state;
s32 audio_tstamp_sec;
s32 audio_tstamp_usec;
};

struct snd_pcm_mmap_status_time64 {
u32 state;
u32 pad1;
u32 hw_ptr;
u32 pad2;
s64 tstamp_sec;
s64 tstamp_usec;
u32 suspended_state;
u32 pad3;
s64 audio_tstamp_sec;
s64 audio_tstamp_usec;
};

struct snd_pcm_mmap_status_time64_i386 {
u32 state;
u32 pad1;
u32 hw_ptr;
s64 tstamp_sec;
s64 tstamp_usec;
u32 suspended_state;
s64 audio_tstamp_sec;
s64 audio_tstamp_usec;
} __packed __aligned(4);

struct snd_pcm_mmap_status_64bit {
u32 state;
u32 pad1;
u64 hw_ptr;
s64 tstamp_sec;
s64 tstamp_usec;
u32 suspended_state;
u32 pad3;
s64 audio_tstamp_sec;
s64 audio_tstamp_usec;
};

My personal preference would be the third approach, but I'd like
to hear from Takashi if he has a preference. The downside of that
is that it requires the most changes to the existing code.

> @@ -1459,8 +1468,21 @@ struct snd_pcm_status64 {
> unsigned char reserved[52-2*sizeof(struct { s64 tv_sec; s64 tv_nsec; })]; /* must be filled with zero */
> };
>
> +struct snd_pcm_sync_ptr64 {
> + unsigned int flags;
> + union {
> + struct snd_pcm_mmap_status64 status;
> + unsigned char reserved[64];
> + } s;
> + union {
> + struct snd_pcm_mmap_control control;
> + unsigned char reserved[64];
> + } c;
> +};
> +
> #define SNDRV_PCM_IOCTL_STATUS64 _IOR('A', 0x20, struct snd_pcm_status64)
> #define SNDRV_PCM_IOCTL_STATUS_EXT64 _IOWR('A', 0x24, struct snd_pcm_status64)
> +#define SNDRV_PCM_IOCTL_SYNC_PTR64 _IOWR('A', 0x23, struct snd_pcm_sync_ptr64)
>
> #if __BITS_PER_LONG == 32
> struct snd_pcm_status32 {
> @@ -1481,8 +1503,30 @@ struct snd_pcm_status32 {
> unsigned char reserved[52-2*sizeof(struct { s32 tv_sec; s32 tv_nsec; })]; /* must be filled with zero */
> };
>
> +struct snd_pcm_mmap_status32 {
> + snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */
> + int pad1; /* Needed for 64 bit alignment */
> + snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */
> + struct { s32 tv_sec; s32 tv_nsec; } tstamp; /* Timestamp */
> + snd_pcm_state_t suspended_state; /* RO: suspended stream state */
> + struct { s32 tv_sec; s32 tv_nsec; } audio_tstamp; /* from sample counter or wall clock */
> +};
> +
> +struct snd_pcm_sync_ptr32 {
> + unsigned int flags;
> + union {
> + struct snd_pcm_mmap_status32 status;
> + unsigned char reserved[64];
> + } s;
> + union {
> + struct snd_pcm_mmap_control control;
> + unsigned char reserved[64];
> + } c;
> +};
> +
> #define SNDRV_PCM_IOCTL_STATUS32 _IOR('A', 0x20, struct snd_pcm_status32)
> #define SNDRV_PCM_IOCTL_STATUS_EXT32 _IOWR('A', 0x24, struct snd_pcm_status32)
> +#define SNDRV_PCM_IOCTL_SYNC_PTR32 _IOWR('A', 0x23, struct snd_pcm_sync_ptr32)
> #endif

Unfortunately, this approach doesn't quite work in this particular
case: it depends on snd_pcm_sync_ptr32 and snd_pcm_sync_ptr64
having different sizes in order to result in distinct command codes
for SNDRV_PCM_IOCTL_SYNC_PTR64 and
SNDRV_PCM_IOCTL_SYNC_PTR32.

However, the 64-byte 'reserved' fields mean that the unions are always
the same size, and only the padding between 'flags' and 's' is different.

Again, I suppose this almost works: 64-bit architectures use only
one possible layout in the .unlocked_ioctl handler, and on most
32-bit architectures the added padding will make the structure 4 bytes
longer, but not on i386, which now doesn't know whether user
space passed a snd_pcm_sync_ptr32 or a snd_pcm_sync_ptr64
structure.

Fixing this will require changing the uapi header file, in one of two
ways:

a) make the command number conditional:

#if __BITS_PER_LONG == 64 || !defined(__i386__)
#define SNDRV_PCM_IOCTL_SYNC_PTR SNDRV_PCM_IOCTL_SYNC_PTR_OLD
#else
#define SNDRV_PCM_IOCTL_SYNC_PTR (sizeof(__kernel_long_t) == sizeof(time_t) \
? SNDRV_PCM_IOCTL_SYNC_PTR_OLD
: SNDRV_PCM_IOCTL_SYNC_PTR_64)
#endif

b) change the user-visible structure definition to contain the
correct explicit padding on all architectures including i386

struct snd_pcm_mmap_status {
snd_pcm_state_t state; /* RO: state - SNDRV_PCM_STATE_XXXX */
int pad1; /* Needed for 64 bit alignment */
snd_pcm_uframes_t hw_ptr; /* RO: hw ptr (0...boundary-1) */
+ char pad2[sizeof(time_t) - sizeof(snd_pcm_uframes_t)];
struct timespec tstamp; /* Timestamp */
snd_pcm_state_t suspended_state; /* RO: suspended stream state */
+ char pad2[sizeof(time_t) - sizeof(snd_pcm_state_t)];
struct timespec audio_tstamp; /* from sample counter or wall clock */
};

struct snd_pcm_mmap_control {
snd_pcm_uframes_t appl_ptr; /* RW: appl ptr (0...boundary-1) */
snd_pcm_uframes_t avail_min; /* RW: min available frames
for wakeup */
};

struct snd_pcm_sync_ptr32 {
unsigned int flags;
+ char __pad[sizeof(time_t) - sizeof(unsigned int)];
union {
struct snd_pcm_mmap_status status;
unsigned char reserved[64];
} s;
union {
struct snd_pcm_mmap_control control;
unsigned char reserved[64];
} c;
};

> @@ -2995,8 +3058,12 @@ static int snd_pcm_common_ioctl(struct file *file,
> return -EFAULT;
> return 0;
> }
> - case SNDRV_PCM_IOCTL_SYNC_PTR:
> - return snd_pcm_sync_ptr(substream, arg);
> +#if __BITS_PER_LONG == 32
> + case SNDRV_PCM_IOCTL_SYNC_PTR32:
> + return snd_pcm_sync_ptr32(substream, arg);
> +#endif
> + case SNDRV_PCM_IOCTL_SYNC_PTR64:
> + return snd_pcm_sync_ptr64(substream, arg);
> #ifdef CONFIG_SND_SUPPORT_OLD_API
> case SNDRV_PCM_IOCTL_HW_REFINE_OLD:
> return snd_pcm_hw_refine_old_user(substream, arg);

Without either of the two changes, this function should cause
a build error on i386 since SNDRV_PCM_IOCTL_SYNC_PTR32
has the same value as SNDRV_PCM_IOCTL_SYNC_PTR64.

Arnd

Next message: Geert Uytterhoeven: "[PATCH] [trivial] dt-bindings: i2c: i2c-mux: Spelling s/required is/required if/"
Previous message: Pierre Yves MORDRET: "Re: [PATCH v4 2/4] dmaengine: Add STM32 DMAMUX driver"
In reply to: Baolin Wang: "[RFC PATCH 3/7] sound: core: Avoid using timespec for struct snd_pcm_sync_ptr"
Next in thread: Baolin Wang: "Re: [RFC PATCH 3/7] sound: core: Avoid using timespec for struct snd_pcm_sync_ptr"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]