{"id":813546,"url":"http://patchwork.ozlabs.org/api/patches/813546/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170913171600.31049-2-jakub.kicinski@netronome.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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":"<20170913171600.31049-2-jakub.kicinski@netronome.com>","list_archive_url":null,"date":"2017-09-13T17:15:58","name":"[net,v2,1/3] nfp: add whitelist of supported flow dissector","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"cd9ca41fe8b9d3c2583c7b1f3180d6100315d978","submitter":{"id":67484,"url":"http://patchwork.ozlabs.org/api/people/67484/?format=json","name":"Jakub Kicinski","email":"jakub.kicinski@netronome.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170913171600.31049-2-jakub.kicinski@netronome.com/mbox/","series":[{"id":2954,"url":"http://patchwork.ozlabs.org/api/series/2954/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=2954","date":"2017-09-13T17:15:59","name":"nfp: wait more carefully for card init","version":2,"mbox":"http://patchwork.ozlabs.org/series/2954/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813546/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813546/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=\"xjXblIqd\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xspJC6f3Xz9sNV\n\tfor ;\n\tThu, 14 Sep 2017 03:17:31 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751501AbdIMRR3 (ORCPT );\n\tWed, 13 Sep 2017 13:17:29 -0400","from mail-pf0-f180.google.com ([209.85.192.180]:45928 \"EHLO\n\tmail-pf0-f180.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751419AbdIMRQw (ORCPT\n\t); Wed, 13 Sep 2017 13:16:52 -0400","by mail-pf0-f180.google.com with SMTP id q76so1226584pfq.2\n\tfor ; Wed, 13 Sep 2017 10:16:51 -0700 (PDT)","from jkicinski-Precision-T1700.netronome.com ([75.53.12.129])\n\tby smtp.gmail.com with ESMTPSA id\n\tm82sm22440568pfk.90.2017.09.13.10.16.49\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 13 Sep 2017 10:16:50 -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=XFccFIrQQTYufNw0+D0JMgpquDsjDa4v+Hrha0BLOAU=;\n\tb=xjXblIqdeqaSH6NrvGd95IXhj4QTUtXK+ko1v23K0T5GNBBQfkcEdxuvKx1T/RcA/x\n\tg0LzafzTaGBlcM0yOBRENHzqgPqwXr3BdgOawni711LKQhpOYV0GAXckeO0883NboTfx\n\tkLpvhILm3HBTDtKBMpBLwGHqX87vlOMYEKGBlSswJHdcog2YdRMcj2xgnOGafrQ/0jub\n\tvUvTFFilpoDxtPbyfvGXcUOioph4tDJtMuaZDpNTQJZ/yEvSWxpGw9dJJHpxwoX0HodY\n\tFhvHx7ekc5LZWqeRjhAswhUnU94UHTfSPy6hstDC+xKIvRPNj5/zOx3a44zWfGUG1EjG\n\ttNRg==","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=XFccFIrQQTYufNw0+D0JMgpquDsjDa4v+Hrha0BLOAU=;\n\tb=meD0GnIt1ji1XwMzgOR2nLDE6Ny+Lx/YADR3zc1RCe+elfIwndWymCpviCAeM0xO2i\n\tEl2ESZccUY++2MTsRYf01APNBwERPbVVg8NOShyAAUs/if4wKr9psvBL4icvAoZ4dFft\n\tj4arrglS18MQTKxEO6pF7UtAw3Qn6TyiB0vmT3YCepp7r6m5tbg8uiFg9d/qcQvB/wrp\n\tf7XKtyijh1GFqmDb0AYW2tp/LQpGMRSRSsEPUggCPE4k6W10zgfyKAMoWELHoIfUSO5S\n\toz+4YkMJfo3iLUvkmCELAXz4LzW4y0/o23QyMHtweJsQRmZAJZ/J0UPdPWqN+25s/tz4\n\tebgg==","X-Gm-Message-State":"AHPjjUjqM4akxUfuBcigg4tcOqyHjnh/dP7Lxr7N0bQI2vdE+uSGU0QF\n\tJOfADz62eeFIZw9AsIo=","X-Google-Smtp-Source":"AOwi7QD2rSA60E/y542IWaG0dL6wp304oB8fvFDcEYC9moqrhn5/8YJlAruMaVq1JQlH19Yxhzd2GQ==","X-Received":"by 10.101.65.196 with SMTP id b4mr4554233pgq.44.1505323011138;\n\tWed, 13 Sep 2017 10:16:51 -0700 (PDT)","From":"Jakub Kicinski ","To":"netdev@vger.kernel.org","Cc":"oss-drivers@netronome.com, Pieter Jansen van Vuuren \n\t","Subject":"[PATCH net v2 1/3] nfp: add whitelist of supported flow dissector","Date":"Wed, 13 Sep 2017 10:15:58 -0700","Message-Id":"<20170913171600.31049-2-jakub.kicinski@netronome.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170913171600.31049-1-jakub.kicinski@netronome.com>","References":"<20170913171600.31049-1-jakub.kicinski@netronome.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Pieter Jansen van Vuuren \n\nPreviously we did not check the flow dissector against a list of allowed\nand supported flow key dissectors. This patch introduces such a list and\ncorrectly rejects unsupported flow keys.\n\nFixes: 43f84b72c50d (\"nfp: add metadata to each flow offload\")\nSigned-off-by: Pieter Jansen van Vuuren \nReviewed-by: Simon Horman \nReviewed-by: Jakub Kicinski \n---\n drivers/net/ethernet/netronome/nfp/flower/offload.c | 13 +++++++++++++\n 1 file changed, 13 insertions(+)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c\nindex d396183108f7..a18b4d2b1d3e 100644\n--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c\n+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c\n@@ -44,6 +44,16 @@\n #include \"../nfp_net.h\"\n #include \"../nfp_port.h\"\n \n+#define NFP_FLOWER_WHITELIST_DISSECTOR \\\n+\t(BIT(FLOW_DISSECTOR_KEY_CONTROL) | \\\n+\t BIT(FLOW_DISSECTOR_KEY_BASIC) | \\\n+\t BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) | \\\n+\t BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) | \\\n+\t BIT(FLOW_DISSECTOR_KEY_PORTS) | \\\n+\t BIT(FLOW_DISSECTOR_KEY_ETH_ADDRS) | \\\n+\t BIT(FLOW_DISSECTOR_KEY_VLAN) | \\\n+\t BIT(FLOW_DISSECTOR_KEY_IP))\n+\n static int\n nfp_flower_xmit_flow(struct net_device *netdev,\n \t\t struct nfp_fl_payload *nfp_flow, u8 mtype)\n@@ -112,6 +122,9 @@ nfp_flower_calculate_key_layers(struct nfp_fl_key_ls *ret_key_ls,\n \tu8 key_layer;\n \tint key_size;\n \n+\tif (flow->dissector->used_keys & ~NFP_FLOWER_WHITELIST_DISSECTOR)\n+\t\treturn -EOPNOTSUPP;\n+\n \tif (dissector_uses_key(flow->dissector,\n \t\t\t FLOW_DISSECTOR_KEY_ENC_CONTROL)) {\n \t\tstruct flow_dissector_key_control *mask_enc_ctl =\n","prefixes":["net","v2","1/3"]}