From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1D15D467AB for ; Wed, 21 May 2025 12:52:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 034F6427A4; Wed, 21 May 2025 12:52:30 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by mails.dpdk.org (Postfix) with ESMTP id E1B9E427A4 for ; Wed, 21 May 2025 12:52:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747824748; x=1779360748; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=AgJ475hFXkCNDReq4wFU6VxStnJyqoIJhvFC271hTW0=; b=UM/mKdePvc26PyJlppA+kVOoSEkXD+5ExmIlk6AtfnVX3XzfiUuhxGHQ NvY1U3Id+vohSVRH0o38nKCOf0OqSje1hJcj0VolJwfsj8VRhcpA4yaS0 14kp/ktV1YzfzZfgerDOVwlp3jtY5Aj4dCKZeVD3OC4K4dTTEgRd83pLF aC/DAM8mRNRpbZA79QxDxuaNUB5MwSwb4Ncu6eQZKU/ouFfZfShMZG9ne 3eeYMvaosSdSNkCYo8Xw1H0mqG5w6/NRGu0yaCEBl3mVKNAOydlAuvMes 6ha5Xk70HTSTjEkwb0RtPmQcSc5GIQuMmRWAgPl1e/q+wkJnQinxiiKqg Q==; X-CSE-ConnectionGUID: i0duQJjZQGu8bLegXt0OXA== X-CSE-MsgGUID: HO7yjbJ4TFap1XxPhM4NpQ== X-IronPort-AV: E=McAfee;i="6700,10204,11439"; a="52423053" X-IronPort-AV: E=Sophos;i="6.15,303,1739865600"; d="scan'208";a="52423053" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2025 03:52:27 -0700 X-CSE-ConnectionGUID: gqMfPtWrSMaow2snNX9ujA== X-CSE-MsgGUID: c213Q9OrTbCoUqz1+x1A4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,303,1739865600"; d="scan'208";a="141077150" Received: from orsmsx901.amr.corp.intel.com ([10.22.229.23]) by fmviesa009.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2025 03:52:27 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.25; Wed, 21 May 2025 03:52:26 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.25 via Frontend Transport; Wed, 21 May 2025 03:52:26 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.45) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.55; Wed, 21 May 2025 03:52:26 -0700 Received: from MW4PR11MB5872.namprd11.prod.outlook.com (2603:10b6:303:169::14) by SA1PR11MB7698.namprd11.prod.outlook.com (2603:10b6:806:332::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.30; Wed, 21 May 2025 10:52:21 +0000 Received: from MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::6444:ca4c:aa3e:f8d2]) by MW4PR11MB5872.namprd11.prod.outlook.com ([fe80::6444:ca4c:aa3e:f8d2%5]) with mapi id 15.20.8722.031; Wed, 21 May 2025 10:52:21 +0000 From: "Loftus, Ciara" To: "Richardson, Bruce" , "dev@dpdk.org" CC: "Richardson, Bruce" , "stable@dpdk.org" , "Burakov, Anatoly" , "Medvedkin, Vladimir" Subject: RE: [PATCH] net/ice: fix support for 3 scheduler levels Thread-Topic: [PATCH] net/ice: fix support for 3 scheduler levels Thread-Index: AQHbvnKgrlkGAuq290mjcWMmsnfL/bPc/8Hw Date: Wed, 21 May 2025 10:52:21 +0000 Message-ID: References: <20250506103414.892849-1-bruce.richardson@intel.com> In-Reply-To: <20250506103414.892849-1-bruce.richardson@intel.com> Accept-Language: en-IE, en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MW4PR11MB5872:EE_|SA1PR11MB7698:EE_ x-ms-office365-filtering-correlation-id: 46b18978-5278-4e4d-95f7-08dd98559023 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|1800799024|366016|376014|38070700018; x-microsoft-antispam-message-info: =?us-ascii?Q?4/zKLozhP+dwPZIbQyOyOvwScVro65Uljv9vzkaKqV6b9+4by0GHGzWdMYOV?= =?us-ascii?Q?jRaXkYHBxW4l0RWWI+1hKJASnoziBMspiU1a0+WRYWtYTuME6NEzDiyiKXTm?= =?us-ascii?Q?sJhhx/JXmPogXg5cWegH7rDLr51A67yLDSEr5ztCzfb1kgwopE4OiZ7rCrAQ?= =?us-ascii?Q?rbNNQoj2Vrzp+809rbZNJ4coTzu7PKcBo21oQ6qSQj3ut4feLOyBnNp+5GQG?= =?us-ascii?Q?NuYgTx7U0h4wAdW2giyECIaU9I5fiMfCKbhiNbIWgNwZN4s0l3A5NGXTdPsM?= =?us-ascii?Q?GD+6bhy9OMkJdlgIxEmzQAZGn9oLPXm4Qk9Y4fGWYE8KF9O1fbVm137oR9+c?= =?us-ascii?Q?foPt27il8h+M0/k6RajmO6UAiHyVEcGQDs7UG/dE6IVszG2QjYc1HpTgN1q8?= =?us-ascii?Q?A86aTFpa6N46T3F9UENS2Zdfw1M4FNm8JkXdopmw3LtUIohKNBXJpAy4cSZz?= =?us-ascii?Q?XJGblnlFBXvyl1Dces5py8db1gg/qxOLF/TaDObVCxDZ19f2hupr3nGPx7K1?= =?us-ascii?Q?EfHSEhfxV081EHtkZKkAOMAfgWhjNgPC/bUzC6QR7/I8nirGG7FAESVyf070?= =?us-ascii?Q?to9qZhow5IYVEJrgRvI4y6tJfHDi0u9L3+BwFaalyBbAbYy6FPaPVRW0jids?= =?us-ascii?Q?DjJq1CM7dqXh6x2eylzi3qj1A2f1ZRh6YWa+Qm1ILgV6VovnrO3lkzHvCiZR?= =?us-ascii?Q?g3iwWD9Ji6pKIkq6BVZXU+xY17zmYphZtKFDqkjl0j0UoFPyvfVj+JhdQ8+t?= =?us-ascii?Q?yyFBidGa0rzJ6RLbGjhrL6EsZafW+VtbjHoTrllyP4FXLK5cTsIr6nARH5J3?= =?us-ascii?Q?oagab3/VXh6Vk1U8fdLp8jp6WiQ0G4b6zqmWg6WlMMs5qKyvy3OSL3hMRgYL?= =?us-ascii?Q?1ZQaZ7YsPJqbmM7f6pREsm6/f6K5DD0g/EZDNvX9hlM1wEIbRCwMIatbjp3j?= =?us-ascii?Q?SBPF5TG69GohnLqq77ahUCxhwhHvtrf0QZLrywDUHBhbRYwQH4/dTwxw1GgQ?= =?us-ascii?Q?tmwG0bYHwcXBBPOzUVdN5Q/uSKVvBB1sczVkBG/bglpVo9T0TsUbl26tzwV7?= =?us-ascii?Q?cNyt0+c2XMWp0/rKxfklSo3DFcqWortF15vFawC5SL18W/6XLqDwKlnQ9vW8?= =?us-ascii?Q?Hy40WbWhchI6FbZQ6GOhaAxqx2niOOmKfWLUxY7br3/lfapvgr4Lho3RQhD5?= =?us-ascii?Q?eJEyHbI1f3Sdgn9Y4nG3tdPaPSpZf8lY0l2HHJCXRQvFaO7MqMqO8rs5ogGh?= =?us-ascii?Q?drL9PZ6p7kS7WCuNMQXbQBepuxctBxeFmGzvqmNqTaz4n3f9udrHV9mbOhRF?= =?us-ascii?Q?AyUsznzm0/U4j0WIENLIJL3cp88hpv0EzOT1E4tA8lfi5ucSMbegsFrsAA4A?= =?us-ascii?Q?oZtw70Ft0usMJ8CE2PYezM892yFHvHelxhobQuo00+6ODgGxA6T+xsTRl41f?= =?us-ascii?Q?NRSQQ8v1OJTAmCFwi8HTT6ycRkzmvxIsRVGAtncsdcf0GYqKXzkpEs/PVOqi?= =?us-ascii?Q?VD0UOvMbJ6Sh0fc=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MW4PR11MB5872.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(38070700018); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?4xI++U3gca3FDPK7N5eG6KHghE7izG9mS1BsvY5h6m7IiajFtEoO939sIu89?= =?us-ascii?Q?zT++iqbRg8XG8t13UCYU78WVQ/TLhcXi9csJnms3y1HdEdkq67Zevnrn6x0f?= =?us-ascii?Q?cdxGK0Cfhb1q6O1FqGCQHBSV1Zkea57hpJxP5X+KgMIQcQKEeWlgfM7HoPSW?= =?us-ascii?Q?nI1PO/xy9RwVocc1BZy5e7X06bEmYuBMZbsu8BP54Q2Vdl8bAoa0IU2TaWk/?= =?us-ascii?Q?ZTkthLr4EI49Qb5B9+SRdPM1sJnlEzBEkGeKwz1iLPMLpX/eRr689w3StT8u?= =?us-ascii?Q?jwjWjUlgS4HIOu/lw+9R690OE3jHU51ZK6+jMBml9HVVsIp8SBU9I/vwAJTi?= =?us-ascii?Q?po2lFNNn1s2aFgZYfQr8f4/gGFsKRhoZG5g0qIAGRzDhEBcPEZx45Io6hqxN?= =?us-ascii?Q?BSAjH0ro7925JfAnOqiCIzIuaX8CM8fMBIPzLUav5aESMgjksJSNv3+F30Gf?= =?us-ascii?Q?2F0niTLzp5++ryUueL+OI0yGld7ahqgBWh1Wtr2XQpuln1d7jpNeTuF/BqdX?= =?us-ascii?Q?skMDy63GcZlCTiFMmnkIOIV7iKMD2ZRPze56MAXf/2TacOVDaW4TEistxwUK?= =?us-ascii?Q?2r/lHBjgB27HSYSMO9QT41OpV3IITiRPWfEdQ7XRJIWdxi7C8TTnQak7qz3l?= =?us-ascii?Q?LX65xvTdEvsCwz58yIAUQYXBHf9q7KBpnkpbUpFAG+sY7GYWpCvhj7bLv2+v?= =?us-ascii?Q?rvJkJh/8TiJVGe9q5XdpAnH9gUjQS4h7HljPItUBl5orIlWQ1WzHmEa7zJhR?= =?us-ascii?Q?5CefHw2R7ZuHAxMalWa9MOBiP8yE7O9SiHeG6kTJ1vUV/VeQ6pmhaDG83EXX?= =?us-ascii?Q?EniMoESPrcDl/Rcw7rDvtLU70+VCRj1hvUryhGnyeVEUsfRLmkMpRaZufrsq?= =?us-ascii?Q?sM4TMx57whJPz8GAl1sCs4PP70E74reZ/fTPeu44m1lq7XwwBOBN4DHE1su3?= =?us-ascii?Q?VniHrWB7zGXxG/syVDX6wibFdheLZijZU3IhU6PNmnaNSSTlO3U+NK3XLQlN?= =?us-ascii?Q?EkiDRw3eJ6/nWPLDkdTCsVYS4UYYDO6tPtbEs8mKa3siOtjzpCYksnI63q2l?= =?us-ascii?Q?tbU74lfRNli4dRItLx6VvGbuWlBk8rv5bxjiDz1WSREEoilqHcOCoI763vlX?= =?us-ascii?Q?EdKJZFfog3PJiY+z4Jy6qzpe1pBQBQ+jE/K+RoG008JbU8UAf2/ilHxbKH6k?= =?us-ascii?Q?W9/pHlPEOOIip0AqB8G7ahtP/8IYeyQXG61fnWag0zvqdkj8GD42sqJnHkYa?= =?us-ascii?Q?L+/Nu/fB7HXgvRnvtlE+VfTKSU3ecZJug+WmrLmdmOfid1O+B0SgqOhWdUtj?= =?us-ascii?Q?ip9uIl1473RMZwtRRL0UeL8zLQtflRE0HBzTpvpL5mD6DNf8eK+HJKTXPdOo?= =?us-ascii?Q?0PJHJjPpZUjWqc5pqvsGa1A8Cqxzd7azqVBeWjJRUOEUl+eLfv+nRg9wuxEA?= =?us-ascii?Q?T4LMp1lqEeGRpuIMRmtpJsOojFOOvXly/8sP4rGvOpM+EgIz0I1j0rafnnU/?= =?us-ascii?Q?i4hx8HfOCaJ5/PBHMJP8+i0G5wtNiz52EYVOfx+GFfL/4dTSSpS+M5PYVL+Y?= =?us-ascii?Q?6e34ND1w8a+0zA/SP/ZNnppyzyUBIq7PzvD9SSRy?= arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WPLIclRqcLYXvGhYPW9YQzmncenapJ4tw4XyOVVUVKN6M5ZycS861ILCr8hLnmEHchm77+GnT4JPmGufi3dohRW1MZ6T6y6kzaKP+IL27u/GdD5iYMHnrnHsSjda1quHV4L5r8Ldm/y9VO4NTKttIfh40krnA4ln3T87DWT24pDQ7wg2Bucc4ON01tvsHSZ00Ui62xRTI2NN0qci5AhvNN6gxj+6orls55TXIQPwNnxJa780sfrN/IY/mAdEpcGOQkkbGmmmueDB8Ba45BUP8dIrWi5Ur/01gn/OqVA+wKl0iIV4sNeDDwv6Oa9aosrHui8k8jBbJ8b1O+lpImi1pw== arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hMrSjS0K933K5jgS0P+OX0yKP7jauqJ6Bu85h9x0KCI=; b=XMNINqabXWT5jD6gYCtG6HxrK09zkVbvwjoHIWW4HLow5gGGcNLDrXgaYctBKnXueLna1uHIjurj16Ffo3HC76uS16ihwqgP10P+jzoYUrPTDvKSF61nkvudF/dfL75GXjuS+L9//WpbvnVLXRgcwo5feQUkvA8564a9u1/cT7VMEPj2wIrPM2PNyNU5DTtIfBe2weF5aZUBcE/QGeSJF5+eZ24rD/kgwWiN/IKp7QRhM2+8S05ZRRzUlMnlRPQmUWttknuBJ2AbqQ59FWmeRUTIrgTXImbNkm466kPzltz5PRJRVUhHVmnrWJKem2f5mYHLmkxh78Y6ktGF/miyhg== arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none x-ms-exchange-crosstenant-authas: Internal x-ms-exchange-crosstenant-authsource: MW4PR11MB5872.namprd11.prod.outlook.com x-ms-exchange-crosstenant-network-message-id: 46b18978-5278-4e4d-95f7-08dd98559023 x-ms-exchange-crosstenant-originalarrivaltime: 21 May 2025 10:52:21.3586 (UTC) x-ms-exchange-crosstenant-fromentityheader: Hosted x-ms-exchange-crosstenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d x-ms-exchange-crosstenant-mailboxtype: HOSTED x-ms-exchange-crosstenant-userprincipalname: lu1Q1Lmn4uL1887OvNvXuxyo05a/YVn8IqTOvqfvc88c6Lf2nchrmpyZVdh/sVR4MVeOBnzRtgl/bIgOBSCu9Q== x-ms-exchange-transport-crosstenantheadersstamped: SA1PR11MB7698 x-originatororg: intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org > > When using only 3 scheduler levels, the VSI node needs to be a node > further down the scheduler hierarchy, rather than one up it as with all > other possible level settings (5-9). Take account of this possibility in > the code. > > Fixes: 4ace7701eb44 ("net/ice: provide parameter to limit scheduler layer= s") > Cc: stable@dpdk.org > > Signed-off-by: Bruce Richardson > --- > drivers/net/intel/ice/ice_tm.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/net/intel/ice/ice_tm.c b/drivers/net/intel/ice/ice_t= m.c > index ff3a6cd77f..f2d8e12181 100644 > --- a/drivers/net/intel/ice/ice_tm.c > +++ b/drivers/net/intel/ice/ice_tm.c > @@ -818,6 +818,18 @@ commit_new_hierarchy(struct rte_eth_dev *dev) > uint8_t qg_lvl =3D q_lvl - 1; > > struct ice_sched_node *new_vsi_root =3D hw->vsi_ctx[pf->main_vsi- > >idx]->sched.vsi_node[0]; > + /* handle case where VSI node needs to move DOWN the hierarchy */ > + while (new_vsi_root->tx_sched_layer < new_root_level) { > + if (new_vsi_root->num_children =3D=3D 0) > + return -1; > + /* remove all child nodes but the first */ > + while (new_vsi_root->num_children > 1) > + free_sched_node_recursive(pi, new_vsi_root, > + new_vsi_root->children[1], > + new_vsi_root->vsi_handle); > + new_vsi_root =3D new_vsi_root->children[0]; > + } > + /* handle case where VSI node needs to move UP the hierarchy */ > while (new_vsi_root->tx_sched_layer > new_root_level) > new_vsi_root =3D new_vsi_root->parent; Acked-by: Ciara Loftus > > -- > 2.45.2