Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp1875314lql; Wed, 13 Mar 2024 10:27:31 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVyQogf10N9ZgGl2x4V5hUV1HYLdwynzDs/uWGg7TJ5sj7FLqVV/2VDEoA1/KagOB+MX5T8xYrzXLSlmkZF4O2UpnJrS56QaXup8V38Xg== X-Google-Smtp-Source: AGHT+IGLFWzy7m0SPuZmm3ywKpkZwXeeA0a28bgV63xO6/nRPxruMeUdoa002y1PyktTukHd7lkc X-Received: by 2002:a17:907:96a8:b0:a46:141d:bf62 with SMTP id hd40-20020a17090796a800b00a46141dbf62mr9097632ejc.73.1710350851737; Wed, 13 Mar 2024 10:27:31 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710350851; cv=pass; d=google.com; s=arc-20160816; b=uJYlGBx/Yv1C5dwfcg1koUiOnLm1mj1FcyCe+dI87YPdWemfsaIfm72mdnhYdwiaAo 1/RsZu/RIG41ALMlel3j9VRuv0rHsKPXe4ku0Cqp7+rqUUiTdHZSnIiqkdApC8cLS41k iyvMSKRk3l5OhZwwfqqYxUKTPUhobZxTBqHm6AzXxZZHPerLg6+MaeGlvb3uBUOs53PV 6ND9YhhAfHRvrcIrR8a4sIS733cYvw7m159HbdZD+cWi80kxux4y5fDjdELVkfaV7ZQm c5Ci62VJ98ulCab3mDha0dvJCLijJE9qmqUk4sQ3nFmKi8wFJGn2ye/0DmslHy2ePMu8 u42A== 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=wN11EP+/gpb7boj7QGIVQIayzMY7p0/OMm6dn5dk3MY=; fh=eqxG9ZgQ7D5gp6Qq4M9r6uRPDgoBvrEdDCiYoLYhsV0=; b=xc2jDsSeyGqQRsnhp8pVf19tJj/5+pWtaOZ8rI7No61uDgrG/ccmGAlS6x+oDysxD1 IIiA0HfBSA68IgpedU+YSyO6TZqvsjbnRFamcbMXmZWgP93y4Skp9fYCLOIdOaCjioRV DtecJ48DurNl0asNabSmoEy/w9hOySJVNx4MwklBhdfphEXCo4P6O0dr5Zi4PpHVqWxa YWbDdv38o+LuiP384c9r1KUq0S1BDxfg+3SbIt3SM2BhfvMK7wgXJwROYCafAMSoRxs0 CXxAsF59DIjD9/jrjlZBlX1traywkZgDOIoq6WH8unl+SlwjY6Lb4MgtuZoQklRWuH4p hAbQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UgJ2BAxA; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-101945-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-101945-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id uz8-20020a170907118800b00a466111a457si580250ejb.1037.2024.03.13.10.27.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 10:27:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-101945-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UgJ2BAxA; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-101945-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-101945-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 am.mirrors.kernel.org (Postfix) with ESMTPS id CBBE11F248A7 for ; Wed, 13 Mar 2024 17:22:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8EB821361CC; Wed, 13 Mar 2024 16:42:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UgJ2BAxA" 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 B681B629F9; Wed, 13 Mar 2024 16:42:32 +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=1710348152; cv=none; b=SsJS50Plu5K6lsRKTFfoeC7Zbda1WnDVbtEv1CjAtikSbrMc8ET3QY4DtAjiZcvqoRrj96nl3eitIsgPgz/8qRAuUmoiTErT2sGiZZUmVn94E2HzfdsGt8s37v0KbzRfvO27ibJlDrGs4Qu1x0L2HqsjqvhvhGZ5d1pZ5oALsLk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710348152; c=relaxed/simple; bh=sBSg5rfKvh3atIZHujnBMgH/0FxhtiJyLtx8D1IvtHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lHxWp71axoIT74xTwj1vN09x7bBwKPQlLvLy3Ldihd+7XOkb3cVkAOZGrJl5GnZwnjn9drXLbk2v1GapXHHlQQBiV41rFVI9PQ7SfD54rxUXhLD+0uA7PhasBRi5Quik8vSeU+FyCemEnmq5NUNsr7+92JnYlTASaqE0xxn+y84= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UgJ2BAxA; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE0D8C32791; Wed, 13 Mar 2024 16:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710348152; bh=sBSg5rfKvh3atIZHujnBMgH/0FxhtiJyLtx8D1IvtHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UgJ2BAxAf9/jek3zXtxlTE6U71X8jAY5pZiXb9jTepcbR4Sp2ztDMhp35gJNhJf9L KJ+Dr2FiTmF/Kt2viiFmwfm9MYUIkJsg+zC5bLR/wt+YeCrKBmMZs4hg4NPI89oUPr qCg78pESq5FnkU4vNCK/HIpe1uSJhsOKs2h9VRV7KMu9EwsCdHl3rWw1N8L2qDiL/O R1JSEncASYCl6hXB/S2lzFC8a3WinYZbBozuCqaK5Dld21TL3VpNRyHV8tDTlIM74D Pz1DOGGMy2Z8SPZq3tQikHq1p7u+1UubTyAkFBElzQBKoHmU6Qti3tgQv8GGy6E12z v/BmB/uP9wSHw== 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 5.15 05/76] i40e: disable NAPI right after disabling irqs when handling xsk_pool Date: Wed, 13 Mar 2024 12:41:12 -0400 Message-ID: <20240313164223.615640-6-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313164223.615640-1-sashal@kernel.org> References: <20240313164223.615640-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/v5.x/stable-review/patch-5.15.152-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.15.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.15.152-rc1 X-KernelTest-Deadline: 2024-03-15T16:42+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 3d2b92a952a65..7b522d55f3684 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -13558,9 +13558,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