{"id":833255,"url":"http://patchwork.ozlabs.org/api/1.2/patches/833255/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-4-jakub.kicinski@netronome.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","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-4-jakub.kicinski@netronome.com>","list_archive_url":null,"date":"2017-11-02T08:31:31","name":"[net-next,3/8] nfp: bpf: reject TC offload if XDP loaded","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"5ec32b55f85235b001054a228765b4a3c2175db5","submitter":{"id":67484,"url":"http://patchwork.ozlabs.org/api/1.2/people/67484/?format=json","name":"Jakub Kicinski","email":"jakub.kicinski@netronome.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171102083136.2096-4-jakub.kicinski@netronome.com/mbox/","series":[{"id":11454,"url":"http://patchwork.ozlabs.org/api/1.2/series/11454/?format=json","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/833255/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/833255/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","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=\"bPtZaJt7\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3ySJJ14lmkz9t2f\n\tfor ;\n\tThu, 2 Nov 2017 19:33:05 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1755458AbdKBIdE (ORCPT );\n\tThu, 2 Nov 2017 04:33:04 -0400","from mail-pg0-f66.google.com ([74.125.83.66]:52641 \"EHLO\n\tmail-pg0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1755419AbdKBIcZ (ORCPT\n\t); Thu, 2 Nov 2017 04:32:25 -0400","by mail-pg0-f66.google.com with SMTP id a192so4432811pge.9\n\tfor ; Thu, 02 Nov 2017 01:32:24 -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.23\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 02 Nov 2017 01:32:23 -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=Qm6FGrisgTPqnT1lMT91hOn9931A7WLuJyfeJ5PO1VE=;\n\tb=bPtZaJt7lDQkQzrrW43PwLEcguJ44wNYqjmLXg7qJi/X7TqeOXCRR0uO6+6QBqI9oJ\n\t7CiBR5aHKtrljJF/OvOeaWw7eWoF+l8hW0VK7GvQ9xOLFjdX34TgAgyOnNoYl6r9pFin\n\tU7g5qdpErN2ZNYvGgfjjO/WjcHEYA2qVZvgioD8eJVOQNhzvJF9h5qws3+Gy041TtJs2\n\tq4SDJQ46EMpNRO2Jwy00ZVERDRBTVbNOHZl4uICFJ56J5oaXlY8DMbTjdDgC2zRADyyj\n\tl/Sw0/Lb9bExWjANVphbrc2Moa3anhbUQDSXGAumweydQoTjShyLxkY+cnjAxGBdPdSF\n\t1VcA==","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=Qm6FGrisgTPqnT1lMT91hOn9931A7WLuJyfeJ5PO1VE=;\n\tb=I0i8jyjJ24Jcrd2BlMNTpIBu/20bFq7p02L7MhoDFsw3r6/O791Ef7KjbGTa7DnkKn\n\tK32wczNIWYWN1aHvHrvvG9euPYhUx3m5Ykt1eFpu3bnbQ3zpPfpj9/tMywPKx+ymjMCl\n\ts6ZGsuYsyAsIPaNKIk4XzAxgzhtUbNeFxhXAl72/wjnf3Bd1XViJxMAOFFQB5kfmpRp7\n\tLr4VjkFZLtaylDMBf8u2SMUnQBJPj2IyMrxhMjLR/pGsxbsxV54piZ/B3c/3++ie5AEp\n\tx4vZFTmvQLjK3vbeRRcT0sljr/k4yl358A5mMbYYDxmN683Uyb3IeZnqtVQKHoQ9qE+K\n\torzA==","X-Gm-Message-State":"AMCzsaUXKQIsX8+O/hesc6GHmIQRF5zeK5ssuFe2istmg+QTejHutU4j\n\tgMt3WZpLSfGPojct1qpXts+/T7q9","X-Google-Smtp-Source":"ABhQp+ReCv+iEL8I+F3bmrckssfrqmDdk4vCbT04WGK8/93sizI7M9/NkC1c3AeDzP+fiAROBKKLpw==","X-Received":"by 10.98.70.78 with SMTP id t75mr2967271pfa.6.1509611544280;\n\tThu, 02 Nov 2017 01:32:24 -0700 (PDT)","From":"Jakub Kicinski ","To":"netdev@vger.kernel.org","Cc":"oss-drivers@netronome.com, Jakub Kicinski ","Subject":"[PATCH net-next 3/8] nfp: bpf: reject TC offload if XDP loaded","Date":"Thu, 2 Nov 2017 01:31:31 -0700","Message-Id":"<20171102083136.2096-4-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":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Recent TC changes dropped the check protecting us from trying\nto offload a TC program if XDP programs are already loaded.\n\nFixes: 90d97315b3e7 (\"nfp: bpf: Convert ndo_setup_tc offloads to block callbacks\")\nSigned-off-by: Jakub Kicinski \nReviewed-by: Simon Horman \n---\n drivers/net/ethernet/netronome/nfp/bpf/main.c | 3 +++\n 1 file changed, 3 insertions(+)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/bpf/main.c b/drivers/net/ethernet/netronome/nfp/bpf/main.c\nindex 04424db24b80..8e3e89cace8d 100644\n--- a/drivers/net/ethernet/netronome/nfp/bpf/main.c\n+++ b/drivers/net/ethernet/netronome/nfp/bpf/main.c\n@@ -130,6 +130,9 @@ static int nfp_bpf_setup_tc_block_cb(enum tc_setup_type type,\n \t\t cls_bpf->common.protocol != htons(ETH_P_ALL) ||\n \t\t cls_bpf->common.chain_index)\n \t\t\treturn -EOPNOTSUPP;\n+\t\tif (nn->dp.bpf_offload_xdp)\n+\t\t\treturn -EBUSY;\n+\n \t\treturn nfp_net_bpf_offload(nn, cls_bpf);\n \tdefault:\n \t\treturn -EOPNOTSUPP;\n","prefixes":["net-next","3/8"]}