mirror/xdp-project-bpf-examples
1
0
Fork 0
mirror of https://github.com/xdp-project/bpf-examples.git synced 2024-05-06 15:54:53 +00:00
Code Issues Projects Releases Wiki Activity

AF_XDP-interaction: lib_xsk_extend move entry allocation

Browse Source 
Avoid doing a malloc in xsk_btf__field_entry().

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
This commit is contained in:
Jesper Dangaard Brouer
2021-11-04 09:44:53 +01:00
parent 07617277ab
commit a37b82bd9d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
AF_XDP-interaction/lib_xsk_extend.c
View File

@ -122,7 +122,7 @@ error_btf:
} }
static int __xsk_btf_field_entry(struct xsk_btf_info *xbi, const char *field, static int __xsk_btf_field_entry(struct xsk_btf_info *xbi, const char *field,
struct xsk_btf_entry **entry) struct xsk_btf_entry *entry)
{ {
const struct btf_member *m; const struct btf_member *m;
unsigned short vlen; unsigned short vlen;
@ -137,15 +137,10 @@ static int __xsk_btf_field_entry(struct xsk_btf_info *xbi, const char *field,
continue; continue;
if (entry) { if (entry) {
*entry = malloc(sizeof(*entry));
if (!entry) {
return -ENOMEM;
}
/* As we bail out at init for bit fields, there should /* As we bail out at init for bit fields, there should
* be no entries whose offset is not a multiple of byte */ * be no entries whose offset is not a multiple of byte */
(*entry)->offset = BTF_MEMBER_BIT_OFFSET(m->offset) / 8; entry->offset = BTF_MEMBER_BIT_OFFSET(m->offset) / 8;
(*entry)->size = btf__resolve_size(xbi->btf, m->type); entry->size = btf__resolve_size(xbi->btf, m->type);
} }
return 0; return 0;
} }
@ -181,10 +176,17 @@ int xsk_btf__read(void **dest, size_t size, const char *field,
return -EINVAL; return -EINVAL;
if (!hashmap__find(&(xbi->map), field, (void **)&entry)) { if (!hashmap__find(&(xbi->map), field, (void **)&entry)) {
err = __xsk_btf_field_entry(xbi, field, &entry); struct xsk_btf_entry e;
err = __xsk_btf_field_entry(xbi, field, &e);
if (err) if (err)
return err; return err;
entry = malloc(sizeof(*entry));
if (!entry)
return -ENOMEM;
*entry = e;
hashmap__add(&(xbi->map), field, entry); hashmap__add(&(xbi->map), field, entry);
} }