From owner-svn-src-head@freebsd.org Tue Jul 28 15:26:49 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 F0A679AC751; Tue, 28 Jul 2015 15:26:49 +0000 (UTC) (envelope-from jason.unovitch@gmail.com) Received: from mail-ig0-x22d.google.com (mail-ig0-x22d.google.com [IPv6:2607:f8b0:4001:c05::22d]) (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 8C00CAED; Tue, 28 Jul 2015 15:26:49 +0000 (UTC) (envelope-from jason.unovitch@gmail.com) Received: by igbpg9 with SMTP id pg9so141651640igb.0; Tue, 28 Jul 2015 08:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=NEuVooqYBKb+76StWalkbIKfRtah5Kakb/twmoEPsNk=; b=mK3OmdDSoeZ0umkNiGuyeJ8zOqJyrP4Of8SvmMEW/EYe2dAczX2fQOhIYbD/h6rhea OoBRxwDnQlD7oDAukveWK4avwazVMnf7ceewBihwjbPJvBs37744PRXRjGl/B50fPLvu 6Vha0WXidUxkCt7DtBoyEuD+SrhpPvEWb2bSOXV7SDJP1NiDR6gxWd1ABLT6b7O53PJ0 2duDY5f/+SAoauprEd6al7YITy1hW/GS0uaQTWkd0cbgOV+TFrmzI0ob9qBiJ6nHheMV R/30lfEDIqUd/Fb/zvCniS2p4yNx+U1vSRDgWskjh7GosLUs/AnXPvC4/06IUrH2IUTh +aNA== MIME-Version: 1.0 X-Received: by 10.50.128.169 with SMTP id np9mr7979252igb.37.1438097208547; Tue, 28 Jul 2015 08:26:48 -0700 (PDT) Received: by 10.36.27.13 with HTTP; Tue, 28 Jul 2015 08:26:48 -0700 (PDT) Received: by 10.36.27.13 with HTTP; Tue, 28 Jul 2015 08:26:48 -0700 (PDT) In-Reply-To: <20150728143106.GY72729@FreeBSD.org> References: <201507212357.t6LNvd7K023794@repo.freebsd.org> <20150728143106.GY72729@FreeBSD.org> Date: Tue, 28 Jul 2015 11:26:48 -0400 Message-ID: Subject: Re: svn commit: r285782 - head/usr.bin/netstat From: Jason Unovitch To: Gleb Smirnoff Cc: src-committers@freebsd.org, svn-src-head@freebsd.org, Mark Johnston , svn-src-all@freebsd.org Content-Type: text/plain; charset=UTF-8 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: Tue, 28 Jul 2015 15:26:50 -0000 On Jul 28, 2015 10:31 AM, "Gleb Smirnoff" wrote: > > Mark, Jason, > > On Tue, Jul 21, 2015 at 11:57:39PM +0000, Mark Johnston wrote: > M> Fix counter reads on platforms where sizeof(uint64_t) != sizeof(uint64_t *). > M> > M> In the kernel, structs such as tcpstat are manipulated as an array of > M> counter_u64_t (uint64_t *), but made visible to userland as an array of > M> uint64_t. kread_counters() was previously copying the counter array into > M> user space and sequentially overwriting each counter with its value. This > M> mostly affects IPsec counters, as other counters are exported via sysctl. > M> > M> PR: 201700 > M> Tested by: Jason Unovitch > > Thanks for fixing the bug after me. > > One question, though: why do you use sizeof(u_long) instead of size of a > pointer? > Gleb, Mark will have to provide more details on the choice of using sizeof(u_long). I had tested the end result of the fix. All of our discussion on the matter was in the PR. https://bugs.freebsd.org/201700 It hasn't been MFC'd so I'd be more than happy to test the revision so we can MFC both commits for the fix. > M>@ ============================================================================== > M> --- head/usr.bin/netstat/main.c Tue Jul 21 23:44:36 2015 (r285781) > M> +++ head/usr.bin/netstat/main.c Tue Jul 21 23:57:38 2015 (r285782) > M> @@ -776,19 +776,31 @@ kread_counter(u_long addr) > M> int > M> kread_counters(u_long addr, void *buf, size_t size) > M> { > M> - uint64_t *c = buf; > M> + uint64_t *c; > M> + u_long *counters; > M> + size_t i, n; > M> > M> if (kvmd_init() < 0) > M> return (-1); > M> > M> - if (kread(addr, buf, size) < 0) > M> + if (size % sizeof(uint64_t) != 0) { > M> + xo_warnx("kread_counters: invalid counter set size"); > M> return (-1); > M> + } > M> > M> - while (size != 0) { > M> - *c = kvm_counter_u64_fetch(kvmd, *c); > M> - size -= sizeof(*c); > M> - c++; > M> + n = size / sizeof(uint64_t); > M> + if ((counters = malloc(n * sizeof(u_long))) == NULL) > M> + xo_err(-1, "malloc"); > M> + if (kread(addr, counters, n * sizeof(u_long)) < 0) { > M> + free(counters); > M> + return (-1); > M> } > M> + > M> + c = buf; > M> + for (i = 0; i < n; i++) > M> + c[i] = kvm_counter_u64_fetch(kvmd, counters[i]); > M> + > M> + free(counters); > M> return (0); > M> } > > -- > Totus tuus, Glebius. -Jason