From owner-svn-src-head@freebsd.org Sat Jul 18 18:47:59 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 420DB370F30; Sat, 18 Jul 2020 18:47:59 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4B8H724QKTz4bn3; Sat, 18 Jul 2020 18:47:58 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id 06IIloBc062055 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 18 Jul 2020 21:47:53 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 06IIloBc062055 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id 06IIloGQ062054; Sat, 18 Jul 2020 21:47:50 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 18 Jul 2020 21:47:50 +0300 From: Konstantin Belousov To: Kristof Provost Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r363308 - head/sys/net Message-ID: <20200718184750.GY44314@kib.kiev.ua> References: <202007181243.06IChBTR073126@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202007181243.06IChBTR073126@repo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 4B8H724QKTz4bn3 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] 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, 18 Jul 2020 18:47:59 -0000 On Sat, Jul 18, 2020 at 12:43:11PM +0000, Kristof Provost wrote: > Author: kp > Date: Sat Jul 18 12:43:11 2020 > New Revision: 363308 > URL: https://svnweb.freebsd.org/changeset/base/363308 > > Log: > bridge: Don't sleep during epoch > > While it doesn't trigger INVARIANTS or WITNESS on head it does in stable/12. > There's also no reason for it, as we can easily report the out of memory error > to the caller (i.e. userspace). All of these can already fail. This makes syscalls (ioctl) fail randomly. Can you pre-allocate the buffers before entering epoch, instead ? > > PR: 248046 > MFC after: 3 days > > Modified: > head/sys/net/if_bridge.c > > Modified: head/sys/net/if_bridge.c > ============================================================================== > --- head/sys/net/if_bridge.c Sat Jul 18 12:21:08 2020 (r363307) > +++ head/sys/net/if_bridge.c Sat Jul 18 12:43:11 2020 (r363308) > @@ -1393,9 +1393,9 @@ bridge_ioctl_gifs(struct bridge_softc *sc, void *arg) > bifc->ifbic_len = buflen; > return (0); > } > - BRIDGE_UNLOCK(sc); > - outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); > - BRIDGE_LOCK(sc); > + outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO); > + if (outbuf == NULL) > + return (ENOMEM); > > count = 0; > buf = outbuf; > @@ -1455,9 +1455,9 @@ bridge_ioctl_rts(struct bridge_softc *sc, void *arg) > count++; > buflen = sizeof(bareq) * count; > > - BRIDGE_UNLOCK(sc); > - outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); > - BRIDGE_LOCK(sc); > + outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO); > + if (outbuf == NULL) > + return (ENOMEM); > > count = 0; > buf = outbuf; > @@ -1783,9 +1783,9 @@ bridge_ioctl_gifsstp(struct bridge_softc *sc, void *ar > return (0); > } > > - BRIDGE_UNLOCK(sc); > - outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); > - BRIDGE_LOCK(sc); > + outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO); > + if (outbuf == NULL) > + return (ENOMEM); > > count = 0; > buf = outbuf;