svn commit: r290708 - head/sys/dev/ixl
Steven Hartland
steven at multiplay.co.uk
Fri Nov 13 01:11:29 UTC 2015
Oh gosh yes, looks like this was lost by r284049 :(
I'm guessing that's one of the reasons for r290717 which should help
ensure changes get merged into Intel's upstream repo and hence don't get
lost.
On 13/11/2015 00:42, Eric Joyner wrote:
> I guess r280043 got overwritten at some point?
>
> - Eric
>
> On Thu, Nov 12, 2015 at 1:45 AM Steven Hartland <smh at freebsd.org
> <mailto:smh at freebsd.org>> wrote:
>
> Author: smh
> Date: Thu Nov 12 09:45:35 2015
> New Revision: 290708
> URL: https://svnweb.freebsd.org/changeset/base/290708
>
> Log:
> Fix ixl debug sysctls panic
>
> Remove the use of sbuf_data on drained sbufs from the debug sysctls:
> * ixl_sysctl_hw_res_alloc
> * ixl_sysctl_switch_config
>
> This prevents a kernel panic when accessing these values under a
> kernel
> compiled with INVARIANTS.
>
> Sponsored by: Multiplay
>
> Modified:
> head/sys/dev/ixl/if_ixl.c
>
> Modified: head/sys/dev/ixl/if_ixl.c
> ==============================================================================
> --- head/sys/dev/ixl/if_ixl.c Thu Nov 12 09:20:10 2015
> (r290707)
> +++ head/sys/dev/ixl/if_ixl.c Thu Nov 12 09:45:35 2015
> (r290708)
> @@ -5119,17 +5119,9 @@ ixl_sysctl_hw_res_alloc(SYSCTL_HANDLER_A
> }
>
> error = sbuf_finish(buf);
> - if (error) {
> - device_printf(dev, "Error finishing sbuf: %d\n",
> error);
> - sbuf_delete(buf);
> - return error;
> - }
> -
> - error = sysctl_handle_string(oidp, sbuf_data(buf),
> sbuf_len(buf), req);
> - if (error)
> - device_printf(dev, "sysctl error: %d\n", error);
> sbuf_delete(buf);
> - return error;
> +
> + return (error);
> }
>
> /*
> @@ -5236,15 +5228,6 @@ ixl_sysctl_switch_config(SYSCTL_HANDLER_
> sbuf_delete(nmbuf);
>
> error = sbuf_finish(buf);
> - if (error) {
> - device_printf(dev, "Error finishing sbuf: %d\n",
> error);
> - sbuf_delete(buf);
> - return error;
> - }
> -
> - error = sysctl_handle_string(oidp, sbuf_data(buf),
> sbuf_len(buf), req);
> - if (error)
> - device_printf(dev, "sysctl error: %d\n", error);
> sbuf_delete(buf);
>
> return (error);
>
More information about the svn-src-all
mailing list