Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp824556pxb; Tue, 12 Apr 2022 14:29:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/zcd+G5InMJBXHRFYQhr0zTtpLvSzD6goYOZuVdoZ3zIV8AcNd4GvEPH7WYNOL1oEiQA1 X-Received: by 2002:a63:552:0:b0:39d:a049:3846 with SMTP id 79-20020a630552000000b0039da0493846mr3112018pgf.490.1649798996609; Tue, 12 Apr 2022 14:29:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649798996; cv=none; d=google.com; s=arc-20160816; b=we0plMVTXLSywJvu0MqHjDzpm4ravItcT/UzrOoEMMd4TauFAcRvpxdUvf5Qot2qg2 rHcrleogkQrVefOQCjoUo/MYl8Q2OzDgqcQvW43Mf/TpnSblRbzXmCfmAx8ThGw5fgT8 PlTOO7J4xAgTyiPnUKib3lEoCxHfLIK9wIcm9V0ZLfSVeGh+maW7PGvx92FFhPk0czrE n//RB9k0VYY1oRCb9JlYKfQGdRAQ/dT/J6/RCmHQf9G/Khd+Xk9M3bfkOZLaasDGax0T 6q489UdWny2oqxIwF1gTditxmB2CBY9z1MYOuxvKon/TpeBGZMt3a9P54BfhU6jkodEf 6zJw== 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=Wp6ibi7sctFzFlEUgl4JzCmvFDINbOO086cCAV5G2l0=; b=YkwF/MVhcCWo3x8cr3o4IDAmVdKz3YWwLO/Fu117it29Sta3dtPFZRFu5emBdAmz2H j68l/ze81QN4ZB8K8ZtBMIOXN93c2OUCQyRCkQEg6VhfLlTqEWQH5rXY3xZbRgXRvZP7 WiqfHiDAgOb2Tz36L7knzu+o75t7+dxzPYitqNcfE1qrB/myCUehXjxeR99WW/8lHJ6N CfoyMvPn5XZAN+NzjsxQOIlmKL+ajiFBKRnAt0+qSf96x82DLa94tbfliiAP6YasT7Cx X/AEl4jwRECobu8E8fceNS36U7qRAZNb18S57rvzvBMWiRlxaFWIBCZSmu6VLQ8fYxbh 8/tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mZA2gYS3; 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 d10-20020aa78e4a000000b00505691992bdsi12108011pfr.170.2022.04.12.14.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:29:56 -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=mZA2gYS3; 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 9FAE410F6FA; Tue, 12 Apr 2022 13:38:37 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234671AbiDLH6C (ORCPT + 99 others); Tue, 12 Apr 2022 03:58:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353628AbiDLHZv (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 2CD4425EB6; Tue, 12 Apr 2022 00:02:24 -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 B09DB60B2B; Tue, 12 Apr 2022 07:02:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7A18C385A6; Tue, 12 Apr 2022 07:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746943; bh=0IsMixcYoYir+0I2ktsvoJUilZLmNIeGvWPRRfGijNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mZA2gYS3AnN5qZjlyBhd8dIanLrCUdG7BhMo2EGghTevnPNna6+xIQDjc/QZGzM+d H404MHFx7W0kOyTQmVb4Y9QLkZqJbl90yHzvV6haWfsxVm8u28EjAbBnH4MkAaPIfu jwnFrFIao167E6yhA+WfDyBeOFOosUczWq2KHIXY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anatolii Gerasymenko , Konrad Jankowski , Alice Michael , Tony Nguyen , Paolo Abeni , Sasha Levin Subject: [PATCH 5.16 186/285] ice: Do not skip not enabled queues in ice_vc_dis_qs_msg Date: Tue, 12 Apr 2022 08:30:43 +0200 Message-Id: <20220412062949.031574197@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: Anatolii Gerasymenko [ Upstream commit 05ef6813b234db3196f083b91db3963f040b65bb ] Disable check for queue being enabled in ice_vc_dis_qs_msg, because there could be a case when queues were created, but were not enabled. We still need to delete those queues. Normal workflow for VF looks like: Enable path: VIRTCHNL_OP_ADD_ETH_ADDR (opcode 10) VIRTCHNL_OP_CONFIG_VSI_QUEUES (opcode 6) VIRTCHNL_OP_ENABLE_QUEUES (opcode 8) Disable path: VIRTCHNL_OP_DISABLE_QUEUES (opcode 9) VIRTCHNL_OP_DEL_ETH_ADDR (opcode 11) The issue appears only in stress conditions when VF is enabled and disabled very fast. Eventually there will be a case, when queues are created by VIRTCHNL_OP_CONFIG_VSI_QUEUES, but are not enabled by VIRTCHNL_OP_ENABLE_QUEUES. In turn, these queues are not deleted by VIRTCHNL_OP_DISABLE_QUEUES, because there is a check whether queues are enabled in ice_vc_dis_qs_msg. When we bring up the VF again, we will see the "Failed to set LAN Tx queue context" error during VIRTCHNL_OP_CONFIG_VSI_QUEUES step. This happens because old 16 queues were not deleted and VF requests to create 16 more, but ice_sched_get_free_qparent in ice_ena_vsi_txq would fail to find a parent node for first newly requested queue (because all nodes are allocated to 16 old queues). Testing Hints: Just enable and disable VF fast enough, so it would be disabled before reaching VIRTCHNL_OP_ENABLE_QUEUES. while true; do ip link set dev ens785f0v0 up sleep 0.065 # adjust delay value for you machine ip link set dev ens785f0v0 down done Fixes: 77ca27c41705 ("ice: add support for virtchnl_queue_select.[tx|rx]_queues bitmap") Signed-off-by: Anatolii Gerasymenko Tested-by: Konrad Jankowski Signed-off-by: Alice Michael Signed-off-by: Tony Nguyen Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c index e17813fb71a1..91182a6bc137 100644 --- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c @@ -3383,9 +3383,9 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg) goto error_param; } - /* Skip queue if not enabled */ if (!test_bit(vf_q_id, vf->txq_ena)) - continue; + dev_dbg(ice_pf_to_dev(vsi->back), "Queue %u on VSI %u is not enabled, but stopping it anyway\n", + vf_q_id, vsi->vsi_num); ice_fill_txq_meta(vsi, ring, &txq_meta); -- 2.35.1