[202205] Update BRCM KNET modules to support new psample definitions from sflow

platform/broadcom/saibcm-modules/debian/opennsl-modules.init

@@ -45,17 +45,14 @@ function create_devices()
 function load_kernel_modules()
 {
     if [[ $is_ltsw_chip -eq 1 ]]; then
-        insmod /lib/modules/$(uname -r)/extra/psample.ko
+        modprobe psample
         modprobe linux_ngbde
         modprobe linux_ngknet
         modprobe linux_ngknetcb
     else
         modprobe linux-kernel-bde dmasize=$dmasize maxpayload=128 debug=4 dma_debug=1 usemsi=$usemsi
         modprobe linux-user-bde
-
-        # Using insmod with absolute path for psample to make sure bcm psample is loaded.
-        # There is a different psample.ko module getting created at net/psample/psample.ko 
-        insmod /lib/modules/$(uname -r)/extra/psample.ko
+        modprobe psample
 
         modprobe linux-bcm-knet use_rx_skb=1 rx_buffer_size=9238 debug=0x5020 default_mtu=9100
         modprobe linux-knet-cb
@@ -69,9 +66,9 @@ function remove_kernel_modules()
         rmmod linux_ngknetcb
         rmmod linux_ngknet
         rmmod linux_ngbde
-        rmmod psample.ko
+        rmmod psample
     else
-        rmmod psample.ko
+        rmmod psample
         rmmod linux-knet-cb
         rmmod linux-bcm-knet
         rmmod linux-user-bde

platform/broadcom/saibcm-modules/sdklt/Makefile

@@ -44,12 +44,7 @@ export CROSS_COMPILE
 
 override SDK := $(CURDIR)
 
-ifeq ($(BUILD_PSAMPLE),1)
-PSAMPLE=psample
-PSAMPLE_SYMVERS=$(SDK)/linux/psample/Module.symvers
-endif
-
-kmod: bde knet knetcb $(PSAMPLE)
+kmod: bde knet knetcb
 
 bde:
 	$(MAKE) -C $(SDK)/linux/bde SDK=$(SDK) \
@@ -62,20 +57,12 @@ knet: bde
 		$(TARGET)
 	ln -sf $(SDK)/linux/knet/*.ko
 
-knetcb: knet $(PSAMPLE)
+knetcb: knet
 	$(MAKE) -C $(SDK)/linux/knetcb SDK=$(SDK) \
 		KBUILD_EXTRA_SYMBOLS=$(SDK)/linux/knet/Module.symvers \
-		KBUILD_EXTRA_SYMBOLS+=$(PSAMPLE_SYMVERS) \
 		$(TARGET)
 	ln -sf $(SDK)/linux/knetcb/*.ko
 
-ifeq ($(BUILD_PSAMPLE),1)
-$(PSAMPLE):
-	$(MAKE) -C $(SDK)/linux/psample SDK=$(SDK) \
-		$(TARGET)
-	ln -sf $(SDK)/linux/psample/*.ko
-endif
-
 clean:
 	$(MAKE) kmod TARGET=clean
 	rm -f *.ko

platform/broadcom/saibcm-modules/sdklt/linux/knetcb/psample-cb.c

@@ -251,6 +251,7 @@ psample_task(struct work_struct *work)
     unsigned long flags;
     struct list_head *list_ptr, *list_next;
     psample_pkt_t *pkt;
+    struct psample_metadata md = {0};
 
     spin_lock_irqsave(&psample_work->lock, flags);
     list_for_each_safe(list_ptr, list_next, &psample_work->pkt_list) {
@@ -267,12 +268,13 @@ psample_task(struct work_struct *work)
                     pkt->meta.trunc_size, pkt->meta.src_ifindex, 
                     pkt->meta.dst_ifindex, pkt->meta.sample_rate);
 
+            md.trunc_size = pkt->meta.trunc_size;
+            md.in_ifindex = pkt->meta.src_ifindex;
+            md.out_ifindex = pkt->meta.dst_ifindex;
             psample_sample_packet(pkt->group, 
                                   pkt->skb, 
-                                  pkt->meta.trunc_size,
-                                  pkt->meta.src_ifindex,
-                                  pkt->meta.dst_ifindex,
-                                  pkt->meta.sample_rate);
+                                  pkt->meta.sample_rate,
+                                  &md);
             g_psample_stats.pkts_f_psample_mod++;
 
             dev_kfree_skb_any(pkt->skb);