SAVEPOINT: 2022-06-07 @ 15:33:40

leodido · Jun 7, 2022 · 37ebb23 · 37ebb23
1 parent f3da7ce
commit 37ebb23
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 25 deletions.
diff --git a/api/api.$progname.h.in b/api/api.$progname.h.in
@@ -1,6 +1,8 @@
 #include "${PROGNAME}.skel.h"
 
-int ${OPERATION}${PROGNAME}(struct config *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb)
+#define ${PROGNAME}_has_rodata ${PROGNAME_WITH_RODATA}
+
+int ${OPERATION}${PROGNAME}(struct config *conf, after_attach_fn_t cb, const void* rodata)
 {
     int err;
     char buf[100];
@@ -15,14 +17,28 @@ int ${OPERATION}${PROGNAME}(struct config *conf, after_attach_fn_t cb, bpf_obj_f
         return 1;
     }
 
-    if (obj_cb) {
-        err = obj_cb(obj);
-        if (err)
-        {
-            fprintf(stderr, "traffico: fail calling obj callback\n");
-            goto destroy_${PROGNAME};
-        }
+    // Set read-only data
+#if ${PROGNAME}_has_rodata
+    struct bpf_map *m = bpf_object__find_map_by_name(obj->obj, ".rodata");
+    if (!m || !bpf_map__is_internal(m))
+    {
+        log_err(conf, "fail: finding the .rodata map\n");
+        return 1;
+    }
+    const char *m_name = bpf_map__name(m);
+    size_t m_size = bpf_map__value_size(m);
+    log_out(conf, "done: finding the %s map (size %d)\n", m_name, m_size);
+    err = bpf_map__set_initial_value(m, rodata, m_size);
+    if (err)
+    {
+        free(m);
+        log_err(conf, "fail: setting the %s map\n", m_name);
+        return 1;
     }
+    log_out(conf, "done: setting the %s map\n", m_name);
+#else
+    log_out(conf, "done: moving on: no .rodata map\n");
+#endif
 
     err = ${PROGNAME}_bpf__load(obj);
     if (err)

diff --git a/api/api.h.in b/api/api.h.in
@@ -31,11 +31,9 @@ struct config
     FILE *out_stream;
 };
 
-typedef int (*bpf_obj_fn_t)(void *obj);
-
 typedef int (*after_attach_fn_t)(struct bpf_tc_hook hook, struct bpf_tc_opts opts);
 
-typedef int (*attach_fn_t)(struct config *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb);
+typedef int (*attach_fn_t)(struct config *conf, after_attach_fn_t cb, const void* rodata);
 
 /// logging
 int print_log(FILE *f, bool verbosity, bool prefix, const char *fmt, va_list argptr)
@@ -78,7 +76,7 @@ int exit_after_attach(struct bpf_tc_hook hook, struct bpf_tc_opts opts)
 }
 
 /// non-existing programs
-int ${OPERATION}0(struct config *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb)
+int ${OPERATION}0(struct config *conf, after_attach_fn_t cb, const void *rodata)
 {
     return 1;
 }
@@ -88,15 +86,13 @@ ${API}
 /// dispatch
 attach_fn_t attach_fn[NUM_PROGRAMS] = { ${PROGRAMS_OPS_AS_SYMBOLS} };
 
-int attach(struct config *conf, after_attach_fn_t cb, bpf_obj_fn_t obj_cb)
+int attach(struct config *conf, after_attach_fn_t cb, const void* rodata)
 {
     attach_fn_t fn = attach_fn[conf->program];
     if (fn) {
-        return fn(conf, cb, obj_cb);
+        return fn(conf, cb, rodata);
     }
-    return ${OPERATION}0(conf, cb, obj_cb);
+    return ${OPERATION}0(conf, cb, NULL);
 }
 
-
-
 #endif // TRAFFICO_API_H
diff --git a/api/xmake.lua b/api/xmake.lua
@@ -8,7 +8,7 @@ includes("xmake/repos.lua")
 add_rules("mode.release", "mode.debug")
 
 -- target to generate API components for every BPF program
