Commit 202187c3 authored by Kumar Sanghvi's avatar Kumar Sanghvi Committed by David S. Miller

cxgb4: add tc flower support for ETH-SMAC rewrite

Adds support for ETH-SMAC rewrite via TC-PEDIT action.
Signed-off-by: default avatarKumar Sanghvi <kumaras@chelsio.com>
Signed-off-by: default avatarRahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bdb376e
...@@ -45,6 +45,8 @@ ...@@ -45,6 +45,8 @@
struct ch_tc_pedit_fields pedits[] = { struct ch_tc_pedit_fields pedits[] = {
PEDIT_FIELDS(ETH_, DMAC_31_0, 4, dmac, 0), PEDIT_FIELDS(ETH_, DMAC_31_0, 4, dmac, 0),
PEDIT_FIELDS(ETH_, DMAC_47_32, 2, dmac, 4), PEDIT_FIELDS(ETH_, DMAC_47_32, 2, dmac, 4),
PEDIT_FIELDS(ETH_, SMAC_15_0, 2, smac, 0),
PEDIT_FIELDS(ETH_, SMAC_47_16, 4, smac, 2),
}; };
static struct ch_tc_flower_entry *allocate_flower_entry(void) static struct ch_tc_flower_entry *allocate_flower_entry(void)
...@@ -291,6 +293,13 @@ static void process_pedit_field(struct ch_filter_specification *fs, u32 val, ...@@ -291,6 +293,13 @@ static void process_pedit_field(struct ch_filter_specification *fs, u32 val,
case PEDIT_ETH_DMAC_47_32_SMAC_15_0: case PEDIT_ETH_DMAC_47_32_SMAC_15_0:
if (~mask & PEDIT_ETH_DMAC_MASK) if (~mask & PEDIT_ETH_DMAC_MASK)
offload_pedit(fs, val, mask, ETH_DMAC_47_32); offload_pedit(fs, val, mask, ETH_DMAC_47_32);
else
offload_pedit(fs, val >> 16, mask >> 16,
ETH_SMAC_15_0);
break;
case PEDIT_ETH_SMAC_47_16:
fs->newsmac = 1;
offload_pedit(fs, val, mask, ETH_SMAC_47_16);
} }
} }
} }
...@@ -440,6 +449,7 @@ static int cxgb4_validate_flow_actions(struct net_device *dev, ...@@ -440,6 +449,7 @@ static int cxgb4_validate_flow_actions(struct net_device *dev,
switch (offset) { switch (offset) {
case PEDIT_ETH_DMAC_31_0: case PEDIT_ETH_DMAC_31_0:
case PEDIT_ETH_DMAC_47_32_SMAC_15_0: case PEDIT_ETH_DMAC_47_32_SMAC_15_0:
case PEDIT_ETH_SMAC_47_16:
break; break;
default: default:
netdev_err(dev, "%s: Unsupported pedit field\n", netdev_err(dev, "%s: Unsupported pedit field\n",
......
...@@ -57,6 +57,8 @@ struct ch_tc_flower_entry { ...@@ -57,6 +57,8 @@ struct ch_tc_flower_entry {
enum { enum {
ETH_DMAC_31_0, /* dmac bits 0.. 31 */ ETH_DMAC_31_0, /* dmac bits 0.. 31 */
ETH_DMAC_47_32, /* dmac bits 32..47 */ ETH_DMAC_47_32, /* dmac bits 32..47 */
ETH_SMAC_15_0, /* smac bits 0.. 15 */
ETH_SMAC_47_16, /* smac bits 16..47 */
}; };
struct ch_tc_pedit_fields { struct ch_tc_pedit_fields {
...@@ -72,6 +74,7 @@ struct ch_tc_pedit_fields { ...@@ -72,6 +74,7 @@ struct ch_tc_pedit_fields {
#define PEDIT_ETH_DMAC_MASK 0xffff #define PEDIT_ETH_DMAC_MASK 0xffff
#define PEDIT_ETH_DMAC_31_0 0x0 #define PEDIT_ETH_DMAC_31_0 0x0
#define PEDIT_ETH_DMAC_47_32_SMAC_15_0 0x4 #define PEDIT_ETH_DMAC_47_32_SMAC_15_0 0x4
#define PEDIT_ETH_SMAC_47_16 0x8
int cxgb4_tc_flower_replace(struct net_device *dev, int cxgb4_tc_flower_replace(struct net_device *dev,
struct tc_cls_flower_offload *cls); struct tc_cls_flower_offload *cls);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment