From owner-svn-src-all@freebsd.org Thu Nov 14 10:12:00 2019 Return-Path: Delivered-To: svn-src-all@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 07EFF17B7E6; Thu, 14 Nov 2019 10:12:00 +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) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47DHMg1zlbz3Lb5; Thu, 14 Nov 2019 10:11: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 xAEABnDh048504 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 14 Nov 2019 12:11:52 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua xAEABnDh048504 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id xAEABnLq048503; Thu, 14 Nov 2019 12:11:49 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 14 Nov 2019 12:11:49 +0200 From: Konstantin Belousov To: Alexander Motin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r354703 - head/sys/dev/ioat Message-ID: <20191114101149.GA2707@kib.kiev.ua> References: <201911140439.xAE4dngZ032224@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201911140439.xAE4dngZ032224@repo.freebsd.org> User-Agent: Mutt/1.12.2 (2019-09-21) 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on tom.home X-Rspamd-Queue-Id: 47DHMg1zlbz3Lb5 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.990,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2019 10:12:00 -0000 On Thu, Nov 14, 2019 at 04:39:49AM +0000, Alexander Motin wrote: > Author: mav > Date: Thu Nov 14 04:39:48 2019 > New Revision: 354703 > URL: https://svnweb.freebsd.org/changeset/base/354703 > > Log: > Pass more reasonable WAIT flags to bus_dma(9) calls. > > MFC after: 2 weeks > > Modified: > head/sys/dev/ioat/ioat.c > > Modified: head/sys/dev/ioat/ioat.c > ============================================================================== > --- head/sys/dev/ioat/ioat.c Thu Nov 14 04:34:58 2019 (r354702) > +++ head/sys/dev/ioat/ioat.c Thu Nov 14 04:39:48 2019 (r354703) > @@ -555,13 +555,14 @@ ioat3_attach(device_t device) > &ioat->comp_update_tag); > > error = bus_dmamem_alloc(ioat->comp_update_tag, > - (void **)&ioat->comp_update, BUS_DMA_ZERO, &ioat->comp_update_map); > + (void **)&ioat->comp_update, BUS_DMA_ZERO | BUS_DMA_WAITOK, > + &ioat->comp_update_map); For waitok, you need to provide locking function in the tag. > if (ioat->comp_update == NULL) > return (ENOMEM); > > error = bus_dmamap_load(ioat->comp_update_tag, ioat->comp_update_map, > ioat->comp_update, sizeof(uint64_t), ioat_comp_update_map, ioat, > - 0); > + BUS_DMA_NOWAIT); > if (error != 0) > return (error); > > @@ -582,7 +583,7 @@ ioat3_attach(device_t device) > return (error); > > error = bus_dmamap_load(ioat->hw_desc_tag, ioat->hw_desc_map, hw_desc, > - ringsz, ioat_dmamap_cb, &ioat->hw_desc_bus_addr, BUS_DMA_WAITOK); > + ringsz, ioat_dmamap_cb, &ioat->hw_desc_bus_addr, BUS_DMA_NOWAIT); > if (error) > return (error); >