From patchwork Fri Mar 12 23:38:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saeed Mahameed X-Patchwork-Id: 398706 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1606390jai; Fri, 12 Mar 2021 15:41:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzHPDq9oFZ3s/MjE9i6I10QX9XkxX+OjvdX5ws1RB5FNsNtBJh1QZRDfXcDKkDHPtqvKFz3 X-Received: by 2002:aa7:d4cb:: with SMTP id t11mr16828513edr.202.1615592461115; Fri, 12 Mar 2021 15:41:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615592461; cv=none; d=google.com; s=arc-20160816; b=ON6inSTn9RZ+T1jzUDOJkgZgKh6tWcsQoW1+AsWG9isGHY8HV14VLiezjiwt7oThA6 nyizUktpwcP6WPFQlt14491fz/XhX8M1CtFkBTHjEaAIawFR+fx1oqzQJWlbSb7kJUIs gnWlWd6r28FzhecfxnInZ/JCv5zHQBaa12Eu8jv6xyiYJNG/bkLqnWMlUlJCmtl3y/Fg JDBjTNwxi6NtQEwI3Jw2yKfIPeikJuUSO2YOyFNgpEkkEKatjn5paycJy2N67gZWit7a MO0lCt4bk5SCJ2he0x+zuHx0a+T7kk6ucvwSnFRPwkd8ndabq1kU9URml4wX43+56Fp5 oSIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=e1Bfokdqlje0ndKDwO0IVmRvdvMEDeyoU6LuIlivSJI=; b=NJCPynbdljI/AX1/JOOo9SBoD2Y+TADNehu/0RMFfJxLdVYV/63rLawyGEommuVTe8 fOhtclqHpIlNRwNlldGzYkfYHzt8hQygliBLJjUbp9Z8gFzDWfTWk7vHNLfGUqMnA4US /sX8Ah86IUWSsFUDBilOuFaRGqTl2KJFzJfbeYKKQuuYUtIsKJa16P4yte7tkBbYnCPs 8aFyVw1pAITp1Fns0ZvdsgpDlxfW5bNJJlhPhNbnKPJzCNsGaotnhhyIQwwm7RShgX18 z8Pt1niyQkanBBgI1Hh4n0LpzobH+II5lW7A+944TP32LOHATEkly17PRjr0JPaOukov h/rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IjzWVzDZ; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j22si5060311ejb.269.2021.03.12.15.41.00; Fri, 12 Mar 2021 15:41:01 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IjzWVzDZ; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235889AbhCLXj3 (ORCPT + 8 others); Fri, 12 Mar 2021 18:39:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:32824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235819AbhCLXjA (ORCPT ); Fri, 12 Mar 2021 18:39:00 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CA4DD64F86; Fri, 12 Mar 2021 23:38:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615592340; bh=5vbNGNIpW0U1T4cAa0Kz7OG1MGTHxQR75AIrz2bHcng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IjzWVzDZItlcnYN43gP+fVUW7stsfLGA+wZGaaB69q5Is9d+PRhPyQwqbmspxJBmR yixkeOe/XE1i/o6Ll06witCOqOa5lBtTBm+a4DpACEnX744ntw4fQlmP/4n7DDqibn a9nlWyKkB8IH8JwJXxk5vVeMtrqqsdYbfJWV6k8YIwvTEKvg54hiegyBr+h4tZWN6X 2XeM/jLVgCydxKMYjoyf/N6zRy4ar0rzuOxsCsrsDUrBOKOp0+uq4e6QubsW/I/YlK 99l8ZObCnw/giDy3a4z2Q8CdJAFsz1pKyE4CaH2iqmsP8erxiRA+1kwYmTEfTcDk0N lXPmRheIkwHvA== From: Saeed Mahameed To: "David S. Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Arnd Bergmann , Tariq Toukan , Saeed Mahameed Subject: [net-next 10/13] net/mlx5e: allocate 'indirection_rqt' buffer dynamically Date: Fri, 12 Mar 2021 15:38:48 -0800 Message-Id: <20210312233851.494832-11-saeed@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210312233851.494832-1-saeed@kernel.org> References: <20210312233851.494832-1-saeed@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann Increasing the size of the indirection_rqt array from 128 to 256 bytes pushed the stack usage of the mlx5e_hairpin_fill_rqt_rqns() function over the warning limit when building with clang and CONFIG_KASAN: drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:970:1: error: stack frame size of 1180 bytes in function 'mlx5e_tc_add_nic_flow' [-Werror,-Wframe-larger-than=] Using dynamic allocation here is safe because the caller does the same, and it reduces the stack usage of the function to just a few bytes. Signed-off-by: Arnd Bergmann Reviewed-by: Tariq Toukan Signed-off-by: Saeed Mahameed --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) -- 2.29.2 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index dc126389291d..c72725c3f53b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -445,12 +445,16 @@ static void mlx5e_hairpin_destroy_transport(struct mlx5e_hairpin *hp) mlx5_core_dealloc_transport_domain(hp->func_mdev, hp->tdn); } -static void mlx5e_hairpin_fill_rqt_rqns(struct mlx5e_hairpin *hp, void *rqtc) +static int mlx5e_hairpin_fill_rqt_rqns(struct mlx5e_hairpin *hp, void *rqtc) { - u32 indirection_rqt[MLX5E_INDIR_RQT_SIZE], rqn; + u32 *indirection_rqt, rqn; struct mlx5e_priv *priv = hp->func_priv; int i, ix, sz = MLX5E_INDIR_RQT_SIZE; + indirection_rqt = kzalloc(sz, GFP_KERNEL); + if (!indirection_rqt) + return -ENOMEM; + mlx5e_build_default_indir_rqt(indirection_rqt, sz, hp->num_channels); @@ -462,6 +466,9 @@ static void mlx5e_hairpin_fill_rqt_rqns(struct mlx5e_hairpin *hp, void *rqtc) rqn = hp->pair->rqn[ix]; MLX5_SET(rqtc, rqtc, rq_num[i], rqn); } + + kfree(indirection_rqt); + return 0; } static int mlx5e_hairpin_create_indirect_rqt(struct mlx5e_hairpin *hp) @@ -482,12 +489,15 @@ static int mlx5e_hairpin_create_indirect_rqt(struct mlx5e_hairpin *hp) MLX5_SET(rqtc, rqtc, rqt_actual_size, sz); MLX5_SET(rqtc, rqtc, rqt_max_size, sz); - mlx5e_hairpin_fill_rqt_rqns(hp, rqtc); + err = mlx5e_hairpin_fill_rqt_rqns(hp, rqtc); + if (err) + goto out; err = mlx5_core_create_rqt(mdev, in, inlen, &hp->indir_rqt.rqtn); if (!err) hp->indir_rqt.enabled = true; +out: kvfree(in); return err; }