diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-26 16:40:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-29 14:16:31 +0100 |
commit | 120c082cc19bbeba69c5d9d665fabc9b2555726d (patch) | |
tree | dae6c26525afd7d50146cc72cf6de7bf39e6db85 /meta | |
parent | 57f36698b1f0c13c924c289661a40c75e2d5a448 (diff) | |
download | poky-120c082cc19bbeba69c5d9d665fabc9b2555726d.tar.gz |
python3: Drop ptest hack
With the kernel TCP backlog queue coalescing bug fixed in the 5.0 kernels
we don't need this patch anymore and can run the tests.
(From OE-Core rev: 21bfbef23e1f4c90070017e19f70e488e6ff64be)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python3/ptesthack.patch | 60 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.7.3.bb | 1 |
2 files changed, 0 insertions, 61 deletions
diff --git a/meta/recipes-devtools/python/python3/ptesthack.patch b/meta/recipes-devtools/python/python3/ptesthack.patch deleted file mode 100644 index 8cfa92f9e8..0000000000 --- a/meta/recipes-devtools/python/python3/ptesthack.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | This test hangs under 5.0 kernels onwards. It appears to be caused by the commit in the kernel: | ||
2 | |||
3 | commit 4f693b55c3d2d2239b8a0094b518a1e533cf75d5 (HEAD, refs/bisect/bad) | ||
4 | Author: Eric Dumazet <edumazet@google.com> | ||
5 | Date: Tue Nov 27 14:42:03 2018 -0800 | ||
6 | |||
7 | tcp: implement coalescing on backlog queue | ||
8 | |||
9 | In case GRO is not as efficient as it should be or disabled, | ||
10 | we might have a user thread trapped in __release_sock() while | ||
11 | softirq handler flood packets up to the point we have to drop. | ||
12 | |||
13 | This patch balances work done from user thread and softirq, | ||
14 | to give more chances to __release_sock() to complete its work | ||
15 | before new packets are added the the backlog. | ||
16 | |||
17 | This also helps if we receive many ACK packets, since GRO | ||
18 | does not aggregate them. | ||
19 | |||
20 | This patch brings ~60% throughput increase on a receiver | ||
21 | without GRO, but the spectacular gain is really on | ||
22 | 1000x release_sock() latency reduction I have measured. | ||
23 | |||
24 | Signed-off-by: Eric Dumazet <edumazet@google.com> | ||
25 | Cc: Neal Cardwell <ncardwell@google.com> | ||
26 | Cc: Yuchung Cheng <ycheng@google.com> | ||
27 | Acked-by: Neal Cardwell <ncardwell@google.com> | ||
28 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
29 | |||
30 | |||
31 | Reported to upstream kernel for advice: https://lore.kernel.org/netdev/85aabf9d4f41b6c57629e736993233f80a037e59.camel@linuxfoundation.org/T/#u | ||
32 | |||
33 | Disable the test for now to stop ptests hanging | ||
34 | |||
35 | Upstream-Status: Inappropriate [real cause of issue still TBD] | ||
36 | |||
37 | Index: Python-3.7.2/Lib/test/test_httplib.py | ||
38 | =================================================================== | ||
39 | --- Python-3.7.2.orig/Lib/test/test_httplib.py | ||
40 | +++ Python-3.7.2/Lib/test/test_httplib.py | ||
41 | @@ -1114,6 +1114,7 @@ class BasicTest(TestCase): | ||
42 | self.assertEqual(sock.file.read(), extradata) #we read to the end | ||
43 | resp.close() | ||
44 | |||
45 | + @unittest.skip("broken on newer kernels") | ||
46 | def test_response_fileno(self): | ||
47 | # Make sure fd returned by fileno is valid. | ||
48 | serv = socket.socket( | ||
49 | Index: Python-3.7.2/Lib/test/test_ssl.py | ||
50 | =================================================================== | ||
51 | --- Python-3.7.2.orig/Lib/test/test_ssl.py | ||
52 | +++ Python-3.7.2/Lib/test/test_ssl.py | ||
53 | @@ -4146,6 +4146,7 @@ class ThreadedTests(unittest.TestCase): | ||
54 | self.assertEqual(sess_stat['accept'], 4) | ||
55 | self.assertEqual(sess_stat['hits'], 2) | ||
56 | |||
57 | + @unittest.skip("broken on newer kernels") | ||
58 | def test_session_handling(self): | ||
59 | client_context, server_context, hostname = testing_context() | ||
60 | client_context2, _, _ = testing_context() | ||
diff --git a/meta/recipes-devtools/python/python3_3.7.3.bb b/meta/recipes-devtools/python/python3_3.7.3.bb index eee01c3af6..081ecf4bee 100644 --- a/meta/recipes-devtools/python/python3_3.7.3.bb +++ b/meta/recipes-devtools/python/python3_3.7.3.bb | |||
@@ -21,7 +21,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
21 | file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ | 21 | file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ |
22 | file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \ | 22 | file://0002-Don-t-do-runtime-test-to-get-float-byte-order.patch \ |
23 | file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ | 23 | file://0003-setup.py-pass-missing-libraries-to-Extension-for-mul.patch \ |
24 | file://ptesthack.patch \ | ||
25 | file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \ | 24 | file://0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch \ |
26 | " | 25 | " |
27 | 26 | ||