Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp51954lfv; Tue, 12 Apr 2022 16:57:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNgvDqEFM0pEylOZ1PuW7Z7Jqngu/Pdd2aQLzC6gmEIsmTYovOIrbwLQijOmsRRWciLRFO X-Received: by 2002:a17:902:ba88:b0:158:5849:5a37 with SMTP id k8-20020a170902ba8800b0015858495a37mr14075958pls.133.1649807867192; Tue, 12 Apr 2022 16:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649807867; cv=none; d=google.com; s=arc-20160816; b=oqG9DhVLddpEbAFES6PBjLxDREAhiqJJjVbmMcp5nxLc9KBpsbMyciz/cSdynS0f1h jKnqj2tk45vv0rb4YtkO57dcJ8K9t1gnkSl5c+APrzK7OSzDFMQVSszdNU1EMKgfllEW iQAWfAOEspPVyh7n6TP1n9vwJbukCuN1GjixvB6s6xxlKwOYbhnJkoNqyvDnFx9eY6rm Gzt89bnxJWFaY8Q+GyY8VvNl1mbcBg+78yj9nC8fE2xui0P6GqSq8VUl0fFNbAfXafLe YnferUacd0Mw8HaZRAhImnAY9ODN3pCKreYG8E02ZencSBB0+SVtD/+G2RQOPoSB7XXI GScQ== 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=MKl8X+F3/HMo4ybWOTKbEXPOrxv3DG6lRS38qlaCYSQ=; b=Mp24SbcI8nzpBlOL2jSlpfkaNO0S5OOqhOguhPeUmcGH56E+H7mn7tA3Ux4gzFfFWh tVIMI1sw6M8klkkMjFy+Gb5da/fVyah8z50l9GtN3of2UZirZ2ZdDfjrMnVz2EW89a2J 3VSYj9qFXkdoG7SBh60vJvdIpPJsNyDmzcK7G6244KShLQ48Q5FCLuZ8CF3zT0xQ3Kwf BOLJmBVi7ym7ceZRGa2+yxS9cFixiQL6vNe5Hy17Cowb9/oHLJX4b0FalDLcQDXvwKZ3 yMCGdEaEPYRHUosDtLiv4QzmOLsFfp6bOcXp/7GLQLQ2CxsxhGJ9ZS9AZS0bN50VKU+K Vvtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eYFJSb0u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id q6-20020a170902f78600b001583bcdb540si10770322pln.155.2022.04.12.16.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:57:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eYFJSb0u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id CCF1120596D; Tue, 12 Apr 2022 14:53:57 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354666AbiDLH0g (ORCPT + 99 others); Tue, 12 Apr 2022 03:26:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351672AbiDLHMv (ORCPT ); Tue, 12 Apr 2022 03:12:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C914011A1F; Mon, 11 Apr 2022 23:51:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8AB9DB81B43; Tue, 12 Apr 2022 06:51:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 056F3C385A6; Tue, 12 Apr 2022 06:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746279; bh=qMOKGD6z+PDfrv1uKDk30yiY5E9vSQk8qXTh8G+G1sU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eYFJSb0uJucrb6l0tTLiLJAG9kWddUr4IL1s+IdemRlfwi/KgYykJ6AP0i+ZtZ41V EuVuPU+KSa0oFaK7Jn0+cbaj+44LXrpzuuRKXPYCJhgUjp7ovWn1ETiR/ZXXNgo3dS qy+rm1/w+bRctKh7IZIuCBekPZ+aj75ZjZne8LSI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maciej Fijalkowski , Shwetha Nagaraju , Tony Nguyen , Sasha Levin Subject: [PATCH 5.15 185/277] ice: xsk: fix VSI state check in ice_xsk_wakeup() Date: Tue, 12 Apr 2022 08:29:48 +0200 Message-Id: <20220412062947.390068416@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062942.022903016@linuxfoundation.org> References: <20220412062942.022903016@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maciej Fijalkowski [ Upstream commit 72b915a2b444e9247c9d424a840e94263db07c27 ] ICE_DOWN is dedicated for pf->state. Check for ICE_VSI_DOWN being set on vsi->state in ice_xsk_wakeup(). Fixes: 2d4238f55697 ("ice: Add support for AF_XDP") Signed-off-by: Maciej Fijalkowski Tested-by: Shwetha Nagaraju Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_xsk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c index 03ba08fdcee8..2b1873061912 100644 --- a/drivers/net/ethernet/intel/ice/ice_xsk.c +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c @@ -761,7 +761,7 @@ ice_xsk_wakeup(struct net_device *netdev, u32 queue_id, struct ice_vsi *vsi = np->vsi; struct ice_ring *ring; - if (test_bit(ICE_DOWN, vsi->state)) + if (test_bit(ICE_VSI_DOWN, vsi->state)) return -ENETDOWN; if (!ice_is_xdp_ena_vsi(vsi)) -- 2.35.1