From: yalin wang <yalin.wang2010@gmail.com>
To: ast@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: yalin wang <yalin.wang2010@gmail.com>
Subject: [RFC] bpf: change bpf syacall to use u64 temp variables
Date: Mon, 19 Oct 2015 15:10:46 +0800 [thread overview]
Message-ID: <1445238646-9379-1-git-send-email-yalin.wang2010@gmail.com> (raw)
This patch change map_lookup_elem() and map_update_elem() function
to use u64 temp variable if the key_size or value_size is less than
u64, we don't need use kmalloc() for these small variables.
Signed-off-by: yalin wang <yalin.wang2010@gmail.com>
---
kernel/bpf/syscall.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index f640e5f..c82d7bf 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -189,7 +189,8 @@ static int map_lookup_elem(union bpf_attr *attr)
void __user *uvalue = u64_to_ptr(attr->value);
int ufd = attr->map_fd;
struct bpf_map *map;
- void *key, *value, *ptr;
+ u64 key_buf, value_buf;
+ void *key = &key_buf, *value = &value_buf, *ptr;
struct fd f;
int err;
@@ -202,7 +203,8 @@ static int map_lookup_elem(union bpf_attr *attr)
return PTR_ERR(map);
err = -ENOMEM;
- key = kmalloc(map->key_size, GFP_USER);
+ if (map->key_size > sizeof(u64))
+ key = kmalloc(map->key_size, GFP_USER);
if (!key)
goto err_put;
@@ -211,7 +213,8 @@ static int map_lookup_elem(union bpf_attr *attr)
goto free_key;
err = -ENOMEM;
- value = kmalloc(map->value_size, GFP_USER);
+ if (map->value_size > sizeof(u64))
+ value = kmalloc(map->value_size, GFP_USER);
if (!value)
goto free_key;
@@ -232,9 +235,11 @@ static int map_lookup_elem(union bpf_attr *attr)
err = 0;
free_value:
- kfree(value);
+ if (value != &value_buf)
+ kfree(value);
free_key:
- kfree(key);
+ if (key != &key_buf)
+ kfree(key);
err_put:
fdput(f);
return err;
@@ -248,7 +253,8 @@ static int map_update_elem(union bpf_attr *attr)
void __user *uvalue = u64_to_ptr(attr->value);
int ufd = attr->map_fd;
struct bpf_map *map;
- void *key, *value;
+ u64 key_buf, value_buf;
+ void *key = &key_buf, *value = &value_buf;
struct fd f;
int err;
@@ -261,7 +267,8 @@ static int map_update_elem(union bpf_attr *attr)
return PTR_ERR(map);
err = -ENOMEM;
- key = kmalloc(map->key_size, GFP_USER);
+ if (map->key_size > sizeof(u64))
+ key = kmalloc(map->key_size, GFP_USER);
if (!key)
goto err_put;
@@ -270,7 +277,8 @@ static int map_update_elem(union bpf_attr *attr)
goto free_key;
err = -ENOMEM;
- value = kmalloc(map->value_size, GFP_USER);
+ if (map->value_size > sizeof(u64))
+ value = kmalloc(map->value_size, GFP_USER);
if (!value)
goto free_key;
@@ -286,9 +294,11 @@ static int map_update_elem(union bpf_attr *attr)
rcu_read_unlock();
free_value:
- kfree(value);
+ if (value != &value_buf)
+ kfree(value);
free_key:
- kfree(key);
+ if (key != &key_buf)
+ kfree(key);
err_put:
fdput(f);
return err;
--
1.9.1
next reply other threads:[~2015-10-19 7:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-19 7:10 yalin wang [this message]
2015-10-19 8:55 ` [RFC] bpf: change bpf syacall to use u64 temp variables Daniel Borkmann
2015-10-19 19:08 ` Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445238646-9379-1-git-send-email-yalin.wang2010@gmail.com \
--to=yalin.wang2010@gmail.com \
--cc=ast@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).