* [PATCH] tmpfs: shmem_fallocate must return ERESTARTSYS
@ 2016-03-04 0:30 Maxim Patlasov
2016-03-04 0:44 ` Mike Kravetz
0 siblings, 1 reply; 2+ messages in thread
From: Maxim Patlasov @ 2016-03-04 0:30 UTC (permalink / raw)
To: hughd; +Cc: linux-mm, linux-kernel, devel
shmem_fallocate() is restartable, so it can return ERESTARTSYS if
signal_pending(). Although fallocate(2) manpage permits EINTR,
the more places use ERESTARTSYS the better.
Signed-off-by: Maxim Patlasov <mpatlasov@virtuozzo.com>
---
mm/shmem.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/mm/shmem.c b/mm/shmem.c
index 440e2a7..60e9c8a 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2229,11 +2229,13 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
struct page *page;
/*
- * Good, the fallocate(2) manpage permits EINTR: we may have
- * been interrupted because we are using up too much memory.
+ * Although fallocate(2) manpage permits EINTR, the more
+ * places use ERESTARTSYS the better. If we have been
+ * interrupted because we are using up too much memory,
+ * oom-killer used fatal signal and we will die anyway.
*/
if (signal_pending(current))
- error = -EINTR;
+ error = -ERESTARTSYS;
else if (shmem_falloc.nr_unswapped > shmem_falloc.nr_falloced)
error = -ENOMEM;
else
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] tmpfs: shmem_fallocate must return ERESTARTSYS
2016-03-04 0:30 [PATCH] tmpfs: shmem_fallocate must return ERESTARTSYS Maxim Patlasov
@ 2016-03-04 0:44 ` Mike Kravetz
0 siblings, 0 replies; 2+ messages in thread
From: Mike Kravetz @ 2016-03-04 0:44 UTC (permalink / raw)
To: Maxim Patlasov, hughd; +Cc: linux-mm, linux-kernel, devel
On 03/03/2016 04:30 PM, Maxim Patlasov wrote:
> shmem_fallocate() is restartable, so it can return ERESTARTSYS if
> signal_pending(). Although fallocate(2) manpage permits EINTR,
> the more places use ERESTARTSYS the better.
>
> Signed-off-by: Maxim Patlasov <mpatlasov@virtuozzo.com>
> ---
> mm/shmem.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 440e2a7..60e9c8a 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -2229,11 +2229,13 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
> struct page *page;
>
> /*
> - * Good, the fallocate(2) manpage permits EINTR: we may have
> - * been interrupted because we are using up too much memory.
> + * Although fallocate(2) manpage permits EINTR, the more
> + * places use ERESTARTSYS the better. If we have been
> + * interrupted because we are using up too much memory,
> + * oom-killer used fatal signal and we will die anyway.
> */
> if (signal_pending(current))
> - error = -EINTR;
> + error = -ERESTARTSYS;
> else if (shmem_falloc.nr_unswapped > shmem_falloc.nr_falloced)
> error = -ENOMEM;
> else
I used the shmem fallocate code as a basis for hugetlbfs fallocate.
See, hugetlbfs_fallocate(). Specifically:
/*
* fallocate(2) manpage permits EINTR; we may have been
* interrupted because we are using up too much memory.
*/
if (signal_pending(current)) {
error = -EINTR;
break;
}
I don't know much about the advantages of changing to ERESTARTSYS. But,
if it is changed for shmem it should be changed for hugetlbfs as well.
--
Mike Kravetz
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-04 0:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-04 0:30 [PATCH] tmpfs: shmem_fallocate must return ERESTARTSYS Maxim Patlasov
2016-03-04 0:44 ` Mike Kravetz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox