Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp1848024lql; Wed, 13 Mar 2024 09:43:32 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXmrPKJMuegcSXhZni31+2icqsKmE1FFw9L4LX0O1EumWCe4o8f1KhmyTp++eVQAGFkFKigQNn9xpz7ukYnbooKtpL1ded7WO/6L+NSTQ== X-Google-Smtp-Source: AGHT+IEn3AoN3oREUUrLkNcBLUFHjc+1xlydCczgytfRu0OYw/cqdAzKpsSOaXxtWyMXhi2tl37F X-Received: by 2002:a05:6a00:b8c:b0:6e6:42ef:ed1b with SMTP id g12-20020a056a000b8c00b006e642efed1bmr3749521pfj.31.1710348212173; Wed, 13 Mar 2024 09:43:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710348212; cv=pass; d=google.com; s=arc-20160816; b=f3bpbrtL8n/fRZSGJxFb4arGwmvKWD/GIjwovSmAEX+WPHEj8RjA7ZYPZ1c21xm9k7 ZT8wQD3wkJ+e7oLCM7JCAORWi4kDozNO3g9s3/RkjwJrHpknyzy9y3OJy/6tzy/R7ybT FlDc+xzlKIojbcksEwbZKfqjO55Yet56xzYVkxXCi1GJXrmql3r6JLaZXYEOOsLP0l+x uft+zxqSwGuT4zyOrA/ejNZzURWkJ+lRfAUsUjhgrxTcro/YHASldw/rr8ZFk0mCMJsa BbA/4u72W2nVe0LSuGDzwcgO61LRKGjWuUxG0QwSIEsCvJ31WDDpP6UCqcIHLHxSrKCU aHjQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=r9V6W5iqNJTwsNNsyt2oiz6i8jB/922iDoZ4JT9nXg4=; fh=eqxG9ZgQ7D5gp6Qq4M9r6uRPDgoBvrEdDCiYoLYhsV0=; b=JxCa9PhfEYzPxhxnCku+A5IH7alSb8TKWn1dAJkmcBHJ4y25C/keU24eJQysw6zR8N 0nOKd6lQbaJY8Cp825BFSjg2DcCBUU5FLdLb9qBwTPEROdrDrte0LitsA6rshdjrCQkp o6Ijhf2xxs34bBIr4YKufI4RhnOKiqjuipjIr99sv5Xz54rW0uF0MmmmOsX8tlI8L/OX rrR38m4vJu2C7dS04ViGSUhUTg/1mE5RFrgloYz7lkG9sHqb+0iFubvbfzroPz8Hmi/o P3XmiJpoosQ3TphlWEXTb/U/14td1TmunWJtJ84Qi85xcgFRkuiAnoIfEQlrT1XPndYS Errg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NfhTLauD; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-101751-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-101751-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id x19-20020a056a00189300b006e6af7eccf2si2815426pfh.37.2024.03.13.09.43.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 09:43:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-101751-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NfhTLauD; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-101751-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-101751-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 927CE28A0C9 for ; Wed, 13 Mar 2024 16:35:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 812365A4E1; Wed, 13 Mar 2024 16:32:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NfhTLauD" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A85735A106; Wed, 13 Mar 2024 16:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710347573; cv=none; b=qK3/hvQKV56zCymOpEROl8EyAEzB5cC3zKxhQmufwb4/ZxaHaNCWWFh90ppXRI2S48VdvwCfgd/OtUNtb8PwWj3qAPZ3juZmDOQ97QWs2auE3Ny7fD4Ikj6iTgqEIwcagcKsUBM68vJ1THK+8INaKDQMmikyfmufzhQtHgPm50U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710347573; c=relaxed/simple; bh=bt5hZPIIQvLWUkySERJJZoBFbF+byIU3qM0QFhV5Bm0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XZCRdFyInaNJlhShtGK+FwZ2o9OgIQaeelJKm7JGH8avl6Yi2Uj799rTtrvpv0Y5ELWPY2CB3DSKCHX9lC861OqMo0GVED2+q+375tvdsr1Qi2wq+lEuHVLXGujtsJMDySovfI+9OjOLeKm2YGxixMpIEiJNp2jOZdW3hkcbaDU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NfhTLauD; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B220C43390; Wed, 13 Mar 2024 16:32:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710347573; bh=bt5hZPIIQvLWUkySERJJZoBFbF+byIU3qM0QFhV5Bm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NfhTLauDhlleIOrcHzZgYApHlS1tvZSmURwNkr18TEUVPc2UywaATaniBQSi1EvTL zQDPfD1Pt3ez6vVfH6Tr45gqkvsy4G/HiKrr7ooH8i4v+piXrFYYKRkuytEs1jSN0n NUutqxgb3AjbCzQPj8Dkj12KUBAeJJcXLLLl7VFnPI4W0RtBXjydtf/dpCCZwnzLGP Dj51vze7+t0yvHM8PG5YyFf9IzZ+HV3Cn2J79MtjZ8gfg84FroOE6C6YVTpHr6AYTJ nbDXTx8DQGqSJ1RHlThApqotO3U0VD48m/KYbTgKkBYCEAKSKANNM9V3PPrUbVgSzz jzww24FAg/sUQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maciej Fijalkowski , Chandan Kumar Rout , Magnus Karlsson , Tony Nguyen , Sasha Levin Subject: [PATCH 6.7 12/61] i40e: disable NAPI right after disabling irqs when handling xsk_pool Date: Wed, 13 Mar 2024 12:31:47 -0400 Message-ID: <20240313163236.613880-13-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313163236.613880-1-sashal@kernel.org> References: <20240313163236.613880-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.7.10-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.7.10-rc1 X-KernelTest-Deadline: 2024-03-15T16:32+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Maciej Fijalkowski [ Upstream commit d562b11c1eac7d73f4c778b4cbe5468f86b1f20d ] Disable NAPI before shutting down queues that this particular NAPI contains so that the order of actions in i40e_queue_pair_disable() mirrors what we do in i40e_queue_pair_enable(). Fixes: 123cecd427b6 ("i40e: added queue pair disable/enable functions") Signed-off-by: Maciej Fijalkowski Tested-by: Chandan Kumar Rout (A Contingent Worker at Intel) Acked-by: Magnus Karlsson Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index d9716bcec81bb..b0dc0fc6b1359 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -13629,9 +13629,9 @@ int i40e_queue_pair_disable(struct i40e_vsi *vsi, int queue_pair) return err; i40e_queue_pair_disable_irq(vsi, queue_pair); + i40e_queue_pair_toggle_napi(vsi, queue_pair, false /* off */); err = i40e_queue_pair_toggle_rings(vsi, queue_pair, false /* off */); i40e_clean_rx_ring(vsi->rx_rings[queue_pair]); - i40e_queue_pair_toggle_napi(vsi, queue_pair, false /* off */); i40e_queue_pair_clean_rings(vsi, queue_pair); i40e_queue_pair_reset_stats(vsi, queue_pair); -- 2.43.0