Skip to content

gh-135239: simpler use of mutex in hashlib & co #135267

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.

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

Open
wants to merge 43 commits into
base: main
Choose a base branch
from

Conversation

picnixz
Copy link
Member

@picnixz picnixz commented Jun 8, 2025

I've taken the liberty of normalizing code style. I'll do the same in other modules, (SHA and BLAKE2). That way, I'll never need to touch cosmetics again in crypto-modules. Well, if it's too much I can drop the last commit.

Copy link
Member

@ZeroIntensity ZeroIntensity left a comment

Choose a reason for hiding this comment

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

Note that PyMutex_Lock will release the GIL/detach the thread state anyway. You want _PyMutex_LockFlags(m, _Py_LOCK_DONT_DETACH) if you're worried about GIL overhead.

@picnixz picnixz marked this pull request as draft June 8, 2025 19:37
@picnixz picnixz requested a review from ZeroIntensity June 15, 2025 09:40
@picnixz picnixz marked this pull request as ready for review June 15, 2025 11:39
@picnixz picnixz marked this pull request as draft June 16, 2025 10:16
@picnixz picnixz force-pushed the perf/hashlib/mutex-135239 branch from bb237c2 to db57278 Compare June 16, 2025 10:35
@picnixz
Copy link
Member Author

picnixz commented Jun 16, 2025

I think we're good now. I'm leaving my dev session and won't be back until Thursday so this will need to wait.

@picnixz picnixz marked this pull request as ready for review June 16, 2025 13:28
@ZeroIntensity
Copy link
Member

Ok, so we're actually losing speed because of Py_BEGIN_ALLOW_THREADS. However, without those calls, we could end up being blocked by the update call itself, right? Thus, I'll restore the check for large buffers, and only release the GIL when the buffers are really large (but I'll still lock the object itself).

That sounds fine to me, but make sure that the locking is done in a consistent order. Note that acquiring the lock will release the GIL, unless you explicitly tell it not to with _Py_LOCK_DONT_DETACH.

@picnixz picnixz requested a review from vstinner June 20, 2025 09:41
@picnixz picnixz marked this pull request as draft June 21, 2025 12:36
@picnixz
Copy link
Member Author

picnixz commented Jun 21, 2025

huh, the tests are becoming slower, something went wrong with my update

@picnixz picnixz marked this pull request as ready for review June 21, 2025 13:46
@picnixz
Copy link
Member Author

picnixz commented Jun 21, 2025

Ok I've removed the renaming. I'll do it in a follow-up because it's easier that way (and it's not even mandatory, I only renamed one function because the name was misleading).

@picnixz
Copy link
Member Author

picnixz commented Jun 21, 2025

!buildbot FIPS only

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @picnixz for commit 98ec915 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F135267%2Fmerge

The command will test the builders whose names match following regular expression: FIPS only

The builders matched are:

  • AMD64 RHEL8 FIPS Only Blake2 Builtin Hash PR
  • AMD64 CentOS9 FIPS Only Blake2 Builtin Hash PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaiting core review skip news type-refactor Code refactoring (with no changes in behavior)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants