From patchwork Tue Mar 8 10:42:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Vadai X-Patchwork-Id: 594007 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AE309140B9E for ; Tue, 8 Mar 2016 21:40:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933181AbcCHKkB (ORCPT ); Tue, 8 Mar 2016 05:40:01 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34798 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933019AbcCHKje (ORCPT ); Tue, 8 Mar 2016 05:39:34 -0500 Received: by mail-wm0-f66.google.com with SMTP id p65so3239270wmp.1 for ; Tue, 08 Mar 2016 02:39:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5KF5EJB7HOuy1cuSUqNk2Fj7pSUjKc3FjB1KZlr4Gnc=; b=gcQdt9YPRnuYTXYdsU1bVoiMtVAQCT1+4zbCcy8+u4bdTCAKOcNp4KNNzeKOojtBPM M7sYQwzjQLe6Yy+xF1bXCExH8wWsbn1jH94S4LGguPcbvZEMK+dt5JDq60gG6UtVUQ4t fLot/9yPIgMGGuPXX/JViYoAmbiUW4xHSGq2UvZcHTMEnGEOijXUgIrLwx7uLP7V4hl8 TrQ9BcRET1I+t+NiNXDobr/Fhscf6lcv7/zBoAi7Wod2m/d04u9EygrZBzRDvsdabrRx PUYPp9Ck4sc5wkD3nBAbgOP9/S8cj/+gSvdB9XBUnoCGVRdEwyvx518vhgA68jNrY+GG uw+Q== X-Gm-Message-State: AD7BkJKLvL0CxsqAlxkNwWwHtdh6AhVl4a69f0gwJ/4UHs+4FUqojK05SMj21kEZxJhnaw== X-Received: by 10.28.142.202 with SMTP id q193mr17641313wmd.60.1457433573175; Tue, 08 Mar 2016 02:39:33 -0800 (PST) Received: from office.mtl.com? (212.116.172.4.static.012.net.il. [212.116.172.4]) by smtp.gmail.com with ESMTPSA id n66sm2706344wmg.20.2016.03.08.02.39.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Mar 2016 02:39:32 -0800 (PST) From: Amir Vadai To: "David S. Miller" Cc: netdev@vger.kernel.org, John Fastabend , Jiri Pirko , Or Gerlitz , Saeed Mahameed , Hadar Har-Zion , Rony Efraim , Amir Vadai Subject: [PATCH net-next V3 10/10] net/mlx5e: Support offload cls_flower with skbedit mark action Date: Tue, 8 Mar 2016 12:42:38 +0200 Message-Id: <1457433758-9193-11-git-send-email-amir@vadai.me> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457433758-9193-1-git-send-email-amir@vadai.me> References: <1457433758-9193-1-git-send-email-amir@vadai.me> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Introduce offloading of skbedit mark action. For example, to mark with 0x1234, all TCP (ip_proto 6) packets arriving to interface ens9: # tc qdisc add dev ens9 ingress # tc filter add dev ens9 protocol ip parent ffff: \ flower ip_proto 6 \ indev ens9 \ action skbedit mark 0x1234 Signed-off-by: Amir Vadai Signed-off-by: Or Gerlitz --- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 3 +++ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c index 519a07f..f293afe 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c @@ -35,6 +35,7 @@ #include #include #include "en.h" +#include "en_tc.h" static inline bool mlx5e_rx_hw_stamp(struct mlx5e_tstamp *tstamp) { @@ -224,6 +225,8 @@ static inline void mlx5e_build_rx_skb(struct mlx5_cqe64 *cqe, if (cqe_has_vlan(cqe)) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), be16_to_cpu(cqe->vlan_info)); + + skb->mark = be32_to_cpu(cqe->sop_drop_qpn) & MLX5E_TC_FLOW_ID_MASK; } int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 3ed4d96..b3de09f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h index 70642f4..d677428 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h @@ -33,6 +33,8 @@ #ifndef __MLX5_EN_TC_H__ #define __MLX5_EN_TC_H__ +#define MLX5E_TC_FLOW_ID_MASK 0x0000ffff + int mlx5e_tc_init(struct mlx5e_priv *priv); void mlx5e_tc_cleanup(struct mlx5e_priv *priv);