From owner-svn-src-all@freebsd.org Thu Apr 25 19:21:05 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A15515A05B6; Thu, 25 Apr 2019 19:21:05 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 3F8F996A63; Thu, 25 Apr 2019 19:21:05 +0000 (UTC) (envelope-from rysto32@gmail.com) Received: by mail-qk1-x72c.google.com with SMTP id k189so480640qkc.0; Thu, 25 Apr 2019 12:21:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=zDxOZ6gW1NzGNMmUcUQdInU1vW8YjVjLcn8ciK4jCyE=; b=GbJnQD8PGZMugWky8ux/McOmze/v/eX3vyI689Fl341Sfu0r7nv6FkSYu/fCU/1hi0 vJhJFEZnRdgjQjcYsCc+0UN7VU6BDel7vMWOcCsxzB0f+LXRxtq1qlCjjPRzFEJJrpkF n4lIVlBZosYPue/8L4liJD8jHeQzLddzdEqqIT89uYvHS5yaTGfRClLuXE4BaXYLee27 eYpgJ1/7V3dm62t50wlmP6bGWTS9FQHQ+/MM3/znwi7DqFAdr4usiqtR4Ep+bqGHEShU aY7MMUOH5yTRRRGRjVg7OESPyzwajquMZtGUUhS9KolbfHG1cYtpOwxiGCQkRbiq64QD gbAQ== 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=zDxOZ6gW1NzGNMmUcUQdInU1vW8YjVjLcn8ciK4jCyE=; b=GW1q2ETFNcaF6IMixrMKY62ew7fA50VKtNenZsXseyijL4/nHL5scuu/6rYVKgaXG0 zBHd306T5C1KPj3r5fltkLs3SE3+/bWbtL/D3EPbgiR7xUBAdBPobOQ/BbOQHQjxJt2V XUK+N/xvpOZRd1MaZvkGybACv035tHYXQuYmj2TZFNUm3l9lBR6fiRLXp/uoqhLe/Tlc WIFSz/fLNcmJE3SSBv9reelMoiQpV03JpdMdUby4z/GE+2CL0peKPKI3ZcOYcx+9pDh+ Sj3vJL4MNQSub4VgEXtpBkXZ4BfdY9D9NGvui53jwOdZtzArgDcbUfyoIFt/fU0Km39O DNEg== X-Gm-Message-State: APjAAAW29L5EyFV2sqBwGzBrr31LVAUgnhfeyGsKewe4lAOJDnoPJ2Nz WwUK+Iwcep8FFmYZQLHOZjNMP3ne8Ie8WF7pl2v78HHBPvk= X-Google-Smtp-Source: APXvYqyYPuJTFUCBTswASgBRFj+Ktox5VquLxH+4j7/oc/P9BqucPds7M7pGx6/7/uCwbV72SDQe9CtQFpZgBtbxlo8= X-Received: by 2002:a05:620a:1486:: with SMTP id w6mr10395989qkj.4.1556220064573; Thu, 25 Apr 2019 12:21:04 -0700 (PDT) MIME-Version: 1.0 References: <201904191343.x3JDhYVF010453@repo.freebsd.org> In-Reply-To: From: Ryan Stone Date: Thu, 25 Apr 2019 15:20:53 -0400 Message-ID: Subject: Re: svn commit: r346386 - in head/sys: dev/bge dev/pci dev/twa x86/iommu To: Tycho Nightingale Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, John Baldwin , Ed Maste Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 3F8F996A63 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.85 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.85)[-0.854,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, 25 Apr 2019 19:21:05 -0000 Following up, this is what will have to be re-instated in the aac driver: http://svn.freebsd.org/changeset/base/232260 However, my biggest concern is that we have no idea how many new devices with the broken behaviour might have been introduced since we fixed the problem in general. How does Linux handle the issue? On Thu, Apr 25, 2019 at 3:17 PM Ryan Stone wrote: > > This change makes me *very* uncomfortable. It was originally brought > in due to issues with Adaptec RAID cards using the aac(9) driver. The > symptoms of the bug included silent corruption of data as it was > written to disk. Are we sure that this change is a good idea, given > how catastrophic it is when a device gets this wrong? > > On Fri, Apr 19, 2019 at 9:43 AM Tycho Nightingale wrote: > > > > Author: tychon > > Date: Fri Apr 19 13:43:33 2019 > > New Revision: 346386 > > URL: https://svnweb.freebsd.org/changeset/base/346386 > > > > Log: > > remove the 4GB boundary requirement on PCI DMA segments > > > > Reviewed by: kib > > Discussed with: jhb > > Sponsored by: Dell EMC Isilon > > Differential Revision: https://reviews.freebsd.org/D19867 > > > > Modified: > > head/sys/dev/bge/if_bgereg.h > > head/sys/dev/pci/pci.c > > head/sys/dev/pci/pcivar.h > > head/sys/dev/twa/tw_osl.h > > head/sys/dev/twa/tw_osl_freebsd.c > > head/sys/x86/iommu/intel_ctx.c > > > > Modified: head/sys/dev/bge/if_bgereg.h > > ============================================================================== > > --- head/sys/dev/bge/if_bgereg.h Fri Apr 19 13:23:41 2019 (r346385) > > +++ head/sys/dev/bge/if_bgereg.h Fri Apr 19 13:43:33 2019 (r346386) > > @@ -3067,3 +3067,11 @@ struct bge_softc { > > #define BGE_LOCK_ASSERT(_sc) mtx_assert(&(_sc)->bge_mtx, MA_OWNED) > > #define BGE_UNLOCK(_sc) mtx_unlock(&(_sc)->bge_mtx) > > #define BGE_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->bge_mtx) > > + > > +#ifdef BUS_SPACE_MAXADDR > > +#if (BUS_SPACE_MAXADDR > 0xFFFFFFFF) > > +#define BGE_DMA_BOUNDARY (0x100000000) > > +#else > > +#define BGE_DMA_BOUNDARY 0 > > +#endif > > +#endif > > > > Modified: head/sys/dev/pci/pci.c > > ============================================================================== > > --- head/sys/dev/pci/pci.c Fri Apr 19 13:23:41 2019 (r346385) > > +++ head/sys/dev/pci/pci.c Fri Apr 19 13:43:33 2019 (r346386) > > @@ -4343,9 +4343,6 @@ pci_attach_common(device_t dev) > > { > > struct pci_softc *sc; > > int busno, domain; > > -#ifdef PCI_DMA_BOUNDARY > > - int error, tag_valid; > > -#endif > > #ifdef PCI_RES_BUS > > int rid; > > #endif > > @@ -4365,23 +4362,7 @@ pci_attach_common(device_t dev) > > if (bootverbose) > > device_printf(dev, "domain=%d, physical bus=%d\n", > > domain, busno); > > -#ifdef PCI_DMA_BOUNDARY > > - tag_valid = 0; > > - if (device_get_devclass(device_get_parent(device_get_parent(dev))) != > > - devclass_find("pci")) { > > - error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, > > - PCI_DMA_BOUNDARY, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, > > - NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED, > > - BUS_SPACE_MAXSIZE, 0, NULL, NULL, &sc->sc_dma_tag); > > - if (error) > > - device_printf(dev, "Failed to create DMA tag: %d\n", > > - error); > > - else > > - tag_valid = 1; > > - } > > - if (!tag_valid) > > -#endif > > - sc->sc_dma_tag = bus_get_dma_tag(dev); > > + sc->sc_dma_tag = bus_get_dma_tag(dev); > > return (0); > > } > > > > > > Modified: head/sys/dev/pci/pcivar.h > > ============================================================================== > > --- head/sys/dev/pci/pcivar.h Fri Apr 19 13:23:41 2019 (r346385) > > +++ head/sys/dev/pci/pcivar.h Fri Apr 19 13:43:33 2019 (r346386) > > @@ -693,14 +693,6 @@ int pcie_link_reset(device_t port, int pcie_location); > > > > void pci_print_faulted_dev(void); > > > > -#ifdef BUS_SPACE_MAXADDR > > -#if (BUS_SPACE_MAXADDR > 0xFFFFFFFF) > > -#define PCI_DMA_BOUNDARY 0x100000000 > > -#else > > -#define PCI_DMA_BOUNDARY 0 > > -#endif > > -#endif > > - > > #endif /* _SYS_BUS_H_ */ > > > > /* > > > > Modified: head/sys/dev/twa/tw_osl.h > > ============================================================================== > > --- head/sys/dev/twa/tw_osl.h Fri Apr 19 13:23:41 2019 (r346385) > > +++ head/sys/dev/twa/tw_osl.h Fri Apr 19 13:43:33 2019 (r346386) > > @@ -57,6 +57,12 @@ > > #define TW_OSLI_MAX_NUM_IOS (TW_OSLI_MAX_NUM_REQUESTS - 2) > > #define TW_OSLI_MAX_NUM_AENS 0x100 > > > > +#ifdef PAE > > +#define TW_OSLI_DMA_BOUNDARY (1u << 31) > > +#else > > +#define TW_OSLI_DMA_BOUNDARY ((bus_size_t)((uint64_t)1 << 32)) > > +#endif > > + > > /* Possible values of req->state. */ > > #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ > > #define TW_OSLI_REQ_STATE_BUSY 0x1 /* submitted to CL */ > > > > Modified: head/sys/dev/twa/tw_osl_freebsd.c > > ============================================================================== > > --- head/sys/dev/twa/tw_osl_freebsd.c Fri Apr 19 13:23:41 2019 (r346385) > > +++ head/sys/dev/twa/tw_osl_freebsd.c Fri Apr 19 13:43:33 2019 (r346386) > > @@ -551,7 +551,7 @@ tw_osli_alloc_mem(struct twa_softc *sc) > > /* Create the parent dma tag. */ > > if (bus_dma_tag_create(bus_get_dma_tag(sc->bus_dev), /* parent */ > > sc->alignment, /* alignment */ > > - 0, /* boundary */ > > + TW_OSLI_DMA_BOUNDARY, /* boundary */ > > BUS_SPACE_MAXADDR, /* lowaddr */ > > BUS_SPACE_MAXADDR, /* highaddr */ > > NULL, NULL, /* filter, filterarg */ > > > > Modified: head/sys/x86/iommu/intel_ctx.c > > ============================================================================== > > --- head/sys/x86/iommu/intel_ctx.c Fri Apr 19 13:23:41 2019 (r346385) > > +++ head/sys/x86/iommu/intel_ctx.c Fri Apr 19 13:43:33 2019 (r346386) > > @@ -130,7 +130,7 @@ ctx_tag_init(struct dmar_ctx *ctx, device_t dev) > > maxaddr = MIN(ctx->domain->end, BUS_SPACE_MAXADDR); > > ctx->ctx_tag.common.ref_count = 1; /* Prevent free */ > > ctx->ctx_tag.common.impl = &bus_dma_dmar_impl; > > - ctx->ctx_tag.common.boundary = PCI_DMA_BOUNDARY; > > + ctx->ctx_tag.common.boundary = 0; > > ctx->ctx_tag.common.lowaddr = maxaddr; > > ctx->ctx_tag.common.highaddr = maxaddr; > > ctx->ctx_tag.common.maxsize = maxaddr; > >