Commit 13defa27 authored by Serhiy Boiko's avatar Serhiy Boiko Committed by David S. Miller
Browse files

net: marvell: prestera: Add matchall support 



- Introduce matchall filter support
- Add SPAN API to configure port mirroring.
- Add tc mirror action.

At this moment, only mirror (egress) action is supported.

Example:
    tc filter ... action mirred egress mirror dev DEV

Co-developed-by: default avatarVolodymyr Mytnyk <vmytnyk@marvell.com>
Signed-off-by: default avatarVolodymyr Mytnyk <vmytnyk@marvell.com>
Signed-off-by: default avatarSerhiy Boiko <serhiy.boiko@plvision.eu>
Signed-off-by: default avatarVadym Kochan <vkochan@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b474a9f

drivers/net/ethernet/marvell/prestera/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ obj-$(CONFIG_PRESTERA) += prestera.o 
prestera-objs		:= prestera_main.o prestera_hw.o prestera_dsa.o \

			   prestera_rxtx.o prestera_devlink.o prestera_ethtool.o \

			   prestera_switchdev.o prestera_acl.o prestera_flow.o \

			   prestera_flower.o

			   prestera_flower.o prestera_span.o



obj-$(CONFIG_PRESTERA_PCI)	+= prestera_pci.o

drivers/net/ethernet/marvell/prestera/prestera.h

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ struct prestera_event { 
};



struct prestera_switchdev;

struct prestera_span;

struct prestera_rxtx;

struct prestera_trap_data;

struct prestera_acl;
@@ -181,6 +182,7 @@ struct prestera_switch { 
	struct prestera_switchdev *swdev;

	struct prestera_rxtx *rxtx;

	struct prestera_acl *acl;

	struct prestera_span *span;

	struct list_head event_handlers;

	struct notifier_block netdev_nb;

	struct prestera_trap_data *trap_data;

drivers/net/ethernet/marvell/prestera/prestera_acl.c

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "prestera.h"

#include "prestera_hw.h"

#include "prestera_acl.h"

#include "prestera_span.h"



struct prestera_acl {

	struct prestera_switch *sw;
@@ -127,6 +128,7 @@ int prestera_acl_block_bind(struct prestera_flow_block *block, 
	binding = kzalloc(sizeof(*binding), GFP_KERNEL);

	if (!binding)

		return -ENOMEM;

	binding->span_id = PRESTERA_SPAN_INVALID_ID;

	binding->port = port;



	err = prestera_hw_acl_port_bind(port, block->ruleset->id);

drivers/net/ethernet/marvell/prestera/prestera_acl.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct prestera_acl_ruleset; 
struct prestera_flow_block_binding {

	struct list_head list;

	struct prestera_port *port;

	int span_id;

};



struct prestera_flow_block {

drivers/net/ethernet/marvell/prestera/prestera_flow.c

+19 −0
Original line number Diff line number Diff line
@@ -7,10 +7,25 @@ 
#include "prestera.h"

#include "prestera_acl.h"

#include "prestera_flow.h"

#include "prestera_span.h"

#include "prestera_flower.h"



static LIST_HEAD(prestera_block_cb_list);



static int prestera_flow_block_mall_cb(struct prestera_flow_block *block,

				       struct tc_cls_matchall_offload *f)

{

	switch (f->command) {

	case TC_CLSMATCHALL_REPLACE:

		return prestera_span_replace(block, f);

	case TC_CLSMATCHALL_DESTROY:

		prestera_span_destroy(block);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int prestera_flow_block_flower_cb(struct prestera_flow_block *block,

					 struct flow_cls_offload *f)

{
@@ -38,6 +53,8 @@ static int prestera_flow_block_cb(enum tc_setup_type type, 
	switch (type) {

	case TC_SETUP_CLSFLOWER:

		return prestera_flow_block_flower_cb(block, type_data);

	case TC_SETUP_CLSMATCHALL:

		return prestera_flow_block_mall_cb(block, type_data);

	default:

		return -EOPNOTSUPP;

	}
@@ -143,6 +160,8 @@ static void prestera_setup_flow_block_unbind(struct prestera_port *port, 


	block = flow_block_cb_priv(block_cb);



	prestera_span_destroy(block);



	err = prestera_acl_block_unbind(block, port);

	if (err)

		goto error;