-
Notifications
You must be signed in to change notification settings - Fork 601
Improve SSL performance by avoiding SSLWantReadError exception and using much faster checks whenever possible #629
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
base: master
Are you sure you want to change the base?
Conversation
|
Can you expend on how you figured out it handles 99% of cases, and what are the last 1%? |
|
99% - 1% is figurative. I don't know the real numbers and obviously it depends on a particular use case. Checking In my use case client and server exchange a lot of small messages and every message (every SSL frame) can fit into a single TCP packet. Incoming data can also fit into all receiving buffers. So it never happens that uvloop reads only a part of SSL frame, it is always a complete frame, and SSLObject.read is able to process all incoming data. Checking |
fantix
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good one!
Though, it's trickier to verify correctness than just SSLWantReadError, because SSLObject.read() may also raise SSLWantWriteError during close_notify and re-negotiation. The two points to verify are:
- If
SSLObject.read()should be called regardlessly per_do_read(). - If
SSLObject.read()should be called regardlessly per loop within_do_read().
(1) is triggered by I/O read event or user calling transport.resume_reading(). In such scenarios, I don't see a case where the SSLObject has a pending state that requires read() to handle, if both buffers are empty.
(2) is where this optimization happens. It challenges the SSLObject state machine assumption, which is, to call read() until it returns 0, or raises an error. In other words, if a first read() call didn't return 0 or raise an error, can we safely skip the next read() call if both buffers are empty? Reading the underlying C code, I don't see any state left behind. And our use case here (sslproto.pyx) doesn't have other changes to the SSLObject state during _do_read(). Also, given that our sophisticated test cases are passing, I believe it's safe to apply this optimization.
uvloop/sslproto.pyx
Outdated
| else: | ||
|
|
||
| last_bytes_read = <Py_ssize_t>self._sslobj_read( | ||
| app_buffer_size, app_buffer) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| app_buffer_size, app_buffer) | |
| app_buffer_size - total_bytes_read, app_buffer) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good one. Fixed!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, probably doesn't make a difference because SSLObject.read won't read more than the length of app_buffer and it is already app_buffer_size - total_bytes_read. I fixed it anyway for consistency
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this whole SSLWantWriteError from SSLObject.read is tricky.
I'm not 100% sure but I have the following assumption:
-
Python ssl.MemoryBIO grows dynamically without fixed capacity, has no limit, write can only fail in case of system out-of-memory
-
SSL_read_ex returns SSL_WANT_WRITE_ERROR when memory BIO runs out of memory, not when we just wrote something. So given (1) SSL_WANT_WRITE_ERROR may only happen when the system runs out of memory.
-
SSL_read_ex does use its chance to write control stuff right after successful read before returning. link
uvloop/sslproto.pyx
Outdated
| # One way to reduce reliance on SSLWantReadError is to check | ||
| # self._incoming.pending > 0 and SSLObject.pending() > 0. | ||
| # SSLObject.read may still throw SSLWantReadError even when | ||
| # self._incoming.pending > 0 SSLObject.pending() == 0, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| # self._incoming.pending > 0 SSLObject.pending() == 0, | |
| # self._incoming.pending > 0 and SSLObject.pending() == 0, |
| if app_buffer_size == 0: | ||
| return |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahh, good catch! This fixes a false EOF bug in previous code I think. Would be nice to have a test!
SSLWantReadError is expensive.
python/cpython#123954
This PR tries to predict that there will be SSLWantReadError by checking incoming.pending and SSLObject.pending() first.
This check works in 99% of cases. For the rest 1% we still rely on SSLWantReadError