From 32f8646c95f147595309b1a1b9f8365c70f1c733 Mon Sep 17 00:00:00 2001 From: rajkumar38 Date: Mon, 24 Jul 2023 17:10:41 +0530 Subject: [PATCH 1/2] [SFLOW] Fixed SFLOW DROPMON patch to align with 2.0.45 version Signed-off-by: rajkumar38 --- ...abled-drop-monitor-support-for-SONiC.patch | 44 +++++-------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/src/sflow/hsflowd/patch/dropmon/0001-sflow-enabled-drop-monitor-support-for-SONiC.patch b/src/sflow/hsflowd/patch/dropmon/0001-sflow-enabled-drop-monitor-support-for-SONiC.patch index 7a3561fd7d4..b99b99aecea 100644 --- a/src/sflow/hsflowd/patch/dropmon/0001-sflow-enabled-drop-monitor-support-for-SONiC.patch +++ b/src/sflow/hsflowd/patch/dropmon/0001-sflow-enabled-drop-monitor-support-for-SONiC.patch @@ -1,49 +1,32 @@ -From 4bdd892662c08a396066ba6a1c55eac3f8aa0a5f Mon Sep 17 00:00:00 2001 -From: Vadym Hlushko -Date: Tue, 25 Jan 2022 12:59:40 +0000 -Subject: [PATCH] [sflow] enabled drop monitor support for SONiC +commit 530a0cfcefa88208b3527e0d1b6b43cf21d7dc20 +Author: marvell +Date: Mon Jul 24 16:06:57 2023 +0530 -Signed-off-by: Vadym Hlushko ---- - src/Linux/Makefile | 2 +- - src/Linux/hsflowd.c | 8 ++++++++ - src/Linux/scripts/hsflowd.conf.sonic | 2 ++ - 3 files changed, 11 insertions(+), 1 deletion(-) + [PATCH] [sflow] enabled drop monitor support for SONiC + + Signed-off-by: Rajkumar P R -diff --git a/src/Linux/Makefile b/src/Linux/Makefile -index 8128cf2..cf538e7 100644 ---- a/src/Linux/Makefile -+++ b/src/Linux/Makefile -@@ -34,7 +34,7 @@ FEATURES_DENT= DENT PSAMPLE SYSTEMD DROPMON - FEATURES_EOS= EAPI - FEATURES_OS10= OS10 DBUS SYSTEMD - FEATURES_OPX= OPX DBUS SYSTEMD --FEATURES_SONIC= SONIC PSAMPLE DOCKER -+FEATURES_SONIC= SONIC PSAMPLE DOCKER DROPMON - FEATURES_XEN= XEN OVS - FEATURES_HOST= NFLOG PCAP TCP DOCKER KVM OVS DBUS SYSTEMD - diff --git a/src/Linux/hsflowd.c b/src/Linux/hsflowd.c -index 5d94e79..25031d1 100644 +index a29da54..4b6acc1 100644 --- a/src/Linux/hsflowd.c +++ b/src/Linux/hsflowd.c -@@ -1877,6 +1877,14 @@ extern "C" { +@@ -1922,6 +1922,14 @@ extern "C" { sp->psample.ingress = YES; - sp->psample.egress = NO; - sp->psample.group = 1; + sp->psample.egress = YES; + sp->psample.group = 1; // Ingress PSAMPLE group number. Expects egress on (group+1). + // drop-monitor support + myLog(LOG_INFO, "drop-monitor support for SONiC"); + sp->dropmon.dropmon = YES; -+ sp->dropmon.group = 1; + sp->dropmon.start = NO; + sp->dropmon.limit = 1000; + sp->dropmon.sw = NO; + sp->dropmon.hw = YES; ++ #endif /* HSP_LOAD_SONIC */ #ifdef HSP_LOAD_XEN diff --git a/src/Linux/scripts/hsflowd.conf.sonic b/src/Linux/scripts/hsflowd.conf.sonic -index e675730..fb52a54 100644 +index e675730..0604c5d 100644 --- a/src/Linux/scripts/hsflowd.conf.sonic +++ b/src/Linux/scripts/hsflowd.conf.sonic @@ -4,6 +4,8 @@ @@ -55,6 +38,3 @@ index e675730..fb52a54 100644 # ====== detect new interfaces ====== refreshAdaptors=60 # ====== Agent IP selection ====== --- -2.17.1 - From a4f6b1c4eaaa107a7d3f769b1585f3aa84ea3c8d Mon Sep 17 00:00:00 2001 From: rajkumar38 Date: Wed, 16 Aug 2023 09:35:52 +0530 Subject: [PATCH 2/2] Addressed review comments --- ...sflow-enabled-drop-monitor-support-for-SONiC.patch | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/sflow/hsflowd/patch/dropmon/0001-sflow-enabled-drop-monitor-support-for-SONiC.patch b/src/sflow/hsflowd/patch/dropmon/0001-sflow-enabled-drop-monitor-support-for-SONiC.patch index b99b99aecea..b5919e8185b 100644 --- a/src/sflow/hsflowd/patch/dropmon/0001-sflow-enabled-drop-monitor-support-for-SONiC.patch +++ b/src/sflow/hsflowd/patch/dropmon/0001-sflow-enabled-drop-monitor-support-for-SONiC.patch @@ -1,10 +1,7 @@ -commit 530a0cfcefa88208b3527e0d1b6b43cf21d7dc20 -Author: marvell -Date: Mon Jul 24 16:06:57 2023 +0530 - - [PATCH] [sflow] enabled drop monitor support for SONiC - - Signed-off-by: Rajkumar P R +From 4bdd892662c08a396066ba6a1c55eac3f8aa0a5f Mon Sep 17 00:00:00 2001 +From: Vadym Hlushko +Date: Tue, 25 Jan 2022 12:59:40 +0000 +Subject: [PATCH] [sflow] enabled drop monitor support for SONiC diff --git a/src/Linux/hsflowd.c b/src/Linux/hsflowd.c index a29da54..4b6acc1 100644