{"id":805984,"url":"http://patchwork.ozlabs.org/api/patches/805984/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1503682263-17858-4-git-send-email-pieter.jansenvanvuuren@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":"<1503682263-17858-4-git-send-email-pieter.jansenvanvuuren@netronome.com>","list_archive_url":null,"date":"2017-08-25T17:31:03","name":"[net,3/3] nfp: remove incorrect mask check for vlan matching","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"2c15cab308932927431de364eb2175f974bedbed","submitter":{"id":72232,"url":"http://patchwork.ozlabs.org/api/people/72232/?format=json","name":"Pieter Jansen van Vuuren","email":"pieter.jansenvanvuuren@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/1503682263-17858-4-git-send-email-pieter.jansenvanvuuren@netronome.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805984/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805984/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=\"cZVjZfum\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xf7WJ2nsRz9sN5\n\tfor ;\n\tSat, 26 Aug 2017 03:31:40 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1757357AbdHYRb1 (ORCPT );\n\tFri, 25 Aug 2017 13:31:27 -0400","from mail-wr0-f180.google.com ([209.85.128.180]:33839 \"EHLO\n\tmail-wr0-f180.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1757334AbdHYRbP (ORCPT\n\t); Fri, 25 Aug 2017 13:31:15 -0400","by mail-wr0-f180.google.com with SMTP id z91so1354082wrc.1\n\tfor ; Fri, 25 Aug 2017 10:31:15 -0700 (PDT)","from pieter-Netronome.netronome.com\n\t(host-79-78-33-110.static.as9105.net. [79.78.33.110])\n\tby smtp.gmail.com with ESMTPSA id\n\t40sm7418994wrz.8.2017.08.25.10.31.13\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 25 Aug 2017 10:31:13 -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=JZGV0UWDv9fKqCXrYChvASU7DDa3FFRPtbrcCpht/kM=;\n\tb=cZVjZfumxgilqRR7+DAOapJL9cCiCw+PjmHc1/kueEWMlspzyJ+ZYP6y1ihQ87KPbr\n\t+YMJewT2GUq9JdWaYCxynbrUcHhUbbEx2IiZe/EW/u3bwKz3D98ha/thRjS8iyLSu6YQ\n\tsg/zl2kV72gF82ldSAasp+mem+b5D8jqaORuUCzONRIqTC6P0VOOwhnwIHSgtMd3yurK\n\tqpkM0WvMHVaWhgkKlpU5e/D5eIrl2XWPDgYpVIExOsGnmCvu26oqJFV1sFaeZtFZLE+O\n\tH9xbl2vqex+tAqqpkXnq1wiHXi7BC2tJcvWueFMQ6B+fFfSGGGSgXmBBTCElPew7BkQ5\n\t7Hfw==","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=JZGV0UWDv9fKqCXrYChvASU7DDa3FFRPtbrcCpht/kM=;\n\tb=elQXthF2u0oZ1YpJbxSVGXAnoRPSzgyJIoNiEKiNcOUVwV83HfAT/ThdVgahJV7EIh\n\ty1Y4zYv6D1HpuqXzw+c3XM5KlrVaa+xSZmWme0ZeVRJHnTbingDiqFgYWsH5/ODhMzU8\n\t9PG3N9STpkh65aw8jUQZBI7Q6mgU0TADKX4zjywEhZFrpofsWJO1e7k0vATay+WUdGM/\n\tpnnI2Le1s0QlM7Hm8/hJBzvRxqNXFtK9Wzoj+wWfpd/odUU4F38tzUVcPvmgzVeKimeT\n\tH5rkD1AVUAgtcKLj7IVlKDQA0fLu6/76kxf0J4mx3zQ92huDqrr1/Ek8cN8TbIukc8VB\n\t4msA==","X-Gm-Message-State":"AHYfb5gTU1mLU9w3pFfWyDVrBsHVVAfB/CKEnlo4fOcb/wxGSIFTzUDk\n\t/4UiFQ1PcwCOmr7Z","X-Received":"by 10.223.188.16 with SMTP id s16mr6166984wrg.311.1503682274371; \n\tFri, 25 Aug 2017 10:31:14 -0700 (PDT)","From":"Pieter Jansen van Vuuren ","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, oss-drivers@netronome.com,\n\tsimon.horman@netronome.com, jakub.kicinski@netronome.com,\n\tPieter Jansen van Vuuren ","Subject":"[PATCH net 3/3] nfp: remove incorrect mask check for vlan matching","Date":"Fri, 25 Aug 2017 19:31:03 +0200","Message-Id":"<1503682263-17858-4-git-send-email-pieter.jansenvanvuuren@netronome.com>","X-Mailer":"git-send-email 1.9.1","In-Reply-To":"<1503682263-17858-1-git-send-email-pieter.jansenvanvuuren@netronome.com>","References":"<1503682263-17858-1-git-send-email-pieter.jansenvanvuuren@netronome.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Previously the vlan tci field was incorrectly exact matched. This patch\nfixes this by using the flow dissector to populate the vlan tci field.\n\nFixes: 5571e8c9f241 (\"nfp: extend flower matching capabilities\")\nSigned-off-by: Pieter Jansen van Vuuren \nReviewed-by: Jakub Kicinski \nReviewed-by: Simon Horman \n---\n drivers/net/ethernet/netronome/nfp/flower/match.c | 8 ++------\n 1 file changed, 2 insertions(+), 6 deletions(-)","diff":"diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c\nindex b365110..d25b503 100644\n--- a/drivers/net/ethernet/netronome/nfp/flower/match.c\n+++ b/drivers/net/ethernet/netronome/nfp/flower/match.c\n@@ -42,6 +42,7 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_two *frame,\n \t\t\t struct tc_cls_flower_offload *flow, u8 key_type,\n \t\t\t bool mask_version)\n {\n+\tstruct fl_flow_key *target = mask_version ? flow->mask : flow->key;\n \tstruct flow_dissector_key_vlan *flow_vlan;\n \tu16 tmp_tci;\n \n@@ -50,15 +51,10 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_two *frame,\n \tframe->nfp_flow_key_layer = key_type;\n \tframe->mask_id = ~0;\n \n-\tif (mask_version) {\n-\t\tframe->tci = cpu_to_be16(~0);\n-\t\treturn;\n-\t}\n-\n \tif (dissector_uses_key(flow->dissector, FLOW_DISSECTOR_KEY_VLAN)) {\n \t\tflow_vlan = skb_flow_dissector_target(flow->dissector,\n \t\t\t\t\t\t FLOW_DISSECTOR_KEY_VLAN,\n-\t\t\t\t\t\t flow->key);\n+\t\t\t\t\t\t target);\n \t\t/* Populate the tci field. */\n \t\tif (flow_vlan->vlan_id) {\n \t\t\ttmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO,\n","prefixes":["net","3/3"]}