* [PATCH net-next v4] igc: offload queue max SDU from tc-taprio
@ 2023-02-09 2:29 ` Muhammad Husaini Zulkifli
0 siblings, 0 replies; 4+ messages in thread
From: Muhammad Husaini Zulkifli @ 2023-02-09 2:29 UTC (permalink / raw)
To: intel-wired-lan
Cc: vinicius.gomes, muhammad.husaini.zulkifli, naamax.meir,
anthony.l.nguyen, leon, davem, kuba, pabeni, edumazet,
tee.min.tan, netdev, sasha.neftin
From: Tan Tee Min <tee.min.tan@linux.intel.com>
Add support for configuring the max SDU for each Tx queue.
If not specified, keep the default.
Signed-off-by: Tan Tee Min <tee.min.tan@linux.intel.com>
Signed-off-by: Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>
---
V3 -> V4: Rebase to the latest tree as per requested by Anthony.
V2 -> V3: Rework based on Leon Romanovsky's comment.
V1 -> V2: Rework based on Vinicius's comment.
---
---
drivers/net/ethernet/intel/igc/igc.h | 1 +
drivers/net/ethernet/intel/igc/igc_main.c | 29 ++++++++++++++++++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
index 9db93c1f97679..34aebf00a5123 100644
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -99,6 +99,7 @@ struct igc_ring {
u32 start_time;
u32 end_time;
+ u32 max_sdu;
/* CBS parameters */
bool cbs_enable; /* indicates if CBS is enabled */
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index ddbabf4213499..bba3fe31157fb 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -1508,6 +1508,7 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
__le32 launch_time = 0;
u32 tx_flags = 0;
unsigned short f;
+ u32 max_sdu = 0;
ktime_t txtime;
u8 hdr_len = 0;
int tso = 0;
@@ -1527,6 +1528,14 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
return NETDEV_TX_BUSY;
}
+ if (tx_ring->max_sdu > 0) {
+ max_sdu = tx_ring->max_sdu +
+ (skb_vlan_tagged(skb) ? VLAN_HLEN : 0);
+
+ if (skb->len > max_sdu)
+ goto skb_drop;
+ }
+
if (!tx_ring->launchtime_enable)
goto done;
@@ -1606,6 +1615,11 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
dev_kfree_skb_any(first->skb);
first->skb = NULL;
+ return NETDEV_TX_OK;
+
+skb_drop:
+ dev_kfree_skb_any(skb);
+
return NETDEV_TX_OK;
}
@@ -6039,6 +6053,7 @@ static int igc_tsn_clear_schedule(struct igc_adapter *adapter)
ring->start_time = 0;
ring->end_time = NSEC_PER_SEC;
+ ring->max_sdu = 0;
}
return 0;
@@ -6122,6 +6137,16 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
}
}
+ for (i = 0; i < adapter->num_tx_queues; i++) {
+ struct igc_ring *ring = adapter->tx_ring[i];
+ struct net_device *dev = adapter->netdev;
+
+ if (qopt->max_sdu[i])
+ ring->max_sdu = qopt->max_sdu[i] + dev->hard_header_len;
+ else
+ ring->max_sdu = 0;
+ }
+
return 0;
}
@@ -6220,8 +6245,10 @@ static int igc_tc_query_caps(struct igc_adapter *adapter,
caps->broken_mqprio = true;
- if (hw->mac.type == igc_i225)
+ if (hw->mac.type == igc_i225) {
+ caps->supports_queue_max_sdu = true;
caps->gate_mask_per_txq = true;
+ }
return 0;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Intel-wired-lan] [PATCH net-next v4] igc: offload queue max SDU from tc-taprio
@ 2023-02-09 2:29 ` Muhammad Husaini Zulkifli
0 siblings, 0 replies; 4+ messages in thread
From: Muhammad Husaini Zulkifli @ 2023-02-09 2:29 UTC (permalink / raw)
To: intel-wired-lan
Cc: pabeni, leon, netdev, edumazet, anthony.l.nguyen, kuba,
muhammad.husaini.zulkifli, davem, tee.min.tan
From: Tan Tee Min <tee.min.tan@linux.intel.com>
Add support for configuring the max SDU for each Tx queue.
If not specified, keep the default.
Signed-off-by: Tan Tee Min <tee.min.tan@linux.intel.com>
Signed-off-by: Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>
---
V3 -> V4: Rebase to the latest tree as per requested by Anthony.
V2 -> V3: Rework based on Leon Romanovsky's comment.
V1 -> V2: Rework based on Vinicius's comment.
---
---
drivers/net/ethernet/intel/igc/igc.h | 1 +
drivers/net/ethernet/intel/igc/igc_main.c | 29 ++++++++++++++++++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
index 9db93c1f97679..34aebf00a5123 100644
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -99,6 +99,7 @@ struct igc_ring {
u32 start_time;
u32 end_time;
+ u32 max_sdu;
/* CBS parameters */
bool cbs_enable; /* indicates if CBS is enabled */
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index ddbabf4213499..bba3fe31157fb 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -1508,6 +1508,7 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
__le32 launch_time = 0;
u32 tx_flags = 0;
unsigned short f;
+ u32 max_sdu = 0;
ktime_t txtime;
u8 hdr_len = 0;
int tso = 0;
@@ -1527,6 +1528,14 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
return NETDEV_TX_BUSY;
}
+ if (tx_ring->max_sdu > 0) {
+ max_sdu = tx_ring->max_sdu +
+ (skb_vlan_tagged(skb) ? VLAN_HLEN : 0);
+
+ if (skb->len > max_sdu)
+ goto skb_drop;
+ }
+
if (!tx_ring->launchtime_enable)
goto done;
@@ -1606,6 +1615,11 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
dev_kfree_skb_any(first->skb);
first->skb = NULL;
+ return NETDEV_TX_OK;
+
+skb_drop:
+ dev_kfree_skb_any(skb);
+
return NETDEV_TX_OK;
}
@@ -6039,6 +6053,7 @@ static int igc_tsn_clear_schedule(struct igc_adapter *adapter)
ring->start_time = 0;
ring->end_time = NSEC_PER_SEC;
+ ring->max_sdu = 0;
}
return 0;
@@ -6122,6 +6137,16 @@ static int igc_save_qbv_schedule(struct igc_adapter *adapter,
}
}
+ for (i = 0; i < adapter->num_tx_queues; i++) {
+ struct igc_ring *ring = adapter->tx_ring[i];
+ struct net_device *dev = adapter->netdev;
+
+ if (qopt->max_sdu[i])
+ ring->max_sdu = qopt->max_sdu[i] + dev->hard_header_len;
+ else
+ ring->max_sdu = 0;
+ }
+
return 0;
}
@@ -6220,8 +6245,10 @@ static int igc_tc_query_caps(struct igc_adapter *adapter,
caps->broken_mqprio = true;
- if (hw->mac.type == igc_i225)
+ if (hw->mac.type == igc_i225) {
+ caps->supports_queue_max_sdu = true;
caps->gate_mask_per_txq = true;
+ }
return 0;
}
--
2.17.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Intel-wired-lan] [PATCH net-next v4] igc: offload queue max SDU from tc-taprio
2023-02-09 2:29 ` [Intel-wired-lan] " Muhammad Husaini Zulkifli
@ 2023-02-09 5:31 ` Jakub Kicinski
-1 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2023-02-09 5:31 UTC (permalink / raw)
To: Muhammad Husaini Zulkifli
Cc: leon, intel-wired-lan, edumazet, anthony.l.nguyen, netdev,
pabeni, davem, tee.min.tan
On Thu, 9 Feb 2023 10:29:24 +0800 Muhammad Husaini Zulkifli wrote:
> V3 -> V4: Rebase to the latest tree as per requested by Anthony.
> V2 -> V3: Rework based on Leon Romanovsky's comment.
Eh. Comment from v3 apply.
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next v4] igc: offload queue max SDU from tc-taprio
@ 2023-02-09 5:31 ` Jakub Kicinski
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2023-02-09 5:31 UTC (permalink / raw)
To: Muhammad Husaini Zulkifli
Cc: intel-wired-lan, vinicius.gomes, naamax.meir, anthony.l.nguyen,
leon, davem, pabeni, edumazet, tee.min.tan, netdev, sasha.neftin
On Thu, 9 Feb 2023 10:29:24 +0800 Muhammad Husaini Zulkifli wrote:
> V3 -> V4: Rebase to the latest tree as per requested by Anthony.
> V2 -> V3: Rework based on Leon Romanovsky's comment.
Eh. Comment from v3 apply.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-09 5:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-09 2:29 [PATCH net-next v4] igc: offload queue max SDU from tc-taprio Muhammad Husaini Zulkifli
2023-02-09 2:29 ` [Intel-wired-lan] " Muhammad Husaini Zulkifli
2023-02-09 5:31 ` Jakub Kicinski
2023-02-09 5:31 ` Jakub Kicinski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.