From owner-svn-src-head@freebsd.org Fri Nov 13 01:11:29 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D18AA2CDC1 for ; Fri, 13 Nov 2015 01:11:29 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EE36C1A32 for ; Fri, 13 Nov 2015 01:11:28 +0000 (UTC) (envelope-from steven@multiplay.co.uk) Received: by wmvv187 with SMTP id v187so59719953wmv.1 for ; Thu, 12 Nov 2015 17:11:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay_co_uk.20150623.gappssmtp.com; s=20150623; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-type; bh=12wpQ+cgJKaazQMoiqSOyHicXPjWKJuQmKPtPcvChb4=; b=0khGN1OYfiVJpJuz2thjXwbjl0pKr24h28/vtELn5BTwoJxUapeqq8lJNS+YO2ks2p BFk+fEhZAcIIZRad1E1G1XSeofYIODzF2S0xXAOiQ3WbXZl2iK3+A/XNZO7doD1NGaMk WTFnYZ6JDInnjrccxka3Je8R5FhyftCD63XiYzd9vHXstZlDfPdseDc+K58kvgruGi38 scSf7+iWgbP3NhBmFCG9DOMOIesZBcZIFwdnX8bpYVO4ApeZm32QhDiXmQY1xgTdQIzX Ls/CvhB3e1eYpwb5PrNB7HPzvUCX/Ngb1zACMPwK1qiS5ccXw8tkOJzxLVPFoujRVavV EW+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-type; bh=12wpQ+cgJKaazQMoiqSOyHicXPjWKJuQmKPtPcvChb4=; b=T1isvlC6CawxIY/IFk3CFSWgKF28BMtR2v1rMdbfPiqrb2JRpG5nsVKID5FwUiWxaf XqX/njRI7V1AzZTLcP49RSsWHGVuYDCg73QbMEapv3n1SSxh0j4mljTqeLG2L0SHu6S2 R0NwEioqLvJeuPe0A2NYZhFeGDhSY5lzA7W7Ns4hEA1YP4/rips6+fyea4/u0XpFUGKr oFUMsSmNPIYcG9OJ817wXcZCVWqeE40DNQT51t9f/E7M9/f35pHcs8wEVD+tb0OIlNd6 PcLRrMeigyRMtNVL3AmaLOxe5tEFaClMvwpRPxj7sUjkqh+ZRlAVZij3nyijVYeRMuQX jduw== X-Gm-Message-State: ALoCoQkW8caQhooAmzpu9wqJAeJy9hBJta2SueaMJKdI2kPH5stgELWx/f1bUC25DDU6Nou1AG7F X-Received: by 10.194.209.195 with SMTP id mo3mr18623832wjc.16.1447377086979; Thu, 12 Nov 2015 17:11:26 -0800 (PST) Received: from [10.10.1.58] (liv3d.labs.multiplay.co.uk. [82.69.141.171]) by smtp.gmail.com with ESMTPSA id he3sm17189970wjc.48.2015.11.12.17.11.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Nov 2015 17:11:25 -0800 (PST) From: Steven Hartland X-Google-Original-From: Steven Hartland Subject: Re: svn commit: r290708 - head/sys/dev/ixl To: Eric Joyner , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201511120945.tAC9jZZk067057@repo.freebsd.org> Message-ID: <564538CA.6020708@freebsd.org> Date: Fri, 13 Nov 2015 01:11:38 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2015 01:11:29 -0000 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 > 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); >