Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp117329ybg; Mon, 8 Jun 2020 18:05:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/YFkZAf96WqfTxp2BVqR5JZN9bUAiXEognDX+/wB+b6phgflrvi9Lx5rRjJtzYvnjUe0F X-Received: by 2002:a17:906:3745:: with SMTP id e5mr1582766ejc.19.1591664726725; Mon, 08 Jun 2020 18:05:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591664726; cv=none; d=google.com; s=arc-20160816; b=0pRgGJct0O58M+2CqFiYV0b3oVNTMsrDMlgrQ6iBnON+vmihzR5TYwWXkPBZgMj6JG hmYvbJBtFcTRi/0jANCwin0vZrMXy24x6lfnc+GECBmufNuw3z/i98QNuSXDo8YfH3xb +Zv3q2XGDkyBRMGRdrVNczV6MJclxPvj/IitkTA3mcqscAwxTtQ8tHtzMe8m0vjoQqUA 8phcd3wHLUYWXRR8uNuLgoDZu1Mu+cpfxF2rZVtL6nmMKKmiSyP5pw2o8fsBxuHyvL/J K3rK63wq4SeqpDRRebGSX7WB56z96by7mcbT4Vd8lPUkIOXFBCOS6P0O0r6C4BH+BFJQ M4OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PmKl9gkrUp4rUYjiyV6C7wEVBuP2e+ks9vvx7imwP8A=; b=nSBAN26Upju33JzxBVzbH7HNBkBXZCq3H1Lpj3cwlMyQ8sws7PWcccEjczrWAYZWVf i5gfTIerSXHRIaVceAL5KcB1IQjl5IwfdAWy+9dYB3e2UNNXaMXXwUJJbetbZUAzzu+7 hAX5x3zQqxTz25MLr8791C5c1Qp/tmoQKgkuEODeFY8IKwPXos4uhwrT3Y4YNgVev4er 55fMuSJ/Tf1E4LFTgzVCMC6nVZTb3kLdvCLubWgV7toAaHMBTHPZOdxRaOgoaQavEyjN ud74EY+O8uGMyTJZdZkGNV9l2PGfvbkrbx3Y2Np81SUmtCocXK5Eej4+hlD5LF3e3pNE vQYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Irnm2iou; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s4si9747438edr.359.2020.06.08.18.05.03; Mon, 08 Jun 2020 18:05:26 -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=@kernel.org header.s=default header.b=Irnm2iou; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388119AbgFIBDR (ORCPT + 99 others); Mon, 8 Jun 2020 21:03:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:52312 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727982AbgFHXHo (ORCPT ); Mon, 8 Jun 2020 19:07:44 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C7CF22086A; Mon, 8 Jun 2020 23:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657664; bh=UpSHGXHv/QX6A4IS4joM6P1Hlv2s0Ot6ssUtVZvGDcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Irnm2iouMUWw8XYm3CAJQ7FcwuhUpKfTkxpj4hbR7WmmxBwqkeQLPE7+1HF9yf5+w LB8aV9TfHmtxUW3hhk3Bgaa1XlbzBiC9uiSm8FexDC6ofABsdMcGiKzoZcAVjaVW/U vNobKHNDAhfy2MEmm78zS9acSutFmE/5OMVdcRcY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marta Plantykow , Andrew Bowers , Jeff Kirsher , Sasha Levin , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 075/274] ice: Change number of XDP TxQ to 0 when destroying rings Date: Mon, 8 Jun 2020 19:02:48 -0400 Message-Id: <20200608230607.3361041-75-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marta Plantykow [ Upstream commit c8f135c6ee7851ad72bd4d877216950fcbd45fb6 ] When XDP Tx rings are destroyed the number of XDP Tx queues is not changing. This patch is changing this number to 0. Signed-off-by: Marta Plantykow Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 5b190c257124..599dab844034 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -1898,6 +1898,9 @@ int ice_destroy_xdp_rings(struct ice_vsi *vsi) for (i = 0; i < vsi->tc_cfg.numtc; i++) max_txqs[i] = vsi->num_txq; + /* change number of XDP Tx queues to 0 */ + vsi->num_xdp_txq = 0; + return ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc, max_txqs); } -- 2.25.1