Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/808443/?format=api
{ "id": 808443, "url": "http://patchwork.ozlabs.org/api/patches/808443/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/1504217150-16151-4-git-send-email-dsahern@gmail.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "name": "Linux network development", "link_name": "netdev", "list_id": "netdev.vger.kernel.org", "list_email": "netdev@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504217150-16151-4-git-send-email-dsahern@gmail.com>", "list_archive_url": null, "date": "2017-08-31T22:05:46", "name": "[v3,net-next,3/7] samples/bpf: Update sock test to allow setting mark and priority", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "b4388d516f25802daf7dfdce0123adf70fe65e00", "submitter": { "id": 6918, "url": "http://patchwork.ozlabs.org/api/people/6918/?format=api", "name": "David Ahern", "email": "dsahern@gmail.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/1504217150-16151-4-git-send-email-dsahern@gmail.com/mbox/", "series": [ { "id": 913, "url": "http://patchwork.ozlabs.org/api/series/913/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=913", "date": "2017-08-31T22:05:43", "name": "bpf: Add option to set mark and priority in cgroup sock programs", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/913/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/808443/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/808443/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "X-Original-To": "patchwork-incoming@ozlabs.org", "Delivered-To": "patchwork-incoming@ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"u/gGiFcO\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xjxLh5d1rz9s81\n\tfor <patchwork-incoming@ozlabs.org>;\n\tFri, 1 Sep 2017 08:07:24 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751844AbdHaWGp (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tThu, 31 Aug 2017 18:06:45 -0400", "from mail-pf0-f196.google.com ([209.85.192.196]:37803 \"EHLO\n\tmail-pf0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751363AbdHaWGM (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Thu, 31 Aug 2017 18:06:12 -0400", "by mail-pf0-f196.google.com with SMTP id a2so523380pfj.4\n\tfor <netdev@vger.kernel.org>; Thu, 31 Aug 2017 15:06:11 -0700 (PDT)", "from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com.\n\t[216.129.126.126]) by smtp.googlemail.com with ESMTPSA id\n\tx12sm845336pfk.42.2017.08.31.15.06.10\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 31 Aug 2017 15:06:10 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=+zxmPv4LJWAXJr+gUFjo/IcFfYGv+trCVW0+HGJ+6N0=;\n\tb=u/gGiFcOZ4V5+DcILIJF2XfuDnRyb+4YEurioVL4UrWXviCm0eFf0pcwKD8qa87/yN\n\tfOsFzI1LEjaM1PzJRj60djwjMptFtjkLMddg3cVQwk7GaqXl+YH/w4LHspis7NdYDkU1\n\th2068UjUNi6ZQVZ+l0ZckLAr0LpsuRQJxZZSCJXdDBurtEATVqkIT36PJTMlwzX5UghX\n\tsVw1+tbw6h1ne2YJ8Fj6PQkzuiA6dVq3Ea9KkYO/w+rujSDFJNT+CY1yOIKxRV7whCFG\n\t02EnKfYAshRGOwkvvNeioBupRSBoI4oZke0eZdagDHKIM1OZhyrDRUVaVdeLxFX7jMsZ\n\t3GqQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=+zxmPv4LJWAXJr+gUFjo/IcFfYGv+trCVW0+HGJ+6N0=;\n\tb=Tf/dxIw+2Hrv2cOJxpp/l3fVOAqFujfIkxbTaDl9FEaPHYU4ozjH/AVSNFZtWUXkWE\n\tJY0Nv/vafji7OyKYqwTcA3b5YnnhAkSufU30L+hNjcGHkCgpAqFDqRmSqBqAGa9CKpCL\n\tMJrRS86AvJYBmnv4J/YWipkqY4Qb8UiLDlhtRE2LAPv50epN/HZxdArx2/ZriJwJeHUQ\n\thjwt1SwruXCEeW8jiRz8oLQlVixUGkjvHoyy72mKqVqupZpMCKI/myTJ0hJxcdPXSZCf\n\thQn9GaxkyCYlEMZofsDyySOiXwaK6PqwdVHLOSn6IHcbUKlmc3/250zl1kUV2ZMaAkgD\n\tCN8A==", "X-Gm-Message-State": "AHYfb5i8uAuRZHosaKUUPZHEPOawcEGm3iiB/gepV1r8FgTRCKFc3st6\n\tPOvY12A5u/NPhqZD", "X-Google-Smtp-Source": "ADKCNb73TooKHV9wLPPfG7by25EX0KHvPh2uABE8rtYBQN0EUyeWHzU+ZImRbyVdxZcraHN0q12Y9A==", "X-Received": "by 10.99.43.129 with SMTP id r123mr4077695pgr.153.1504217171337; \n\tThu, 31 Aug 2017 15:06:11 -0700 (PDT)", "From": "David Ahern <dsahern@gmail.com>", "To": "netdev@vger.kernel.org, daniel@iogearbox.net, ast@kernel.org", "Cc": "David Ahern <dsahern@gmail.com>", "Subject": "[PATCH v3 net-next 3/7] samples/bpf: Update sock test to allow\n\tsetting mark and priority", "Date": "Thu, 31 Aug 2017 15:05:46 -0700", "Message-Id": "<1504217150-16151-4-git-send-email-dsahern@gmail.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<1504217150-16151-1-git-send-email-dsahern@gmail.com>", "References": "<1504217150-16151-1-git-send-email-dsahern@gmail.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Update sock test to set mark and priority on socket create.\n\nSigned-off-by: David Ahern <dsahern@gmail.com>\n---\n samples/bpf/test_cgrp2_sock.c | 134 ++++++++++++++++++++++++++++++++++++-----\n samples/bpf/test_cgrp2_sock.sh | 2 +-\n 2 files changed, 119 insertions(+), 17 deletions(-)", "diff": "diff --git a/samples/bpf/test_cgrp2_sock.c b/samples/bpf/test_cgrp2_sock.c\nindex c3cfb23e23b5..681abbe6c85e 100644\n--- a/samples/bpf/test_cgrp2_sock.c\n+++ b/samples/bpf/test_cgrp2_sock.c\n@@ -19,59 +19,161 @@\n #include <errno.h>\n #include <fcntl.h>\n #include <net/if.h>\n+#include <inttypes.h>\n #include <linux/bpf.h>\n \n #include \"libbpf.h\"\n \n char bpf_log_buf[BPF_LOG_BUF_SIZE];\n \n-static int prog_load(int idx)\n+static int prog_load(__u32 idx, __u32 mark, __u32 prio)\n {\n-\tstruct bpf_insn prog[] = {\n+\t/* save pointer to context */\n+\tstruct bpf_insn prog_start[] = {\n \t\tBPF_MOV64_REG(BPF_REG_6, BPF_REG_1),\n+\t};\n+\tstruct bpf_insn prog_end[] = {\n+\t\tBPF_MOV64_IMM(BPF_REG_0, 1), /* r0 = verdict */\n+\t\tBPF_EXIT_INSN(),\n+\t};\n+\n+\t/* set sk_bound_dev_if on socket */\n+\tstruct bpf_insn prog_dev[] = {\n \t\tBPF_MOV64_IMM(BPF_REG_3, idx),\n \t\tBPF_MOV64_IMM(BPF_REG_2, offsetof(struct bpf_sock, bound_dev_if)),\n \t\tBPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, offsetof(struct bpf_sock, bound_dev_if)),\n-\t\tBPF_MOV64_IMM(BPF_REG_0, 1), /* r0 = verdict */\n-\t\tBPF_EXIT_INSN(),\n \t};\n-\tsize_t insns_cnt = sizeof(prog) / sizeof(struct bpf_insn);\n \n-\treturn bpf_load_program(BPF_PROG_TYPE_CGROUP_SOCK, prog, insns_cnt,\n+\t/* set mark on socket */\n+\tstruct bpf_insn prog_mark[] = {\n+\t\tBPF_MOV64_REG(BPF_REG_1, BPF_REG_6),\n+\t\tBPF_MOV64_IMM(BPF_REG_3, mark),\n+\t\tBPF_MOV64_IMM(BPF_REG_2, offsetof(struct bpf_sock, mark)),\n+\t\tBPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, offsetof(struct bpf_sock, mark)),\n+\t};\n+\n+\t/* set priority on socket */\n+\tstruct bpf_insn prog_prio[] = {\n+\t\tBPF_MOV64_REG(BPF_REG_1, BPF_REG_6),\n+\t\tBPF_MOV64_IMM(BPF_REG_3, prio),\n+\t\tBPF_MOV64_IMM(BPF_REG_2, offsetof(struct bpf_sock, priority)),\n+\t\tBPF_STX_MEM(BPF_W, BPF_REG_1, BPF_REG_3, offsetof(struct bpf_sock, priority)),\n+\t};\n+\n+\tstruct bpf_insn *prog;\n+\tsize_t insns_cnt;\n+\tvoid *p;\n+\tint ret;\n+\n+\tinsns_cnt = sizeof(prog_start) + sizeof(prog_end);\n+\tif (idx)\n+\t\tinsns_cnt += sizeof(prog_dev);\n+\n+\tif (mark)\n+\t\tinsns_cnt += sizeof(prog_mark);\n+\n+\tif (prio)\n+\t\tinsns_cnt += sizeof(prog_prio);\n+\n+\tp = prog = malloc(insns_cnt);\n+\tif (!prog) {\n+\t\tfprintf(stderr, \"Failed to allocate memory for instructions\\n\");\n+\t\treturn EXIT_FAILURE;\n+\t}\n+\n+\tmemcpy(p, prog_start, sizeof(prog_start));\n+\tp += sizeof(prog_start);\n+\n+\tif (idx) {\n+\t\tmemcpy(p, prog_dev, sizeof(prog_dev));\n+\t\tp += sizeof(prog_dev);\n+\t}\n+\n+\tif (mark) {\n+\t\tmemcpy(p, prog_mark, sizeof(prog_mark));\n+\t\tp += sizeof(prog_mark);\n+\t}\n+\n+\tif (prio) {\n+\t\tmemcpy(p, prog_prio, sizeof(prog_prio));\n+\t\tp += sizeof(prog_prio);\n+\t}\n+\n+\tmemcpy(p, prog_end, sizeof(prog_end));\n+\tp += sizeof(prog_end);\n+\n+\tinsns_cnt /= sizeof(struct bpf_insn);\n+\n+\tret = bpf_load_program(BPF_PROG_TYPE_CGROUP_SOCK, prog, insns_cnt,\n \t\t\t\t\"GPL\", 0, bpf_log_buf, BPF_LOG_BUF_SIZE);\n+\n+\tfree(prog);\n+\n+\treturn ret;\n }\n \n static int usage(const char *argv0)\n {\n-\tprintf(\"Usage: %s cg-path device-index\\n\", argv0);\n+\tprintf(\"Usage: %s -b bind-to-dev -m mark -p prio cg-path\\n\", argv0);\n \treturn EXIT_FAILURE;\n }\n \n int main(int argc, char **argv)\n {\n+\t__u32 idx = 0, mark = 0, prio = 0;\n+\tconst char *cgrp_path = NULL;\n \tint cg_fd, prog_fd, ret;\n-\tunsigned int idx;\n+\tint rc;\n+\n+\twhile ((rc = getopt(argc, argv, \"b:m:p:\")) != -1) {\n+\t\tswitch (rc) {\n+\t\tcase 'b':\n+\t\t\tidx = if_nametoindex(optarg);\n+\t\t\tif (!idx) {\n+\t\t\t\tidx = strtoumax(optarg, NULL, 0);\n+\t\t\t\tif (!idx) {\n+\t\t\t\t\tprintf(\"Invalid device name\\n\");\n+\t\t\t\t\treturn EXIT_FAILURE;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tbreak;\n+\t\tcase 'm':\n+\t\t\tmark = strtoumax(optarg, NULL, 0);\n+\t\t\tbreak;\n+\t\tcase 'p':\n+\t\t\tprio = strtoumax(optarg, NULL, 0);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\treturn usage(argv[0]);\n+\t\t}\n+\t}\n \n-\tif (argc < 2)\n+\tif (optind == argc)\n \t\treturn usage(argv[0]);\n \n-\tidx = if_nametoindex(argv[2]);\n-\tif (!idx) {\n-\t\tprintf(\"Invalid device name\\n\");\n+\tcgrp_path = argv[optind];\n+\tif (!cgrp_path) {\n+\t\tfprintf(stderr, \"cgroup path not given\\n\");\n \t\treturn EXIT_FAILURE;\n \t}\n \n-\tcg_fd = open(argv[1], O_DIRECTORY | O_RDONLY);\n+\tif (!idx && !mark && !prio) {\n+\t\tfprintf(stderr,\n+\t\t\t\"One of device, mark or priority must be given\\n\");\n+\t\treturn EXIT_FAILURE;\n+\t}\n+\n+\tcg_fd = open(cgrp_path, O_DIRECTORY | O_RDONLY);\n \tif (cg_fd < 0) {\n \t\tprintf(\"Failed to open cgroup path: '%s'\\n\", strerror(errno));\n \t\treturn EXIT_FAILURE;\n \t}\n \n-\tprog_fd = prog_load(idx);\n-\tprintf(\"Output from kernel verifier:\\n%s\\n-------\\n\", bpf_log_buf);\n-\n+\tprog_fd = prog_load(idx, mark, prio);\n \tif (prog_fd < 0) {\n \t\tprintf(\"Failed to load prog: '%s'\\n\", strerror(errno));\n+\t\tprintf(\"Output from kernel verifier:\\n%s\\n-------\\n\",\n+\t\t bpf_log_buf);\n \t\treturn EXIT_FAILURE;\n \t}\n \ndiff --git a/samples/bpf/test_cgrp2_sock.sh b/samples/bpf/test_cgrp2_sock.sh\nindex 925fd467c7cc..1153c33e8964 100755\n--- a/samples/bpf/test_cgrp2_sock.sh\n+++ b/samples/bpf/test_cgrp2_sock.sh\n@@ -20,7 +20,7 @@ function attach_bpf {\n \tmkdir -p /tmp/cgroupv2\n \tmount -t cgroup2 none /tmp/cgroupv2\n \tmkdir -p /tmp/cgroupv2/foo\n-\ttest_cgrp2_sock /tmp/cgroupv2/foo foo\n+\ttest_cgrp2_sock -b foo /tmp/cgroupv2/foo\n \techo $$ >> /tmp/cgroupv2/foo/cgroup.procs\n }\n \n", "prefixes": [ "v3", "net-next", "3/7" ] }