December 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-upf[master]: upf_gtp: automatically clean old gtp devices

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/39161?usp=email ) Change subject: upf_gtp: automatically clean old gtp devices ...................................................................... upf_gtp: automatically clean old gtp devices If osmo-upf crashes without running the destructor, we may have a leftover gtp device. This can be simulated with "killall -9 osmo-upf". Clean it up automatically. Related: SYS#7240 Depends: libgtpnl Ib99bd8eed854014a5c9118c23e4058a41f3145f2 Change-Id: I7bb5c1ed51f4e05964688ee77b8de77fd3c0f345 --- M src/osmo-upf/upf_gtp.c 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/61/39161/1 diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index e2c6d07..78acd47 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -178,6 +178,13 @@ return 0; } +static int dev_gtp_create(struct upf_gtp_dev *dev, int gtp0_fd, int gtp1_fd) +{ + if (dev->sgsn_mode) + return gtp_dev_create_sgsn(-1, dev->name, gtp0_fd, gtp1_fd); + return gtp_dev_create(-1, dev->name, gtp0_fd, gtp1_fd); +} + int upf_gtp_dev_open(const char *name, bool create_gtp_dev, const char *local_addr, bool listen_for_gtpv0, bool sgsn_mode) { const struct osmo_sockaddr any = { @@ -235,10 +242,13 @@ if (create_gtp_dev) { int gtp0_fd = listen_for_gtpv0 ? dev->gtpv0.ofd.fd : -1; int gtp1_fd = dev->gtpv1.ofd.fd; - if (dev->sgsn_mode) - rc = gtp_dev_create_sgsn(-1, dev->name, gtp0_fd, gtp1_fd); - else - rc = gtp_dev_create(-1, dev->name, gtp0_fd, gtp1_fd); + + rc = dev_gtp_create(dev, gtp0_fd, gtp1_fd); + if (rc == -EEXIST && gtp_dev_destroy(dev->name) == 0) { + LOG_GTP_DEV(dev, LOGL_ERROR, "deleted GTP device from unclean shutdown\n"); + rc = dev_gtp_create(dev, gtp0_fd, gtp1_fd); + } + if (rc < 0) { LOG_GTP_DEV(dev, LOGL_ERROR, "Cannot create GTP device: rc=%d\n", rc); /* name = NULL: signal to the destructor that it does not need to delete the device */ -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/39161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I7bb5c1ed51f4e05964688ee77b8de77fd3c0f345 Gerrit-Change-Number: 39161 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[XS] Change in libgtpnl[master]: dev_create: support returning -EEXIST

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/39160?usp=email ) Change subject: dev_create: support returning -EEXIST ...................................................................... dev_create: support returning -EEXIST Check if netlink has set errno to EEXIST and return -EEXIST in gtp_dev_create() and gtp_dev_create_sgsn(). Users of the function can use this to delete the GTP device and try creating it again. Related: SYS#7240 Change-Id: Ib99bd8eed854014a5c9118c23e4058a41f3145f2 --- M src/gtp-rtnl.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/60/39160/1 diff --git a/src/gtp-rtnl.c b/src/gtp-rtnl.c index e0db921..b43d9d6 100644 --- a/src/gtp-rtnl.c +++ b/src/gtp-rtnl.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <string.h> #include <time.h> +#include <errno.h> #include <libmnl/libmnl.h> #include <net/if.h> @@ -143,7 +144,12 @@ EXPORT_SYMBOL(gtp_dev_create); int gtp_dev_create(int dest_ns, const char *gtp_ifname, int fd0, int fd1) { - return _gtp_dev_create(dest_ns, gtp_ifname, fd0, fd1, GTP_ROLE_GGSN); + int rc = _gtp_dev_create(dest_ns, gtp_ifname, fd0, fd1, GTP_ROLE_GGSN); + + if (rc < 0 && errno == EEXIST) + return -EEXIST; + + return rc; } EXPORT_SYMBOL(gtp_dev_create_sgsn); -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/39160?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: Ib99bd8eed854014a5c9118c23e4058a41f3145f2 Gerrit-Change-Number: 39160 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: voicebus: Don't check BAR0 is an IO resource

by tnt

