Re: [net-next v2 04/15] i40e: remove BUG_ON from feature string building

[Jeff Kirsher <jeffrey.t.kirsher@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 2414 bytes --]

On Tue, 2015-12-01 at 12:48 -0800, Joe Perches wrote:
> On Wed, 2015-11-25 at 11:36 -0800, Joe Perches wrote:
> > On Wed, 2015-11-25 at 10:35 -0800, Jeff Kirsher wrote:
> > > On Wed, 2015-11-25 at 21:26 +0300, Sergei Shtylyov wrote:
> > > > On 11/25/2015 09:21 PM, Jeff Kirsher wrote:
> > > > 
> > > > > From: Shannon Nelson <shannon.nelson@intel.com>
> > > > > 
> > > > > There's really no reason to kill the kernel thread just
> because
> > > > > of a
> > > > > little info string. This reworks the code to use snprintf's
> > > > > limiting to
> > > > > assure that the string is never too long, and WARN_ON to
> still
> > > > > put out
> > > > > a warning that we might want to look at the feature list
> > > > > length.
> > > > > 
> > > > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c
> > > > > b/drivers/net/ethernet/intel/i40e/i40e_main.c
> > []
> > > > >        if (pf->flags & I40E_FLAG_VEB_MODE_ENABLED)
> > > > > -             buf += sprintf(buf, "VEB ");
> > > > > +             i += snprintf(&buf[i], REMAIN(i), "VEPA ");
> > > > 
> > > >     Not "VEB "?
> > > 
> > > Nice catch Sergei, I will wait a till this afternoon to respin
> the
> > > patch series, just in case there are other changes needed that
> our
> > > validation did not catch. :-)
> > 
> > trivia:
> > 
> > If you redo these, it'd be nicer not to use " " after each
> > fixed string, but use " " before each fixed string.
> > 
> > The final output string would be 1 byte shorter overall and
> > not have an excess " " before the newline.
> > 
> > The declaration of i doesn't need initialization to 0:
> > 
> >       i = snprintf(buf, INFO_STRING_LEN, "Features: PF-id[%d]", ...
> > 
> > would work.
> 
> Maybe something like this patch (net-next)
> 
> Fix I40E_FLAG_VEB_MODE_ENABLED output of VEB
> 
> Miscellanea:
> o Remove unnecessary string variable
> o Add space before not after fixed strings
> o Use kmalloc not kzalloc
> o Don't initialize i to 0, use result of first snprintf
> 
> ---
>  drivers/net/ethernet/intel/i40e/i40e_main.c | 42 +++++++++++++----
> ------------
>  1 file changed, 19 insertions(+), 23 deletions(-)

Looks fine Joe, can you send to intel-wired-lan@lists.osuosl.org mailin
g list?  That way I can get it added to my queue and the other
developers can properly review the change.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]