lkml.org 
[lkml]   [2015]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v9 8/10] x86, mm: Add set_memory_wt() for WT
From
Date
On Fri, 2015-05-22 at 09:48 +0200, Thomas Gleixner wrote:
> On Wed, 13 May 2015, Toshi Kani wrote:
> > +int set_memory_wt(unsigned long addr, int numpages)
> > +{
> > + int ret;
> > +
> > + if (!pat_enabled)
> > + return set_memory_uc(addr, numpages);
> > +
> > + ret = reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
> > + _PAGE_CACHE_MODE_WT, NULL);
> > + if (ret)
> > + goto out_err;
> > +
> > + ret = _set_memory_wt(addr, numpages);
> > + if (ret)
> > + goto out_free;
> > +
> > + return 0;
> > +
> > +out_free:
> > + free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);
> > +out_err:
> > + return ret;
>
>
> This goto zoo is horrible to read. What's wrong with a straight forward:
>
> + if (!pat_enabled)
> + return set_memory_uc(addr, numpages);
> +
> + ret = reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
> + _PAGE_CACHE_MODE_WT, NULL);
> + if (ret)
> + return ret;
> +
> + ret = _set_memory_wt(addr, numpages);
> + if (ret)
> + free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);
> + return ret;

Agreed. I will change set_memory_wc() as well, which is the base of
this function.

Thanks,
-Toshi




\
 
 \ /
  Last update: 2015-05-22 18:41    [W:0.063 / U:0.184 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site