[22339] Fix tsan potential deadlock between `StatefulWriter` and `FlowController` by Mario-DL · Pull Request #5432 · eProsima/Fast-DDS

Mario-DL · 2024-11-27T15:10:48Z

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.

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

…d_status() Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

src/cpp/rtps/writer/StatefulWriter.cpp

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

MiguelCompany

LGTM with green CI

MiguelCompany · 2024-12-13T12:12:23Z

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

mergify · 2024-12-13T12:12:47Z

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

✅ Backports have been created

Details

#5494 [22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) has been created for branch 3.1.x
#5495 [22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) has been created for branch 3.0.x
#5496 [22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) has been created for branch 2.14.x but encountered conflicts
#5497 [22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) has been created for branch 2.10.x but encountered conflicts

…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)

…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

…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

…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>

…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) Fix conflicts Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

…ler` (#5432) (#5496) * Refs #22339: Add BB test * Refs #22339: Fix tsan deadlock report * Refs #22339: Take writer's mutex before rproxy->stop() and check_acked_status() * Refs #22339: Apply Miguels suggestion --------- (cherry picked from commit 8fcd7ca) Fix conflicts Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com> Co-authored-by: Eugenio Collado <eugeniocollado@eprosima.com>

…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

…ler` (#5432) (#5497) * Fix tsan potential deadlock between `StatefulWriter` and `FlowController` (#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 * Fix conflicts Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

Mario-DL added 2 commits November 27, 2024 16:08

Refs #22339: Add BB test

83fb9b2

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

Refs #22339: Fix tsan deadlock report

9de8ea9

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

Mario-DL added this to the v3.2.0 milestone Nov 27, 2024

Mario-DL requested review from richiprosima and removed request for richiprosima November 27, 2024 15:12

github-actions bot added the ci-pending PR which CI is running label Nov 27, 2024

Mario-DL marked this pull request as ready for review November 28, 2024 06:38

rsanchez15 requested a review from richiware November 28, 2024 08:21

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 force-pushed the fix/22339 branch from f2af158 to 211423d Compare December 11, 2024 09:47

Mario-DL requested review from richiware and removed request for richiware December 11, 2024 09:48

MiguelCompany requested changes Dec 11, 2024

View reviewed changes

src/cpp/rtps/writer/StatefulWriter.cpp Show resolved Hide resolved

Refs #22339: Apply Miguels suggestion

a5a1787

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

Mario-DL requested review from richiware and removed request for richiware December 11, 2024 11:46

MiguelCompany approved these changes Dec 11, 2024

View reviewed changes

MiguelCompany merged commit 8fcd7ca into master Dec 13, 2024

MiguelCompany deleted the fix/22339 branch December 13, 2024 12:12

mergify bot mentioned this pull request Dec 13, 2024

[22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) #5494

Merged

14 tasks

mergify bot mentioned this pull request Dec 13, 2024

[22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) #5495

Merged

14 tasks

mergify bot mentioned this pull request Dec 13, 2024

[22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) #5496

Merged

14 tasks

mergify bot mentioned this pull request Dec 13, 2024

[22339] Fix tsan potential deadlock between StatefulWriter and FlowController (backport #5432) #5497

Merged

14 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

[22339] Fix tsan potential deadlock between `StatefulWriter` and `FlowController`#5432
MiguelCompany merged 4 commits intomasterfrom
fix/22339

Mario-DL commented Nov 27, 2024 •

edited by MiguelCompany

Loading

Uh oh!

Uh oh!

MiguelCompany left a comment

Uh oh!

MiguelCompany commented Dec 13, 2024

Uh oh!

mergify bot commented Dec 13, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Mario-DL commented Nov 27, 2024 • edited by MiguelCompany Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Contributor Checklist

Reviewer Checklist

Uh oh!

Uh oh!

MiguelCompany left a comment

Choose a reason for hiding this comment

Uh oh!

MiguelCompany commented Dec 13, 2024

Uh oh!

mergify bot commented Dec 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Mario-DL commented Nov 27, 2024 •

edited by MiguelCompany

Loading

mergify bot commented Dec 13, 2024 •

edited

Loading