From davem at davemloft.net Fri May 1 22:34:29 2020 From: davem at davemloft.net (David Miller) Date: Fri, 01 May 2020 15:34:29 -0700 (PDT) Subject: [PATCH net] gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() In-Reply-To: <20200430050136.1837-1-ahochauwaaaaa@gmail.com> References: <20200430050136.1837-1-ahochauwaaaaa@gmail.com> Message-ID: <20200501.153429.2281822366307684985.davem@davemloft.net> From: Yoshiyuki Kurauchi Date: Thu, 30 Apr 2020 14:01:36 +0900 > In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI > flag since it returns multipart message. > This patch adds a new arg "flags" in gtp_genl_fill_info() so that > flags can be set by the callers. > > Signed-off-by: Yoshiyuki Kurauchi Applied. From sashal at kernel.org Thu May 14 18:54:03 2020 From: sashal at kernel.org (Sasha Levin) Date: Thu, 14 May 2020 14:54:03 -0400 Subject: [PATCH AUTOSEL 4.19 21/31] gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() In-Reply-To: <20200514185413.20755-1-sashal@kernel.org> References: <20200514185413.20755-1-sashal@kernel.org> Message-ID: <20200514185413.20755-21-sashal@kernel.org> From: Yoshiyuki Kurauchi [ Upstream commit 846c68f7f1ac82c797a2f1db3344a2966c0fe2e1 ] In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI flag since it returns multipart message. This patch adds a new arg "flags" in gtp_genl_fill_info() so that flags can be set by the callers. Signed-off-by: Yoshiyuki Kurauchi Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/gtp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index eab9984f73a88..d73850ebb671f 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1177,11 +1177,11 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) static struct genl_family gtp_genl_family; static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, - u32 type, struct pdp_ctx *pctx) + int flags, u32 type, struct pdp_ctx *pctx) { void *genlh; - genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, 0, + genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, flags, type); if (genlh == NULL) goto nlmsg_failure; @@ -1235,8 +1235,8 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) goto err_unlock; } - err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, - info->snd_seq, info->nlhdr->nlmsg_type, pctx); + err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, info->snd_seq, + 0, info->nlhdr->nlmsg_type, pctx); if (err < 0) goto err_unlock_free; @@ -1279,6 +1279,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb, gtp_genl_fill_info(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, + NLM_F_MULTI, cb->nlh->nlmsg_type, pctx)) { cb->args[0] = i; cb->args[1] = j; -- 2.20.1 From sashal at kernel.org Thu May 14 18:51:16 2020 From: sashal at kernel.org (Sasha Levin) Date: Thu, 14 May 2020 14:51:16 -0400 Subject: [PATCH AUTOSEL 5.6 31/62] gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() In-Reply-To: <20200514185147.19716-1-sashal@kernel.org> References: <20200514185147.19716-1-sashal@kernel.org> Message-ID: <20200514185147.19716-31-sashal@kernel.org> From: Yoshiyuki Kurauchi [ Upstream commit 846c68f7f1ac82c797a2f1db3344a2966c0fe2e1 ] In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI flag since it returns multipart message. This patch adds a new arg "flags" in gtp_genl_fill_info() so that flags can be set by the callers. Signed-off-by: Yoshiyuki Kurauchi Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/gtp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 672cd2caf2fbe..21640a035d7df 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1169,11 +1169,11 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) static struct genl_family gtp_genl_family; static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, - u32 type, struct pdp_ctx *pctx) + int flags, u32 type, struct pdp_ctx *pctx) { void *genlh; - genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, 0, + genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, flags, type); if (genlh == NULL) goto nlmsg_failure; @@ -1227,8 +1227,8 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) goto err_unlock; } - err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, - info->snd_seq, info->nlhdr->nlmsg_type, pctx); + err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, info->snd_seq, + 0, info->nlhdr->nlmsg_type, pctx); if (err < 0) goto err_unlock_free; @@ -1271,6 +1271,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb, gtp_genl_fill_info(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, + NLM_F_MULTI, cb->nlh->nlmsg_type, pctx)) { cb->args[0] = i; cb->args[1] = j; -- 2.20.1 From sashal at kernel.org Thu May 14 18:52:49 2020 From: sashal at kernel.org (Sasha Levin) Date: Thu, 14 May 2020 14:52:49 -0400 Subject: [PATCH AUTOSEL 5.4 28/49] gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() In-Reply-To: <20200514185311.20294-1-sashal@kernel.org> References: <20200514185311.20294-1-sashal@kernel.org> Message-ID: <20200514185311.20294-28-sashal@kernel.org> From: Yoshiyuki Kurauchi [ Upstream commit 846c68f7f1ac82c797a2f1db3344a2966c0fe2e1 ] In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI flag since it returns multipart message. This patch adds a new arg "flags" in gtp_genl_fill_info() so that flags can be set by the callers. Signed-off-by: Yoshiyuki Kurauchi Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/gtp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 3a53d222bfcc1..d89ec99abcd63 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1172,11 +1172,11 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) static struct genl_family gtp_genl_family; static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, - u32 type, struct pdp_ctx *pctx) + int flags, u32 type, struct pdp_ctx *pctx) { void *genlh; - genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, 0, + genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, flags, type); if (genlh == NULL) goto nlmsg_failure; @@ -1230,8 +1230,8 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) goto err_unlock; } - err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, - info->snd_seq, info->nlhdr->nlmsg_type, pctx); + err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, info->snd_seq, + 0, info->nlhdr->nlmsg_type, pctx); if (err < 0) goto err_unlock_free; @@ -1274,6 +1274,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb, gtp_genl_fill_info(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, + NLM_F_MULTI, cb->nlh->nlmsg_type, pctx)) { cb->args[0] = i; cb->args[1] = j; -- 2.20.1 From sashal at kernel.org Thu May 14 18:54:47 2020 From: sashal at kernel.org (Sasha Levin) Date: Thu, 14 May 2020 14:54:47 -0400 Subject: [PATCH AUTOSEL 4.14 30/39] gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() In-Reply-To: <20200514185456.21060-1-sashal@kernel.org> References: <20200514185456.21060-1-sashal@kernel.org> Message-ID: <20200514185456.21060-30-sashal@kernel.org> From: Yoshiyuki Kurauchi [ Upstream commit 846c68f7f1ac82c797a2f1db3344a2966c0fe2e1 ] In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI flag since it returns multipart message. This patch adds a new arg "flags" in gtp_genl_fill_info() so that flags can be set by the callers. Signed-off-by: Yoshiyuki Kurauchi Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/gtp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 92e4e5d53053f..090607e725a24 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1177,11 +1177,11 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info) static struct genl_family gtp_genl_family; static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, - u32 type, struct pdp_ctx *pctx) + int flags, u32 type, struct pdp_ctx *pctx) { void *genlh; - genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, 0, + genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, flags, type); if (genlh == NULL) goto nlmsg_failure; @@ -1235,8 +1235,8 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) goto err_unlock; } - err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, - info->snd_seq, info->nlhdr->nlmsg_type, pctx); + err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, info->snd_seq, + 0, info->nlhdr->nlmsg_type, pctx); if (err < 0) goto err_unlock_free; @@ -1279,6 +1279,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb, gtp_genl_fill_info(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, + NLM_F_MULTI, cb->nlh->nlmsg_type, pctx)) { cb->args[0] = i; cb->args[1] = j; -- 2.20.1 From sashal at kernel.org Thu May 14 18:55:43 2020 From: sashal at kernel.org (Sasha Levin) Date: Thu, 14 May 2020 14:55:43 -0400 Subject: [PATCH AUTOSEL 4.9 20/27] gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp() In-Reply-To: <20200514185550.21462-1-sashal@kernel.org> References: <20200514185550.21462-1-sashal@kernel.org> Message-ID: <20200514185550.21462-20-sashal@kernel.org> From: Yoshiyuki Kurauchi [ Upstream commit 846c68f7f1ac82c797a2f1db3344a2966c0fe2e1 ] In drivers/net/gtp.c, gtp_genl_dump_pdp() should set NLM_F_MULTI flag since it returns multipart message. This patch adds a new arg "flags" in gtp_genl_fill_info() so that flags can be set by the callers. Signed-off-by: Yoshiyuki Kurauchi Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/gtp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index a9e8a7356c41d..fe844888e0ed8 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1108,11 +1108,11 @@ static struct genl_family gtp_genl_family = { }; static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq, - u32 type, struct pdp_ctx *pctx) + int flags, u32 type, struct pdp_ctx *pctx) { void *genlh; - genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, 0, + genlh = genlmsg_put(skb, snd_portid, snd_seq, >p_genl_family, flags, type); if (genlh == NULL) goto nlmsg_failure; @@ -1208,8 +1208,8 @@ static int gtp_genl_get_pdp(struct sk_buff *skb, struct genl_info *info) goto err_unlock; } - err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, - info->snd_seq, info->nlhdr->nlmsg_type, pctx); + err = gtp_genl_fill_info(skb2, NETLINK_CB(skb).portid, info->snd_seq, + 0, info->nlhdr->nlmsg_type, pctx); if (err < 0) goto err_unlock_free; @@ -1252,6 +1252,7 @@ static int gtp_genl_dump_pdp(struct sk_buff *skb, gtp_genl_fill_info(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, + NLM_F_MULTI, cb->nlh->nlmsg_type, pctx)) { cb->args[0] = i; cb->args[1] = j; -- 2.20.1 From northmirko at gmail.com Thu May 21 13:31:45 2020 From: northmirko at gmail.com (Mirko Kovacevic) Date: Thu, 21 May 2020 15:31:45 +0200 Subject: Compilation of TTCN3 tests for SGSN failed Message-ID: *Hi, Osmocom-SGSN* I have downloaded latest master branch sources for TTCN3 tests. I followed instructions for compilations and dependencies. In file : *regen_makefile.sh * If line with ../regen-makefile.sh SGSN_Tests.ttcn $FILES is replaced with ../regen-makefile.sh $FILES then this warning is not present File `SGSN_Tests.ttcn' was given more than once for the Makefile. Also, after command *make compile * *(same with * *make sgsn * *from upper dir.)* I got from output: .... GSM_RR_Types.ttcn:404.2-408.2: In type definition `SecondPartAssign': GSM_RR_Types.ttcn:409.18-20: error: in variant attribute, at or before token `CSN': syntax error, unexpected XIdentifier, expecting $end GSM_RR_Types.ttcn:510.2-512.2: In type definition `IaRestOctLL': GSM_RR_Types.ttcn:513.42-44: error: in variant attribute, at or before token `CSN': syntax error, unexpected XIdentifier, expecting $end GSM_RR_Types.ttcn:588.2-594.2: In type definition `IaRestOctets': GSM_RR_Types.ttcn:595.23-25: error: in variant attribute, at or before token `CSN': syntax error, unexpected XIdentifier, expecting $end ........ Notify: Errors found in the input modules. Code will not be generated. make: *** [Makefile:206: compile] Error 1 Last time in April, I played with TTCN3 for SGSN, everything was good. Can you help me with this ? -------------- next part -------------- An HTML attachment was scrubbed... URL: From northmirko at gmail.com Thu May 21 13:47:00 2020 From: northmirko at gmail.com (Mirko Kovacevic) Date: Thu, 21 May 2020 15:47:00 +0200 Subject: Compilation of TTCN3 tests for SGSN failed In-Reply-To: References: Message-ID: Git checkout to some random commit from April, have solved problem for me. But in current master branch definitely the is a problem. Regards. On Thu, May 21, 2020 at 3:31 PM Mirko Kovacevic wrote: > *Hi, Osmocom-SGSN* > > I have downloaded latest master branch sources for TTCN3 tests. > > > I followed instructions for compilations and dependencies. > In file : > *regen_makefile.sh * > If line with > ../regen-makefile.sh SGSN_Tests.ttcn $FILES > is replaced with > ../regen-makefile.sh $FILES > then this warning is not present > File `SGSN_Tests.ttcn' was given more than once for the Makefile. > > Also, > after command > > *make compile * > > *(same with * > > *make sgsn * > > *from upper dir.)* > I got from output: > > .... > GSM_RR_Types.ttcn:404.2-408.2: In type definition `SecondPartAssign': > GSM_RR_Types.ttcn:409.18-20: error: in variant attribute, at or before > token `CSN': syntax error, unexpected XIdentifier, expecting $end > GSM_RR_Types.ttcn:510.2-512.2: In type definition `IaRestOctLL': > GSM_RR_Types.ttcn:513.42-44: error: in variant attribute, at or before > token `CSN': syntax error, unexpected XIdentifier, expecting $end > GSM_RR_Types.ttcn:588.2-594.2: In type definition `IaRestOctets': > GSM_RR_Types.ttcn:595.23-25: error: in variant attribute, at or before > token `CSN': syntax error, unexpected XIdentifier, expecting $end > ........ > Notify: Errors found in the input modules. Code will not be generated. > make: *** [Makefile:206: compile] Error 1 > > Last time in April, I played with TTCN3 for SGSN, everything was good. > > Can you help me with this ? > > > > > > -- *Puno pozdrava,Mirko Kovacevic* -------------- next part -------------- An HTML attachment was scrubbed... URL: From pespin at sysmocom.de Thu May 21 13:51:38 2020 From: pespin at sysmocom.de (Pau Espin Pedrol) Date: Thu, 21 May 2020 15:51:38 +0200 Subject: Compilation of TTCN3 tests for SGSN failed In-Reply-To: References: Message-ID: Hi, to me it looks like you are using a version of TITAN too old. Support for CSN L/H bits was addded recently, and that's why we switched also recently to TITAN version 6.6.1 to be able to use it. Regards, -- - Pau Espin Pedrol http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Director: Harald Welte From pespin at sysmocom.de Thu May 21 13:55:39 2020 From: pespin at sysmocom.de (Pau Espin Pedrol) Date: Thu, 21 May 2020 15:55:39 +0200 Subject: Compilation of TTCN3 tests for SGSN failed In-Reply-To: References: Message-ID: Hi, Forgot to mention your comments regarding build: * I think we add SGSN_Tests.ttcn first explicitly because it is relevant for some reason I forgot. Maybe to generate correct binary file name? * If you want to build the SGSN, simply run "make sgsn" from the topdir of the git repo and you should be done. * Have a look at docker-playground.git in git.osmocom.org for already prepared containerized setup to run it (ttcn3-sgsn-tests/jenkins.sh). -- - Pau Espin Pedrol http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschaeftsfuehrer / Managing Director: Harald Welte From northmirko at gmail.com Thu May 21 20:24:58 2020 From: northmirko at gmail.com (Mirko Kovacevic) Date: Thu, 21 May 2020 22:24:58 +0200 Subject: Compilation of TTCN3 tests for SGSN failed In-Reply-To: References: Message-ID: You are right. Old version of titan.eclipse. Wasn't aware of it. Problem solved, Thank you. On Thu, May 21, 2020 at 3:51 PM Pau Espin Pedrol wrote: > Hi, > > to me it looks like you are using a version of TITAN too old. Support > for CSN L/H bits was addded recently, and that's why we switched also > recently to TITAN version 6.6.1 to be able to use it. > > Regards, > > -- > - Pau Espin Pedrol http://www.sysmocom.de/ > ======================================================================= > * sysmocom - systems for mobile communications GmbH > * Alt-Moabit 93 > * 10559 Berlin, Germany > * Sitz / Registered office: Berlin, HRB 134158 B > * Geschaeftsfuehrer / Managing Director: Harald Welte > -- *Puno pozdrava,Mirko Kovacevic* -------------- next part -------------- An HTML attachment was scrubbed... URL: