Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2679065pxb; Mon, 19 Apr 2021 11:04:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyw1VmT806iVWWaRScfRXm2joK6qVO3phwaAvLPImC+hSGE0Cfk6oMmdwwEbnngFB3ikWY X-Received: by 2002:a17:906:d795:: with SMTP id pj21mr23203886ejb.102.1618855467823; Mon, 19 Apr 2021 11:04:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618855467; cv=none; d=google.com; s=arc-20160816; b=qjnuYwaZHkSLolBkZONuyCFsX4hH9+MJT2Yi2XugcdiyBmiaX76PSr8nFnDXI47QBO vhPxa+4eSL5YwjqPcl26YpXVdZK2PGsY0KZIGxDTcZR53wQfbjqfDiZFXhIPh1TKyeoU FAW18eFpOljaecE9TpLW90C0fksWnfk+YrZHgjmJDySp9lkfS0U8/ytu2xLPqZfIHQcK QfJiLFb0FUrsw/SYg18hhGOcPbWJxV4lTOpj+kZ3t/57epYEdCGj7yqwTPWmZKv0Rip5 yNxCMiHvlqTXTnJZfY8BAAOoe133LX1+lRl+ZXD9x6y+WnzFx1mJUSXKTcHSMv0olpfe KEmg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pHT80b/xFojJic83Hfq4lgj7R7tHnsZcvAsqqc7wOs8=; b=z5lIJTdZXIv1YyNPTPHN9Rgd2ajeYhwMUCKsii2KQqCAom9jwcEdK2LXXAA4u2737L i6PYGtikMflEhdOGkUQJReVpGD7q/4tKtdyQgQVwHtMuUFoMThtH71wZdhPqyd0DAmlo 8XC3xT72XDA44lnbpEcY7L2poR6ni71QEsIO7692LicYbysxaazw95XBkf+fP8yXsYje TWLNo8uWIfNejMh5gYosS1hPE6MNkP0Oj8whUPP0L9pmibir/oariko6m1YQP8ziMWd5 oo+S5OUZiZKxEZbqujtdeFTtmroSGX3kAlO51vBHNS5M0+FhfBwIbREoGqDh2DV5+ghd b2VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2nlxA1KZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b1si14360927ejb.714.2021.04.19.11.04.03; Mon, 19 Apr 2021 11:04:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@linuxfoundation.org header.s=korg header.b=2nlxA1KZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242077AbhDSNiB (ORCPT + 99 others); Mon, 19 Apr 2021 09:38:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:34380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242184AbhDSNZ0 (ORCPT ); Mon, 19 Apr 2021 09:25:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 46C7A613C8; Mon, 19 Apr 2021 13:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1618838438; bh=u05CCzA5cj58TVwSHqo3oMndRTJ8FNoUaaEhd3c9LbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2nlxA1KZIuHVk8gNlwls4V24j0QgknBb4IeUvQNncUZZ/A17L0xGVu1/uWZYpuPC2 RXpTsDk2SwKgKRdczVRC4pXoYDSx4zGrwjvtkSCEPxXuUKaTyiV5LcXEP7qZ8G3tJb qOpNIigg8tNIwyL9ylEDGGZDNt1PXCGT83h6dIoY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shujin Li , Jason Xing , Jesse Brandeburg , Jesper Dangaard Brouer , "David S. Miller" Subject: [PATCH 5.4 59/73] i40e: fix the panic when running bpf in xdpdrv mode Date: Mon, 19 Apr 2021 15:06:50 +0200 Message-Id: <20210419130525.742946040@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419130523.802169214@linuxfoundation.org> References: <20210419130523.802169214@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jason Xing commit 4e39a072a6a0fc422ba7da5e4336bdc295d70211 upstream. Fix this panic by adding more rules to calculate the value of @rss_size_max which could be used in allocating the queues when bpf is loaded, which, however, could cause the failure and then trigger the NULL pointer of vsi->rx_rings. Prio to this fix, the machine doesn't care about how many cpus are online and then allocates 256 queues on the machine with 32 cpus online actually. Once the load of bpf begins, the log will go like this "failed to get tracking for 256 queues for VSI 0 err -12" and this "setup of MAIN VSI failed". Thus, I attach the key information of the crash-log here. BUG: unable to handle kernel NULL pointer dereference at 0000000000000000 RIP: 0010:i40e_xdp+0xdd/0x1b0 [i40e] Call Trace: [2160294.717292] ? i40e_reconfig_rss_queues+0x170/0x170 [i40e] [2160294.717666] dev_xdp_install+0x4f/0x70 [2160294.718036] dev_change_xdp_fd+0x11f/0x230 [2160294.718380] ? dev_disable_lro+0xe0/0xe0 [2160294.718705] do_setlink+0xac7/0xe70 [2160294.719035] ? __nla_parse+0xed/0x120 [2160294.719365] rtnl_newlink+0x73b/0x860 Fixes: 41c445ff0f48 ("i40e: main driver core") Co-developed-by: Shujin Li Signed-off-by: Shujin Li Signed-off-by: Jason Xing Reviewed-by: Jesse Brandeburg Acked-by: Jesper Dangaard Brouer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -11872,6 +11872,7 @@ static int i40e_sw_init(struct i40e_pf * { int err = 0; int size; + u16 pow; /* Set default capability flags */ pf->flags = I40E_FLAG_RX_CSUM_ENABLED | @@ -11890,6 +11891,11 @@ static int i40e_sw_init(struct i40e_pf * pf->rss_table_size = pf->hw.func_caps.rss_table_size; pf->rss_size_max = min_t(int, pf->rss_size_max, pf->hw.func_caps.num_tx_qp); + + /* find the next higher power-of-2 of num cpus */ + pow = roundup_pow_of_two(num_online_cpus()); + pf->rss_size_max = min_t(int, pf->rss_size_max, pow); + if (pf->hw.func_caps.rss) { pf->flags |= I40E_FLAG_RSS_ENABLED; pf->alloc_rss_size = min_t(int, pf->rss_size_max,