From nobody Sun Feb 8 10:33:58 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 CD2A81F4CB8; Wed, 14 May 2025 04:31:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747197121; cv=none; b=AHzhftRcLl9SEidK5rt4FJswwcAeYtjEpod2CZTyi8gemmq34JvT4EVKeXEEf75ieeJbpY9bpCOqxlS5plc6Zlb436yyq8m7wSoXLEaAglc3Dc1yNfr7Hp60+v45f0wZD3KcVPSOtn5yBa1U2L3Ad9FiyW9m28NbiV8cifbBXmk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747197121; c=relaxed/simple; bh=0dLog9l3Xnpd+gs+hRIb40IRlDcbRwXl+QmLyBvPzOU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dfeqtRBkZCBW0wptxmx0N83HB8dwmIFlpo9trSZKtzRVoHvA49nhpCTLRJkSL++WdAO1oeK9m4C7IXZ8LdkG9S489PgT3y5JEQj0zu54Nc75m9w/rPJObP5B8dyD0Li40v06+xqkvzkMmfEPbEUniX1zuD2zTT3jrb19it+Eo5k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=iB1Bj3VA; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="iB1Bj3VA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747197119; x=1778733119; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0dLog9l3Xnpd+gs+hRIb40IRlDcbRwXl+QmLyBvPzOU=; b=iB1Bj3VATbViy9AHZqcPjhMFjbHHDvmcCDhDjUzdBJvOldYLipI+aNYd P0sykAFsKDOBU27jJ/UfHoB/Xkst214KX6j3QYnKTC1jL/fZtHUMO9LDD fcR1llKyNivJ1Xsth1YJ+ZGYaWKlVddQGqbguyg4VLtAL3B00YANF77LT 5GGRroOEAt/a/sP7aKmS4BxhJTrLBdmXZZEdZvzf7nKV+EpK4beS6POrZ CFKGpdOtxmhPs9TXEW4yzw4HsHUnXLmxCBARmoa7rgg1OGYIQBqEnCrfP Ww334rNaxCLtH8TI6TjEqHit0iw7b5HF/RtaA9NsbePTs2hRSK5+rPJqA A==; X-CSE-ConnectionGUID: 2kXuhqn2S9+chwZ2i2rlJA== X-CSE-MsgGUID: +9GMx9nNTPucVrJLSD6YzA== X-IronPort-AV: E=McAfee;i="6700,10204,11432"; a="36699540" X-IronPort-AV: E=Sophos;i="6.15,287,1739865600"; d="scan'208";a="36699540" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2025 21:31:33 -0700 X-CSE-ConnectionGUID: 5Zxt4s7TQt+Oj5pEhwJ6iw== X-CSE-MsgGUID: KxRckVdYT3ekTZxCXgeJ0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,287,1739865600"; d="scan'208";a="142861937" Received: from mohdfai2-ilbpg12-1.png.intel.com ([10.88.227.73]) by orviesa004.jf.intel.com with ESMTP; 13 May 2025 21:31:26 -0700 From: Faizal Rahim To: Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Vladimir Oltean Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Faizal Rahim , Aleksandr Loktionov , Chwee-Lin Choong Subject: [PATCH iwl-next v2 7/8] igc: add preemptible queue support in mqprio Date: Wed, 14 May 2025 00:29:44 -0400 Message-Id: <20250514042945.2685273-8-faizal.abdul.rahim@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250514042945.2685273-1-faizal.abdul.rahim@linux.intel.com> References: <20250514042945.2685273-1-faizal.abdul.rahim@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" igc already supports enabling MAC Merge for FPE. This patch adds support for preemptible queues in mqprio. Tested preemption with mqprio by: 1. Enable FPE: ethtool --set-mm enp1s0 pmac-enabled on tx-enabled on verify-enabled on 2. Enable preemptible queue in mqprio: mqprio num_tc 4 map 0 1 2 3 0 0 0 0 0 0 0 0 0 0 0 0 \ queues 1@0 1@1 1@2 1@3 \ fp P P P E Signed-off-by: Faizal Rahim --- drivers/net/ethernet/intel/igc/igc_main.c | 9 ++------- drivers/net/ethernet/intel/igc/igc_tsn.c | 9 +++++++++ drivers/net/ethernet/intel/igc/igc_tsn.h | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethern= et/intel/igc/igc_main.c index 1da84b00d090..4d748eca0c6c 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -6755,6 +6755,7 @@ static int igc_tsn_enable_mqprio(struct igc_adapter *= adapter, =20 if (!mqprio->qopt.num_tc) { adapter->strict_priority_enable =3D false; + igc_fpe_clear_preempt_queue(adapter); netdev_reset_tc(adapter->netdev); goto apply; } @@ -6782,13 +6783,6 @@ static int igc_tsn_enable_mqprio(struct igc_adapter = *adapter, return -EOPNOTSUPP; } =20 - /* Preemption is not supported yet. */ - if (mqprio->preemptible_tcs) { - NL_SET_ERR_MSG_MOD(mqprio->extack, - "Preemption is not supported yet"); - return -EOPNOTSUPP; - } - igc_save_mqprio_params(adapter, mqprio->qopt.num_tc, mqprio->qopt.offset); =20 @@ -6808,6 +6802,7 @@ static int igc_tsn_enable_mqprio(struct igc_adapter *= adapter, adapter->queue_per_tc[i] =3D i; =20 mqprio->qopt.hw =3D TC_MQPRIO_HW_OFFLOAD_TCS; + igc_fpe_save_preempt_queue(adapter, mqprio); =20 apply: return igc_tsn_offload_apply(adapter); diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/etherne= t/intel/igc/igc_tsn.c index 811856d66571..b23b9ca451a7 100644 --- a/drivers/net/ethernet/intel/igc/igc_tsn.c +++ b/drivers/net/ethernet/intel/igc/igc_tsn.c @@ -160,6 +160,15 @@ void igc_fpe_init(struct igc_adapter *adapter) ethtool_mmsv_init(&adapter->fpe.mmsv, adapter->netdev, &igc_mmsv_ops); } =20 +void igc_fpe_clear_preempt_queue(struct igc_adapter *adapter) +{ + for (int i =3D 0; i < adapter->num_tx_queues; i++) { + struct igc_ring *tx_ring =3D adapter->tx_ring[i]; + + tx_ring->preemptible =3D false; + } +} + static u32 igc_fpe_map_preempt_tc_to_queue(const struct igc_adapter *adapt= er, unsigned long preemptible_tcs) { diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.h b/drivers/net/etherne= t/intel/igc/igc_tsn.h index f2e8bfef4871..a95b893459d7 100644 --- a/drivers/net/ethernet/intel/igc/igc_tsn.h +++ b/drivers/net/ethernet/intel/igc/igc_tsn.h @@ -17,6 +17,7 @@ enum igc_txd_popts_type { DECLARE_STATIC_KEY_FALSE(igc_fpe_enabled); =20 void igc_fpe_init(struct igc_adapter *adapter); +void igc_fpe_clear_preempt_queue(struct igc_adapter *adapter); void igc_fpe_save_preempt_queue(struct igc_adapter *adapter, const struct tc_mqprio_qopt_offload *mqprio); u32 igc_fpe_get_supported_frag_size(u32 frag_size); --=20 2.34.1