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

[S] Change in libosmocore[master]: osmo_io: Track IOFD_FLAG_FD_REGISTERED in all backends

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39071?usp=email ) Change subject: osmo_io: Track IOFD_FLAG_FD_REGISTERED in all backends ...................................................................... osmo_io: Track IOFD_FLAG_FD_REGISTERED in all backends This will be used in common segmentation handling code to figure out whether the iofd is still registered or was unregistered by the user during the read cb, in order to know whether to continue submitting read events upwards or to discard the handling. Change-Id: Id5e92aa22ce1c5d76028c539784118be227b9d5a --- M src/core/osmo_io.c M src/core/osmo_io_poll.c 2 files changed, 21 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 387cefb..c61c8e9 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -737,19 +737,29 @@ { int rc = 0; - if (fd >= 0) - iofd->fd = fd; - else if (iofd->fd < 0) { + if (fd < 0 && iofd->fd < 0) { /* this might happen if both osmo_iofd_setup() and osmo_iofd_register() are called with -1 */ LOGPIO(iofd, LOGL_ERROR, "Cannot register io_fd using invalid fd == %d\n", iofd->fd); return -EBADF; } + if (fd < 0) + fd = iofd->fd; + else if (iofd->fd < 0) + iofd->fd = fd; + + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_FD_REGISTERED)) { + /* If re-registering same fd, handle as NO-OP. + * New FD should go through unregister() first. */ + return iofd->fd == fd ? 0 : -ENOTSUP; + } rc = osmo_iofd_ops.register_fd(iofd); if (rc) return rc; IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED); + IOFD_FLAG_SET(iofd, IOFD_FLAG_FD_REGISTERED); + if ((iofd->mode == OSMO_IO_FD_MODE_READ_WRITE && iofd->io_ops.read_cb) || (iofd->mode == OSMO_IO_FD_MODE_RECVFROM_SENDTO && iofd->io_ops.recvfrom_cb) || (iofd->mode == OSMO_IO_FD_MODE_RECVMSG_SENDMSG && iofd->io_ops.recvmsg_cb)) { @@ -772,7 +782,14 @@ */ int osmo_iofd_unregister(struct osmo_io_fd *iofd) { - return osmo_iofd_ops.unregister_fd(iofd); + int rc; + + if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_FD_REGISTERED)) + return 0; + + rc = osmo_iofd_ops.unregister_fd(iofd); + IOFD_FLAG_UNSET(iofd, IOFD_FLAG_FD_REGISTERED); + return rc; } /*! Retrieve the number of messages pending in the transmit queue. diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index 92f03f8..bf0291e 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -128,29 +128,18 @@ struct osmo_fd *ofd = &iofd->u.poll.ofd; int rc; - if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_FD_REGISTERED)) - return 0; - osmo_fd_setup(ofd, iofd->fd, 0, &iofd_poll_ofd_cb_dispatch, iofd, 0); if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) osmo_fd_write_enable(&iofd->u.poll.ofd); rc = osmo_fd_register(ofd); - if (!rc) - IOFD_FLAG_SET(iofd, IOFD_FLAG_FD_REGISTERED); - return rc; } static int iofd_poll_unregister(struct osmo_io_fd *iofd) { struct osmo_fd *ofd = &iofd->u.poll.ofd; - - if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_FD_REGISTERED)) - return 0; osmo_fd_unregister(ofd); - IOFD_FLAG_UNSET(iofd, IOFD_FLAG_FD_REGISTERED); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39071?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5e92aa22ce1c5d76028c539784118be227b9d5a Gerrit-Change-Number: 39071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: segmented_read: Avoid triggering read events if user unregis...

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39072?usp=email ) Change subject: osmo_io: segmented_read: Avoid triggering read events if user unregisters ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39072?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2199b9aa805cc7e7793c1a8aecd10b61f2b4c90 Gerrit-Change-Number: 39072 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 11:21:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add constants for PFCP FAR IDs

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39079?usp=email ) Change subject: s1gw: add constants for PFCP FAR IDs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib25e5cc9ca21047f9884e1c13d0861bf4f7251a1 Gerrit-Change-Number: 39079 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 11:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: segmented_read: Avoid triggering read events if user unregis...

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39072?usp=email ) Change subject: osmo_io: segmented_read: Avoid triggering read events if user unregisters ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39072?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2199b9aa805cc7e7793c1a8aecd10b61f2b4c90 Gerrit-Change-Number: 39072 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 11:21:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add constants for PFCP FAR IDs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39079?usp=email ) Change subject: s1gw: add constants for PFCP FAR IDs ...................................................................... s1gw: add constants for PFCP FAR IDs Change-Id: Ib25e5cc9ca21047f9884e1c13d0861bf4f7251a1 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/39079/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index c1c1701..f077afc 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -301,6 +301,9 @@ private const S1AP_IEs.Cause c_REL_CMD_CAUSE := { nas := normal_release }; +private const LIN4_BO_LAST c_PFCP_FAR_ID_C2A := 1; /* Core -> Access */ +private const LIN4_BO_LAST c_PFCP_FAR_ID_A2C := 2; /* Access -> Core */ + function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs) runs on ConnHdlr { var template (value) E_RABToBeSetupListBearerSUReq items; @@ -729,11 +732,11 @@ pdr1 := tr_PFCP_Create_PDR(pdr_id := 1, /* -- for Core -> Access */ pdi := tr_PFCP_PDI(CORE), ohr := ohr, - far_id := 1); + far_id := c_PFCP_FAR_ID_C2A); pdr2 := tr_PFCP_Create_PDR(pdr_id := 2, /* -- for Access -> Core */ pdi := tr_PFCP_PDI(ACCESS), ohr := ohr, - far_id := 2); + far_id := c_PFCP_FAR_ID_A2C); /* Forwarding Action Rules */ var template (present) Outer_Header_Creation ohc2; @@ -745,10 +748,10 @@ f_inet_addr(erab.u2c.tla)); fpars2 := tr_PFCP_Forwarding_Parameters(CORE, ohc2); - far1 := tr_PFCP_Create_FAR(far_id := 1, /* -- for Core -> Access */ + far1 := tr_PFCP_Create_FAR(far_id := c_PFCP_FAR_ID_C2A, /* -- for Core -> Access */ aa := tr_PFCP_Apply_Action_DROP, fp := omit); - far2 := tr_PFCP_Create_FAR(far_id := 2, /* -- for Access -> Core */ + far2 := tr_PFCP_Create_FAR(far_id := c_PFCP_FAR_ID_A2C, /* -- for Access -> Core */ aa := tr_PFCP_Apply_Action_FORW, fp := fpars2); @@ -861,7 +864,7 @@ log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erabs[i].erab_id); var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erabs[i].u2a, seid := erabs[i].pfcp_loc_seid, - far_id := 1); + far_id := c_PFCP_FAR_ID_C2A); log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erabs[i].erab_id); f_ConnHdlr_tx_session_modify_resp(erabs[i], pdu); } @@ -925,7 +928,7 @@ log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erabs[i].erab_id); var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erabs[i].u2cm, seid := erabs[i].pfcp_loc_seid, - far_id := 2); /* Access -> Core */ + far_id := c_PFCP_FAR_ID_A2C); log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erabs[i].erab_id); f_ConnHdlr_tx_session_modify_resp(erabs[i], pdu); } @@ -951,7 +954,7 @@ log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erab_id); var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erab.u2c, seid := erab.pfcp_loc_seid, - far_id := 2); /* Access -> Core */ + far_id := c_PFCP_FAR_ID_A2C); log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erab_id); f_ConnHdlr_tx_session_modify_resp(erab, pdu); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib25e5cc9ca21047f9884e1c13d0861bf4f7251a1 Gerrit-Change-Number: 39079 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Track IOFD_FLAG_FD_REGISTERED in all backends

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39071?usp=email ) Change subject: osmo_io: Track IOFD_FLAG_FD_REGISTERED in all backends ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39071?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5e92aa22ce1c5d76028c539784118be227b9d5a Gerrit-Change-Number: 39071 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 11:19:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[XS] Change in libosmocore[master]: osmo_io: close() op in backend only takes care of closing

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39070?usp=email ) Change subject: osmo_io: close() op in backend only takes care of closing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39070?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0150afcc0b83ea8b2d00d108658ed688ce487f7f Gerrit-Change-Number: 39070 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 11:19:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: poll: connect_notify: Avoid calling register

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39069?usp=email ) Change subject: osmo_io: poll: connect_notify: Avoid calling register ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39069?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8757259edf07a65f19019cf2b2e5886201d31983 Gerrit-Change-Number: 39069 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 11:19:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[M] Change in libosmocore[master]: osmo_io: uring: Setup connect_notify internal ofd during register() op

by pespin

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/39068?usp=email ) Change subject: osmo_io: uring: Setup connect_notify internal ofd during register() op ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39068?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifac374170736a9fe922362e95059a18c2a3ccaac Gerrit-Change-Number: 39068 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 11:19:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39076?usp=email ) Change subject: s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible ...................................................................... Patch Set 1: (1 comment) File s1gw/S1GW_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39076/comment/24099919_22cd… : PS1, Line 739: far_id := 1); > FAR ID is not specific to an E-RAB. Each E-RAB has two FAR IDs, it's always 1 and 2. […] isn't far ids being 1 and 2 just an implementation detail on how the node works? It could be any number right? May be worth properly documenting that with a constant or whatever, or also manage it as a param as mentioned. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I52317e79ac02cb4e321b49c2cd824de28e25a1c6 Gerrit-Change-Number: 39076 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Dec 2024 11:18:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

6 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2024