Skip to content

Commit

Permalink
drm/vc4: Add a pad field to align drm_vc4_submit_cl to 64 bits.
Browse files Browse the repository at this point in the history
I had originally asked Stefan Schake to drop the pad field from the
syncobj changes that just landed, because I couldn't come up with a
reason to align to 64 bits.

Talking with Dave Airlie about the new v3d driver's submit ioctl, we
came up with a reason: sizeof() on 64-bit platforms may align to 64
bits, in which case the userspace will be submitting the aligned size
and the final 32 bits won't be zero-padded by the kernel.  If
userspace doesn't zero-fill, then a future ABI change adding a 32-bit
field at the end could potentially cause the kernel to read undefined
data from old userspace (our userspace happens to use structure
initialization that zero-fills, but as a general rule we try not to
rely on that in the kernel).

Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20180430235927.28712-1-eric@anholt.net
Reviewed-by: Stefan Schake <stschake@gmail.com>
  • Loading branch information
Eric Anholt committed May 3, 2018
1 parent 0a4587a commit 4c70ac7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/gpu/drm/vc4/vc4_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,11 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
return -EINVAL;
}

if (args->pad2 != 0) {
DRM_DEBUG("Invalid pad: 0x%08x\n", args->pad2);
return -EINVAL;
}

exec = kcalloc(1, sizeof(*exec), GFP_KERNEL);
if (!exec) {
DRM_ERROR("malloc failure on exec struct\n");
Expand Down
2 changes: 2 additions & 0 deletions include/uapi/drm/vc4_drm.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ struct drm_vc4_submit_cl {
* render job. 0 means ignore.
*/
__u32 out_sync;

__u32 pad2;
};

/**
Expand Down

0 comments on commit 4c70ac7

Please sign in to comment.