Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp813232pxb; Tue, 12 Apr 2022 14:09:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeSJ2atyiQxCAo1FPeQAPaOITDAhOYJQbT15xwY81Rs4HGji5b4Hs2jBDUFgnw1Z8ZzJdf X-Received: by 2002:a17:90b:4acc:b0:1cd:37de:3baf with SMTP id mh12-20020a17090b4acc00b001cd37de3bafmr3735000pjb.194.1649797791748; Tue, 12 Apr 2022 14:09:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649797791; cv=none; d=google.com; s=arc-20160816; b=hedSa7ia/NXqGHmZ/V/3pRjdyyoH5UOSF84YBXRRV1onRiXc7HdrCpbAIal/nr8iPF a7KutbdSb1To59UgAfMowO8tAPpw7yPyn0Fiz7cjpIiLdazF9uTcuxqBx81EoODA6Y5x kssQtocb/fu7lcvIL8FbboOJLISSEHylq0nNeC4Ts1OrxAbBfPILM1dTVVJT0zKUhusJ HgSMBoIL1bYAClc5IuulU8YF4VkMNLm904mrgIpeuxi6RmxCfhosLvbhpme1XP19sqYz EgTCSHsrM3glyi8UHR5/lkogR64auM0KWuma57VeEm7BeCAbISbblua+NQLJ5QjIMrLF fgzg== 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=+nKF4rANdmg+lP3MkzHPNA0vaZpALUykVUrPNG3/rVw=; b=JQeEwva63Ev1+MiWc6GM3GJWVi/PqiNDQOI/vmvIW6IKBeBobpuxyTcr1KQKqoFdWX 5Rh4c+KlliIjXt61Oh4dvCOiUbuH83ajFjy5HHXP5bOfrR62SnMo1BsM8tLe3JVtfaJa AVz7IMSrwjn5OGITfjupRj6rjn6tGcBCdl1aUDo+TFGdxwI5CkspicVF65TcjXGczONn 6CoiOmRgPbPaxdSCpJuAq/6009SP94wK7HPX3g372r+XrcgMr9qoap6dGRMRy/kdVtLR /0zONexVMdVjM83JKzCkNXS3dXXQklFY8eol336rl1C2UmVChR+M0scXVdythRa5Zutq mPww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RAXpcxHt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id t29-20020a63461d000000b0039d4d2e587asi3676225pga.656.2022.04.12.14.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:09:51 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RAXpcxHt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 F03CE7892A; Tue, 12 Apr 2022 13:26:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353115AbiDLIDP (ORCPT + 99 others); Tue, 12 Apr 2022 04:03:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353633AbiDLHZv (ORCPT ); Tue, 12 Apr 2022 03:25:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D7F443AF9; Tue, 12 Apr 2022 00:02:35 -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 dfw.source.kernel.org (Postfix) with ESMTPS id B1560615B4; Tue, 12 Apr 2022 07:02:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3625C385A6; Tue, 12 Apr 2022 07:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746954; bh=Cmo89yAXoJxFmGVPhilXjPQI930qLUDic7RefpgLBM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RAXpcxHtaOTW8zqZ8S7Xpqdj3RnrR0ImYAeVe4FuotWuJlHNrnLd70fEsRn/8u8MB food1SIAohoxP0W2Y+dCSWnSuZsO508RmI0bQeoyFZ4dw6kxAFl5sUyJG9G6AUjvHn WHkM0Kq6erIL089gu656kMY9Y0aeFQM3r+7s9yjY= 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.16 189/285] ice: xsk: fix VSI state check in ice_xsk_wakeup() Date: Tue, 12 Apr 2022 08:30:46 +0200 Message-Id: <20220412062949.117259792@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@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 dfef1e75469d..28c4f90ad07f 100644 --- a/drivers/net/ethernet/intel/ice/ice_xsk.c +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c @@ -765,7 +765,7 @@ ice_xsk_wakeup(struct net_device *netdev, u32 queue_id, struct ice_vsi *vsi = np->vsi; struct ice_tx_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