tnt has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39153?usp=email ) Change subject: voicebus: Don't check BAR0 is an IO resource ...................................................................... voicebus: Don't check BAR0 is an IO resource BAR0 isn't actually _used_ by anything, all commnication goes through BAR1 which is MMIO. So that check just prevents it to work on devices that don't support IO transactions at all (like RPi5) but for no good reason. Change-Id: I3c6fe1664e8dc3f158c64d16640b912fa5a4d12e Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/voicebus/voicebus.c 1 file changed, 0 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve tnt: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c index 8a1f7a6..eb110ea 100644 --- a/drivers/dahdi/voicebus/voicebus.c +++ b/drivers/dahdi/voicebus/voicebus.c @@ -1794,11 +1794,6 @@ goto cleanup; } - if (0 == (pci_resource_flags(vb->pdev, 0)&IORESOURCE_IO)) { - dev_err(&vb->pdev->dev, "BAR0 is not IO Memory.\n"); - retval = -EIO; - goto cleanup; - } vb->iobase = pci_iomap(vb->pdev, 1, 0); if (request_mem_region(pci_resource_start(vb->pdev, 1), pci_resource_len(vb->pdev, 1), -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I3c6fe1664e8dc3f158c64d16640b912fa5a4d12e Gerrit-Change-Number: 39153 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com>

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: dahdi-base: Allow reselection of the same clock master

by tnt

tnt has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39154?usp=email ) Change subject: dahdi-base: Allow reselection of the same clock master ...................................................................... dahdi-base: Allow reselection of the same clock master __dahdi_find_master_span is called from a bunch of different places, like when a span comes on-line, this is to potentially select a new master. However the way it's written now, when it's called, it will ALWAYS tried to find a DIFFERENT master than what is selected now if there is another available, no matter is the current one is earlier in the list. Change-Id: Ibe2365953c5ac7f3dcc7c10526b9eb797ea320ee Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M drivers/dahdi/dahdi-base.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve tnt: Looks good to me, approved; Verified diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index ef29c4b..43948bd 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -3995,8 +3995,6 @@ continue; if (!can_provide_timing(s)) continue; - if (master_span == s) - continue; master_span = s; break; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39154?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ibe2365953c5ac7f3dcc7c10526b9eb797ea320ee Gerrit-Change-Number: 39154 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com>

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: dahdi-base: Allow reselection of the same clock master

by tnt

tnt has posted comments on this change by tnt. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39154?usp=email ) Change subject: dahdi-base: Allow reselection of the same clock master ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39154?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ibe2365953c5ac7f3dcc7c10526b9eb797ea320ee Gerrit-Change-Number: 39154 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 17 Dec 2024 11:36:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: dahdi-base: Allow reselection of the same clock master

by tnt

tnt has posted comments on this change by tnt. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39154?usp=email ) Change subject: dahdi-base: Allow reselection of the same clock master ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39154?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ibe2365953c5ac7f3dcc7c10526b9eb797ea320ee Gerrit-Change-Number: 39154 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 17 Dec 2024 11:36:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: dahdi-base: Allow reselection of the same clock master

by tnt

Attention is currently required from: tnt. tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39154?usp=email ) Change subject: dahdi-base: Allow reselection of the same clock master ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39154?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: deleteVote Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ibe2365953c5ac7f3dcc7c10526b9eb797ea320ee Gerrit-Change-Number: 39154 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com>

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: voicebus: Don't check BAR0 is an IO resource

by tnt

tnt has posted comments on this change by tnt. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39153?usp=email ) Change subject: voicebus: Don't check BAR0 is an IO resource ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I3c6fe1664e8dc3f158c64d16640b912fa5a4d12e Gerrit-Change-Number: 39153 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 17 Dec 2024 11:35:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: voicebus: Don't check BAR0 is an IO resource

by tnt

tnt has removed a vote from this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39153?usp=email ) Change subject: voicebus: Don't check BAR0 is an IO resource ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: deleteVote Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I3c6fe1664e8dc3f158c64d16640b912fa5a4d12e Gerrit-Change-Number: 39153 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com>

6 months, 1 week

1
0
0 0

[XS] Change in dahdi-linux[master]: voicebus: Don't check BAR0 is an IO resource

by tnt

tnt has posted comments on this change by tnt. ( https://gerrit.osmocom.org/c/dahdi-linux/+/39153?usp=email ) Change subject: voicebus: Don't check BAR0 is an IO resource ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/39153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I3c6fe1664e8dc3f158c64d16640b912fa5a4d12e Gerrit-Change-Number: 39153 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 17 Dec 2024 11:35:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024