RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mars0.1.y' into mars0.1a.y

This commit is contained in:
Thomas Schoebel-Theuer 2019-04-16 10:12:03 +02:00
parent b247d548ac 1cf1baa2d1
commit 996d9c3f1a
2 changed files with 53 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -341,6 +341,20 @@ Attention! This branch will go EOL around March 2019.
And even more stable, although the 0.1a releases were And even more stable, although the 0.1a releases were
called "beta" up to now. called "beta" up to now.
mars0.1stable73
* Critical fix, only relevant for kernels >= 4.2.x:
NULL deref occurs systematically when more than 64
file handles are being allocated.
There is already an upstream bugfix in linux-next
(missing initializer for resize_wait in fs/file.c).
Since this fix is missing in many LTS and distro kernels
(at the moment), I added a workaround in MARS.
Recommendation: anyone operating MARS on newer kernels
should update to mars0.1astable73 for safe operations.
Don't leave this unfixed. It can explode at the worst
moment, and restoring operations may only be possible
by completely giving up a secondary host, or with a fix.
mars0.1stable72 mars0.1stable72
* Minor fix: writeback improved in a corner case. * Minor fix: writeback improved in a corner case.
* Minor improvement: display WriteBack data amount in * Minor improvement: display WriteBack data amount in

45
kernel/mars_aio.c
View File

@ -722,10 +722,13 @@ EXPORT_SYMBOL(fd_uninstall);
static static
atomic_t ioctx_count = ATOMIC_INIT(0); atomic_t ioctx_count = ATOMIC_INIT(0);
static DEFINE_MUTEX(_fd_lock);
static static
void _destroy_ioctx(struct aio_output *output) void _destroy_ioctx(struct aio_output *output)
{ {
int fd;
if (unlikely(!output)) if (unlikely(!output))
goto done; goto done;
@ -747,11 +750,14 @@ void _destroy_ioctx(struct aio_output *output)
output->ctxp = 0; output->ctxp = 0;
} }
if (likely(output->fd >= 0)) { fd = output->fd;
MARS_DBG("destroying fd %d\n", output->fd); if (likely(fd >= 0)) {
fd_uninstall(output->fd); MARS_DBG("destroying fd %d\n", fd);
put_unused_fd(output->fd); mutex_lock(&_fd_lock);
fd_uninstall(fd);
put_unused_fd(fd);
output->fd = -1; output->fd = -1;
mutex_unlock(&_fd_lock);
} }
done: done:
@ -771,9 +777,34 @@ void _destroy_ioctx(struct aio_output *output)
*/ */
static int _get_fd(void) static int _get_fd(void)
{ {
int err; struct files_struct *files;
int err = -EINVAL;
int count = 0;
do { do {
mutex_lock(&_fd_lock);
files = current->files;
CHECK_PTR(files, done);
/* Workaround upstream bug:
* Commit 8a81252b774b53e628a8a0fe18e2b8fc236d92cc
* forgot to initialize the new field resize_wait in
* fs/file.c in the initializer of init_files.
* We detect whether this commit is present via neighbor
* commit a7928c1578c550bd6f4dec62d65132e6db226c57
* which removed the ancient define for blk_pm_request.
* Once the bug is fixed in all relevant upstream LTS kernels
* and in all relevant distro kernels, this hack should be
* removed again.
*/
#ifndef blk_pm_request
if (unlikely(!files->resize_wait.task_list.next)) {
files->resize_in_progress = false;
init_waitqueue_head(&files->resize_wait);
}
#endif
/* see f938612dd97d481b8b5bf960c992ae577f081c17 /* see f938612dd97d481b8b5bf960c992ae577f081c17
* and 1a7bd2265fc57f29400d57f66275cc5918e30aa6 * and 1a7bd2265fc57f29400d57f66275cc5918e30aa6
*/ */
@ -782,8 +813,10 @@ static int _get_fd(void)
#else #else
err = get_unused_fd_flags(0); err = get_unused_fd_flags(0);
#endif #endif
mutex_unlock(&_fd_lock);
/* safety workaround: skip standard Unix filehandles */ /* safety workaround: skip standard Unix filehandles */
} while (err >= 0 && err <= 2); } while (err >= 0 && err <= 2 && count++ < 3);
done:
return err; return err;
} }