Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[22339] Fix tsan potential deadlock between StatefulWriter and FlowController #5432

Merged
merged 4 commits into from
Dec 13, 2024
Merged

[22339] Fix tsan potential deadlock between StatefulWriter and FlowController #5432

merged 4 commits into from
Dec 13, 2024

Conversation

Mario-DL
Copy link
Member

@Mario-DL Mario-DL commented Nov 27, 2024 •
edited by MiguelCompany
Loading

Description

This PR addresses a TSAN potential deadlock by lock inversion report between StatefulWriter::matched_reader_remove() and (async)FlowController::run().

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • Any new/modified methods have been properly documented using Doxygen.
  • Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • Changes are API compatible.
  • N/A: New feature has been added to the versions.md file (if applicable).
  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@Mario-DL
Refs #22339: Add BB test
83fb9b2 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL
Refs #22339: Fix tsan deadlock report
9de8ea9 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL added this to the v3.2.0 milestone Nov 27, 2024
@Mario-DL Mario-DL requested review from richiprosima and removed request for richiprosima November 27, 2024 15:12
@github-actions github-actions bot added the ci-pending PR which CI is running label Nov 27, 2024
@Mario-DL Mario-DL marked this pull request as ready for review November 28, 2024 06:38
@rsanchez15 rsanchez15 requested a review from richiware November 28, 2024 08:21
@Mario-DL
Refs #22339: Take writer's mutex before rproxy->stop() and check_acke…
211423d 
…d_status()

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL requested review from richiware and removed request for richiware December 11, 2024 09:48
@Mario-DL
Refs #22339: Apply Miguels suggestion
a5a1787 
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL requested review from richiware and removed request for richiware December 11, 2024 11:46
MiguelCompany
MiguelCompany approved these changes Dec 11, 2024
View reviewed changes
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@MiguelCompany
Copy link
Member

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

@MiguelCompany MiguelCompany merged commit 8fcd7ca into master Dec 13, 2024
16 of 17 checks passed
@MiguelCompany MiguelCompany deleted the fix/22339 branch December 13, 2024 12:12
@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 13, 2024 •
edited
Loading

backport 3.1.x 3.0.x 2.14.x 2.10.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 13, 2024
@Mario-DL @mergify
Fix tsan potential deadlock between StatefulWriter and `FlowControl…
e48bbd7 
…ler` (#5432)

* Refs #22339: Add BB test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Fix tsan deadlock report

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Take writer's mutex before rproxy->stop() and check_acked_status()

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Apply Miguels suggestion

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 8fcd7ca)
@mergify mergify bot mentioned this pull request Dec 13, 2024
Merged
14 tasks
mergify bot pushed a commit that referenced this pull request Dec 13, 2024
@Mario-DL @mergify
Fix tsan potential deadlock between StatefulWriter and `FlowControl…
0bc3f91 
…ler` (#5432)

* Refs #22339: Add BB test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Fix tsan deadlock report

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Take writer's mutex before rproxy->stop() and check_acked_status()

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Apply Miguels suggestion

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 8fcd7ca)
@mergify mergify bot mentioned this pull request Dec 13, 2024
Merged
14 tasks
mergify bot pushed a commit that referenced this pull request Dec 13, 2024
@Mario-DL @mergify
Fix tsan potential deadlock between StatefulWriter and `FlowControl…
9d92bc2 
…ler` (#5432)

* Refs #22339: Add BB test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Fix tsan deadlock report

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Take writer's mutex before rproxy->stop() and check_acked_status()

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Apply Miguels suggestion

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 8fcd7ca)

# Conflicts:
#	src/cpp/rtps/writer/StatefulWriter.cpp
@mergify mergify bot mentioned this pull request Dec 13, 2024
Open
14 tasks
mergify bot pushed a commit that referenced this pull request Dec 13, 2024
@Mario-DL @mergify
Fix tsan potential deadlock between StatefulWriter and `FlowControl…
b1b3187 
…ler` (#5432)

* Refs #22339: Add BB test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Fix tsan deadlock report

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Take writer's mutex before rproxy->stop() and check_acked_status()

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Apply Miguels suggestion

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 8fcd7ca)

# Conflicts:
#	src/cpp/rtps/writer/StatefulWriter.cpp
#	test/blackbox/common/DDSBlackboxTestsBasic.cpp
@mergify mergify bot mentioned this pull request Dec 13, 2024
Open
14 tasks
MiguelCompany pushed a commit that referenced this pull request Dec 16, 2024
@mergify @Mario-DL
Fix tsan potential deadlock between StatefulWriter and `FlowControl…
32092e5 
…ler` (#5432) (#5494)

* Refs #22339: Add BB test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Fix tsan deadlock report

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Take writer's mutex before rproxy->stop() and check_acked_status()

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #22339: Apply Miguels suggestion

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit 8fcd7ca)

Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

@richiware richiware Awaiting requested review from richiware

Assignees
No one assigned
Labels
ci-pending PR which CI is running
Projects
None yet
Milestone
v3.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@Mario-DL @MiguelCompany