diff mbox series

[v1,1/3] net/axgbe: packet size doesn't exceed the configured MTU

Message ID 20231111160006.455767-1-jesna.k.e@amd.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series [v1,1/3] net/axgbe: packet size doesn't exceed the configured MTU |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Jesna K E Nov. 11, 2023, 4 p.m. UTC 
  Signed-off-by: Jesna K E <jesna.k.e@amd.com>
---
 drivers/net/axgbe/axgbe_ethdev.c |  6 ------
 drivers/net/axgbe/axgbe_rxtx.c   | 20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

Comments

Ferruh Yigit Nov. 13, 2023, 3:07 p.m. UTC | #1 
On 11/11/2023 4:00 PM, Jesna K E wrote:
> Signed-off-by: Jesna K E <jesna.k.e@amd.com>
>

Hi Jesna,

Description is missing, making it hard to understand the problem and
motivation of the change.


> ---
>  drivers/net/axgbe/axgbe_ethdev.c |  6 ------
>  drivers/net/axgbe/axgbe_rxtx.c   | 20 ++++++++++++++++++--
>  2 files changed, 18 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
> index 3717166384..e12ee3e17a 100644
> --- a/drivers/net/axgbe/axgbe_ethdev.c
> +++ b/drivers/net/axgbe/axgbe_ethdev.c
> @@ -1492,12 +1492,6 @@ static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
>  	struct axgbe_port *pdata = dev->data->dev_private;
>  	unsigned int val;
>  
> -	/* mtu setting is forbidden if port is start */
> -	if (dev->data->dev_started) {
> -		PMD_DRV_LOG(ERR, "port %d must be stopped before configuration",
> -				dev->data->port_id);
> -		return -EBUSY;
> -	}
>

Is it allowed to configure MTU when port is already started?

>  	val = mtu > RTE_ETHER_MTU ? 1 : 0;
>  	AXGMAC_IOWRITE_BITS(pdata, MAC_RCR, JE, val);
>  
> diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
> index a9ff291cef..68aa67a3fa 100644
> --- a/drivers/net/axgbe/axgbe_rxtx.c
> +++ b/drivers/net/axgbe/axgbe_rxtx.c
> @@ -210,7 +210,7 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
>  	uint64_t old_dirty = rxq->dirty;
>  	struct rte_mbuf *mbuf, *tmbuf;
>  	unsigned int err, etlt;
> -	uint32_t error_status;
> +	uint32_t error_status, max_len;
>  	uint16_t idx, pidx, pkt_len;
>  
>  	idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur);
> @@ -300,6 +300,14 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
>  					| RTE_MBUF_F_RX_IEEE1588_TMST;
>  		pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3,
>  					     PL) - rxq->crc_len;
> +
> +		/* Be sure we don't exceed the configured MTU */
> +		max_len = rxq->pdata->eth_dev->data->mtu  + RTE_ETHER_HDR_LEN;
> +			if (pkt_len > max_len) {
> +				printf( "packet length exceeds configured MTU\n");
> +				goto err_set;
> +			}
> +
>

Not sure if it is good idea to add above check per packet, can there be
a device configuration to limit received packet size.


>  		/* Mbuf populate */
>  		mbuf->next = NULL;
>  		mbuf->data_off = RTE_PKTMBUF_HEADROOM;
> @@ -342,7 +350,7 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
>  	struct rte_mbuf *first_seg = NULL;
>  	struct rte_mbuf *mbuf, *tmbuf;
>  	unsigned int err = 0, etlt;
> -	uint32_t error_status = 0;
> +	uint32_t error_status = 0, max_len = 0;
>  	uint16_t idx, pidx, data_len = 0, pkt_len = 0;
>  	bool eop = 0;
>  
> @@ -409,6 +417,14 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
>  			}
>  
>  		}
> +
> +                /* Be sure we don't exceed the configured MTU */
> +                max_len = rxq->pdata->eth_dev->data->mtu  + RTE_ETHER_HDR_LEN;
> +                        if (pkt_len > max_len) {
> +                                printf( "packet length exceeds configured MTU\n");
> +                                goto err_set;
> +                        }
> +
>  		/* Mbuf populate */
>  		mbuf->data_off = RTE_PKTMBUF_HEADROOM;
>  		mbuf->data_len = data_len;
diff mbox series

Patch

diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
index 3717166384..e12ee3e17a 100644
--- a/drivers/net/axgbe/axgbe_ethdev.c
+++ b/drivers/net/axgbe/axgbe_ethdev.c
@@ -1492,12 +1492,6 @@  static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 	struct axgbe_port *pdata = dev->data->dev_private;
 	unsigned int val;
 
-	/* mtu setting is forbidden if port is start */
-	if (dev->data->dev_started) {
-		PMD_DRV_LOG(ERR, "port %d must be stopped before configuration",
-				dev->data->port_id);
-		return -EBUSY;
-	}
 	val = mtu > RTE_ETHER_MTU ? 1 : 0;
 	AXGMAC_IOWRITE_BITS(pdata, MAC_RCR, JE, val);
 
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index a9ff291cef..68aa67a3fa 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -210,7 +210,7 @@  axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 	uint64_t old_dirty = rxq->dirty;
 	struct rte_mbuf *mbuf, *tmbuf;
 	unsigned int err, etlt;
-	uint32_t error_status;
+	uint32_t error_status, max_len;
 	uint16_t idx, pidx, pkt_len;
 
 	idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur);
@@ -300,6 +300,14 @@  axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 					| RTE_MBUF_F_RX_IEEE1588_TMST;
 		pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3,
 					     PL) - rxq->crc_len;
+
+		/* Be sure we don't exceed the configured MTU */
+		max_len = rxq->pdata->eth_dev->data->mtu  + RTE_ETHER_HDR_LEN;
+			if (pkt_len > max_len) {
+				printf( "packet length exceeds configured MTU\n");
+				goto err_set;
+			}
+
 		/* Mbuf populate */
 		mbuf->next = NULL;
 		mbuf->data_off = RTE_PKTMBUF_HEADROOM;
@@ -342,7 +350,7 @@  uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
 	struct rte_mbuf *first_seg = NULL;
 	struct rte_mbuf *mbuf, *tmbuf;
 	unsigned int err = 0, etlt;
-	uint32_t error_status = 0;
+	uint32_t error_status = 0, max_len = 0;
 	uint16_t idx, pidx, data_len = 0, pkt_len = 0;
 	bool eop = 0;
 
@@ -409,6 +417,14 @@  uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
 			}
 
 		}
+
+                /* Be sure we don't exceed the configured MTU */
+                max_len = rxq->pdata->eth_dev->data->mtu  + RTE_ETHER_HDR_LEN;
+                        if (pkt_len > max_len) {
+                                printf( "packet length exceeds configured MTU\n");
+                                goto err_set;
+                        }
+
 		/* Mbuf populate */
 		mbuf->data_off = RTE_PKTMBUF_HEADROOM;
 		mbuf->data_len = data_len;