Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp1854803lql; Wed, 13 Mar 2024 09:55:49 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXi5VZc5X0YfkWdUk20bSY6DYcOrwhWjdzhJ0shPOH6CAGaidhy6ERUKWsw8Zrr1ehD01kumxONgTIbjDcCHdgScGoDuQRqZ+X0FcKqeA== X-Google-Smtp-Source: AGHT+IEJST8uzi4tovkm1VkNG7XyJdmVkafKyMX4K2/7HU2rRMq0AI7a6xHclHf/aLzKYYhPpF5w X-Received: by 2002:a05:6358:27a0:b0:17b:dc2a:1d7b with SMTP id l32-20020a05635827a000b0017bdc2a1d7bmr622785rwb.0.1710348949495; Wed, 13 Mar 2024 09:55:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710348949; cv=pass; d=google.com; s=arc-20160816; b=OkzHAWW3uchCBMKd7nQ4XlHUz7hpv/nrojVqgYRPCaKEGI0ylADdKpQlCAG5Tf79xt 5SAYUgQNoufDHy8GshDztzgNLDKBqKB46bTrtwUMQ/oo8I23EfF1AkVBw0XkEZhqbPL4 98P1xuyzCJGKCgAv0OKUFRrOmtOyelsZeZuAVUIzbbfPKQTj870oAVw8bzKD+J29wb2O 5lhesRby6W+ur+Ru+oorS+vhCAZNLdROaDoKb7JeFVUtNZplP8Ci2To21BCauPSsiTIN WctTUq8H5zlULWKiqEdAJ3DkFfCD94Z6T9FPcABtLCnM27p+o1P6qULWOvW426P4RiyY SHow== 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=2aJQD02Mw92xJ2enKM9fUQBihr9lX75hBr1P3aIA3Tw=; fh=eqxG9ZgQ7D5gp6Qq4M9r6uRPDgoBvrEdDCiYoLYhsV0=; b=OiY2FGPsCdoGJmq/SvrCsN4IlTLtOjZBTwavFDFneTw6LB46pu/ZMp7s8h9ZvkeSiO silKFBC/2QcquB0dRKpYLiNM87aHaUvTCdteLPumoH6MFB5hIwXne2VWhHooG77txjsP tSk3mV67nOFugvIPndtxzfckzfcNWT6KMFrmbLZu0BLsOfm2j5zuvrUiLgUhMKtZ5HPQ 7CkLKUezcOSEYorcuN4PCEMR5pSAAGwwg8J+uemXa7aX5OHZHcXpGoczgI/eAwuCxsAN f8JjjqZN5vOrCFgqreyz8dX0qYvdrgfPSCrl/UPOejtje2RoYNVgYZbXJxnzUh3tlCm5 Bxrw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rn9a8LA4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-101815-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-101815-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. [139.178.88.99]) by mx.google.com with ESMTPS id bz42-20020a056a02062a00b005d3646ae6f1si2511487pgb.4.2024.03.13.09.55.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 09:55:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-101815-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rn9a8LA4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-101815-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-101815-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 B89A4282AAF for ; Wed, 13 Mar 2024 16:50:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CF6AF692FC; Wed, 13 Mar 2024 16:37:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rn9a8LA4" 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 E6A9C5F46C; Wed, 13 Mar 2024 16:37:25 +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=1710347846; cv=none; b=WF5GVlfnFJxuVbuJAuSZA8M1/DxU60gVEpVu8LNZmTWuUKiV/CSR6Ncf5dLUGG+Md+SCAp0eib7ihkAQovkSYHHPFxOSIFWaKMcjHEe5+cHKko5/+Ni5z5CDMqHF4WU14KjRhDC/ogLeAflFZQPJWdzIlqACGQNn+5Fn8gw1njA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710347846; c=relaxed/simple; bh=ehhPxOYTcUJIZMePAgzfG67jXSngClZyoOyO/+GP4Q8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oWfCuMeyyeqiG2Dl7EQklKMyiGHq+3Ut1xqrg6KgNvmkuKvsdM4BBLOhbgQW7kJDbTIYnlyRD4TY23isUqSrRblPtrvVCd5TNRHwHcMI6W635eQk80i6xAxP9FFSUWREWiqVx1qJujoD6sp5AEaQxppAcLBbJnGiGMdENO5rIig= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rn9a8LA4; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2F06C433F1; Wed, 13 Mar 2024 16:37:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710347845; bh=ehhPxOYTcUJIZMePAgzfG67jXSngClZyoOyO/+GP4Q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rn9a8LA4uAlpeQeX31HtWS5Q+au90yejywTyA3RLJuGPhwfzCkKtFPEp4GcekHuKF kbhFnXXx7qqdWifYd0eAX7RynXgyb6+kmYP9ao9yfx+8xsH8Aw70suNrRXF2uyxB8r ddLWoBIMyPjsUmu1nA4qRVSsKFeg++J/F1R7kB+5lUBfqrREyuz3XqJhIxrYs9p5lq 6a26HfmjkkgZmmBwIG5NafWfs8B7tPUi4EmSJ/kq6yRF45gCmIi+YxCYwiSbH3nq1Y 5m5jcFKeO1K3HiUIt44ajEn+TqBUFNMx3YSd8OzLff6s10s20T1bbRgtWqgE8iMJzq oc8Uxxn6oNo+g== 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.6 12/60] i40e: disable NAPI right after disabling irqs when handling xsk_pool Date: Wed, 13 Mar 2024 12:36:19 -0400 Message-ID: <20240313163707.615000-13-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313163707.615000-1-sashal@kernel.org> References: <20240313163707.615000-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.6.22-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-6.6.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 6.6.22-rc1 X-KernelTest-Deadline: 2024-03-15T16:36+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 9d37c0374c75e..ae32e83a69902 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -13617,9 +13617,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