libceph: Avoid holding the zero page on ceph_msgr_slab_init errors
diff mbox

Message ID 1435195676-2873-2-git-send-email-benoit.canet@nodalink.com
State New
Headers show

Commit Message

Benoît Canet June 25, 2015, 1:27 a.m. UTC
ceph_msgr_slab_init may fail due to a temporary ENOMEM.

Delay a bit the initialization of zero_page in ceph_msgr_init and
reorder it's cleanup in _ceph_msgr_exit for readability sake.

BUG_ON() will not suffer to be postponed in case it is triggered.

Signed-off-by: Benoît Canet <benoit.canet@nodalink.com>
---
 net/ceph/messenger.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Alex Elder June 25, 2015, 2:09 p.m. UTC | #1
On 06/24/2015 08:27 PM, Benoît Canet wrote:
> ceph_msgr_slab_init may fail due to a temporary ENOMEM.

Looks good.

> Delay a bit the initialization of zero_page in ceph_msgr_init and
> reorder it's cleanup in _ceph_msgr_exit for readability sake.

I'd say it's not readability, but a proper ordering (tear down
in reverse order of set up).

Reviewed-by: Alex Elder <elder@linaro.org>

> BUG_ON() will not suffer to be postponed in case it is triggered.

This is unrelated, but in cases like this (where there's already
something in place to return an error) we should replace these
BUG_ON() calls with logged errors and a return.  They should
never ever happen, of course (they represent design problems)
but if it did it's better to allow the system to keep running.

> Signed-off-by: Benoît Canet <benoit.canet@nodalink.com>
> ---
>   net/ceph/messenger.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
> index 38f06a4..ec68cd3 100644
> --- a/net/ceph/messenger.c
> +++ b/net/ceph/messenger.c
> @@ -275,22 +275,22 @@ static void _ceph_msgr_exit(void)
>   		ceph_msgr_wq = NULL;
>   	}
>
> -	ceph_msgr_slab_exit();
> -
>   	BUG_ON(zero_page == NULL);
>   	page_cache_release(zero_page);
>   	zero_page = NULL;
> +
> +	ceph_msgr_slab_exit();
>   }
>
>   int ceph_msgr_init(void)
>   {
> +	if (ceph_msgr_slab_init())
> +		return -ENOMEM;
> +
>   	BUG_ON(zero_page != NULL);
>   	zero_page = ZERO_PAGE(0);
>   	page_cache_get(zero_page);
>
> -	if (ceph_msgr_slab_init())
> -		return -ENOMEM;
> -
>   	/*
>   	 * The number of active work items is limited by the number of
>   	 * connections, so leave @max_active at default.
>

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 38f06a4..ec68cd3 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -275,22 +275,22 @@  static void _ceph_msgr_exit(void)
 		ceph_msgr_wq = NULL;
 	}
 
-	ceph_msgr_slab_exit();
-
 	BUG_ON(zero_page == NULL);
 	page_cache_release(zero_page);
 	zero_page = NULL;
+
+	ceph_msgr_slab_exit();
 }
 
 int ceph_msgr_init(void)
 {
+	if (ceph_msgr_slab_init())
+		return -ENOMEM;
+
 	BUG_ON(zero_page != NULL);
 	zero_page = ZERO_PAGE(0);
 	page_cache_get(zero_page);
 
-	if (ceph_msgr_slab_init())
-		return -ENOMEM;
-
 	/*
 	 * The number of active work items is limited by the number of
 	 * connections, so leave @max_active at default.