-target("every.api")
+target("every-api")
     set_kind("headeronly")
     includes("../bpf")
     add_deps("bpf")
@@ -23,10 +23,10 @@ target("every.api")
 -- target to generate the API
 target("api")
     set_kind("headeronly")
-    add_deps("every.api")
+    add_deps("every-api")
     on_config(function(target)
         import("xmake.modules.api", { rootdir = os.projectdir() })
-        api(target, "every.api", true)
+        api(target, "every-api", true)
 
         import("actions.config.configfiles", { alias = "gen_configfiles", rootdir = os.programdir() })
         gen_configfiles()

diff --git a/traffico.c b/traffico.c
@@ -244,5 +244,8 @@ int main(int argc, char **argv)
 
     // Execute
     log_info("prog: %s\n", g_programs_name[g_config.program]);
-    return attach(&g_config, &await, NULL);
+    __u32 input = 16843010;
+    __u8 *val = malloc(4);
+    memcpy(val, &input, 4); // memset(val, 1, 4);
+    return attach(&g_config, &await, val);
 }
diff --git a/xmake/modules/api.lua b/xmake/modules/api.lua
@@ -1,4 +1,5 @@
 import("core.project.project")
+import("lib.detect.check_cxsnippets")
 
 -- get sourcefiles
 function _get_programs(target_name)
@@ -17,6 +18,10 @@ function gen(target, source_target)
     if not target then
         raise("could not configure target")
     end
+    local source_gendir = path.absolute(project.target(source_target):autogendir())
+    if not source_gendir then
+        raise("could not obtain the autogendir of the source target")
+    end
 
     target:set("configdir", target:autogendir())
 
@@ -30,7 +35,22 @@ function gen(target, source_target)
         local tempconf = path.join(os.tmpdir(), confname)
         os.tryrm(tempconf)
         os.cp(configfile_template_path, tempconf)
-        target:add("configfiles", tempconf, { variables = { PROGNAME = progname, OPERATION = "attach__" } })
+
+        local skelpath = path.join(source_gendir, progname .. ".skel.h")
+        local has_rodata = check_cxsnippets("void test() {&((struct " .. progname .. "_bpf*)0)->rodata;}", {includes = skelpath}) and 1 or 0
+        if has_rodata == 1 then
+            utils.dump(
+                check_cxsnippets('void test() {printf("%ld", sizeof(&((struct ' .. progname .. '_bpf*)0)->rodata));}', {includes = skelpath})
+            )
+        end
+
+        target:add("configfiles", tempconf, {
+            variables = {
+                PROGNAME = progname,
+                OPERATION = "attach__",
+                PROGNAME_WITH_RODATA = has_rodata
+            }
+        })
     end
 end
 
@@ -51,18 +71,23 @@ function main(target, components_target, banner)
 
     local op = vars[1].variables.OPERATION
     v["OPERATION"] = op
-
+
+    local descr = '"  - '
     local programs = {}
     table.insert(programs, "0")
-    for _, v in ipairs(vars) do
+    for i, v in ipairs(vars) do
         table.insert(programs, v.variables.PROGNAME)
+        descr = descr .. v.variables.PROGNAME .. (v.variables.PROGNAME_WITH_RODATA == 1 and ' [input]' or '')
+        if i ~= #vars then
+            descr = descr .. '\\n  - '
+        end
     end
     table.sort(programs)
     v["PROGRAMS_AS_SYMBOLS"] = 'program_' .. table.concat(programs, ", program_")
     v["PROGRAMS_AS_STRINGS"] = '"' .. table.concat(programs, '", "') .. '"'
     v["PROGRAMS_OPS_AS_SYMBOLS"] = op .. table.concat(programs, ', ' .. op)
     table.remove(programs, 1)
-    v["PROGRAMS_DESCRIPTION"] = '"  - ' .. table.concat(programs, '\\n  - ') .. '"'
+    v["PROGRAMS_DESCRIPTION"] = descr .. '"'
 
     local content = ""
     for i, c in ipairs(components) do