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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 89716C2D0C0 for ; Tue, 24 Dec 2019 01:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D0F4206D3 for ; Tue, 24 Dec 2019 01:01:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SW+/QrRx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727198AbfLXBBt (ORCPT ); Mon, 23 Dec 2019 20:01:49 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24735 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726865AbfLXBBt (ORCPT ); Mon, 23 Dec 2019 20:01:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577149307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lNR8caCFuSaW15vNt0X+BCpE9Gkglp0py4B5ycCfZsA=; b=SW+/QrRxuCf4KQBuNKWNtmXv3tgZJYXmOU90+Xk1E2ugHHvKCGtb7Su473yMBpnLa24aMy I9EdgRxXX/ZKYIWHFxKAYJTbn+d0bspjFz4CGjccChKhW7L9Nz67+XXpB0zR6zYx2wTrEd GqB18o7xipYkjZ1FeZzJn0Mtb541KLI= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-182-DgFydOTnNqqiw7IVc8qHMg-1; Mon, 23 Dec 2019 20:01:46 -0500 X-MC-Unique: DgFydOTnNqqiw7IVc8qHMg-1 Received: by mail-wr1-f70.google.com with SMTP id z14so8861691wrs.4 for ; Mon, 23 Dec 2019 17:01:45 -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=lNR8caCFuSaW15vNt0X+BCpE9Gkglp0py4B5ycCfZsA=; b=qZP+38/oNIrgg/gI4Tt7zxCZTj0nMoBv5wliMhtjLT5zXWXDGQy0SuChmeJNvu/hYM 3ppzpcNyrBIabBE3XUUCvaD9aP08xvR21oprKutk9o/njI+IugrWBOhWLjI1QcMCQ1s2 dMqkAVz/1TbgYa+GrkqXd/17ovSN9SIAnJCUmKpa7W+UDCu+JCaUQthUASinQxg+MMsg yzstU4PBDxIjt0ngTljQjve0RVPxhESmljiTRkcoW5eBaSzCRTaRXHBD6o0TsmvZf1CB wN4nDxGcYQ+2JbyAQKs3Y7qvVY0jWRy6HCr+Du+edz6o42Vrk18WZIdLkTjr3CVwOuMI Bp4g== X-Gm-Message-State: APjAAAWBmMsUzzEPGu+X0HDQXi90GqodSSpffuJx+2icc6ok9tklX3Yy p68H2CRMlRxQxQJBbsU7mB+5FRDgSEUHdD+r0dKTFZtvg6gpUEZJjBGkJcdctckv2UbzeQAxx9Q W8YNOZCAfwB/+Pw6+/zmcVvg0 X-Received: by 2002:a1c:a543:: with SMTP id o64mr1343957wme.108.1577149304965; Mon, 23 Dec 2019 17:01:44 -0800 (PST) X-Google-Smtp-Source: APXvYqwLbp9ysb39KhPxYI6LO1wfaY27/OAdRJojrU1rwE2sB5KzOrsO0TbdDO9yelLn37HkmqW28w== X-Received: by 2002:a1c:a543:: with SMTP id o64mr1343939wme.108.1577149304792; Mon, 23 Dec 2019 17:01:44 -0800 (PST) Received: from mcroce-redhat.homenet.telecomitalia.it (host213-32-dynamic.19-79-r.retail.telecomitalia.it. [79.19.32.213]) by smtp.gmail.com with ESMTPSA id e18sm22330532wrw.70.2019.12.23.17.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Dec 2019 17:01:44 -0800 (PST) From: Matteo Croce To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ilias Apalodimas , Lorenzo Bianconi , Maxime Chevallier , Antoine Tenart , Luka Perkov , Tomislav Tomasic , Marcin Wojtas , Stefan Chulski , Jesper Dangaard Brouer , Nadav Haklai Subject: [RFC net-next 2/2] mvpp2: memory accounting Date: Tue, 24 Dec 2019 02:01:03 +0100 Message-Id: <20191224010103.56407-3-mcroce@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191224010103.56407-1-mcroce@redhat.com> References: <20191224010103.56407-1-mcroce@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the XDP API for memory accounting. Signed-off-by: Matteo Croce --- drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 3 ++ .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 31 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h index 67b3bf0d3c8b..ffd633e0a3be 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h @@ -1165,6 +1165,9 @@ struct mvpp2_rx_queue { /* Port's logic RXQ number to which physical RXQ is mapped */ int logic_rxq; + + /* XDP memory accounting */ + struct xdp_rxq_info xdp_rxq; }; struct mvpp2_bm_pool { diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 4edb81c8941f..3b0aac66ac52 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -2405,10 +2405,11 @@ static int mvpp2_aggr_txq_init(struct platform_device *pdev, /* Create a specified Rx queue */ static int mvpp2_rxq_init(struct mvpp2_port *port, struct mvpp2_rx_queue *rxq) - { + struct mvpp2 *priv = port->priv; unsigned int thread; u32 rxq_dma; + int err; rxq->size = port->rx_ring_size; @@ -2446,7 +2447,35 @@ static int mvpp2_rxq_init(struct mvpp2_port *port, /* Add number of descriptors ready for receiving packets */ mvpp2_rxq_status_update(port, rxq->id, 0, rxq->size); + err = xdp_rxq_info_reg(&rxq->xdp_rxq, port->dev, rxq->id); + if (err < 0) + goto err_free_dma; + + if (priv->percpu_pools) { + /* Every RXQ has a pool for short and another for long packets */ + err = xdp_rxq_info_reg_mem_model(&rxq->xdp_rxq, + MEM_TYPE_PAGE_POOL, + priv->page_pool[rxq->logic_rxq]); + if (err < 0) + goto err_unregister_rxq; + + err = xdp_rxq_info_reg_mem_model(&rxq->xdp_rxq, + MEM_TYPE_PAGE_POOL, + priv->page_pool[rxq->logic_rxq + + port->nrxqs]); + if (err < 0) + goto err_unregister_rxq; + } + return 0; + +err_unregister_rxq: + xdp_rxq_info_unreg(&rxq->xdp_rxq); +err_free_dma: + dma_free_coherent(port->dev->dev.parent, + rxq->size * MVPP2_DESC_ALIGNED_SIZE, + rxq->descs, rxq->descs_dma); + return err; } /* Push packets received by the RXQ to BM pool */ -- 2.24.1