Skip to content

W
White Rabbit Switch - Software
Commit 6581d71c authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

[BUG: 1575] userspace: add "monitor" port parameter to HAL and snmp 

Include again the commit:
[BUG: 1575] userspace: add "monitor" port parameter to HAL and snmp
74e16153

This time on top of HA
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent e859ad5f
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 9 deletions
doc/wrs_failures/fail.tex
View file @ 6581d71c
...@@ -297,6 +297,7 @@ WR network. ...@@ -297,6 +297,7 @@ WR network.
\snmpadd{WR-SWITCH-MIB::wrsPortStatusSfpInDB.<n>}\\ \snmpadd{WR-SWITCH-MIB::wrsPortStatusSfpInDB.<n>}\\
\snmpadd{WR-SWITCH-MIB::wrsPortStatusSfpGbE.<n>}\\ \snmpadd{WR-SWITCH-MIB::wrsPortStatusSfpGbE.<n>}\\
\snmpadd{WR-SWITCH-MIB::wrsPortStatusSfpError.<n>}\\ \snmpadd{WR-SWITCH-MIB::wrsPortStatusSfpError.<n>}\\
\snmpadd{WR-SWITCH-MIB::wrsPortStatusMonitor.<n>}\\
\snmpadd{WR-SWITCH-MIB::wrsSFPsStatus}\\ \snmpadd{WR-SWITCH-MIB::wrsSFPsStatus}\\
\snmpadd{WR-SWITCH-MIB::wrsNetworkingStatus}\\ \snmpadd{WR-SWITCH-MIB::wrsNetworkingStatus}\\
\snmpadd{WR-SWITCH-MIB::wrsMainSystemStatus} } \snmpadd{WR-SWITCH-MIB::wrsMainSystemStatus} }
......
doc/wrs_failures/snmp_objects.tex
View file @ 6581d71c
...@@ -253,9 +253,12 @@ ...@@ -253,9 +253,12 @@
\item Check your network layout and the WR Switch configuration. If you \item Check your network layout and the WR Switch configuration. If you
have some non-WR devices connected to ports of the WR Switch (e.g. have some non-WR devices connected to ports of the WR Switch (e.g.
computer sending/receiving only data, without the need of computer sending/receiving only data, without the need of
synchronization), these ports should have their role in the timing synchronization), for firmware versions up to 5.0.1
these ports should have their role in the timing
configuration set to \emph{non-wr} to avoid PTP traffic or \emph{none} configuration set to \emph{non-wr} to avoid PTP traffic or \emph{none}
to disable PTP traffic at all. to disable PTP traffic at all. For newer releases the parameter
\emph{monitor} shall be set to \emph{n} to ignore all errors on
a given port.
\item Check the status of a WR device connected to the reported port. \item Check the status of a WR device connected to the reported port.
\item Restart the switch. \item Restart the switch.
\item If the problem persists, please contact WR experts for in-depth \item If the problem persists, please contact WR experts for in-depth
...@@ -285,8 +288,10 @@ ...@@ -285,8 +288,10 @@
wri2} wri2}
\item If the reported port is intended to be used with WR not compatible \item If the reported port is intended to be used with WR not compatible
equipment (e.g. using a copper SFP module), to avoid SNMP errors set equipment (e.g. using a copper SFP module), to avoid SNMP errors set
this port to \emph{non-wr}. To disable PTP traffic on this port set it on this port the \emph{role} to \emph{non-wr} or set \emph{monitor=y}
to \emph{none}. (firmware after 5.0.1). To disable WR traffic on this port set
the \emph{role} to \emph{non-wr}, to disable PTP traffic set to
\emph{none}.
\item Otherwise, you should use a WR-supported SFP module and make sure it \item Otherwise, you should use a WR-supported SFP module and make sure it
is declared together with calibration values in the WRS configuration. is declared together with calibration values in the WRS configuration.
\end{pck_proc} \end{pck_proc}
...@@ -631,6 +636,7 @@ ...@@ -631,6 +636,7 @@
\snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusSfpError.<n>}{} \snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusSfpError.<n>}{}
\snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusPtpTxFrames.<n>}{} \snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusPtpTxFrames.<n>}{}
\snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusPtpRxFrames.<n>}{} \snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusPtpRxFrames.<n>}{}
\snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusMonitor.<n>}{}
\snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusSfpDom.<n>}{} \snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusSfpDom.<n>}{}
\snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusSfpTemp.<n>}{} \snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusSfpTemp.<n>}{}
\snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusSfpVcc.<n>}{} \snmpentrye{WR-SWITCH-MIB}{wrsPortStatusTable}{wrsPortStatusSfpVcc.<n>}{}
......
userspace/libwr/include/libwr/hal_shmem.h
View file @ 6581d71c
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
#define READ_SFP_DIAG_ENABLE 1 #define READ_SFP_DIAG_ENABLE 1
#define READ_SFP_DIAG_DISABLE 0 #define READ_SFP_DIAG_DISABLE 0
/* Monitor port in SNMP */
#define HAL_PORT_MONITOR_ENABLE 1
#define HAL_PORT_MONITOR_DISABLE 2
#define DEFAULT_T2_PHASE_TRANS 0 #define DEFAULT_T2_PHASE_TRANS 0
#define DEFAULT_T4_PHASE_TRANS 0 #define DEFAULT_T4_PHASE_TRANS 0
...@@ -109,6 +113,10 @@ struct hal_port_state { ...@@ -109,6 +113,10 @@ struct hal_port_state {
/* whether SFP has diagnostic Monitoring capability */ /* whether SFP has diagnostic Monitoring capability */
int has_sfp_diag; int has_sfp_diag;
/* whether the port shall be monitored by SNMP */
int monitor;
}; };
struct hal_temp_sensors { struct hal_temp_sensors {
...@@ -119,7 +127,8 @@ struct hal_temp_sensors { ...@@ -119,7 +127,8 @@ struct hal_temp_sensors {
}; };
/* This is the overall structure stored in shared memory */ /* This is the overall structure stored in shared memory */
#define HAL_SHMEM_VERSION 11 /* Version 11, changed wrs_shm_head */ #define HAL_SHMEM_VERSION 12 /* Version 12, added monitor to
struct hal_port_state */
struct hal_shmem_header { struct hal_shmem_header {
int nports; int nports;
......
ppsi @ 2630de3c
Subproject commit be8e037238a2ca33e636f26ba693a5520192b97e Subproject commit 2630de3cdc31bf389fe23ea16f26b96e0b2de1f1
userspace/snmpd/WR-SWITCH-MIB.txt
View file @ 6581d71c
...@@ -27,8 +27,9 @@ wrSwitchMIB MODULE-IDENTITY ...@@ -27,8 +27,9 @@ wrSwitchMIB MODULE-IDENTITY
" "
REVISION "201807181400Z" REVISION "201807181400Z"
DESCRIPTION DESCRIPTION
"Add wrsStartCntLldpd" "Add wrsStartCntLldpd
Add in wrsPortStatusTable: Add in wrsPortStatusTable:
- wrsPortStatusMonitor
- wrsPortStatusSfpDom - wrsPortStatusSfpDom
- wrsPortStatusSfpTemp - wrsPortStatusSfpTemp
- wrsPortStatusSfpVcc - wrsPortStatusSfpVcc
...@@ -1979,7 +1980,7 @@ WrsPortStatusEntry ::= ...@@ -1979,7 +1980,7 @@ WrsPortStatusEntry ::=
wrsPortStatusSfpError INTEGER, wrsPortStatusSfpError INTEGER,
wrsPortStatusPtpTxFrames Counter32, wrsPortStatusPtpTxFrames Counter32,
wrsPortStatusPtpRxFrames Counter32, wrsPortStatusPtpRxFrames Counter32,
wrsPortStatusDummy INTEGER, -- reserved for wrsPortStatusMonitor wrsPortStatusMonitor INTEGER,
wrsPortStatusSfpDom INTEGER, wrsPortStatusSfpDom INTEGER,
wrsPortStatusSfpTemp INTEGER, wrsPortStatusSfpTemp INTEGER,
wrsPortStatusSfpVcc INTEGER, wrsPortStatusSfpVcc INTEGER,
...@@ -2122,6 +2123,18 @@ wrsPortStatusPtpRxFrames OBJECT-TYPE ...@@ -2122,6 +2123,18 @@ wrsPortStatusPtpRxFrames OBJECT-TYPE
running on particular port" running on particular port"
::= { wrsPortStatusEntry 14 } ::= { wrsPortStatusEntry 14 }
wrsPortStatusMonitor OBJECT-TYPE
SYNTAX INTEGER {
na(0),
enable(1),
disable(2)
}
MAX-ACCESS read-only
STATUS current
DESCRIPTION
"If disable, SNMP will not generate any errors for this port."
::= { wrsPortStatusEntry 15 }
wrsPortStatusSfpDom OBJECT-TYPE wrsPortStatusSfpDom OBJECT-TYPE
SYNTAX INTEGER { SYNTAX INTEGER {
na(0), na(0),
...@@ -2132,7 +2145,7 @@ wrsPortStatusSfpDom OBJECT-TYPE ...@@ -2132,7 +2145,7 @@ wrsPortStatusSfpDom OBJECT-TYPE
MAX-ACCESS read-only MAX-ACCESS read-only
STATUS current STATUS current
DESCRIPTION DESCRIPTION
"If disable, SNMP will not generate any errors for this port." "SFP plugged into a given port has extra monitoring (DOM) capabilities."
::= { wrsPortStatusEntry 16 } ::= { wrsPortStatusEntry 16 }
wrsPortStatusSfpTemp OBJECT-TYPE wrsPortStatusSfpTemp OBJECT-TYPE
......
userspace/snmpd/wrsPortStatusTable.c
View file @ 6581d71c
...@@ -23,6 +23,7 @@ static struct pickinfo wrsPortStatusTable_pickinfo[] = { ...@@ -23,6 +23,7 @@ static struct pickinfo wrsPortStatusTable_pickinfo[] = {
FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusSfpError), FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusSfpError),
FIELD(wrsPortStatusTable_s, ASN_COUNTER, wrsPortStatusPtpTxFrames), FIELD(wrsPortStatusTable_s, ASN_COUNTER, wrsPortStatusPtpTxFrames),
FIELD(wrsPortStatusTable_s, ASN_COUNTER, wrsPortStatusPtpRxFrames), FIELD(wrsPortStatusTable_s, ASN_COUNTER, wrsPortStatusPtpRxFrames),
FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusMonitor),
FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusSfpDom), FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusSfpDom),
FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusSfpTemp), FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusSfpTemp),
FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusSfpVcc), FIELD(wrsPortStatusTable_s, ASN_INTEGER, wrsPortStatusSfpVcc),
...@@ -86,6 +87,10 @@ time_t wrsPortStatusTable_data_fill(unsigned int *n_rows) ...@@ -86,6 +87,10 @@ time_t wrsPortStatusTable_data_fill(unsigned int *n_rows)
*/ */
continue; continue;
} }
wrsPortStatusTable_array[i].wrsPortStatusMonitor =
port_state->monitor;
/* No need to copy all ports structures, only what /* No need to copy all ports structures, only what
* we're interested in. * we're interested in.
* Keep value 0 for Not available * Keep value 0 for Not available
...@@ -194,6 +199,7 @@ time_t wrsPortStatusTable_data_fill(unsigned int *n_rows) ...@@ -194,6 +199,7 @@ time_t wrsPortStatusTable_data_fill(unsigned int *n_rows)
} }
if ((wrsPortStatusTable_array[i].wrsPortStatusConfiguredMode != WRS_PORT_STATUS_CONFIGURED_MODE_NON_WR) if ((wrsPortStatusTable_array[i].wrsPortStatusConfiguredMode != WRS_PORT_STATUS_CONFIGURED_MODE_NON_WR)
&& (wrsPortStatusTable_array[i].wrsPortStatusConfiguredMode != WRS_PORT_STATUS_CONFIGURED_MODE_NONE) && (wrsPortStatusTable_array[i].wrsPortStatusConfiguredMode != WRS_PORT_STATUS_CONFIGURED_MODE_NONE)
&& (wrsPortStatusTable_array[i].wrsPortStatusMonitor != WRS_PORT_STATUS_MONITOR_DISABLE)
&& (wrsPortStatusTable_array[i].wrsPortStatusSfpInDB == WRS_PORT_STATUS_SFP_IN_DB_NOT_IN_DATA_BASE)) { && (wrsPortStatusTable_array[i].wrsPortStatusSfpInDB == WRS_PORT_STATUS_SFP_IN_DB_NOT_IN_DATA_BASE)) {
/* error, port is not non-wr mode and sfp not in data base */ /* error, port is not non-wr mode and sfp not in data base */
wrsPortStatusTable_array[i].wrsPortStatusSfpError = WRS_PORT_STATUS_SFP_ERROR_SFP_ERROR; wrsPortStatusTable_array[i].wrsPortStatusSfpError = WRS_PORT_STATUS_SFP_ERROR_SFP_ERROR;
......
userspace/snmpd/wrsPortStatusTable.h
View file @ 6581d71c
...@@ -23,9 +23,13 @@ ...@@ -23,9 +23,13 @@
#define WRS_PORT_STATUS_SFP_GBE_LINK_NOT_GBE 1 /* error */ #define WRS_PORT_STATUS_SFP_GBE_LINK_NOT_GBE 1 /* error */
#define WRS_PORT_STATUS_SFP_GBE_LINK_GBE 2 /* ok */ #define WRS_PORT_STATUS_SFP_GBE_LINK_GBE 2 /* ok */
#define WRS_PORT_STATUS_MONITOR_ENABLE HAL_PORT_MONITOR_ENABLE
#define WRS_PORT_STATUS_MONITOR_DISABLE HAL_PORT_MONITOR_DISABLE
#define WRS_PORT_STATUS_SFP_DOM_ENABLE 1 #define WRS_PORT_STATUS_SFP_DOM_ENABLE 1
#define WRS_PORT_STATUS_SFP_DOM_DISABLE 2 #define WRS_PORT_STATUS_SFP_DOM_DISABLE 2
#define WRS_PORT_STATUS_SFP_DOM_NOT_SUPPORTED 3 #define WRS_PORT_STATUS_SFP_DOM_NOT_SUPPORTED 3
struct wrsPortStatusTable_s { struct wrsPortStatusTable_s {
uint32_t index; /* not reported, index fields has to be marked uint32_t index; /* not reported, index fields has to be marked
* as not-accessible in MIB */ * as not-accessible in MIB */
...@@ -43,6 +47,7 @@ struct wrsPortStatusTable_s { ...@@ -43,6 +47,7 @@ struct wrsPortStatusTable_s {
int wrsPortStatusSfpError; int wrsPortStatusSfpError;
unsigned long wrsPortStatusPtpTxFrames; unsigned long wrsPortStatusPtpTxFrames;
unsigned long wrsPortStatusPtpRxFrames; unsigned long wrsPortStatusPtpRxFrames;
int wrsPortStatusMonitor; /* Ignore errors on this port */
int wrsPortStatusSfpDom; int wrsPortStatusSfpDom;
int wrsPortStatusSfpTemp; int wrsPortStatusSfpTemp;
int wrsPortStatusSfpVcc; int wrsPortStatusSfpVcc;
......
userspace/snmpd/wrsTimingStatusGroup.c
View file @ 6581d71c
...@@ -333,6 +333,7 @@ static void get_wrsSlaveLinksStatus(unsigned int port_status_nrows) ...@@ -333,6 +333,7 @@ static void get_wrsSlaveLinksStatus(unsigned int port_status_nrows)
if (shmem_ready_hald()) { if (shmem_ready_hald()) {
t->wrsSlaveLinksStatus = WRS_SLAVE_LINK_STATUS_OK; t->wrsSlaveLinksStatus = WRS_SLAVE_LINK_STATUS_OK;
for (i = 0; i < port_status_nrows; i++) { for (i = 0; i < port_status_nrows; i++) {
/* wrsPortStatusMonitor value is ignored for this oid on this port */
/* warning N/A */ /* warning N/A */
if (p_a[i].wrsPortStatusConfiguredMode == 0) { if (p_a[i].wrsPortStatusConfiguredMode == 0) {
if (t->wrsSlaveLinksStatus != WRS_SLAVE_LINK_STATUS_ERROR) { if (t->wrsSlaveLinksStatus != WRS_SLAVE_LINK_STATUS_ERROR) {
...@@ -436,6 +437,7 @@ static void get_wrsPTPFramesFlowing(unsigned int port_status_nrows) ...@@ -436,6 +437,7 @@ static void get_wrsPTPFramesFlowing(unsigned int port_status_nrows)
} }
if ((p_a[i].wrsPortStatusConfiguredMode != WRS_PORT_STATUS_CONFIGURED_MODE_NON_WR) if ((p_a[i].wrsPortStatusConfiguredMode != WRS_PORT_STATUS_CONFIGURED_MODE_NON_WR)
&& (p_a[i].wrsPortStatusConfiguredMode != WRS_PORT_STATUS_CONFIGURED_MODE_NONE) && (p_a[i].wrsPortStatusConfiguredMode != WRS_PORT_STATUS_CONFIGURED_MODE_NONE)
&& (p_a[i].wrsPortStatusMonitor != WRS_PORT_STATUS_MONITOR_DISABLE)
&& (p_a[i].wrsPortStatusLink == WRS_PORT_STATUS_LINK_UP)) { && (p_a[i].wrsPortStatusLink == WRS_PORT_STATUS_LINK_UP)) {
if (wrsPortStatusPtpTxFrames_prev[i] == p_a[i].wrsPortStatusPtpTxFrames) { if (wrsPortStatusPtpTxFrames_prev[i] == p_a[i].wrsPortStatusPtpTxFrames) {
t->wrsPTPFramesFlowing = WRS_PTP_FRAMES_FLOWING_ERROR; t->wrsPTPFramesFlowing = WRS_PTP_FRAMES_FLOWING_ERROR;
......
userspace/tools/wrs_dump_shmem.c
View file @ 6581d71c
...@@ -443,6 +443,7 @@ struct dump_info hal_port_info [] = { ...@@ -443,6 +443,7 @@ struct dump_info hal_port_info [] = {
DUMP_FIELD(uint32_t, t4_phase_transition), DUMP_FIELD(uint32_t, t4_phase_transition),
DUMP_FIELD(uint32_t, ep_base), DUMP_FIELD(uint32_t, ep_base),
DUMP_FIELD(int, has_sfp_diag), DUMP_FIELD(int, has_sfp_diag),
DUMP_FIELD(int, monitor),
}; };
int dump_hal_mem(struct wrs_shm_head *head) int dump_hal_mem(struct wrs_shm_head *head)
......
userspace/wrsw_hal/hal_ports.c
View file @ 6581d71c
...@@ -209,6 +209,30 @@ static int hal_port_init(int index) ...@@ -209,6 +209,30 @@ static int hal_port_init(int index)
p->fiber_index = 0; p->fiber_index = 0;
} }
/* Enable port monitoring by default */
p->monitor = HAL_PORT_MONITOR_ENABLE;
sprintf(key,"PORT%02i_INST%02i_MONITOR",port_i,i);
if ((retValue = libwr_cfg_get(key)) == NULL ) {
pr_error("port %i (%s): no key \"%s\" specified. Default to"
" monitor=y.\n",
port_i, p->name,key);
} else {
if (!strcasecmp(retValue, "n")) {
p->monitor = HAL_PORT_MONITOR_DISABLE;
pr_info("port %i (%s): monitor=n (%i)\n", port_i,
p->name, p->monitor);
} else if (!strcasecmp(retValue, "y")) {
p->monitor = HAL_PORT_MONITOR_ENABLE;
pr_info("port %i (%s): monitor=y (%i)\n", port_i,
p->name, p->monitor);
} else {
/* error */
pr_error("port %i (%s): not supported \"monitor\" "
"value, default to y\n",
port_i, p->name);
}
}
/* Used to pre-calibrate the TX path for each port. No more in V3 */ /* Used to pre-calibrate the TX path for each port. No more in V3 */
/* FIXME: this address should come from the driver header */ /* FIXME: this address should come from the driver header */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment