Message-ID: <5717E15B.6090006@hpe.com>
Date: Wed, 20 Apr 2016 16:06:51 -0400
From: Waiman Long <waiman.long@hpe.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20130109 Thunderbird/10.0.12
MIME-Version: 1.0
To: Davidlohr Bueso <dave@stgolabs.net>
CC: "mingo@kernel.org" <mingo@kernel.org>,
        "peterz@infradead.org" <peterz@infradead.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Davidlohr Bueso <dbueso@suse.de>
Subject: Re: [PATCH -tip v3 3/3] locking/pvqspinlock: Robustify init_qspinlock_stat()
References: <1460961103-24953-1-git-send-email-dave@stgolabs.net> <1460961103-24953-3-git-send-email-dave@stgolabs.net> <20160418161650.GA25176@linux-uzut.site> <CS1PR84MB0312315E60265F5E8972CACBF16C0@CS1PR84MB0312.NAMPRD84.PROD.OUTLOOK.COM> <20160420041725.GC3472@linux-uzut.site>
In-Reply-To: <20160420041725.GC3472@linux-uzut.site>
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:23
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2016 20:06:56.7283 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AT5PR84MB0307
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2042
Lines: 59

On 04/20/2016 12:17 AM, Davidlohr Bueso wrote:
> locking/pvqspinlock: Robustify init_qspinlock_stat()
>
> Specifically around the debugfs file creation calls,
> I have no idea if they could ever possibly fail, but
> this is core code (debug aside) so lets at least
> check the return value and inform anything fishy.
>
> Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
> ---
> kernel/locking/qspinlock_stat.h | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/kernel/locking/qspinlock_stat.h 
> b/kernel/locking/qspinlock_stat.h
> index 72722334237a..22e025309845 100644
> --- a/kernel/locking/qspinlock_stat.h
> +++ b/kernel/locking/qspinlock_stat.h
> @@ -212,10 +212,8 @@ static int __init init_qspinlock_stat(void)
>     struct dentry *d_qstat = debugfs_create_dir("qlockstat", NULL);
>     int i;
>
> -    if (!d_qstat) {
> -        pr_warn("Could not create 'qlockstat' debugfs directory\n");
> -        return 0;
> -    }
> +    if (!d_qstat)
> +        goto out;
>
>     /*
>      * Create the debugfs files
> @@ -225,12 +223,20 @@ static int __init init_qspinlock_stat(void)
>      * performance.
>      */
>     for (i = 0; i < qstat_num; i++)
> -        debugfs_create_file(qstat_names[i], 0400, d_qstat,
> -                   (void *)(long)i, &fops_qstat);
> +        if (!debugfs_create_file(qstat_names[i], 0400, d_qstat,
> +                     (void *)(long)i, &fops_qstat))
> +            goto fail_undo;
> +
> +    if (!debugfs_create_file(qstat_names[qstat_reset_cnts], 0200, 
> d_qstat,
> +                 (void *)(long)qstat_reset_cnts, &fops_qstat))
> +        goto fail_undo;
>
> -    debugfs_create_file(qstat_names[qstat_reset_cnts], 0200, d_qstat,
> -               (void *)(long)qstat_reset_cnts, &fops_qstat);
>     return 0;
> +fail_undo:
> +    debugfs_remove_recursive(d_qstat);
> +out:
> +    pr_warn("Could not create 'qlockstat' debugfs entries\n");
> +    return -ENOMEM;
> }
> fs_initcall(init_qspinlock_stat);
>

Reviewed-by: Waiman Long <Waiman.Long@hpe.com>