diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-03-22 10:59:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-03-22 10:59:39 +0000 |
| commit | 6a91e62694624035064c58bad5b3e75924892355 (patch) | |
| tree | 28c6bd08ea535c33c13f6a83f6c1b7d1080dbcbe | |
| parent | fea445e8fe9acea4f775a832815ee22bdf2b0222 (diff) | |
| parent | 9352f80cd926fe2dde7c89b93ee33bb0356ff40e (diff) | |
Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging
Pull request
I was too quick in sending the coroutine pool sizing change for -rc0 and still
needed to address feedback from Daniel Berrangé.
# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmX8bOUACgkQnKSrs4Gr
# c8hcHAf/cWacqq8B6fiUVszTHBZuvOn+curY0JGjwA6D1yeWmUVkn4xk06GYA8Zc
# wrm5jTy9nznt/Es9V8DyOCgYAPyKgDsavP1uuPjLTtJnA1lXgdrjfUi7Swd4B+5r
# rBb+WJZXa9sGM8uy2wcPxTFmIgYT7u2/b8JaOnUDBIIdvhmyOBJZTOnfRzh9xCz/
# 0vmPseq7qgWJohzpx5AVcxT3BP1cRCmOw6sKyHTdughLj+DOqg0maKamLzwBnnqC
# gdJBbplXnCH+Xz4jQ9JkzV6EWOq3MxcFFszvt8Zm3OjauSKOjTyrzUNRCZcoImYh
# Ft0A5SIla3aRN+smoXC/LBKs2HnYUg==
# =CNpd
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 21 Mar 2024 17:22:45 GMT
# gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* tag 'block-pull-request' of https://gitlab.com/stefanha/qemu:
coroutine: reserve 5,000 mappings
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | util/qemu-coroutine.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c index 2790959eaf..eb4eebefdf 100644 --- a/util/qemu-coroutine.c +++ b/util/qemu-coroutine.c @@ -377,12 +377,17 @@ static unsigned int get_global_pool_hard_max_size(void) NULL) && qemu_strtoi(contents, NULL, 10, &max_map_count) == 0) { /* - * This is a conservative upper bound that avoids exceeding - * max_map_count. Leave half for non-coroutine users like library - * dependencies, vhost-user, etc. Each coroutine takes up 2 VMAs so - * halve the amount again. + * This is an upper bound that avoids exceeding max_map_count. Leave a + * fixed amount for non-coroutine users like library dependencies, + * vhost-user, etc. Each coroutine takes up 2 VMAs so halve the + * remaining amount. */ - return max_map_count / 4; + if (max_map_count > 5000) { + return (max_map_count - 5000) / 2; + } else { + /* Disable the global pool but threads still have local pools */ + return 0; + } } #endif |