From patchwork Mon Dec 3 14:34:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10709693 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AD1E115A6 for ; Mon, 3 Dec 2018 14:34:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9EB672AEF4 for ; Mon, 3 Dec 2018 14:34:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 934562AF06; Mon, 3 Dec 2018 14:34:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43DAA2AEF4 for ; Mon, 3 Dec 2018 14:34:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726638AbeLCOf4 (ORCPT ); Mon, 3 Dec 2018 09:35:56 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53461 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726028AbeLCOf4 (ORCPT ); Mon, 3 Dec 2018 09:35:56 -0500 Received: by mail-wm1-f65.google.com with SMTP id y1so6046840wmi.3 for ; Mon, 03 Dec 2018 06:34:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d//qVM9jVpSOvUd5ZS6wDI+lA9i/aX+EmIvbG/vCXc0=; b=a1k2URuphLaMOwGgQQaBkrwwXKl42uXWb1evtCnCzMv3qSQiv5snKrD9xSjM/f7vDv 2JZG5QOsNM3+MSVHC63eJPIDj0p7GlvKcOKsKnj8h2E1dT055etB2Y33wpNliwdNzE3u L6JbOWTQ8ek/duEQY8kGMMkEby4cpIsPDUjDykZU4i4o2G7JkusfaXUzAv0G9XNjJAJK +Lo9VA6SyFLzXas9A/wxKZPif1PldlAhxLavsghEG0Rq7ZnQtTnnV1GzlqqtvLUzT83F lV6hI6aCuK2dJkd2uBu7NrxmM3I9dhyh9izY9IDuP4uuXb4kXOtcDXJV8FaJZIEEt4mz jCXw== X-Gm-Message-State: AA+aEWYHp4yKy/6dA6pscMsjeLoQSKKsYcmScAOQId6PtT0tP47cvM8V iuWxVGWBZE+R715wM6/MWq9VGs5IFsE= X-Google-Smtp-Source: AFSGD/Uk9an8eAXxSr4PLcJhOoheB913r0pQe3YGMVz82GumrQSeqSZuMb93ogkM4tI2crSIS4nFcw== X-Received: by 2002:a1c:9803:: with SMTP id a3mr8916355wme.69.1543847680614; Mon, 03 Dec 2018 06:34:40 -0800 (PST) Received: from localhost.localdomain ([151.66.39.232]) by smtp.gmail.com with ESMTPSA id c77sm9911023wmh.12.2018.12.03.06.34.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Dec 2018 06:34:39 -0800 (PST) From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org Subject: [PATCH 1/2] mt76: dma: do not build skb if reported len does not fit in buf_size Date: Mon, 3 Dec 2018 15:34:24 +0100 Message-Id: <0583d3f607ef493df9a2ff12bbe773174008027d.1543846816.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Precompute data length in order to avoid to allocate the related skb data structure if reported length does not fit in queue buf_size Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/dma.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c index b7fd2e110663..1db163c40dcf 100644 --- a/drivers/net/wireless/mediatek/mt76/dma.c +++ b/drivers/net/wireless/mediatek/mt76/dma.c @@ -417,10 +417,9 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, static int mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) { + int len, data_len, done = 0; struct sk_buff *skb; unsigned char *data; - int len; - int done = 0; bool more; while (done < budget) { @@ -430,7 +429,12 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) if (!data) break; - if (q->buf_size < len + q->buf_offset) { + if (q->rx_head) + data_len = q->buf_size; + else + data_len = SKB_WITH_OVERHEAD(q->buf_size); + + if (data_len < len + q->buf_offset) { dev_kfree_skb(q->rx_head); q->rx_head = NULL; @@ -448,12 +452,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) skb_free_frag(data); continue; } - skb_reserve(skb, q->buf_offset); - if (skb->tail + len > skb->end) { - dev_kfree_skb(skb); - continue; - } if (q == &dev->q_rx[MT_RXQ_MCU]) { u32 *rxfce = (u32 *) skb->cb; From patchwork Mon Dec 3 14:34:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10709695 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 072FD15A6 for ; Mon, 3 Dec 2018 14:34:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECC5A2AEF4 for ; Mon, 3 Dec 2018 14:34:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E12282AF06; Mon, 3 Dec 2018 14:34:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA3CD2AEF4 for ; Mon, 3 Dec 2018 14:34:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726653AbeLCOf7 (ORCPT ); Mon, 3 Dec 2018 09:35:59 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39421 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726028AbeLCOf6 (ORCPT ); Mon, 3 Dec 2018 09:35:58 -0500 Received: by mail-wm1-f68.google.com with SMTP id f81so3497259wmd.4 for ; Mon, 03 Dec 2018 06:34:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=msJbzeL7JL+n07PYTSAFbAgFda6kwH4oemDnatrAGPQ=; b=CKaP8DdjgID7fDOML7cllBkO1GiGt50cyRDv6716IriTyWMkbfjaovzng9PZotOdKE 625OMfnBAwDrL2FU6M7KThc1PmGCykf99ADStrbY8P/3bbNaiDNmvOM5HldpzPsEN74M TlrxCdFDc7csbqoiqxK8CUYF7lXahXiKOQXy0wtypQE+pVzDD8Cb6Uljvg9PlFQ8YE5M Mk1NA1av/nqIu5npzuI+fdAFKu0/G5UQo5+9gQkIkCQho+wA1NINgsosIxgO2P6kTff0 cPJxBOZk9Bmv/1pD0q7qQAoJ0/od0pwO63ws/6ypif7eq2GZcM5RkBoZV1k+I2v88mtB TXoQ== X-Gm-Message-State: AA+aEWbrLPEd3WuIbq0NBdEq5CHSATOpfoEXLjoIg8ALwbRaBGPYiC+N Q1/szT60Kt3waQ6hpdIp8GDrLy0//to= X-Google-Smtp-Source: AFSGD/XfNAdjm6GdXcbUMhhUlbQtKjd4Bzrc1a1QJJuxl+X3eg4KozEsg3ZB52T6/DX5QgDkWH8aSA== X-Received: by 2002:a1c:dd06:: with SMTP id u6mr8249248wmg.81.1543847683042; Mon, 03 Dec 2018 06:34:43 -0800 (PST) Received: from localhost.localdomain ([151.66.39.232]) by smtp.gmail.com with ESMTPSA id c77sm9911023wmh.12.2018.12.03.06.34.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Dec 2018 06:34:42 -0800 (PST) From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org Subject: [PATCH 2/2] mt76: dma: add rx buffer recycle support Date: Mon, 3 Dec 2018 15:34:25 +0100 Message-Id: <8c05c03018ca9f98047ff961028f09da2e1565d0.1543846816.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for recycling rx buffers if they are not forwarded to network stack instead of reallocate them from scratch Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/dma.c | 60 +++++++++++++++++++++-- drivers/net/wireless/mediatek/mt76/mt76.h | 3 ++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c index 1db163c40dcf..eceadfa3f980 100644 --- a/drivers/net/wireless/mediatek/mt76/dma.c +++ b/drivers/net/wireless/mediatek/mt76/dma.c @@ -39,6 +39,15 @@ mt76_dma_alloc_queue(struct mt76_dev *dev, struct mt76_queue *q) if (!q->entry) return -ENOMEM; + /* allocate recycle buffer ring */ + if (q == &dev->q_rx[MT_RXQ_MCU] || + q == &dev->q_rx[MT_RXQ_MAIN]) { + size = q->ndesc * sizeof(*q->recycle); + q->recycle = devm_kzalloc(dev->dev, size, GFP_KERNEL); + if (!q->recycle) + return -ENOMEM; + } + /* clear descriptors */ for (i = 0; i < q->ndesc; i++) q->desc[i].ctrl = cpu_to_le32(MT_DMA_CTL_DMA_DONE); @@ -317,6 +326,49 @@ int mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q, } EXPORT_SYMBOL_GPL(mt76_dma_tx_queue_skb); +/* caller must hold mt76_queue spinlock */ +static u8 *mt76_dma_get_free_buf(struct mt76_queue *q, bool flush) +{ + if (q->recycle[q->rhead] || flush) { + u8 *buff = q->recycle[q->rhead]; + + q->recycle[q->rhead] = NULL; + q->rhead = (q->rhead + 1) % q->ndesc; + return buff; + } + + return page_frag_alloc(&q->rx_page, q->buf_size, GFP_ATOMIC); +} + +static void +mt76_dma_set_recycle_buf(struct mt76_queue *q, u8 *data) +{ + spin_lock_bh(&q->lock); + if (!q->recycle[q->rtail]) { + q->recycle[q->rtail] = data; + q->rtail = (q->rtail + 1) % q->ndesc; + } else { + skb_free_frag(data); + } + spin_unlock_bh(&q->lock); +} + +static void +mt76_dma_free_recycle_ring(struct mt76_queue *q) +{ + u8 *buf; + + spin_lock_bh(&q->lock); + while (true) { + buf = mt76_dma_get_free_buf(q, true); + if (!buf) + break; + + skb_free_frag(buf); + } + spin_unlock_bh(&q->lock); +} + static int mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) { @@ -332,7 +384,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) while (q->queued < q->ndesc - 1) { struct mt76_queue_buf qbuf; - buf = page_frag_alloc(&q->rx_page, q->buf_size, GFP_ATOMIC); + buf = mt76_dma_get_free_buf(q, false); if (!buf) break; @@ -373,6 +425,8 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q) } while (1); spin_unlock_bh(&q->lock); + mt76_dma_free_recycle_ring(q); + if (!q->rx_page.va) return; @@ -438,7 +492,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) dev_kfree_skb(q->rx_head); q->rx_head = NULL; - skb_free_frag(data); + mt76_dma_set_recycle_buf(q, data); continue; } @@ -449,7 +503,7 @@ mt76_dma_rx_process(struct mt76_dev *dev, struct mt76_queue *q, int budget) skb = build_skb(data, q->buf_size); if (!skb) { - skb_free_frag(data); + mt76_dma_set_recycle_buf(q, data); continue; } skb_reserve(skb, q->buf_offset); diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index 5cd508a68609..95546c744494 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -114,6 +114,9 @@ struct mt76_queue { spinlock_t lock; struct mt76_queue_entry *entry; struct mt76_desc *desc; + /* recycle ring */ + u16 rhead, rtail; + u8 **recycle; struct list_head swq; int swq_queued;