Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/833251/?format=api
{ "id": 833251, "url": "http://patchwork.ozlabs.org/api/1.2/patches/833251/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-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": "<20171102083136.2096-6-jakub.kicinski@netronome.com>", "list_archive_url": null, "date": "2017-11-02T08:31:33", "name": "[net-next,5/8] nfp: bpf: fall back to core NIC app if BPF not selected", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "fddd0dadcab81e6d9ad1a48b97fc03ced31eeb56", "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/20171102083136.2096-6-jakub.kicinski@netronome.com/mbox/", "series": [ { "id": 11454, "url": "http://patchwork.ozlabs.org/api/1.2/series/11454/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/list/?series=11454", "date": "2017-11-02T08:31:28", "name": "nfp: TC block fixes, app fallback and dev_alloc()", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/11454/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/833251/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/833251/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=\"wdS5HbMo\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySJHT1QM5z9t2f\n\tfor <patchwork-incoming@ozlabs.org>;\n\tThu, 2 Nov 2017 19:32:37 +1100 (AEDT)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755445AbdKBIcb (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tThu, 2 Nov 2017 04:32:31 -0400", "from mail-pg0-f68.google.com ([74.125.83.68]:49054 \"EHLO\n\tmail-pg0-f68.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1755437AbdKBIc0 (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Thu, 2 Nov 2017 04:32:26 -0400", "by mail-pg0-f68.google.com with SMTP id v78so4438220pgb.5\n\tfor <netdev@vger.kernel.org>; Thu, 02 Nov 2017 01:32:26 -0700 (PDT)", "from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\tz13sm5390484pgc.29.2017.11.02.01.32.25\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 02 Nov 2017 01:32:25 -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=m35mGlFRHergfYj0On1/Hx4JIs69Yqnl/XhMsJ4r3Ao=;\n\tb=wdS5HbMoVRnw5FpbbeJFRKXCHmxFrOeVjDcSgTPsG9V3osCE3QCC0Pq6f4zUhrJx+D\n\tIluGpTGdtA5cif0TSlQKFb1Ti02/ClU70GkhaldmrIIxruY9+cm2ATiuDLAXfTU3V0Ha\n\tX+uRL2+W3ttHJrkCfov7dGfYNyuuen/7ZVz1x3Gd9zQwyWeOyaeeF5noY49bEV+JMxGH\n\tIH4e9VgwVnnCjCK99eLCtkUYXYCg6acDKZnfBMP/Vwr1u1PrSNyI3mhgOf7McT3mosf5\n\tzQtEcf35vSghqmkzr+nWjEO2ySY9MeqEMPkDp6XWGjxDZ8JCxLSYirMKtWWoWhjyrlaC\n\t5lcw==", "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=m35mGlFRHergfYj0On1/Hx4JIs69Yqnl/XhMsJ4r3Ao=;\n\tb=dr43VafAnc1W795mJb4juLLrxRxYbTvMnR4jrOwyz35NHNfRW7kUmGI+N7/Pbeou4x\n\tXJIvpxgreHZQWSUGOutk8DXbMZT8Uym/Tc4/7ODnYi22xDUEj4Y2elLkLqUxsMwvy/Wg\n\tOgpC35X+yAzhl3Vse4AdNBU8ryGpyWv+3nsXZdLWsWLNAycWI36yNM+5ihD6YZwCfGUW\n\tPr8uR/XNDn9HKGAM1Dmv368qhCs9dwJTb/yJhqCIEN2ulOQgB2WEzypvWWw9+SP7rH/V\n\tFkw+wVLSYO8I9IjFEvqO9K5Ufd3FNQXaTOw5ktvNoXUOsOQb3L1/Iw5riMtlRYlvU1Rt\n\tqUAw==", "X-Gm-Message-State": "AMCzsaVp3Np6jNqCfBlbjgOp3ljEZnvHuIN6ComTCQfAUM1gVg+htytn\n\tc9Mm42oMXZk0/w3xEgQaGp9ntJAK", "X-Google-Smtp-Source": "ABhQp+QpH2G4yc0kcCgGtemBRbL2aU/G7oLg85WFyMSZML0eTZCBfHCjsxnxgUg/REHCFem79LC3XA==", "X-Received": "by 10.84.157.74 with SMTP id u10mr2462053plu.304.1509611545918; \n\tThu, 02 Nov 2017 01:32:25 -0700 (PDT)", "From": "Jakub Kicinski <jakub.kicinski@netronome.com>", "To": "netdev@vger.kernel.org", "Cc": "oss-drivers@netronome.com, Jakub Kicinski <jakub.kicinski@netronome.com>", "Subject": "[PATCH net-next 5/8] nfp: bpf: fall back to core NIC app if BPF not\n\tselected", "Date": "Thu, 2 Nov 2017 01:31:33 -0700", "Message-Id": "<20171102083136.2096-6-jakub.kicinski@netronome.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20171102083136.2096-1-jakub.kicinski@netronome.com>", "References": "<20171102083136.2096-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": "If kernel config does not include BPF just replace the BPF\napp handler with the handler for basic NIC. The BPF app\nwill now be built only if BPF infrastructure is selected\nin kernel config.\n\nSigned-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>\nReviewed-by: Simon Horman <simon.horman@netronome.com>\n---\n drivers/net/ethernet/netronome/nfp/Makefile | 4 ++--\n drivers/net/ethernet/netronome/nfp/bpf/offload.c | 3 ---\n drivers/net/ethernet/netronome/nfp/nfp_app.c | 4 ++++\n 3 files changed, 6 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/netronome/nfp/Makefile b/drivers/net/ethernet/netronome/nfp/Makefile\nindex bd3b2bd408bc..9e8d30cb1517 100644\n--- a/drivers/net/ethernet/netronome/nfp/Makefile\n+++ b/drivers/net/ethernet/netronome/nfp/Makefile\n@@ -27,8 +27,6 @@ nfp-objs := \\\n \t nfp_net_sriov.o \\\n \t nfp_netvf_main.o \\\n \t nfp_port.o \\\n-\t bpf/main.o \\\n-\t bpf/offload.o \\\n \t nic/main.o\n \n ifeq ($(CONFIG_NFP_APP_FLOWER),y)\n@@ -44,6 +42,8 @@ endif\n \n ifeq ($(CONFIG_BPF_SYSCALL),y)\n nfp-objs += \\\n+\t bpf/main.o \\\n+\t bpf/offload.o \\\n \t bpf/verifier.o \\\n \t bpf/jit.o\n endif\ndiff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c\nindex 63c8f7847054..6d576f631392 100644\n--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c\n+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c\n@@ -150,9 +150,6 @@ nfp_net_bpf_offload_prepare(struct nfp_net *nn,\n \tunsigned int max_mtu;\n \tint ret;\n \n-\tif (!IS_ENABLED(CONFIG_BPF_SYSCALL))\n-\t\treturn -EOPNOTSUPP;\n-\n \tret = nfp_net_bpf_get_act(nn, cls_bpf);\n \tif (ret < 0)\n \t\treturn ret;\ndiff --git a/drivers/net/ethernet/netronome/nfp/nfp_app.c b/drivers/net/ethernet/netronome/nfp/nfp_app.c\nindex 085c5151c601..3644d74fe304 100644\n--- a/drivers/net/ethernet/netronome/nfp/nfp_app.c\n+++ b/drivers/net/ethernet/netronome/nfp/nfp_app.c\n@@ -44,7 +44,11 @@\n \n static const struct nfp_app_type *apps[] = {\n \t[NFP_APP_CORE_NIC]\t= &app_nic,\n+#ifdef CONFIG_BPF_SYSCALL\n \t[NFP_APP_BPF_NIC]\t= &app_bpf,\n+#else\n+\t[NFP_APP_BPF_NIC]\t= &app_nic,\n+#endif\n #ifdef CONFIG_NFP_APP_FLOWER\n \t[NFP_APP_FLOWER_NIC]\t= &app_flower,\n #endif\n", "prefixes": [ "net-next", "5/8" ] }