From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH 2/3] dma-debug: simplify counting of preallocated requests Date: Tue, 8 May 2018 10:50:06 +0100 Message-ID: References: <20180424140235.9125-1-hch@lst.de> <20180424140235.9125-3-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20180424140235.9125-3-hch-jcswGhMUV9g@public.gmane.org> Content-Language: en-GB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Christoph Hellwig , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw@public.gmane.org, Michal Simek , linux-snps-arc-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-c6x-dev-jPsnJVOj+W6hPH1hqNUYSQ@public.gmane.org, linux-parisc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-hexagon-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-m68k-cunTk1MwBs8S/qaLPR03pWD2FQJk+8+b@public.gmane.org, openrisc-cunTk1MwBs9a3B2Vnqf2dGD2FQJk+8+b@public.gmane.org, Greentime Hu , linux-alpha-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, nios2-dev-g9ZBwUv/Ih/yUk5EbOjzuce+I+R0W71w@public.gmane.org, Vincent Chen , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-arch.vger.kernel.org On 24/04/18 15:02, Christoph Hellwig wrote: > Just keep a single variable with a descriptive name instead of two > with confusing names. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > lib/dma-debug.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/lib/dma-debug.c b/lib/dma-debug.c > index 712a897174e4..075253cb613b 100644 > --- a/lib/dma-debug.c > +++ b/lib/dma-debug.c > @@ -132,7 +132,7 @@ static u32 min_free_entries; > static u32 nr_total_entries; > > /* number of preallocated entries requested by kernel cmdline */ > -static u32 req_entries; > +static u32 nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES; > > /* debugfs dentry's for the stuff above */ > static struct dentry *dma_debug_dent __read_mostly; > @@ -1011,7 +1011,6 @@ void dma_debug_add_bus(struct bus_type *bus) > > static int dma_debug_init(void) > { > - u32 num_entries; > int i; > > /* Do not use dma_debug_initialized here, since we really want to be > @@ -1032,12 +1031,7 @@ static int dma_debug_init(void) > return 0; > } > > - if (req_entries) > - num_entries = req_entries; > - else > - num_entries = PREALLOC_DMA_DEBUG_ENTRIES; > - > - if (prealloc_memory(num_entries) != 0) { > + if (prealloc_memory(nr_prealloc_entries) != 0) { > pr_err("DMA-API: debugging out of memory error - disabled\n"); > global_disable = true; > > @@ -1068,16 +1062,10 @@ static __init int dma_debug_cmdline(char *str) > > static __init int dma_debug_entries_cmdline(char *str) > { > - int res; > - > if (!str) > return -EINVAL; > - > - res = get_option(&str, &req_entries); > - > - if (!res) > - req_entries = 0; > - > + if (!get_option(&str, &nr_prealloc_entries)) > + nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES; > return 0; > } > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:55120 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754763AbeEHJuL (ORCPT ); Tue, 8 May 2018 05:50:11 -0400 Subject: Re: [PATCH 2/3] dma-debug: simplify counting of preallocated requests References: <20180424140235.9125-1-hch@lst.de> <20180424140235.9125-3-hch@lst.de> From: Robin Murphy Message-ID: Date: Tue, 8 May 2018 10:50:06 +0100 MIME-Version: 1.0 In-Reply-To: <20180424140235.9125-3-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Christoph Hellwig , iommu@lists.linux-foundation.org Cc: linux-arch@vger.kernel.org, linux-xtensa@linux-xtensa.org, Michal Simek , Vincent Chen , linux-c6x-dev@linux-c6x.org, linux-parisc@vger.kernel.org, linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, openrisc@lists.librecores.org, Greentime Hu , linux-alpha@vger.kernel.org, sparclinux@vger.kernel.org, nios2-dev@lists.rocketboards.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org Message-ID: <20180508095006.i-mDrsxK_5EjHhZKYyefHUAVVGtxBDp5HV9ObkeUFCg@z> On 24/04/18 15:02, Christoph Hellwig wrote: > Just keep a single variable with a descriptive name instead of two > with confusing names. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > lib/dma-debug.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/lib/dma-debug.c b/lib/dma-debug.c > index 712a897174e4..075253cb613b 100644 > --- a/lib/dma-debug.c > +++ b/lib/dma-debug.c > @@ -132,7 +132,7 @@ static u32 min_free_entries; > static u32 nr_total_entries; > > /* number of preallocated entries requested by kernel cmdline */ > -static u32 req_entries; > +static u32 nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES; > > /* debugfs dentry's for the stuff above */ > static struct dentry *dma_debug_dent __read_mostly; > @@ -1011,7 +1011,6 @@ void dma_debug_add_bus(struct bus_type *bus) > > static int dma_debug_init(void) > { > - u32 num_entries; > int i; > > /* Do not use dma_debug_initialized here, since we really want to be > @@ -1032,12 +1031,7 @@ static int dma_debug_init(void) > return 0; > } > > - if (req_entries) > - num_entries = req_entries; > - else > - num_entries = PREALLOC_DMA_DEBUG_ENTRIES; > - > - if (prealloc_memory(num_entries) != 0) { > + if (prealloc_memory(nr_prealloc_entries) != 0) { > pr_err("DMA-API: debugging out of memory error - disabled\n"); > global_disable = true; > > @@ -1068,16 +1062,10 @@ static __init int dma_debug_cmdline(char *str) > > static __init int dma_debug_entries_cmdline(char *str) > { > - int res; > - > if (!str) > return -EINVAL; > - > - res = get_option(&str, &req_entries); > - > - if (!res) > - req_entries = 0; > - > + if (!get_option(&str, &nr_prealloc_entries)) > + nr_prealloc_entries = PREALLOC_DMA_DEBUG_ENTRIES; > return 0; > } > >