Commit 38ebcf50 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

scm: optimize put_cmsg()

Calling two copy_to_user() for very small regions has very high overhead.

Switch to inlined unsafe_put_user() to save one stac/clac sequence,
and avoid copy_to_user().
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6faf160
...@@ -228,14 +228,16 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data) ...@@ -228,14 +228,16 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
if (msg->msg_control_is_user) { if (msg->msg_control_is_user) {
struct cmsghdr __user *cm = msg->msg_control_user; struct cmsghdr __user *cm = msg->msg_control_user;
struct cmsghdr cmhdr;
if (!user_write_access_begin(cm, cmlen))
cmhdr.cmsg_level = level; goto efault;
cmhdr.cmsg_type = type;
cmhdr.cmsg_len = cmlen; unsafe_put_user(len, &cm->cmsg_len, efault_end);
if (copy_to_user(cm, &cmhdr, sizeof cmhdr) || unsafe_put_user(level, &cm->cmsg_level, efault_end);
copy_to_user(CMSG_USER_DATA(cm), data, cmlen - sizeof(*cm))) unsafe_put_user(type, &cm->cmsg_type, efault_end);
return -EFAULT; unsafe_copy_to_user(CMSG_USER_DATA(cm), data,
cmlen - sizeof(*cm), efault_end);
user_write_access_end();
} else { } else {
struct cmsghdr *cm = msg->msg_control; struct cmsghdr *cm = msg->msg_control;
...@@ -249,6 +251,11 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data) ...@@ -249,6 +251,11 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
msg->msg_control += cmlen; msg->msg_control += cmlen;
msg->msg_controllen -= cmlen; msg->msg_controllen -= cmlen;
return 0; return 0;
efault_end:
user_write_access_end();
efault:
return -EFAULT;
} }
EXPORT_SYMBOL(put_cmsg); EXPORT_SYMBOL(put_cmsg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment