leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: sockmap: use bitmap for copy info

Browse Source 
Don't use bool array in struct sk_msg_sg, save 12 bytes.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2019-10-06 21:09:27 -07:00 committed by David S. Miller
parent 8211fbfaf2
commit 163ab96b52
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/skmsg.h
View File

@ -28,13 +28,14 @@ struct sk_msg_sg {
u32 end; u32 end;
u32 size; u32 size;
u32 copybreak; u32 copybreak;
bool copy[MAX_MSG_FRAGS]; unsigned long copy;
/* The extra element is used for chaining the front and sections when /* The extra element is used for chaining the front and sections when
* the list becomes partitioned (e.g. end < start). The crypto APIs * the list becomes partitioned (e.g. end < start). The crypto APIs
* require the chaining. * require the chaining.
*/ */
struct scatterlist data[MAX_MSG_FRAGS + 1]; struct scatterlist data[MAX_MSG_FRAGS + 1];
}; };
static_assert(BITS_PER_LONG >= MAX_MSG_FRAGS);
/* UAPI in filter.c depends on struct sk_msg_sg being first element. */ /* UAPI in filter.c depends on struct sk_msg_sg being first element. */
struct sk_msg { struct sk_msg {
@ -227,7 +228,7 @@ static inline void sk_msg_compute_data_pointers(struct sk_msg *msg)
{ {
struct scatterlist *sge = sk_msg_elem(msg, msg->sg.start); struct scatterlist *sge = sk_msg_elem(msg, msg->sg.start);
if (msg->sg.copy[msg->sg.start]) { if (test_bit(msg->sg.start, &msg->sg.copy)) {
msg->data = NULL; msg->data = NULL;
msg->data_end = NULL; msg->data_end = NULL;
} else { } else {
@ -246,7 +247,7 @@ static inline void sk_msg_page_add(struct sk_msg *msg, struct page *page,
sg_set_page(sge, page, len, offset); sg_set_page(sge, page, len, offset);
sg_unmark_end(sge); sg_unmark_end(sge);
msg->sg.copy[msg->sg.end] = true; __set_bit(msg->sg.end, &msg->sg.copy);
msg->sg.size += len; msg->sg.size += len;
sk_msg_iter_next(msg, end); sk_msg_iter_next(msg, end);
} }
@ -254,7 +255,10 @@ static inline void sk_msg_page_add(struct sk_msg *msg, struct page *page,
static inline void sk_msg_sg_copy(struct sk_msg *msg, u32 i, bool copy_state) static inline void sk_msg_sg_copy(struct sk_msg *msg, u32 i, bool copy_state)
{ {
do { do {
msg->sg.copy[i] = copy_state; if (copy_state)
__set_bit(i, &msg->sg.copy);
else
__clear_bit(i, &msg->sg.copy);
sk_msg_iter_var_next(i); sk_msg_iter_var_next(i);
if (i == msg->sg.end) if (i == msg->sg.end)
break; break;

4
net/core/filter.c
View File

@ -2245,7 +2245,7 @@ BPF_CALL_4(bpf_msg_pull_data, struct sk_msg *, msg, u32, start,
* account for the headroom. * account for the headroom.
*/ */
bytes_sg_total = start - offset + bytes; bytes_sg_total = start - offset + bytes;
if (!msg->sg.copy[i] && bytes_sg_total <= len) if (!test_bit(i, &msg->sg.copy) && bytes_sg_total <= len)
goto out; goto out;
/* At this point we need to linearize multiple scatterlist /* At this point we need to linearize multiple scatterlist
@ -2450,7 +2450,7 @@ BPF_CALL_4(bpf_msg_push_data, struct sk_msg *, msg, u32, start,
/* Place newly allocated data buffer */ /* Place newly allocated data buffer */
sk_mem_charge(msg->sk, len); sk_mem_charge(msg->sk, len);
msg->sg.size += len; msg->sg.size += len;
msg->sg.copy[new] = false; __clear_bit(new, &msg->sg.copy);
sg_set_page(&msg->sg.data[new], page, len + copy, 0); sg_set_page(&msg->sg.data[new], page, len + copy, 0);
if (rsge.length) { if (rsge.length) {
get_page(sg_page(&rsge)); get_page(sg_page(&rsge));