Commit 78a7dcb7 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: pci: Extract cookie index for ACL discard trap packets 



In case the received packet comes in due to one of ACL discard traps,
take the user_def_val_orig_pkt_len field from CQE and store it
in skb->cb as ACL cookie index.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d19d2bd

drivers/net/ethernet/mellanox/mlxsw/core.h

+4 −1
Original line number Diff line number Diff line
@@ -473,7 +473,10 @@ enum mlxsw_devlink_param_id { 
};



struct mlxsw_skb_cb {

	union {

		struct mlxsw_tx_info tx_info;

		u32 cookie_index; /* Only used during receive */

	};

};



static inline struct mlxsw_skb_cb *mlxsw_skb_cb(struct sk_buff *skb)

drivers/net/ethernet/mellanox/mlxsw/pci.c

+9 −0
Original line number Diff line number Diff line
@@ -575,6 +575,15 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci, 


	rx_info.trap_id = mlxsw_pci_cqe_trap_id_get(cqe);



	if (rx_info.trap_id == MLXSW_TRAP_ID_DISCARD_INGRESS_ACL ||

	    rx_info.trap_id == MLXSW_TRAP_ID_DISCARD_EGRESS_ACL) {

		u32 cookie_index = 0;



		if (mlxsw_pci->max_cqe_ver >= MLXSW_PCI_CQE_V2)

			cookie_index = mlxsw_pci_cqe2_user_def_val_orig_pkt_len_get(cqe);

		mlxsw_skb_cb(skb)->cookie_index = cookie_index;

	}



	byte_count = mlxsw_pci_cqe_byte_count_get(cqe);

	if (mlxsw_pci_cqe_crc_get(cqe_v, cqe))

		byte_count -= ETH_FCS_LEN;

drivers/net/ethernet/mellanox/mlxsw/pci_hw.h

+5 −0
Original line number Diff line number Diff line
@@ -208,6 +208,11 @@ MLXSW_ITEM32(pci, cqe0, dqn, 0x0C, 1, 5); 
MLXSW_ITEM32(pci, cqe12, dqn, 0x0C, 1, 6);

mlxsw_pci_cqe_item_helpers(dqn, 0, 12, 12);



/* pci_cqe_user_def_val_orig_pkt_len

 * When trap_id is an ACL: User defined value from policy engine action.

 */

MLXSW_ITEM32(pci, cqe2, user_def_val_orig_pkt_len, 0x14, 0, 20);



/* pci_cqe_owner

 * Ownership bit.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE