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 X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CAB7C47247 for ; Sat, 9 May 2020 00:38:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2657F20746 for ; Sat, 9 May 2020 00:38:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588984720; bh=JYE9+M/aG072dPIHuxuvk9POKsJEMF02ttHiR9oDgzk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=GqDKSdAC5DrCjbcLmS+2+ZDtD3gNWlenL58+wkYex7qCt5VeAYX6X5OORAMhb259J SK2vrzyfCefrbi9YTFNK2gixZ/0i199s/5Gm3vuEeMkDwnc/s7TlX68MC+cWgzS+l2 jal5FS02j8VuykogzMylXOZymsGGGJbV4kz+AdWM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728487AbgEIAij (ORCPT ); Fri, 8 May 2020 20:38:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:50808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727984AbgEIAif (ORCPT ); Fri, 8 May 2020 20:38:35 -0400 Received: from kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com (unknown [163.114.132.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0AF3620746; Sat, 9 May 2020 00:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588984715; bh=JYE9+M/aG072dPIHuxuvk9POKsJEMF02ttHiR9oDgzk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=RtNYOnnITyiJrt+lymaFD888fAMBHMisLLXzR8M3Df5vC/vxfTCPQ1h1GFi9TZfOk AzdQQgBrWMqdWP18lLH5o11gmgnFb10JQK5qjcsLu6bmuAEIsAR7TqvxCMGNmYzdUU 6vIbkVsVO5FpGhXS13jTjlTEyOb3jpj6QuZJkLBk= Date: Fri, 8 May 2020 17:38:33 -0700 From: Jakub Kicinski To: Kevin Hao Cc: netdev@vger.kernel.org, Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , davem@davemloft.net, Sunil Kovvuri Subject: Re: [PATCH v2] octeontx2-pf: Use the napi_alloc_frag() to alloc the pool buffers Message-ID: <20200508173833.0f48cccc@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20200508114953.2753-1-haokexin@gmail.com> References: <20200508114953.2753-1-haokexin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri, 8 May 2020 19:49:53 +0800 Kevin Hao wrote: > diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c > index f1d2dea90a8c..612d33207326 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c > +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c > @@ -379,40 +379,33 @@ void otx2_config_irq_coalescing(struct otx2_nic *pfvf, int qidx) > (pfvf->hw.cq_ecount_wait - 1)); > } > > -dma_addr_t otx2_alloc_rbuf(struct otx2_nic *pfvf, struct otx2_pool *pool, > - gfp_t gfp) > +dma_addr_t _otx2_alloc_rbuf(struct otx2_nic *pfvf, struct otx2_pool *pool) If you need to respin please use double underscore as a prefix, it's a far more common style in the kernel. > { > dma_addr_t iova; > + u8 *buf; > > - /* Check if request can be accommodated in previous allocated page */ > - if (pool->page && ((pool->page_offset + pool->rbsize) <= > - (PAGE_SIZE << pool->rbpage_order))) { > - pool->pageref++; > - goto ret; > - } > - > - otx2_get_page(pool); > - > - /* Allocate a new page */ > - pool->page = alloc_pages(gfp | __GFP_COMP | __GFP_NOWARN, > - pool->rbpage_order); > - if (unlikely(!pool->page)) > + buf = napi_alloc_frag(pool->rbsize); > + if (unlikely(!buf)) > return -ENOMEM; > > - pool->page_offset = 0; > -ret: > - iova = (u64)otx2_dma_map_page(pfvf, pool->page, pool->page_offset, > - pool->rbsize, DMA_FROM_DEVICE); > - if (!iova) { > - if (!pool->page_offset) > - __free_pages(pool->page, pool->rbpage_order); > - pool->page = NULL; > + iova = dma_map_single_attrs(pfvf->dev, buf, pool->rbsize, > + DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); > + if (unlikely(dma_mapping_error(pfvf->dev, iova))) Thanks for doing this, but aren't you leaking the buf on DMA mapping error? > return -ENOMEM; > - } > - pool->page_offset += pool->rbsize; > + > return iova; > }