From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BCF3BA04B1 for ; Fri, 28 Aug 2020 12:14:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B4BE01C119; Fri, 28 Aug 2020 12:14:25 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 361F21C115 for ; Fri, 28 Aug 2020 12:14:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609663; 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=ppSgaIFb27Sasqs7sGdr2fRFwkKvFwTy+4DiHqj1jn4=; b=EIV9P16SnLyKYuMaBvEFP4aQhpgHwminMIhm4IKACfWCyqrC3cOuEQJOnJpUt2z7oYInFT ET/6gH7CIcDNNqBbLYazOK1Tn2NerPsmeJ71QSTcE78LkCNbDwpllo4AjgLvjN08d8aK6k 0ZgQoJ15bLavk2eZqL4RIwLFnjKiy6M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-578-W-gSMjQlP2aUlYc9yy-iJA-1; Fri, 28 Aug 2020 06:14:20 -0400 X-MC-Unique: W-gSMjQlP2aUlYc9yy-iJA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A0258807337; Fri, 28 Aug 2020 10:14:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9CDF19D7C; Fri, 28 Aug 2020 10:14:18 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Fri, 28 Aug 2020 11:12:55 +0100 Message-Id: <20200828101308.223767-29-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx4: optimize stack memory size in probe' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/a1801c7bb86a0b24d5538aabb6af36100c78976c Thanks. Kevin. --- >From a1801c7bb86a0b24d5538aabb6af36100c78976c Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 21 Jul 2020 12:01:09 +0000 Subject: [PATCH] net/mlx4: optimize stack memory size in probe [ upstream commit 4a28e831c97cd02e1646337ea6391288f7e8db05 ] The mlx4_pci_probe function sets a pointer to the mlx4_priv structure, and during that function fills its fields one by one with relevant values. It wants to put a value in the intr_handle field that has all its fields zero except 2. To do so, it initializes a local struct rte_intr_handle type variable and updates it only 2 fields and assigns it into the appropriate field. However, it initializes a very large structure on the stack while not at all certain that this place exists and in any case it is very wasteful. Reset all fields directly to the pointer by memset, then format the 2 fields to the relevant values. Fixes: 63c2f23c852a ("net/mlx4: use a single interrupt handle") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx4/mlx4.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 5e22ee4381..58152bb97a 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -795,8 +795,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) rte_eth_copy_pci_info(eth_dev, pci_dev); /* Initialize local interrupt handle for current port. */ - priv->intr_handle = (struct rte_intr_handle){ - .fd = -1, - .type = RTE_INTR_HANDLE_EXT, - }; + memset(&priv->intr_handle, 0, sizeof(struct rte_intr_handle)); + priv->intr_handle.fd = -1; + priv->intr_handle.type = RTE_INTR_HANDLE_EXT; /* * Override ethdev interrupt handle pointer with private -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.619864219 +0100 +++ 0029-net-mlx4-optimize-stack-memory-size-in-probe.patch 2020-08-28 11:03:25.957955716 +0100 @@ -1 +1 @@ -From 4a28e831c97cd02e1646337ea6391288f7e8db05 Mon Sep 17 00:00:00 2001 +From a1801c7bb86a0b24d5538aabb6af36100c78976c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4a28e831c97cd02e1646337ea6391288f7e8db05 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index e619a749d9..71061a720f 100644 +index 5e22ee4381..58152bb97a 100644 @@ -33 +34 @@ -@@ -1030,8 +1030,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) +@@ -795,8 +795,7 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)