cilium, status: add clock source status

Add a Cilium status dump on this datapath feature in order to allow for easier introspection. Clock source will show up under --verbose. Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
cilium · Nov 17, 2020 · 7436d3c · 7436d3c
1 parent d170ce8
commit 7436d3c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/daemon/cmd/status.go b/daemon/cmd/status.go
@@ -170,6 +170,15 @@ func (d *Daemon) getHostRoutingStatus() *models.HostRouting {
 	return s
 }
 
+func (d *Daemon) getClockSourceStatus() *models.ClockSource {
+	s := &models.ClockSource{Mode: models.ClockSourceModeKtime}
+	if option.Config.ClockSource == option.ClockSourceJiffies {
+		s.Mode = models.ClockSourceModeJiffies
+		s.Hertz = int64(option.Config.KernelHz)
+	}
+	return s
+}
+
 func (d *Daemon) getKubeProxyReplacementStatus() *models.KubeProxyReplacement {
 	var mode string
 	switch option.Config.KubeProxyReplacement {
@@ -875,6 +884,7 @@ func (d *Daemon) startStatusCollector() {
 	d.statusResponse.Masquerading = d.getMasqueradingStatus()
 	d.statusResponse.BandwidthManager = d.getBandwidthManagerStatus()
 	d.statusResponse.HostRouting = d.getHostRoutingStatus()
+	d.statusResponse.ClockSource = d.getClockSourceStatus()
 	d.statusResponse.BpfMaps = d.getBPFMapStatus()
 
 	d.statusCollector = status.NewCollector(probes, status.Config{})

diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -256,6 +256,8 @@ type StatusDetails struct {
 	BPFMapDetails bool
 	// KubeProxyReplacementDetails causes BPF kube-proxy details to be printed by FormatStatusResponse.
 	KubeProxyReplacementDetails bool
+	// ClockSourceDetails causes BPF time-keeping internals to be printed by FormatStatusResponse.
+	ClockSourceDetails bool
 }
 
 var (
@@ -271,6 +273,7 @@ var (
 		AllClusters:                 true,
 		BPFMapDetails:               true,
 		KubeProxyReplacementDetails: true,
+		ClockSourceDetails:          true,
 	}
 )
 
@@ -417,6 +420,15 @@ func FormatStatusResponse(w io.Writer, sr *models.StatusResponse, sd StatusDetai
 		fmt.Fprintf(w, "Masquerading:\t%s\n", status)
 	}
 
+	if sd.ClockSourceDetails && sr.ClockSource != nil {
+		status := sr.ClockSource.Mode
+		if sr.ClockSource.Mode == models.ClockSourceModeJiffies {
+			status = fmt.Sprintf("%s\t[%d Hz]",
+				sr.ClockSource.Mode, sr.ClockSource.Hertz)
+		}
+		fmt.Fprintf(w, "Clock Source for BPF:\t%s\n", status)
+	}
+
 	if sr.Controllers != nil {
 		nFailing, out := 0, []string{"  Name\tLast success\tLast error\tCount\tMessage\n"}
 		for _, ctrl := range sr.Controllers {