From owner-svn-src-head@freebsd.org Sat Aug 29 10:05:08 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 444D23D3763 for ; Sat, 29 Aug 2020 10:05:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BdsXM1z7Hz4Fgs for ; Sat, 29 Aug 2020 10:05:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x731.google.com with SMTP id b14so1979678qkn.4 for ; Sat, 29 Aug 2020 03:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fHWPOBbKafawZ0WGTH4sb0VjMATu9lFMcSQou1fqz7c=; b=OqxJ1zF7BCBMEUxLG7fJKj1/jwNmz7AA/qfGAz6y8On9/t+Pxj3OGjctrMWWz+AEKD 4XZGkxOqEDXBTwLJFBZXBgHJeqhrspFW4BvcCXBkZjV3sKjIsXbKThDkMn+JehKVVYFv PH7MAhsysj+IUGJt5l1VCL83485xdzpZvbbDBLSoSzu/CL7tvHl/4D0t7Mn2HRHynVDv LYAaTsd99Scg1TRrJ8MwznAZRueG+F3SdMqN0kF8F1LMWbqi2NXqL0wqQtG2cbIv6stZ ejSIxXtVlFxlDCcA/dDxvIBK4Ye7OVz9ajjxd4tkytvtp5WVtBU/50OfKlc+Qm1TRV0y LgWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fHWPOBbKafawZ0WGTH4sb0VjMATu9lFMcSQou1fqz7c=; b=sP4XQcSl3+5l8y1LupTS0AQ+AvUxco1joixTm+xrBLCo9qyByLH5m+I+Jmvxd/gc7R 6xkKrQ80N/AdDWB11CBnryIhazALS4fLmrkcHlpO1jebKCCcAZBS4yx6Td83LDU7BmzL QzaQxbRIIzUEEcZGiUsJ/2WicpL7ThOsHvKXenPCcOmu+s7Q+JrNJ7WTJiLuUE5bcnMK 8VRoBdfS1nnG0AkRxZcze6nkg78dPjSQOPBjgEctnUcXiMwwM8tWjuPGngkViCou+DOp FhZG/AC7F0pT52FS5VO/yPXPIXcDskPM5SjnI7pLb6kqKnT4NDYfefeM+yJzOWGNsjPy fNEQ== X-Gm-Message-State: AOAM530pAiEhPK+t2yXCMNeMV3PX4BwPToiLws3A3scVw6rsBCam93yo zdM9MPWGvOhz1ITE6pqWxELn4xlDDu44w49IV0U6KQ== X-Google-Smtp-Source: ABdhPJwJRD1adpgazsM2JVtlvlfGQov/TPXBNSg9hMiFT10D86x2aSOpo0vepuCM/1LH+8o/p8fwZ6sl9x5tgWZAs4Q= X-Received: by 2002:a37:b801:: with SMTP id i1mr2628648qkf.240.1598695506179; Sat, 29 Aug 2020 03:05:06 -0700 (PDT) MIME-Version: 1.0 References: <202008290430.07T4UCM4007928@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Sat, 29 Aug 2020 04:04:55 -0600 Message-ID: Subject: Re: svn commit: r364946 - head/sys/kern To: Mateusz Guzik Cc: Warner Losh , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4BdsXM1z7Hz4Fgs X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=OqxJ1zF7; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::731) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.99 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.81)[-0.813]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.95)[-0.948]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.23)[-0.225]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::731:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[gmail.com]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[svn-src-head] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 29 Aug 2020 10:05:08 -0000 On Sat, Aug 29, 2020 at 1:09 AM Mateusz Guzik wrote: > This crashes on boot for me: > I wasn't able to get it to crash on boot for me, but I was able to recreate it. Fixed in r364949. I think it didn't crash on boot for me because kldxref failed due to the segment thing so devmatch didn't run which would have triggered this bug. devinfo did trigger a very similar crash, and r364949 fixes that crash. Even a new kldxref failed due to the too many segments thing, so I can't confirm that's what you hit, but I'm pretty sure it is... Warner > atal trap 12: page fault while in kernel mode > cpuid = 0; apic id = 00 > fault virtual address = 0x0 > fault code = supervisor read data, page not present > instruction pointer = 0x20:0xffffffff805b0a7f > stack pointer = 0x28:0xfffffe002366a7f0 > frame pointer = 0x28:0xfffffe002366a7f0 > code segment = base 0x0, limit 0xfffff, type 0x1b > = DPL 0, pres 1, long 1, def32 0, gran 1 > processor eflags = interrupt enabled, resume, IOPL = 0 > current process = 89 (devmatch) > trap number = 12 > panic: page fault > cpuid = 0 > time = 1598692135 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame > 0xfffffe002366a4a0 > vpanic() at vpanic+0x182/frame 0xfffffe002366a4f0 > panic() at panic+0x43/frame 0xfffffe002366a550 > trap_fatal() at trap_fatal+0x387/frame 0xfffffe002366a5b0 > trap_pfault() at trap_pfault+0x4f/frame 0xfffffe002366a610 > trap() at trap+0x27d/frame 0xfffffe002366a720 > calltrap() at calltrap+0x8/frame 0xfffffe002366a720 > --- trap 0xc, rip = 0xffffffff805b0a7f, rsp = 0xfffffe002366a7f0, rbp > = 0xfffffe002366a7f0 --- > strlen() at strlen+0x1f/frame 0xfffffe002366a7f0 > sbuf_cat() at sbuf_cat+0x15/frame 0xfffffe002366a810 > sysctl_devices() at sysctl_devices+0x104/frame 0xfffffe002366a8a0 > sysctl_root_handler_locked() at sysctl_root_handler_locked+0x91/frame > 0xfffffe002366a8f0 > sysctl_root() at sysctl_root+0x249/frame 0xfffffe002366a970 > userland_sysctl() at userland_sysctl+0x170/frame 0xfffffe002366aa20 > sys___sysctl() at sys___sysctl+0x5f/frame 0xfffffe002366aad0 > amd64_syscall() at amd64_syscall+0x10c/frame 0xfffffe002366abf0 > fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe002366abf0 > --- syscall (202, FreeBSD ELF64, sys___sysctl), rip = 0x80041c0ea, rsp > = 0x7fffffffda78, rbp = 0x7fffffffdab0 --- > KDB: enter: panic > [ thread pid 89 tid 100067 ] > Stopped at kdb_enter+0x37: movq $0,0x7e2616(%rip) > > > On 8/29/20, Warner Losh wrote: > > Author: imp > > Date: Sat Aug 29 04:30:12 2020 > > New Revision: 364946 > > URL: https://svnweb.freebsd.org/changeset/base/364946 > > > > Log: > > Move to using sbuf for some sysctl in newbus > > > > Convert two different sysctl to using sbuf. First, for all the default > > sysctls we implement for each device driver that's attached. This is a > > pure sbuf conversion. > > > > Second, convert sysctl_devices to fill its buffer with sbuf rather > > than a hand-rolled crappy thing I wrote years ago. > > > > Reviewed by: cem, markj > > Differential Revision: https://reviews.freebsd.org/D26206 > > > > Modified: > > head/sys/kern/subr_bus.c > > > > Modified: head/sys/kern/subr_bus.c > > > ============================================================================== > > --- head/sys/kern/subr_bus.c Sat Aug 29 04:30:06 2020 (r364945) > > +++ head/sys/kern/subr_bus.c Sat Aug 29 04:30:12 2020 (r364946) > > @@ -260,36 +260,33 @@ enum { > > static int > > device_sysctl_handler(SYSCTL_HANDLER_ARGS) > > { > > + struct sbuf sb; > > device_t dev = (device_t)arg1; > > - const char *value; > > - char *buf; > > int error; > > > > - buf = NULL; > > + sbuf_new_for_sysctl(&sb, NULL, 1024, req); > > switch (arg2) { > > case DEVICE_SYSCTL_DESC: > > - value = dev->desc ? dev->desc : ""; > > + sbuf_cpy(&sb, dev->desc ? dev->desc : ""); > > break; > > case DEVICE_SYSCTL_DRIVER: > > - value = dev->driver ? dev->driver->name : ""; > > + sbuf_cpy(&sb, dev->driver ? dev->driver->name : ""); > > break; > > case DEVICE_SYSCTL_LOCATION: > > - value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO); > > - bus_child_location_str(dev, buf, 1024); > > + bus_child_location_sb(dev, &sb); > > break; > > case DEVICE_SYSCTL_PNPINFO: > > - value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO); > > - bus_child_pnpinfo_str(dev, buf, 1024); > > + bus_child_pnpinfo_sb(dev, &sb); > > break; > > case DEVICE_SYSCTL_PARENT: > > - value = dev->parent ? dev->parent->nameunit : ""; > > + sbuf_cpy(&sb, dev->parent ? dev->parent->nameunit : ""); > > break; > > default: > > + sbuf_delete(&sb); > > return (EINVAL); > > } > > - error = SYSCTL_OUT_STR(req, value); > > - if (buf != NULL) > > - free(buf, M_BUS); > > + error = sbuf_finish(&sb); > > + sbuf_delete(&sb); > > return (error); > > } > > > > @@ -5464,13 +5461,13 @@ SYSCTL_PROC(_hw_bus, OID_AUTO, info, > CTLTYPE_STRUCT > > | > > static int > > sysctl_devices(SYSCTL_HANDLER_ARGS) > > { > > + struct sbuf sb; > > int *name = (int *)arg1; > > u_int namelen = arg2; > > int index; > > device_t dev; > > struct u_device *udev; > > int error; > > - char *walker, *ep; > > > > if (namelen != 2) > > return (EINVAL); > > @@ -5501,34 +5498,21 @@ sysctl_devices(SYSCTL_HANDLER_ARGS) > > udev->dv_devflags = dev->devflags; > > udev->dv_flags = dev->flags; > > udev->dv_state = dev->state; > > - walker = udev->dv_fields; > > - ep = walker + sizeof(udev->dv_fields); > > -#define CP(src) \ > > - if ((src) == NULL) \ > > - *walker++ = '\0'; \ > > - else { \ > > - strlcpy(walker, (src), ep - walker); \ > > - walker += strlen(walker) + 1; \ > > - } \ > > - if (walker >= ep) \ > > - break; > > - > > - do { > > - CP(dev->nameunit); > > - CP(dev->desc); > > - CP(dev->driver != NULL ? dev->driver->name : NULL); > > - bus_child_pnpinfo_str(dev, walker, ep - walker); > > - walker += strlen(walker) + 1; > > - if (walker >= ep) > > - break; > > - bus_child_location_str(dev, walker, ep - walker); > > - walker += strlen(walker) + 1; > > - if (walker >= ep) > > - break; > > - *walker++ = '\0'; > > - } while (0); > > -#undef CP > > - error = SYSCTL_OUT(req, udev, sizeof(*udev)); > > + sbuf_new(&sb, udev->dv_fields, sizeof(udev->dv_fields), > SBUF_FIXEDLEN); > > + sbuf_cat(&sb, dev->nameunit); > > + sbuf_putc(&sb, '\0'); > > + sbuf_cat(&sb, dev->desc); > > + sbuf_putc(&sb, '\0'); > > + sbuf_cat(&sb, dev->driver != NULL ? dev->driver->name : '\0'); > > + sbuf_putc(&sb, '\0'); > > + bus_child_pnpinfo_sb(dev, &sb); > > + sbuf_putc(&sb, '\0'); > > + bus_child_location_sb(dev, &sb); > > + sbuf_putc(&sb, '\0'); > > + error = sbuf_finish(&sb); > > + if (error == 0) > > + error = SYSCTL_OUT(req, udev, sizeof(*udev)); > > + sbuf_delete(&sb); > > free(udev, M_BUS); > > return (error); > > } > > > > > -- > Mateusz Guzik >