diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-08-31 06:01:26 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-09-11 13:34:57 -0400 |
commit | 17451138cf60f5d64eed88cc5defd44981926d9d (patch) | |
tree | ea335a05d9e038876d42bcd8a73c56e3b60af1a5 /drivers/gpu/nvgpu/common/linux/ioctl_as.c | |
parent | de0ce3e017decadd3a5049477f17ba770ddf074c (diff) |
gpu: nvgpu: hold ch ref when getting ch from fd
Fix a race condition in gk20a_get_channel_from_file() that returns a
channel pointer from an fd: take a reference to the channel before
putting the file ref back. Now the caller is responsible of releasing
the channel reference eventually.
Also document why dbg_session_channel_data has to hold a ref to the
channel file instead of just the channel: that might deadlock if the fds
were closed in "wrong" order.
Change-Id: I8e91b809f5f7b1cb0c1487bd955ad6d643727a53
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1549290
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/ioctl_as.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_as.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/common/linux/ioctl_as.c index 6fd0a3d2..d4242955 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_as.c | |||
@@ -42,14 +42,19 @@ static int gk20a_as_ioctl_bind_channel( | |||
42 | gk20a_dbg_fn(""); | 42 | gk20a_dbg_fn(""); |
43 | 43 | ||
44 | ch = gk20a_get_channel_from_file(args->channel_fd); | 44 | ch = gk20a_get_channel_from_file(args->channel_fd); |
45 | if (!ch || gk20a_channel_as_bound(ch)) | 45 | if (!ch) |
46 | return -EINVAL; | 46 | return -EINVAL; |
47 | 47 | ||
48 | if (gk20a_channel_as_bound(ch)) { | ||
49 | err = -EINVAL; | ||
50 | goto out; | ||
51 | } | ||
52 | |||
48 | /* this will set channel_gk20a->vm */ | 53 | /* this will set channel_gk20a->vm */ |
49 | err = ch->g->ops.mm.vm_bind_channel(as_share, ch); | 54 | err = ch->g->ops.mm.vm_bind_channel(as_share, ch); |
50 | if (err) | ||
51 | return err; | ||
52 | 55 | ||
56 | out: | ||
57 | gk20a_channel_put(ch); | ||
53 | return err; | 58 | return err; |
54 | } | 59 | } |
55 | 60 | ||