From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57AB2279DD8 for ; Tue, 1 Jul 2025 16:33:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751387594; cv=none; b=M7XX6u6K7av9aNBSabvJBzp0xoGiOrFc5U8fQOQBJZDhtyWakzQM3OfLvIXv42mSDQUZbLpNuPcl8sCirY/PR1flyqqX9kM90/Kgcy1KDqxNHd8cTsTDdYx0GkyyAgFoUHg146DVIeHfFKfqD1exYjV4RJzPuZYjQM7EghG/zQ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751387594; c=relaxed/simple; bh=cYcTvErTdUiGz4HGSo3g3lV+5DJH+CuVIJXqNpULwPg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=HnPiseRFxPhyXGMBYOK4VSmWo+mBuFBy0QdEXQonevLGjG6/Y4ZMy0MjZiNCcBFJ1SL0c7uCFbfE4/x8YtdkhYh8Y1twBWKFtDF9CGCqHN0cOqRaQe1rCWo2lKZ5yy1elBVfmgnmVvywjUSBMmpmKlxovPXh/wWB6GFoTmTSdNE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Ju+xTz/G; arc=none smtp.client-ip=95.215.58.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Ju+xTz/G" Message-ID: <7752e805-0a06-46ed-b4ac-a51081a73f78@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1751387579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j04zcoZXlPQ2qOZxAyDtyKIp/7+XM+QSiGk1gGR0QUc=; b=Ju+xTz/G5fb+wlJYkXEWRGHEdx3g5TOUDlmIH2PwBRPG4cQMJTl6eX/sqDpUGXVxFEkgBC Bla3HiZYfX21Sl+v4RhprTORRrTEgRIOJeeN9eDj8TlE8KEfZY5IpB5Vur9C7ZVPT6PXw8 ToHrkIH3HW+qSrP4qbfirHzI3OBhGSE= Date: Tue, 1 Jul 2025 12:32:51 -0400 Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH net-next v2 11/18] net: macb: single dma_alloc_coherent() for DMA descriptors To: =?UTF-8?Q?Th=C3=A9o_Lebrun?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Nicolas Ferre , Claudiu Beznea , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Samuel Holland , Richard Cochran , Russell King , Thomas Bogendoerfer , Vladimir Kondratiev , Gregory CLEMENT , Cyrille Pitchen , Harini Katakam , Rafal Ozieblo , Haavard Skinnemoen , Jeff Garzik Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mips@vger.kernel.org, Thomas Petazzoni , Tawfik Bayouk References: <20250627-macb-v2-0-ff8207d0bb77@bootlin.com> <20250627-macb-v2-11-ff8207d0bb77@bootlin.com> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Sean Anderson In-Reply-To: <20250627-macb-v2-11-ff8207d0bb77@bootlin.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT On 6/27/25 05:08, Théo Lebrun wrote: > Move from two (Tx/Rx) dma_alloc_coherent() for DMA descriptor rings *per > queue* to two dma_alloc_coherent() overall. > > Issue is with how all queues share the same register for configuring the > upper 32-bits of Tx/Rx descriptor rings. For example, with Tx, notice > how TBQPH does *not* depend on the queue index: > > #define GEM_TBQP(hw_q) (0x0440 + ((hw_q) << 2)) > #define GEM_TBQPH(hw_q) (0x04C8) > > queue_writel(queue, TBQP, lower_32_bits(queue->tx_ring_dma)); > #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT > if (bp->hw_dma_cap & HW_DMA_CAP_64B) > queue_writel(queue, TBQPH, upper_32_bits(queue->tx_ring_dma)); > #endif > > To maxime our chances of getting valid DMA addresses, we do a single maximize > dma_alloc_coherent() across queues. Is there really any chance involved (other than avoiding ENOMEM)? > This improves the odds because > alloc_pages() guarantees natural alignment. It cannot ensure valid DMA > addresses because of IOMMU or codepaths that don't go through > alloc_pages(). > > We error out if all rings don't have the same upper 32 bits, which is > better than the current (theoretical, not reproduced) silent corruption > caused by hardware that accesses invalid addresses. I think this is addressed by the previous patch. > Two considerations: > - dma_alloc_coherent() gives us page alignment. Here we remove this > containst meaning each queue's ring won't be page-aligned anymore. constraint > - This can save some memory. Less allocations means less overhead fewer > (constant cost per alloc) and less wasted bytes due to alignment > constraints. I think it's probably a bit of a wash with reasonably-sized rings. Although the prefetch probably interacts poorly with the default "round" power-of-two ring sizes. > Fixes: 02c958dd3446 ("net/macb: add TX multiqueue support for gem") > Signed-off-by: Théo Lebrun > --- > drivers/net/ethernet/cadence/macb_main.c | 83 ++++++++++++++++++-------------- > 1 file changed, 46 insertions(+), 37 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index d3b3635998cad095246edf8a75faebbcf7115355..48b75d95861317b9925b366446c7572c7e186628 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -2445,33 +2445,32 @@ static void macb_free_rx_buffers(struct macb *bp) > > static void macb_free_consistent(struct macb *bp) > { > - struct macb_queue *queue; > + size_t size, tx_size_per_queue, rx_size_per_queue; > + struct macb_queue *queue, *queue0 = bp->queues; > + struct device *dev = &bp->pdev->dev; > unsigned int q; > - int size; > > if (bp->rx_ring_tieoff) { > - dma_free_coherent(&bp->pdev->dev, macb_dma_desc_get_size(bp), > + dma_free_coherent(dev, macb_dma_desc_get_size(bp), > bp->rx_ring_tieoff, bp->rx_ring_tieoff_dma); > bp->rx_ring_tieoff = NULL; > } > > bp->macbgem_ops.mog_free_rx_buffers(bp); > > + tx_size_per_queue = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch; > + size = bp->num_queues * tx_size_per_queue; Can you refactor the size calculation into a helper function? > + dma_free_coherent(dev, size, queue0->tx_ring, queue0->tx_ring_dma); > + > + rx_size_per_queue = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch; > + size = bp->num_queues * rx_size_per_queue; > + dma_free_coherent(dev, size, queue0->rx_ring, queue0->rx_ring_dma); > + > for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { > kfree(queue->tx_skb); > queue->tx_skb = NULL; > - if (queue->tx_ring) { > - size = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch; > - dma_free_coherent(&bp->pdev->dev, size, > - queue->tx_ring, queue->tx_ring_dma); > - queue->tx_ring = NULL; > - } > - if (queue->rx_ring) { > - size = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch; > - dma_free_coherent(&bp->pdev->dev, size, > - queue->rx_ring, queue->rx_ring_dma); > - queue->rx_ring = NULL; > - } > + queue->tx_ring = NULL; /* Single buffer owned by queue0 */ > + queue->rx_ring = NULL; /* Single buffer owned by queue0 */ OK, but queue0 doesn't own the ring either at this point (it's free'd). > } > } > > @@ -2513,37 +2512,47 @@ static int macb_alloc_rx_buffers(struct macb *bp) > > static int macb_alloc_consistent(struct macb *bp) > { > + size_t size, tx_size_per_queue, rx_size_per_queue; > + dma_addr_t tx_dma, rx_dma; > + struct device *dev = &bp->pdev->dev; > struct macb_queue *queue; > unsigned int q; > - int size; > + void *tx, *rx; > + > + /* > + * Upper 32-bits of Tx/Rx DMA descriptor for each queues much match! > + * We cannot enforce this guarantee, the best we can do is do a single > + * allocation and hope it will land into alloc_pages() that guarantees > + * natural alignment of physical addresses. > + */ > + > + tx_size_per_queue = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch; > + size = bp->num_queues * tx_size_per_queue; > + tx = dma_alloc_coherent(dev, size, &tx_dma, GFP_KERNEL); > + if (!tx || upper_32_bits(tx_dma) != upper_32_bits(tx_dma + size - 1)) > + goto out_err; > + netdev_dbg(bp->dev, "Allocated %zu bytes for %u TX rings at %08lx (mapped %p)\n", > + size, bp->num_queues, (unsigned long)tx_dma, tx); > + > + rx_size_per_queue = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch; > + size = bp->num_queues * rx_size_per_queue; > + rx = dma_alloc_coherent(dev, size, &rx_dma, GFP_KERNEL); > + if (!rx || upper_32_bits(rx_dma) != upper_32_bits(rx_dma + size - 1)) > + goto out_err; > + netdev_dbg(bp->dev, "Allocated %zu bytes for %u RX rings at %08lx (mapped %p)\n", > + size, bp->num_queues, (unsigned long)rx_dma, rx); > > for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { > - size = TX_RING_BYTES(bp) + bp->tx_bd_rd_prefetch; > - queue->tx_ring = dma_alloc_coherent(&bp->pdev->dev, size, > - &queue->tx_ring_dma, > - GFP_KERNEL); > - if (!queue->tx_ring || > - upper_32_bits(queue->tx_ring_dma) != upper_32_bits(bp->queues->tx_ring_dma)) > - goto out_err; > - netdev_dbg(bp->dev, > - "Allocated TX ring for queue %u of %d bytes at %08lx (mapped %p)\n", > - q, size, (unsigned long)queue->tx_ring_dma, > - queue->tx_ring); > + queue->tx_ring = tx + tx_size_per_queue * q; > + queue->tx_ring_dma = tx_dma + tx_size_per_queue * q; > + > + queue->rx_ring = rx + rx_size_per_queue * q; > + queue->rx_ring_dma = rx_dma + rx_size_per_queue * q; > > size = bp->tx_ring_size * sizeof(struct macb_tx_skb); > queue->tx_skb = kmalloc(size, GFP_KERNEL); > if (!queue->tx_skb) > goto out_err; > - > - size = RX_RING_BYTES(bp) + bp->rx_bd_rd_prefetch; > - queue->rx_ring = dma_alloc_coherent(&bp->pdev->dev, size, > - &queue->rx_ring_dma, GFP_KERNEL); > - if (!queue->rx_ring || > - upper_32_bits(queue->rx_ring_dma) != upper_32_bits(bp->queues->rx_ring_dma)) > - goto out_err; > - netdev_dbg(bp->dev, > - "Allocated RX ring of %d bytes at %08lx (mapped %p)\n", > - size, (unsigned long)queue->rx_ring_dma, queue->rx_ring); > } > if (bp->macbgem_ops.mog_alloc_rx_buffers(bp)) > goto out_err; > Reviewed-by: Sean Anderson From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12217C7EE30 for ; Tue, 1 Jul 2025 19:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=b2aEIvIzZyHIbbk6f91XfluKnCqbzRElLDsuB9kllWI=; b=RICqfApGygPNx1 va9SqsGOmdytU7EfPYCtxIq0mWoZVjLDiexkAmYVAJdg+owYj/lwEsx0dFgnowjYZxR8L445fd99R B41LWLvfghr2X5pFkKQ1RRvMDr2XOGYax0wkh4jUsiHF2OaP5hUWYzvCA4PfFPi10czAHAgXYUJjE pgF5FbgEjY4m2AD7kvkc7bmPp/k1hAJI88etfmNwtCl7LFFYx1gr658k7HvJRaA/qlrbZvLerUFHX YZKtxrI4refS7Jo1IcKgcYHBlcE7RGdXbZ0OhgRKd5mNIA+0rllsX2juPfzUvKlU/EG3bB1ivVKNw 67bocqepgCElXqWq5MBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uWgDV-00000006PHR-1m6d; Tue, 01 Jul 2025 19:00:29 +0000 Received: from out-189.mta1.migadu.com ([95.215.58.189]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uWduo-000000063NK-0ksH for linux-riscv@lists.infradead.org; Tue, 01 Jul 2025 16:33:03 +0000 Message-ID: <7752e805-0a06-46ed-b4ac-a51081a73f78@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1751387579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j04zcoZXlPQ2qOZxAyDtyKIp/7+XM+QSiGk1gGR0QUc=; b=Ju+xTz/G5fb+wlJYkXEWRGHEdx3g5TOUDlmIH2PwBRPG4cQMJTl6eX/sqDpUGXVxFEkgBC Bla3HiZYfX21Sl+v4RhprTORRrTEgRIOJeeN9eDj8TlE8KEfZY5IpB5Vur9C7ZVPT6PXw8 ToHrkIH3HW+qSrP4qbfirHzI3OBhGSE= Date: Tue, 1 Jul 2025 12:32:51 -0400 MIME-Version: 1.0 Subject: Re: [PATCH net-next v2 11/18] net: macb: single dma_alloc_coherent() for DMA descriptors To: =?UTF-8?Q?Th=C3=A9o_Lebrun?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Nicolas Ferre , Claudiu Beznea , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Samuel Holland , Richard Cochran , Russell King , Thomas Bogendoerfer , Vladimir Kondratiev , Gregory CLEMENT , Cyrille Pitchen , Harini Katakam , Rafal Ozieblo , Haavard Skinnemoen , Jeff Garzik Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-mips@vger.kernel.org, Thomas Petazzoni , Tawfik Bayouk References: <20250627-macb-v2-0-ff8207d0bb77@bootlin.com> <20250627-macb-v2-11-ff8207d0bb77@bootlin.com> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Sean Anderson In-Reply-To: <20250627-macb-v2-11-ff8207d0bb77@bootlin.com> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250701_093302_506528_2BC5A5D6 X-CRM114-Status: GOOD ( 29.72 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org T24gNi8yNy8yNSAwNTowOCwgVGjDqW8gTGVicnVuIHdyb3RlOgo+IE1vdmUgZnJvbSB0d28gKFR4 L1J4KSBkbWFfYWxsb2NfY29oZXJlbnQoKSBmb3IgRE1BIGRlc2NyaXB0b3IgcmluZ3MgKnBlcgo+ IHF1ZXVlKiB0byB0d28gZG1hX2FsbG9jX2NvaGVyZW50KCkgb3ZlcmFsbC4KPiAKPiBJc3N1ZSBp cyB3aXRoIGhvdyBhbGwgcXVldWVzIHNoYXJlIHRoZSBzYW1lIHJlZ2lzdGVyIGZvciBjb25maWd1 cmluZyB0aGUKPiB1cHBlciAzMi1iaXRzIG9mIFR4L1J4IGRlc2NyaXB0b3IgcmluZ3MuIEZvciBl eGFtcGxlLCB3aXRoIFR4LCBub3RpY2UKPiBob3cgVEJRUEggZG9lcyAqbm90KiBkZXBlbmQgb24g dGhlIHF1ZXVlIGluZGV4Ogo+IAo+IAkjZGVmaW5lIEdFTV9UQlFQKGh3X3EpCQkoMHgwNDQwICsg KChod19xKSA8PCAyKSkKPiAJI2RlZmluZSBHRU1fVEJRUEgoaHdfcSkJCSgweDA0QzgpCj4gCj4g CXF1ZXVlX3dyaXRlbChxdWV1ZSwgVEJRUCwgbG93ZXJfMzJfYml0cyhxdWV1ZS0+dHhfcmluZ19k bWEpKTsKPiAJI2lmZGVmIENPTkZJR19BUkNIX0RNQV9BRERSX1RfNjRCSVQKPiAJaWYgKGJwLT5o d19kbWFfY2FwICYgSFdfRE1BX0NBUF82NEIpCj4gCQlxdWV1ZV93cml0ZWwocXVldWUsIFRCUVBI LCB1cHBlcl8zMl9iaXRzKHF1ZXVlLT50eF9yaW5nX2RtYSkpOwo+IAkjZW5kaWYKPiAKPiBUbyBt YXhpbWUgb3VyIGNoYW5jZXMgb2YgZ2V0dGluZyB2YWxpZCBETUEgYWRkcmVzc2VzLCB3ZSBkbyBh IHNpbmdsZQoKbWF4aW1pemUKCj4gZG1hX2FsbG9jX2NvaGVyZW50KCkgYWNyb3NzIHF1ZXVlcy4K CklzIHRoZXJlIHJlYWxseSBhbnkgY2hhbmNlIGludm9sdmVkIChvdGhlciB0aGFuIGF2b2lkaW5n IEVOT01FTSk/Cgo+IFRoaXMgaW1wcm92ZXMgdGhlIG9kZHMgYmVjYXVzZQo+IGFsbG9jX3BhZ2Vz KCkgZ3VhcmFudGVlcyBuYXR1cmFsIGFsaWdubWVudC4gSXQgY2Fubm90IGVuc3VyZSB2YWxpZCBE TUEKPiBhZGRyZXNzZXMgYmVjYXVzZSBvZiBJT01NVSBvciBjb2RlcGF0aHMgdGhhdCBkb24ndCBn byB0aHJvdWdoCj4gYWxsb2NfcGFnZXMoKS4KPiAKPiBXZSBlcnJvciBvdXQgaWYgYWxsIHJpbmdz IGRvbid0IGhhdmUgdGhlIHNhbWUgdXBwZXIgMzIgYml0cywgd2hpY2ggaXMKPiBiZXR0ZXIgdGhh biB0aGUgY3VycmVudCAodGhlb3JldGljYWwsIG5vdCByZXByb2R1Y2VkKSBzaWxlbnQgY29ycnVw dGlvbgo+IGNhdXNlZCBieSBoYXJkd2FyZSB0aGF0IGFjY2Vzc2VzIGludmFsaWQgYWRkcmVzc2Vz LgoKSSB0aGluayB0aGlzIGlzIGFkZHJlc3NlZCBieSB0aGUgcHJldmlvdXMgcGF0Y2guCgo+IFR3 byBjb25zaWRlcmF0aW9uczoKPiAgLSBkbWFfYWxsb2NfY29oZXJlbnQoKSBnaXZlcyB1cyBwYWdl IGFsaWdubWVudC4gSGVyZSB3ZSByZW1vdmUgdGhpcwo+ICAgIGNvbnRhaW5zdCBtZWFuaW5nIGVh Y2ggcXVldWUncyByaW5nIHdvbid0IGJlIHBhZ2UtYWxpZ25lZCBhbnltb3JlLgoKY29uc3RyYWlu dAoKPiAgLSBUaGlzIGNhbiBzYXZlIHNvbWUgbWVtb3J5LiBMZXNzIGFsbG9jYXRpb25zIG1lYW5z IGxlc3Mgb3ZlcmhlYWQKCmZld2VyCgo+ICAgIChjb25zdGFudCBjb3N0IHBlciBhbGxvYykgYW5k IGxlc3Mgd2FzdGVkIGJ5dGVzIGR1ZSB0byBhbGlnbm1lbnQKPiAgICBjb25zdHJhaW50cy4KCkkg dGhpbmsgaXQncyBwcm9iYWJseSBhIGJpdCBvZiBhIHdhc2ggd2l0aCByZWFzb25hYmx5LXNpemVk IHJpbmdzLgpBbHRob3VnaCB0aGUgcHJlZmV0Y2ggcHJvYmFibHkgaW50ZXJhY3RzIHBvb3JseSB3 aXRoIHRoZSBkZWZhdWx0ICJyb3VuZCIKcG93ZXItb2YtdHdvIHJpbmcgc2l6ZXMuCgo+IEZpeGVz OiAwMmM5NThkZDM0NDYgKCJuZXQvbWFjYjogYWRkIFRYIG11bHRpcXVldWUgc3VwcG9ydCBmb3Ig Z2VtIikKPiBTaWduZWQtb2ZmLWJ5OiBUaMOpbyBMZWJydW4gPHRoZW8ubGVicnVuQGJvb3RsaW4u Y29tPgo+IC0tLQo+ICBkcml2ZXJzL25ldC9ldGhlcm5ldC9jYWRlbmNlL21hY2JfbWFpbi5jIHwg ODMgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDQ2 IGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L25ldC9ldGhlcm5ldC9jYWRlbmNlL21hY2JfbWFpbi5jIGIvZHJpdmVycy9uZXQvZXRoZXJuZXQv Y2FkZW5jZS9tYWNiX21haW4uYwo+IGluZGV4IGQzYjM2MzU5OThjYWQwOTUyNDZlZGY4YTc1ZmFl YmJjZjcxMTUzNTUuLjQ4Yjc1ZDk1ODYxMzE3Yjk5MjViMzY2NDQ2Yzc1NzJjN2UxODY2MjggMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9uZXQvZXRoZXJuZXQvY2FkZW5jZS9tYWNiX21haW4uYwo+ICsr KyBiL2RyaXZlcnMvbmV0L2V0aGVybmV0L2NhZGVuY2UvbWFjYl9tYWluLmMKPiBAQCAtMjQ0NSwz MyArMjQ0NSwzMiBAQCBzdGF0aWMgdm9pZCBtYWNiX2ZyZWVfcnhfYnVmZmVycyhzdHJ1Y3QgbWFj YiAqYnApCj4gIAo+ICBzdGF0aWMgdm9pZCBtYWNiX2ZyZWVfY29uc2lzdGVudChzdHJ1Y3QgbWFj YiAqYnApCj4gIHsKPiAtCXN0cnVjdCBtYWNiX3F1ZXVlICpxdWV1ZTsKPiArCXNpemVfdCBzaXpl LCB0eF9zaXplX3Blcl9xdWV1ZSwgcnhfc2l6ZV9wZXJfcXVldWU7Cj4gKwlzdHJ1Y3QgbWFjYl9x dWV1ZSAqcXVldWUsICpxdWV1ZTAgPSBicC0+cXVldWVzOwo+ICsJc3RydWN0IGRldmljZSAqZGV2 ID0gJmJwLT5wZGV2LT5kZXY7Cj4gIAl1bnNpZ25lZCBpbnQgcTsKPiAtCWludCBzaXplOwo+ICAK PiAgCWlmIChicC0+cnhfcmluZ190aWVvZmYpIHsKPiAtCQlkbWFfZnJlZV9jb2hlcmVudCgmYnAt PnBkZXYtPmRldiwgbWFjYl9kbWFfZGVzY19nZXRfc2l6ZShicCksCj4gKwkJZG1hX2ZyZWVfY29o ZXJlbnQoZGV2LCBtYWNiX2RtYV9kZXNjX2dldF9zaXplKGJwKSwKPiAgCQkJCSAgYnAtPnJ4X3Jp bmdfdGllb2ZmLCBicC0+cnhfcmluZ190aWVvZmZfZG1hKTsKPiAgCQlicC0+cnhfcmluZ190aWVv ZmYgPSBOVUxMOwo+ICAJfQo+ICAKPiAgCWJwLT5tYWNiZ2VtX29wcy5tb2dfZnJlZV9yeF9idWZm ZXJzKGJwKTsKPiAgCj4gKwl0eF9zaXplX3Blcl9xdWV1ZSA9IFRYX1JJTkdfQllURVMoYnApICsg YnAtPnR4X2JkX3JkX3ByZWZldGNoOwo+ICsJc2l6ZSA9IGJwLT5udW1fcXVldWVzICogdHhfc2l6 ZV9wZXJfcXVldWU7CgpDYW4geW91IHJlZmFjdG9yIHRoZSBzaXplIGNhbGN1bGF0aW9uIGludG8g YSBoZWxwZXIgZnVuY3Rpb24/Cgo+ICsJZG1hX2ZyZWVfY29oZXJlbnQoZGV2LCBzaXplLCBxdWV1 ZTAtPnR4X3JpbmcsIHF1ZXVlMC0+dHhfcmluZ19kbWEpOwo+ICsKPiArCXJ4X3NpemVfcGVyX3F1 ZXVlID0gUlhfUklOR19CWVRFUyhicCkgKyBicC0+cnhfYmRfcmRfcHJlZmV0Y2g7Cj4gKwlzaXpl ID0gYnAtPm51bV9xdWV1ZXMgKiByeF9zaXplX3Blcl9xdWV1ZTsKPiArCWRtYV9mcmVlX2NvaGVy ZW50KGRldiwgc2l6ZSwgcXVldWUwLT5yeF9yaW5nLCBxdWV1ZTAtPnJ4X3JpbmdfZG1hKTsKPiAr Cj4gIAlmb3IgKHEgPSAwLCBxdWV1ZSA9IGJwLT5xdWV1ZXM7IHEgPCBicC0+bnVtX3F1ZXVlczsg KytxLCArK3F1ZXVlKSB7Cj4gIAkJa2ZyZWUocXVldWUtPnR4X3NrYik7Cj4gIAkJcXVldWUtPnR4 X3NrYiA9IE5VTEw7Cj4gLQkJaWYgKHF1ZXVlLT50eF9yaW5nKSB7Cj4gLQkJCXNpemUgPSBUWF9S SU5HX0JZVEVTKGJwKSArIGJwLT50eF9iZF9yZF9wcmVmZXRjaDsKPiAtCQkJZG1hX2ZyZWVfY29o ZXJlbnQoJmJwLT5wZGV2LT5kZXYsIHNpemUsCj4gLQkJCQkJICBxdWV1ZS0+dHhfcmluZywgcXVl dWUtPnR4X3JpbmdfZG1hKTsKPiAtCQkJcXVldWUtPnR4X3JpbmcgPSBOVUxMOwo+IC0JCX0KPiAt CQlpZiAocXVldWUtPnJ4X3JpbmcpIHsKPiAtCQkJc2l6ZSA9IFJYX1JJTkdfQllURVMoYnApICsg YnAtPnJ4X2JkX3JkX3ByZWZldGNoOwo+IC0JCQlkbWFfZnJlZV9jb2hlcmVudCgmYnAtPnBkZXYt PmRldiwgc2l6ZSwKPiAtCQkJCQkgIHF1ZXVlLT5yeF9yaW5nLCBxdWV1ZS0+cnhfcmluZ19kbWEp Owo+IC0JCQlxdWV1ZS0+cnhfcmluZyA9IE5VTEw7Cj4gLQkJfQo+ICsJCXF1ZXVlLT50eF9yaW5n ID0gTlVMTDsgLyogU2luZ2xlIGJ1ZmZlciBvd25lZCBieSBxdWV1ZTAgKi8KPiArCQlxdWV1ZS0+ cnhfcmluZyA9IE5VTEw7IC8qIFNpbmdsZSBidWZmZXIgb3duZWQgYnkgcXVldWUwICovCgpPSywg YnV0IHF1ZXVlMCBkb2Vzbid0IG93biB0aGUgcmluZyBlaXRoZXIgYXQgdGhpcyBwb2ludCAoaXQn cyBmcmVlJ2QpLgoKPiAgCX0KPiAgfQo+ICAKPiBAQCAtMjUxMywzNyArMjUxMiw0NyBAQCBzdGF0 aWMgaW50IG1hY2JfYWxsb2NfcnhfYnVmZmVycyhzdHJ1Y3QgbWFjYiAqYnApCj4gIAo+ICBzdGF0 aWMgaW50IG1hY2JfYWxsb2NfY29uc2lzdGVudChzdHJ1Y3QgbWFjYiAqYnApCj4gIHsKPiArCXNp emVfdCBzaXplLCB0eF9zaXplX3Blcl9xdWV1ZSwgcnhfc2l6ZV9wZXJfcXVldWU7Cj4gKwlkbWFf YWRkcl90IHR4X2RtYSwgcnhfZG1hOwo+ICsJc3RydWN0IGRldmljZSAqZGV2ID0gJmJwLT5wZGV2 LT5kZXY7Cj4gIAlzdHJ1Y3QgbWFjYl9xdWV1ZSAqcXVldWU7Cj4gIAl1bnNpZ25lZCBpbnQgcTsK PiAtCWludCBzaXplOwo+ICsJdm9pZCAqdHgsICpyeDsKPiArCj4gKwkvKgo+ICsJICogVXBwZXIg MzItYml0cyBvZiBUeC9SeCBETUEgZGVzY3JpcHRvciBmb3IgZWFjaCBxdWV1ZXMgbXVjaCBtYXRj aCEKPiArCSAqIFdlIGNhbm5vdCBlbmZvcmNlIHRoaXMgZ3VhcmFudGVlLCB0aGUgYmVzdCB3ZSBj YW4gZG8gaXMgZG8gYSBzaW5nbGUKPiArCSAqIGFsbG9jYXRpb24gYW5kIGhvcGUgaXQgd2lsbCBs YW5kIGludG8gYWxsb2NfcGFnZXMoKSB0aGF0IGd1YXJhbnRlZXMKPiArCSAqIG5hdHVyYWwgYWxp Z25tZW50IG9mIHBoeXNpY2FsIGFkZHJlc3Nlcy4KPiArCSAqLwo+ICsKPiArCXR4X3NpemVfcGVy X3F1ZXVlID0gVFhfUklOR19CWVRFUyhicCkgKyBicC0+dHhfYmRfcmRfcHJlZmV0Y2g7Cj4gKwlz aXplID0gYnAtPm51bV9xdWV1ZXMgKiB0eF9zaXplX3Blcl9xdWV1ZTsKPiArCXR4ID0gZG1hX2Fs bG9jX2NvaGVyZW50KGRldiwgc2l6ZSwgJnR4X2RtYSwgR0ZQX0tFUk5FTCk7Cj4gKwlpZiAoIXR4 IHx8IHVwcGVyXzMyX2JpdHModHhfZG1hKSAhPSB1cHBlcl8zMl9iaXRzKHR4X2RtYSArIHNpemUg LSAxKSkKPiArCQlnb3RvIG91dF9lcnI7Cj4gKwluZXRkZXZfZGJnKGJwLT5kZXYsICJBbGxvY2F0 ZWQgJXp1IGJ5dGVzIGZvciAldSBUWCByaW5ncyBhdCAlMDhseCAobWFwcGVkICVwKVxuIiwKPiAr CQkgICBzaXplLCBicC0+bnVtX3F1ZXVlcywgKHVuc2lnbmVkIGxvbmcpdHhfZG1hLCB0eCk7Cj4g Kwo+ICsJcnhfc2l6ZV9wZXJfcXVldWUgPSBSWF9SSU5HX0JZVEVTKGJwKSArIGJwLT5yeF9iZF9y ZF9wcmVmZXRjaDsKPiArCXNpemUgPSBicC0+bnVtX3F1ZXVlcyAqIHJ4X3NpemVfcGVyX3F1ZXVl Owo+ICsJcnggPSBkbWFfYWxsb2NfY29oZXJlbnQoZGV2LCBzaXplLCAmcnhfZG1hLCBHRlBfS0VS TkVMKTsKPiArCWlmICghcnggfHwgdXBwZXJfMzJfYml0cyhyeF9kbWEpICE9IHVwcGVyXzMyX2Jp dHMocnhfZG1hICsgc2l6ZSAtIDEpKQo+ICsJCWdvdG8gb3V0X2VycjsKPiArCW5ldGRldl9kYmco YnAtPmRldiwgIkFsbG9jYXRlZCAlenUgYnl0ZXMgZm9yICV1IFJYIHJpbmdzIGF0ICUwOGx4ICht YXBwZWQgJXApXG4iLAo+ICsJCSAgIHNpemUsIGJwLT5udW1fcXVldWVzLCAodW5zaWduZWQgbG9u ZylyeF9kbWEsIHJ4KTsKPiAgCj4gIAlmb3IgKHEgPSAwLCBxdWV1ZSA9IGJwLT5xdWV1ZXM7IHEg PCBicC0+bnVtX3F1ZXVlczsgKytxLCArK3F1ZXVlKSB7Cj4gLQkJc2l6ZSA9IFRYX1JJTkdfQllU RVMoYnApICsgYnAtPnR4X2JkX3JkX3ByZWZldGNoOwo+IC0JCXF1ZXVlLT50eF9yaW5nID0gZG1h X2FsbG9jX2NvaGVyZW50KCZicC0+cGRldi0+ZGV2LCBzaXplLAo+IC0JCQkJCQkgICAgJnF1ZXVl LT50eF9yaW5nX2RtYSwKPiAtCQkJCQkJICAgIEdGUF9LRVJORUwpOwo+IC0JCWlmICghcXVldWUt PnR4X3JpbmcgfHwKPiAtCQkgICAgdXBwZXJfMzJfYml0cyhxdWV1ZS0+dHhfcmluZ19kbWEpICE9 IHVwcGVyXzMyX2JpdHMoYnAtPnF1ZXVlcy0+dHhfcmluZ19kbWEpKQo+IC0JCQlnb3RvIG91dF9l cnI7Cj4gLQkJbmV0ZGV2X2RiZyhicC0+ZGV2LAo+IC0JCQkgICAiQWxsb2NhdGVkIFRYIHJpbmcg Zm9yIHF1ZXVlICV1IG9mICVkIGJ5dGVzIGF0ICUwOGx4IChtYXBwZWQgJXApXG4iLAo+IC0JCQkg ICBxLCBzaXplLCAodW5zaWduZWQgbG9uZylxdWV1ZS0+dHhfcmluZ19kbWEsCj4gLQkJCSAgIHF1 ZXVlLT50eF9yaW5nKTsKPiArCQlxdWV1ZS0+dHhfcmluZyA9IHR4ICsgdHhfc2l6ZV9wZXJfcXVl dWUgKiBxOwo+ICsJCXF1ZXVlLT50eF9yaW5nX2RtYSA9IHR4X2RtYSArIHR4X3NpemVfcGVyX3F1 ZXVlICogcTsKPiArCj4gKwkJcXVldWUtPnJ4X3JpbmcgPSByeCArIHJ4X3NpemVfcGVyX3F1ZXVl ICogcTsKPiArCQlxdWV1ZS0+cnhfcmluZ19kbWEgPSByeF9kbWEgKyByeF9zaXplX3Blcl9xdWV1 ZSAqIHE7Cj4gIAo+ICAJCXNpemUgPSBicC0+dHhfcmluZ19zaXplICogc2l6ZW9mKHN0cnVjdCBt YWNiX3R4X3NrYik7Cj4gIAkJcXVldWUtPnR4X3NrYiA9IGttYWxsb2Moc2l6ZSwgR0ZQX0tFUk5F TCk7Cj4gIAkJaWYgKCFxdWV1ZS0+dHhfc2tiKQo+ICAJCQlnb3RvIG91dF9lcnI7Cj4gLQo+IC0J CXNpemUgPSBSWF9SSU5HX0JZVEVTKGJwKSArIGJwLT5yeF9iZF9yZF9wcmVmZXRjaDsKPiAtCQlx dWV1ZS0+cnhfcmluZyA9IGRtYV9hbGxvY19jb2hlcmVudCgmYnAtPnBkZXYtPmRldiwgc2l6ZSwK PiAtCQkJCQkJICZxdWV1ZS0+cnhfcmluZ19kbWEsIEdGUF9LRVJORUwpOwo+IC0JCWlmICghcXVl dWUtPnJ4X3JpbmcgfHwKPiAtCQkgICAgdXBwZXJfMzJfYml0cyhxdWV1ZS0+cnhfcmluZ19kbWEp ICE9IHVwcGVyXzMyX2JpdHMoYnAtPnF1ZXVlcy0+cnhfcmluZ19kbWEpKQo+IC0JCQlnb3RvIG91 dF9lcnI7Cj4gLQkJbmV0ZGV2X2RiZyhicC0+ZGV2LAo+IC0JCQkgICAiQWxsb2NhdGVkIFJYIHJp bmcgb2YgJWQgYnl0ZXMgYXQgJTA4bHggKG1hcHBlZCAlcClcbiIsCj4gLQkJCSAgIHNpemUsICh1 bnNpZ25lZCBsb25nKXF1ZXVlLT5yeF9yaW5nX2RtYSwgcXVldWUtPnJ4X3JpbmcpOwo+ICAJfQo+ ICAJaWYgKGJwLT5tYWNiZ2VtX29wcy5tb2dfYWxsb2NfcnhfYnVmZmVycyhicCkpCj4gIAkJZ290 byBvdXRfZXJyOwo+IAoKUmV2aWV3ZWQtYnk6IFNlYW4gQW5kZXJzb24gPHNlYW4uYW5kZXJzb25A bGludXguZGV2PgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KbGludXgtcmlzY3YgbWFpbGluZyBsaXN0CmxpbnV4LXJpc2N2QGxpc3RzLmluZnJhZGVhZC5v cmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1yaXNj dgo=