Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/834101/?format=api
{ "id": 834101, "url": "http://patchwork.ozlabs.org/api/1.2/patches/834101/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20171103205630.1083-6-jakub.kicinski@netronome.com/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/1.2/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": "<20171103205630.1083-6-jakub.kicinski@netronome.com>", "list_archive_url": null, "date": "2017-11-03T20:56:20", "name": "[net-next,v2,05/15] xdp: allow attaching programs loaded for specific device", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "b4a0306982ee2d0a7de22b710cfe8684ff1bf302", "submitter": { "id": 67484, "url": "http://patchwork.ozlabs.org/api/1.2/people/67484/?format=api", "name": "Jakub Kicinski", "email": "jakub.kicinski@netronome.com" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/1.2/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20171103205630.1083-6-jakub.kicinski@netronome.com/mbox/", "series": [ { "id": 11839, "url": "http://patchwork.ozlabs.org/api/1.2/series/11839/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=11839", "date": "2017-11-03T20:56:15", "name": "bpf: add offload as a first class citizen", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/11839/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/834101/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/834101/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=netronome-com.20150623.gappssmtp.com\n\theader.i=@netronome-com.20150623.gappssmtp.com\n\theader.b=\"j3VNQyOO\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yTDmm6nVcz9s7p\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSat, 4 Nov 2017 07:57:44 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1756020AbdKCU5l (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tFri, 3 Nov 2017 16:57:41 -0400", "from mail-pf0-f194.google.com ([209.85.192.194]:49851 \"EHLO\n\tmail-pf0-f194.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1753688AbdKCU4u (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Fri, 3 Nov 2017 16:56:50 -0400", "by mail-pf0-f194.google.com with SMTP id i5so3031900pfe.6\n\tfor <netdev@vger.kernel.org>; Fri, 03 Nov 2017 13:56:49 -0700 (PDT)", "from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\to10sm9989029pgq.69.2017.11.03.13.56.48\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 03 Nov 2017 13:56:48 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=netronome-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=TBooQMyu+hFmKhBbKmy59f2XQiO35HyVmUdH1kSZtXs=;\n\tb=j3VNQyOO15qdr/rOEKGVPM6YJCOiqkmNTdaMqGJIas553Q3XsD97VxZzJCgr1dbdiZ\n\t9KpHJioQf7SNCpS57Hx7U4iWyWtOB6dx6bZWIyZx0jexALXRf/y0PSqpGCHlaJdACFs6\n\t4k6wn4rzspaD2CY0nuTQNU6RfYwPEAtzIITxpj4/85pK+zI0dZ/f/JTsSaJCYaGMOgM+\n\tqD3NGYlfpCB+UpxBwqljlN5WU+9dMvuBmH4C+CKy6TQRAeD0XqU9zG3ADOiVAbdAGc7O\n\tW28vxhOfh3kKVpLVHWQP6LtTapHVmWkhxBTFqLCdpjea/kWF8zpfy7ocXO+ZJQ0upfFy\n\tZS2A==", "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=TBooQMyu+hFmKhBbKmy59f2XQiO35HyVmUdH1kSZtXs=;\n\tb=B1LCQegLMp40Ho0yGfRd5jHWmz/ZEXgNPysU8zAi8KhZpu8xTIAImDpoLVCgWcRl7l\n\tQS7NWfnYnhJgM0Xrl0Hzf0yySGTlXsMpNUq0j0Fa1k9VRATb74EqURKjBGxQFnlgKQ3h\n\tAF9JF5SBcQi7TtSIENDanaIJ/JigxdDi6+EXh3xIzjZmeMg6VRgeLKwh64i/3MsCAZ2A\n\trBpihYq8RSZ5X+qZ6/dLrpubXefMvVVq0VOJqVeHBrTc9h+OmSGWoio3oX47C7vpSUD4\n\tuipND8DSoGWfTynfwZ5EJiIblDFFYDlR1OCV24/DcKa/YtwidpRXZiWPIcc5ZhtAdYeh\n\t9jZA==", "X-Gm-Message-State": "AMCzsaUYgse/4y5096IFoYqEHFSm54+iAqAP4614iIomNmkNTe9nbF/r\n\t1kE/3CQQZgoptTJBRvjcPFAVwSYa", "X-Google-Smtp-Source": "ABhQp+QF38wSAqO156tGlPPhD6vTGWIDtq26XeLsoBg6f23SP6gD6mOC9WnPWPPIcpNHxjt6pQpRzA==", "X-Received": "by 10.99.104.73 with SMTP id d70mr8262065pgc.58.1509742609107;\n\tFri, 03 Nov 2017 13:56:49 -0700 (PDT)", "From": "Jakub Kicinski <jakub.kicinski@netronome.com>", "To": "netdev@vger.kernel.org", "Cc": "oss-drivers@netronome.com, alexei.starovoitov@gmail.com,\n\tdaniel@iogearbox.net, Jakub Kicinski <jakub.kicinski@netronome.com>", "Subject": "[PATCH net-next v2 05/15] xdp: allow attaching programs loaded for\n\tspecific device", "Date": "Fri, 3 Nov 2017 13:56:20 -0700", "Message-Id": "<20171103205630.1083-6-jakub.kicinski@netronome.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20171103205630.1083-1-jakub.kicinski@netronome.com>", "References": "<20171103205630.1083-1-jakub.kicinski@netronome.com>", "Sender": "netdev-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Pass the netdev pointer to bpf_prog_get_type(). This way\nBPF code can decide whether the device matches what the\ncode was loaded/translated for.\n\nSigned-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>\nReviewed-by: Simon Horman <simon.horman@netronome.com>\nReviewed-by: Quentin Monnet <quentin.monnet@netronome.com>\n---\n include/linux/bpf.h | 10 ++++++++++\n kernel/bpf/syscall.c | 33 +++++++++++++++++++++++++++++----\n net/core/dev.c | 6 +++++-\n 3 files changed, 44 insertions(+), 5 deletions(-)", "diff": "diff --git a/include/linux/bpf.h b/include/linux/bpf.h\nindex 98bacd0fa5cc..c397934f91dd 100644\n--- a/include/linux/bpf.h\n+++ b/include/linux/bpf.h\n@@ -335,6 +335,8 @@ extern const struct bpf_verifier_ops xdp_analyzer_ops;\n \n struct bpf_prog *bpf_prog_get(u32 ufd);\n struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type);\n+struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type,\n+\t\t\t\t struct net_device *netdev);\n struct bpf_prog * __must_check bpf_prog_add(struct bpf_prog *prog, int i);\n void bpf_prog_sub(struct bpf_prog *prog, int i);\n struct bpf_prog * __must_check bpf_prog_inc(struct bpf_prog *prog);\n@@ -428,6 +430,14 @@ static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,\n {\n \treturn ERR_PTR(-EOPNOTSUPP);\n }\n+\n+static inline struct bpf_prog *bpf_prog_get_type_dev(u32 ufd,\n+\t\t\t\t\t\t enum bpf_prog_type type,\n+\t\t\t\t\t\t struct net_device *netdev)\n+{\n+\treturn ERR_PTR(-EOPNOTSUPP);\n+}\n+\n static inline struct bpf_prog * __must_check bpf_prog_add(struct bpf_prog *prog,\n \t\t\t\t\t\t\t int i)\n {\ndiff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c\nindex 3217c20ea91b..68f9123acd39 100644\n--- a/kernel/bpf/syscall.c\n+++ b/kernel/bpf/syscall.c\n@@ -1057,7 +1057,22 @@ struct bpf_prog *bpf_prog_inc_not_zero(struct bpf_prog *prog)\n }\n EXPORT_SYMBOL_GPL(bpf_prog_inc_not_zero);\n \n-static struct bpf_prog *__bpf_prog_get(u32 ufd, enum bpf_prog_type *attach_type)\n+static bool bpf_prog_can_attach(struct bpf_prog *prog,\n+\t\t\t\tenum bpf_prog_type *attach_type,\n+\t\t\t\tstruct net_device *netdev)\n+{\n+\tstruct bpf_dev_offload *offload = prog->aux->offload;\n+\n+\tif (prog->type != *attach_type)\n+\t\treturn false;\n+\tif (offload && offload->netdev != netdev)\n+\t\treturn false;\n+\n+\treturn true;\n+}\n+\n+static struct bpf_prog *__bpf_prog_get(u32 ufd, enum bpf_prog_type *attach_type,\n+\t\t\t\t struct net_device *netdev)\n {\n \tstruct fd f = fdget(ufd);\n \tstruct bpf_prog *prog;\n@@ -1065,7 +1080,7 @@ static struct bpf_prog *__bpf_prog_get(u32 ufd, enum bpf_prog_type *attach_type)\n \tprog = ____bpf_prog_get(f);\n \tif (IS_ERR(prog))\n \t\treturn prog;\n-\tif (attach_type && (prog->type != *attach_type || prog->aux->offload)) {\n+\tif (attach_type && !bpf_prog_can_attach(prog, attach_type, netdev)) {\n \t\tprog = ERR_PTR(-EINVAL);\n \t\tgoto out;\n \t}\n@@ -1078,12 +1093,12 @@ static struct bpf_prog *__bpf_prog_get(u32 ufd, enum bpf_prog_type *attach_type)\n \n struct bpf_prog *bpf_prog_get(u32 ufd)\n {\n-\treturn __bpf_prog_get(ufd, NULL);\n+\treturn __bpf_prog_get(ufd, NULL, NULL);\n }\n \n struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type)\n {\n-\tstruct bpf_prog *prog = __bpf_prog_get(ufd, &type);\n+\tstruct bpf_prog *prog = __bpf_prog_get(ufd, &type, NULL);\n \n \tif (!IS_ERR(prog))\n \t\ttrace_bpf_prog_get_type(prog);\n@@ -1091,6 +1106,16 @@ struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type)\n }\n EXPORT_SYMBOL_GPL(bpf_prog_get_type);\n \n+struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type,\n+\t\t\t\t struct net_device *netdev)\n+{\n+\tstruct bpf_prog *prog = __bpf_prog_get(ufd, &type, netdev);\n+\n+\tif (!IS_ERR(prog))\n+\t\ttrace_bpf_prog_get_type(prog);\n+\treturn prog;\n+}\n+\n /* last field in 'union bpf_attr' used by this command */\n #define\tBPF_PROG_LOAD_LAST_FIELD prog_target_ifindex\n \ndiff --git a/net/core/dev.c b/net/core/dev.c\nindex 10cde58d3275..30b5fe32c525 100644\n--- a/net/core/dev.c\n+++ b/net/core/dev.c\n@@ -7157,7 +7157,11 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack,\n \t\t __dev_xdp_attached(dev, bpf_op, NULL))\n \t\t\treturn -EBUSY;\n \n-\t\tprog = bpf_prog_get_type(fd, BPF_PROG_TYPE_XDP);\n+\t\tif (bpf_op == ops->ndo_bpf)\n+\t\t\tprog = bpf_prog_get_type_dev(fd, BPF_PROG_TYPE_XDP,\n+\t\t\t\t\t\t dev);\n+\t\telse\n+\t\t\tprog = bpf_prog_get_type(fd, BPF_PROG_TYPE_XDP);\n \t\tif (IS_ERR(prog))\n \t\t\treturn PTR_ERR(prog);\n \t}\n", "prefixes": [ "net-next", "v2", "05/15" ] }