<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/19700">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support setting rt-prio and cpu-affinity mask through VTY<br><br>Change-Id: I1af1b154d14de6d6d6fba08f15f167f4b2ed9aa2<br>Depends: libosmocore.git Change-Id If76a4bd2cc7b3c7adf5d84790a944d78be70e10a<br>Depends: osmo-gsm-masnuals.git Change-Id Icd75769ef630c3fa985fc5e2154d5521689cdd3c<br>Related: SYS#4986<br>---<br>M TODO-RELEASE<br>M configure.ac<br>M debian/control<br>M doc/manuals/vty/sgsn_vty_reference.xml<br>M src/sgsn/sgsn_main.c<br>5 files changed, 49 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/00/19700/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index e5e3b39..6b29a87 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -1,4 +1,2 @@</span><br><span> #component what description / commit summary line</span><br><span style="color: hsl(0, 100%, 40%);">-manual needs common chapter cs7-config.adoc from osmo-gsm-manuals > 0.3.0</span><br><span style="color: hsl(0, 100%, 40%);">-libosmocore osmo_mobile_identity Depends on libosmocore > 1.3.0</span><br><span style="color: hsl(0, 100%, 40%);">-osmo-bsc Mobile Identity Coding OsmoBSC is stricter in rejecting invalid coding of Mobile Identity IEs</span><br><span style="color: hsl(120, 100%, 40%);">+manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index db2e1ad..12af7e6 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -47,11 +47,11 @@</span><br><span> AC_SUBST(LIBRARY_DLSYM)</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.2.0)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.2.0)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.2.0)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.2.0)</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.2.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.4.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.4.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.0.0)</span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index 1b659eb..e512c8f 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -13,7 +13,7 @@</span><br><span> libtalloc-dev,</span><br><span> libc-ares-dev,</span><br><span> libgtp-dev (>= 1.5.0),</span><br><span style="color: hsl(0, 100%, 40%);">- libosmocore-dev (>= 1.2.0),</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmocore-dev (>= 1.4.0),</span><br><span> libosmo-abis-dev (>= 0.6.0),</span><br><span> libosmo-netif-dev (>= 0.4.0),</span><br><span> libosmo-gsup-client-dev (>= 1.0.0),</span><br><span>diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml</span><br><span>index e49d278..8ffc607 100644</span><br><span>--- a/doc/manuals/vty/sgsn_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/sgsn_vty_reference.xml</span><br><span>@@ -431,6 +431,13 @@</span><br><span> <param name='[TNNNN]' doc='T- or X-timer-number -- 3GPP compliant timer number of the format '1234' or 'T1234' or 't1234'; Osmocom-specific timer number of the format: 'X1234' or 'x1234'.' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show cpu-sched threads'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='show' doc='Show running system information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cpu-sched' doc='Show Sched section information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='threads' doc='Show information about running threads)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='show cs7 instance <0-15> users'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span>@@ -1113,6 +1120,13 @@</span><br><span> <param name='update-auth-info' doc='Complete the send authentication info procedure' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show cpu-sched threads'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='show' doc='Show running system information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cpu-sched' doc='Show Sched section information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='threads' doc='Show information about running threads)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='show cs7 instance <0-15> users'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span>@@ -1560,6 +1574,11 @@</span><br><span> <param name='ctrl' doc='Configure the Control Interface' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='cpu-sched'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cpu-sched' doc='Configure CPU Scheduler related settings' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='cs7 instance <0-15>'></span><br><span> <params></span><br><span> <param name='cs7' doc='ITU-T Signaling System 7' /></span><br><span>@@ -2348,6 +2367,27 @@</span><br><span> </params></span><br><span> </command></span><br><span> </node></span><br><span style="color: hsl(120, 100%, 40%);">+ <node id='config-cpu-sched'></span><br><span style="color: hsl(120, 100%, 40%);">+ <name>config-cpu-sched</name></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='policy rr <1-32>'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='policy' doc='Set the scheduling policy to use for the process' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='rr' doc='Use the SCHED_RR real-time scheduling algorithm' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='<1-32>' doc='Set the SCHED_RR real-time priority' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='cpu-affinity (self|all|<0-4294967295>|THREADNAME) CPUHEXMASK [delay]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cpu-affinity' doc='Set CPU affinity mask on a (group of) thread(s)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='self' doc='Set CPU affinity mask on thread running the VTY' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='all' doc='Set CPU affinity mask on all process' threads' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='<0-4294967295>' doc='Set CPU affinity mask on a thread with specified PID' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='THREADNAME' doc='Set CPU affinity mask on a thread with specified thread name' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='CPUHEXMASK' doc='CPU affinity mask' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[delay]' doc='If set, delay applying the affinity mask now and let the app handle it at a later point' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span style="color: hsl(120, 100%, 40%);">+ </node></span><br><span> <node id='config-sgsn'></span><br><span> <name>config-sgsn</name></span><br><span> <command id='gtp local-ip A.B.C.D'></span><br><span>diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c</span><br><span>index 5b53815..257c3a2 100644</span><br><span>--- a/src/sgsn/sgsn_main.c</span><br><span>+++ b/src/sgsn/sgsn_main.c</span><br><span>@@ -49,6 +49,7 @@</span><br><span> #include <osmocom/vty/stats.h></span><br><span> #include <osmocom/vty/ports.h></span><br><span> #include <osmocom/vty/misc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/cpu_sched_vty.h></span><br><span> </span><br><span> #include <osmocom/ctrl/control_vty.h></span><br><span> </span><br><span>@@ -414,6 +415,7 @@</span><br><span> osmo_stats_vty_add_cmds();</span><br><span> sgsn_vty_init(&sgsn->cfg);</span><br><span> ctrl_vty_init(tall_sgsn_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cpu_sched_vty_init(tall_sgsn_ctx);</span><br><span> </span><br><span> #if BUILD_IU</span><br><span> OSMO_ASSERT(osmo_ss7_init() == 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/19700">change 19700</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-sgsn/+/19700"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1af1b154d14de6d6d6fba08f15f167f4b2ed9aa2 </div>
<div style="display:none"> Gerrit-Change-Number: 19700 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>