From patchwork Fri Jul 5 12:09:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 11032585 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6EE4713A4 for ; Fri, 5 Jul 2019 13:58:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D96C28A7A for ; Fri, 5 Jul 2019 13:58:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 516AA28A92; Fri, 5 Jul 2019 13:58:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 01FFD28A7A for ; Fri, 5 Jul 2019 13:58:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5aFIB7GnoX7/tQGKlE0Uy17CZtQIQdkc/tls0ZPkoSc=; b=uYZWLNgsBa8MDQ 4kG+Fo5hAF+VduWBcrkqWgpljUlS5B+a0uH/uoSV85Ug/VtbXO3Ahr+BoTPQTuOdxURwV36yuBKCw GTfaGY7L+zgudV115sgzEReWOZtWcjKEHD8dE4gBnJiVa1a7bSiVZay8gBp1Yv8XWbfLVWZjX2N3t 49cxNYqs0vt2zRj2wK3QLD1XFu33eq2q89eCmdeSPVSu3MESpYdF0LBDdMRafAEvsQaGNYhFlLlpe NuTz279AotI6KJ748Rn3cFmRoWpP50Ix0xU21kwGwMnmJK0+ap5qS/Rhy4n4CTQo8nZGnY3OKETFL XKGWPo4FFirE9vPR6Zxg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hjOjQ-0001MK-9D; Fri, 05 Jul 2019 13:58:32 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hjN2c-0004gt-1D for linux-arm-kernel@bombadil.infradead.org; Fri, 05 Jul 2019 12:10:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=sEk8eh/WZX52vhZjt9j66vA5gBnPvpML1f8yj58nR0M=; b=uFHOfOxa794tdzCHceRiUfVO6X eGnKq9DTVs/dh3zGruBOXdr70L4+KYDVSDdtIzKKkXiCccJvluRaQ6vxpAvabAoZTiDV4ZZ2TA3ar d+uDDmt8nnywcIVJOCW9H3imsGO9lVx877dbueZQR0M9J72aGLCxxV9CC1J+Tp/x3LrnZztRwmiQk gxubm9hQfUhtmK8EtjNNfAkF1ZmBm8ZALg1pb5ZuKVzHWPovjvTTgTuxoFt8DGUwxAguS8bUkcrgH uOhNSg/YJ+dId2EW2dNdSbBnKzUzZadOE4b4QBLIHcV5YaSgQxAmx7QPLh/IAiPQmaz8+i1ksrDlF /RnRNgnw==; Received: from relay12.mail.gandi.net ([217.70.178.232]) by casper.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hjN2Z-0000ta-4r for linux-arm-kernel@lists.infradead.org; Fri, 05 Jul 2019 12:10:12 +0000 Received: from mc-bl-xps13.lan (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (Authenticated sender: maxime.chevallier@bootlin.com) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 4A055200011; Fri, 5 Jul 2019 12:09:15 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Subject: [PATCH net-next 1/2] net: mvpp2: cls: Report an error for unsupported flow types Date: Fri, 5 Jul 2019 14:09:12 +0200 Message-Id: <20190705120913.25013-2-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190705120913.25013-1-maxime.chevallier@bootlin.com> References: <20190705120913.25013-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190705_131011_216057_EB813AEA X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Antoine Tenart , netdev@vger.kernel.org, gregory.clement@bootlin.com, linux-kernel@vger.kernel.org, Maxime Chevallier , nadavh@marvell.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com, stefanc@marvell.com, mw@semihalf.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add a missing check to detect flow types that we don't support, so that user can be informed of this. Signed-off-by: Maxime Chevallier --- drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c index b195fb5d61f4..6c088c903c15 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c @@ -1373,6 +1373,10 @@ int mvpp2_ethtool_cls_rule_ins(struct mvpp2_port *port, efs->rule.flow = ethtool_rule->rule; efs->rule.flow_type = mvpp2_cls_ethtool_flow_to_type(info->fs.flow_type); + if (efs->rule.flow_type < 0) { + ret = efs->rule.flow_type; + goto clean_rule; + } ret = mvpp2_cls_rfs_parse_rule(&efs->rule); if (ret) From patchwork Fri Jul 5 12:09:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Chevallier X-Patchwork-Id: 11032587 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBC9A112C for ; Fri, 5 Jul 2019 13:58:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA33428A7A for ; Fri, 5 Jul 2019 13:58:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DF9B28A92; Fri, 5 Jul 2019 13:58:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1756F28A7A for ; Fri, 5 Jul 2019 13:58:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=B4EYAqSS9octTzaqELnwxzxpt/m4X8vTJYNceuHqDSI=; b=c98T9PZA+v814N 3mjcz86biRwKwj7LMxUcZ+iwDw/34ssK/skupp7NiLoEc0Q4LKMd2nlrHlxXZwGcI4iied900nLXx U/8TMoOUFmojDmadzc47UifGRecnDUPtNKu8dST6YwQMSupaP/0enLrwW++c/GjChaZcHtQ2mALW5 dkwusVd4EynikYQVZiTM4NtVcfPwhiyKZJUFxgC36GXcKxC0cAtnp7kHQP5E0eVuFlLfEG/AuHW7u EjbEVjg8OmA2rXW3hx//nXrDyB7y/80tzYNgGbsjwVXRz23GNvEDWVrOwYCIUq1OfpspStgfGzLCx /cnj13Cad8+Db36x+KlQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hjOjZ-0001X8-DM; Fri, 05 Jul 2019 13:58:41 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hjN2c-0004ou-Gi for linux-arm-kernel@bombadil.infradead.org; Fri, 05 Jul 2019 12:10:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=T86XdJ8efDoll85FvdfuxVoAvnlka8CM+xoA0u9jJyI=; b=GuSRP+QOfKXKY2fN+jvkUadIs8 yG7IGVfCn+bkS8Dmpc4sBZo0TiywCb1oEo1ZrGzW06l81x5MHAYmMn7o46luz/naNqCLbf+3kZiqD Nzm8GIMiexSqqHlvsts36JwIcEnrwzDKM/7/n13ve4r4A1DpY+sOqZ5uinKTQbdXGelF6SDn9sYig MozKnGMai/WeqlV/eW2X7XOabeMln4Gw/6S2PKQ3IYWoSYEbxlzYoVWKc/oNspBvfCbvDlk+Z8joS 2IZcnYh9X5yJpWDHng2uKFx76odzI6agKnImdQSACahqxVljQ6cJps5f4HSMcGrLI57EcQNiPyotp K9VCtXgQ==; Received: from relay12.mail.gandi.net ([217.70.178.232]) by casper.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hjN2f-0000tZ-L2 for linux-arm-kernel@lists.infradead.org; Fri, 05 Jul 2019 12:10:19 +0000 Received: from mc-bl-xps13.lan (lfbn-1-17395-211.w86-250.abo.wanadoo.fr [86.250.200.211]) (Authenticated sender: maxime.chevallier@bootlin.com) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 51EF7200017; Fri, 5 Jul 2019 12:09:16 +0000 (UTC) From: Maxime Chevallier To: davem@davemloft.net Subject: [PATCH net-next 2/2] net: mvpp2: cls: Add support for ETHER_FLOW Date: Fri, 5 Jul 2019 14:09:13 +0200 Message-Id: <20190705120913.25013-3-maxime.chevallier@bootlin.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190705120913.25013-1-maxime.chevallier@bootlin.com> References: <20190705120913.25013-1-maxime.chevallier@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190705_131017_724551_55CB11F3 X-CRM114-Status: UNSURE ( 9.71 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Antoine Tenart , netdev@vger.kernel.org, gregory.clement@bootlin.com, linux-kernel@vger.kernel.org, Maxime Chevallier , nadavh@marvell.com, thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com, stefanc@marvell.com, mw@semihalf.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Users can specify classification actions based on the 'ether' flow type. In that case, this will apply to all ethernet traffic, superseeding flows such as 'udp4' or 'tcp6'. Add support for this flow type in the PPv2 classifier, by mapping the ETHER_FLOW value to the corresponding entries in the classifier. Signed-off-by: Maxime Chevallier --- drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c index 6c088c903c15..35478cba2aa5 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c @@ -548,6 +548,8 @@ void mvpp2_cls_c2_read(struct mvpp2 *priv, int index, static int mvpp2_cls_ethtool_flow_to_type(int flow_type) { switch (flow_type & ~(FLOW_EXT | FLOW_MAC_EXT | FLOW_RSS)) { + case ETHER_FLOW: + return MVPP22_FLOW_ETHERNET; case TCP_V4_FLOW: return MVPP22_FLOW_TCP4; case TCP_V6_FLOW: