matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[broadcom patch] take Broadcom patch sdk-6.5.13-gpl-modules.patch

Browse Source 
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
This commit is contained in:
Ying Xie 2018-08-24 01:33:13 +00:00
parent 73d4c99d78
commit c50d4c2723
3 changed files with 212 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/broadcom/saibcm-modules/include/kcom.h
View File

@ -461,7 +461,8 @@ typedef struct kcom_msg_filter_destroy_s {
* Get list of currently defined packet filters.
*/
#ifndef KCOM_FILTER_MAX
#define KCOM_FILTER_MAX 128
/* SAI_FIXUP - Increased the filters to 1024 from 128 */
#define KCOM_FILTER_MAX 1024
#endif
typedef struct kcom_msg_filter_list_s {

250
platform/broadcom/saibcm-modules/systems/linux/kernel/modules/knet-cb/knet-cb.c
View File

@ -15,24 +15,35 @@
*/
/*
* $Id: $
* $Copyright: (c) 2014 Broadcom Corp.
* $Copyright: (c) 2017 Broadcom Corp.
* All Rights Reserved.$
*/
/*
* Test driver for call-back functions in Linux KNET driver.
* Driver for call-back functions for Linux KNET driver.
*
* This is sample code that demonstrates how to selectively strip VLAN tags
* from an incoming packet based on tag information in the DMA control block
* (DCB). The switch will automatically add a VLAN tag to packets that ingress
* without an outer VLAN tag. Outer tagged and double tagged packets are
* not modified. The call back defined here determines which packets have
* had tags added by those and strips only those tags from the packet.
*
* This is sample code, the customer is responsible for maintaining and
* modifying this code as necessary.
*
* The module can be built from the standard Linux user mode target
* directories using the following command (assuming bash), e.g.
*
* cd $SDK/systems/linux/user/gto-2_6
* BUILD_KNET_CB=1 make -s mod
* cd $SDK/systems/linux/user/<target>
* make BUILD_KNET_CB=1
*
*/
#include <gmodule.h> /* Must be included first */
#include <kcom.h>
#include <bcm-knet.h>
#include <linux/if_vlan.h>
MODULE_AUTHOR("Broadcom Corporation");
MODULE_DESCRIPTION("Broadcom Linux KNET Call-Back Driver");
@ -42,60 +53,203 @@ MODULE_LICENSE("GPL");
#define MODULE_MAJOR 121
#define MODULE_NAME "linux-knet-cb"
/* set KNET_CB_DEBUG for debug info */
#define KNET_CB_DEBUG
#define FILTER_TAG_STRIP 0
#define FILTER_TAG_KEEP 1
/* Maintain tag strip statistics */
struct strip_stats_s {
unsigned long stripped; /* Number of packets that have been stripped */
unsigned long checked;
unsigned long skipped;
};
static struct strip_stats_s strip_stats;
/* Local function prototypes */
static void strip_vlan_tag(struct sk_buff *skb);
static int get_tag_status(int dcb_type, void *meta);
static struct sk_buff *strip_tag_rx_cb(struct sk_buff *skb, int dev_no, void *meta);
static struct sk_buff *strip_tag_tx_cb(struct sk_buff *skb, int dev_no, void *meta);
static int strip_tag_filter_cb(uint8_t * pkt, int size, int dev_no, void *meta,
int chan, kcom_filter_t * kf);
static int _pprint(void);
static int _cleanup(void);
static int _init(void);
/* Remove VLAN tag for select TPIDs */
static void
show_mac(struct sk_buff *skb)
strip_vlan_tag(struct sk_buff *skb)
{
printk("DMAC=%02X:%02X:%02X:%02X:%02X:%02X\n",
skb->data[0], skb->data[1], skb->data[2],
skb->data[3], skb->data[4], skb->data[5]);
}
static struct sk_buff *
test_rx_cb(struct sk_buff *skb, int dev_no, void *meta)
{
printk("rx_cb for dev %d\n", dev_no);
printk("netif user data 0x%x\n", KNET_SKB_CB(skb)->netif_user_data);
printk("filter user data 0x%x\n", KNET_SKB_CB(skb)->filter_user_data);
printk("dcb type 0x%x\n", KNET_SKB_CB(skb)->dcb_type);
if (skb->data[5] == 0x03) {
dev_kfree_skb(skb);
return NULL;
uint16_t vlan_proto = (uint16_t) ((skb->data[12] << 8) | skb->data[13]);
if ((vlan_proto == 0x8100) || (vlan_proto == 0x88a8) || (vlan_proto == 0x9100)) {
/* Move first 12 bytes of packet back by 4 */
((u32 *) skb->data)[3] = ((u32 *) skb->data)[2];
((u32 *) skb->data)[2] = ((u32 *) skb->data)[1];
((u32 *) skb->data)[1] = ((u32 *) skb->data)[0];
skb_pull(skb, 4); /* Remove 4 bytes from start of buffer */
}
show_mac(skb);
return skb;
}
static struct sk_buff *
test_tx_cb(struct sk_buff *skb, int dev_no, void *meta)
{
printk("tx_cb for dev %d\n", dev_no);
show_mac(skb);
skb->data[5] += 1;
return skb;
}
/*
* Location of tagging status in select DCB types found below:
*
* DCB type 14: word 12, bits 10.11
* DCB type 19, 20, 21, 22, 30: word 12, bits 10..11
* DCB type 23, 29: word 13, bits 0..1
* DCB type 31, 34, 37: word 13, bits 0..1
* DCB type 26, 32, 33, 35: word 13, bits 0..1
*
* The function get_tag_status() returns the tag status for known DCB types.
* 0 = Untagged
* 1 = Single inner-tag
* 2 = Single outer-tag
* 3 = Double tagged.
* -1 = Unsupported DCB type
*/
static int
test_filter_cb(uint8_t *pkt, int size, int dev_no, void *meta,
int chan, kcom_filter_t *kf)
get_tag_status(int dcb_type, void *meta)
{
printk("filter_cb (%d) for dev %d\n", kf->dest_id, dev_no);
if (pkt[12] == 0x81 && pkt[13] == 0x00) {
printk(" VTAG %d\n", pkt[15]);
kf->dest_type = KCOM_DEST_T_NETIF;
kf->dest_id = pkt[15];
return 1;
uint32 *dcb = (uint32 *) meta;
int tag_status;
switch (dcb_type) {
case 14:
case 19:
case 20:
case 21:
case 22:
case 30:
tag_status = (dcb[12] > 10) & 0x3;
break;
case 23:
case 29:
case 31:
case 34:
case 37:
case 26:
case 32:
case 33:
case 35:
tag_status = dcb[13] & 0x3;
break;
case 36:
/* TD3 */
tag_status = ((dcb[13] >> 9) & 0x3);
break;
break;
case 38:
{
/* untested */
/* TH3 only parses outer tag. */
const int tag_map[4] = { 0, 2, -1, -1 };
tag_status = tag_map[(dcb[9] >> 13) & 0x3];
}
break;
default:
tag_status = -1;
break;
}
#ifdef KNET_CB_DEBUG
gprintk("%s; DCB Type: %d; tag status: %d\n", __func__, dcb_type, tag_status);
#endif
return tag_status;
}
/* Rx packet callback function */
static struct sk_buff *
strip_tag_rx_cb(struct sk_buff *skb, int dev_no, void *meta)
{
unsigned netif_flags = KNET_SKB_CB(skb)->netif_user_data;
unsigned filter_flags = KNET_SKB_CB(skb)->filter_user_data;
unsigned dcb_type;
int tag_status;
unsigned int strip_tag = 0;
/* Currently not using filter flags:
* unsigned filter_flags = KNET_SKB_CB(skb)->filter_user_data;
*/
#ifdef KNET_CB_DEBUG
gprintk("%s Enter; netif Flags: %08X filter_flags %08X \n",
__func__, netif_flags, filter_flags);
#endif
/* KNET implements this already */
if (filter_flags == FILTER_TAG_KEEP)
{
strip_stats.skipped++;
return skb;
}
/* SAI strip implies always strip. If the packet is untagged or
inner taged, SDK adds a .1q tag, so we need to strip tag
anyway */
if (filter_flags == FILTER_TAG_STRIP)
{
strip_tag = 1;
}
/* Get DCB type for this packet, passed by KNET driver */
dcb_type = KNET_SKB_CB(skb)->dcb_type;
/* Get tag status from DCB */
tag_status = get_tag_status(dcb_type, meta);
#ifdef KNET_CB_DEBUG
gprintk("%s; DCB Type: %d; tag status: %d\n", __func__, dcb_type, tag_status);
#endif
if (tag_status < 0) {
/* Unsupported DCB type */
return skb;
}
strip_stats.checked++;
if (strip_tag) {
#ifdef KNET_CB_DEBUG
gprintk("%s; Stripping VLAN\n", __func__);
#endif
strip_stats.stripped++;
strip_vlan_tag(skb);
}
#ifdef KNET_CB_DEBUG
else {
gprintk("%s; Preserve VLAN\n", __func__);
}
#endif
return skb;
}
/* Tx callback not used */
static struct sk_buff *
strip_tag_tx_cb(struct sk_buff *skb, int dev_no, void *meta)
{
/* Pass through for now */
return skb;
}
/* Filter callback not used */
static int
strip_tag_filter_cb(uint8_t * pkt, int size, int dev_no, void *meta,
int chan, kcom_filter_t *kf)
{
/* Pass through for now */
return 0;
}
/*
* Generic module functions
* Get statistics.
* % cat /proc/linux-knet-cb
*/
static int
_pprint(void)
{
pprintf("Broadcom Linux KNET Call-Back Driver\n");
pprintf("Broadcom Linux KNET Call-Back: Untagged VLAN Stripper\n");
pprintf(" %lu stripped packets\n", strip_stats.stripped);
pprintf(" %lu packets checked\n", strip_stats.checked);
pprintf(" %lu packets skipped\n", strip_stats.skipped);
return 0;
}
@ -103,9 +257,9 @@ _pprint(void)
static int
_cleanup(void)
{
bkn_rx_skb_cb_unregister(test_rx_cb);
bkn_tx_skb_cb_unregister(test_tx_cb);
bkn_filter_cb_unregister(test_filter_cb);
bkn_rx_skb_cb_unregister(strip_tag_rx_cb);
bkn_tx_skb_cb_unregister(strip_tag_tx_cb);
bkn_filter_cb_unregister(strip_tag_filter_cb);
return 0;
}
@ -113,9 +267,9 @@ _cleanup(void)
static int
_init(void)
{
bkn_rx_skb_cb_register(test_rx_cb);
bkn_tx_skb_cb_register(test_tx_cb);
bkn_filter_cb_register(test_filter_cb);
bkn_rx_skb_cb_register(strip_tag_rx_cb);
bkn_tx_skb_cb_register(strip_tag_tx_cb);
bkn_filter_cb_register(strip_tag_filter_cb);
return 0;
}

10
platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
View File

@ -130,6 +130,9 @@ ADD_TO_CFLAGS += -I$(SDK)/systems/linux/kernel/modules/include
COND_KNET_LIBS = libuser.$(libext)
endif
#SAI_FIXUP
.NOTPARALLEL:
all: $(BLDDIR)/.tree $(all_targets)
ifeq ($(NO_LOCAL_TARGETS),)
@ -146,15 +149,18 @@ ADD_TO_CFLAGS += -I$(SDK)/systems/bde/linux/include
ADD_TO_CFLAGS += -DPROXY_SUPPORT=0
CFLAGS += $(ADD_TO_CFLAGS)
#SAI_FIXUP
CFLAGS:=$(filter-out -fPIC, $(CFLAGS))
kernel_modules:
$(MAKE) -C $(SDK)/systems/bde/linux/kernel kernel_version=$(kernel_version)
$(MAKE) -C $(SDK)/systems/bde/linux/user/kernel kernel_version=$(kernel_version)
ifeq ($(BUILD_KNET),1)
$(MAKE) -C $(SDK)/systems/linux/kernel/modules kernel_version=$(kernel_version) \
$(MAKE) -j1 -C $(SDK)/systems/linux/kernel/modules kernel_version=$(kernel_version) \
subdirs="shared bcm-knet" override-target=linux-$(platform) CFLAGS="$(CFLAGS)"
ifdef BUILD_KNET_CB
$(MAKE) -C $(SDK)/systems/linux/kernel/modules kernel_version=$(kernel_version) \
$(MAKE) -j1 -C $(SDK)/systems/linux/kernel/modules kernel_version=$(kernel_version) \
subdirs="knet-cb" override-target=linux-$(platform) CFLAGS="$(CFLAGS)"
endif
endif