| Message ID | 1401867571-11684-5-git-send-email-b38611@freescale.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Fugang Duan > In order to support SG, software TSO, let's increase BD entry number. > > CC: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > CC: Eric Dumazet <eric.dumazet@gmail.com> > CC: David Laight <David.Laight@ACULAB.COM> > Signed-off-by: Fugang Duan <B38611@freescale.com> > --- > drivers/net/ethernet/freescale/fec.h | 6 +++--- > drivers/net/ethernet/freescale/fec_main.c | 21 ++++++++++++--------- > 2 files changed, 15 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h > index 3b8d6d1..798ad88 100644 > --- a/drivers/net/ethernet/freescale/fec.h > +++ b/drivers/net/ethernet/freescale/fec.h > @@ -240,14 +240,14 @@ struct bufdesc_ex { > * the skbuffer directly. > */ > > -#define FEC_ENET_RX_PAGES 8 > +#define FEC_ENET_RX_PAGES 128 > #define FEC_ENET_RX_FRSIZE 2048 > #define FEC_ENET_RX_FRPPG (PAGE_SIZE / FEC_ENET_RX_FRSIZE) > #define RX_RING_SIZE (FEC_ENET_RX_FRPPG * FEC_ENET_RX_PAGES) > ... You are changing the number of rx descriptors as well. This isn't mentioned in the description. And, as I said before, basing this on PAGE_SIZE cannot be right. David -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Laight <David.Laight@ACULAB.COM> Data: Wednesday, June 04, 2014 5:27 PM > To: Duan Fugang-B38611; davem@davemloft.net > Cc: netdev@vger.kernel.org; shawn.guo@linaro.org; Estevam Fabio-R49496; > ezequiel.garcia@free-electrons.com; bhutchings@solarflare.com; > stephen@networkplumber.org; Li Frank-B20596; eric.dumazet@gmail.com > Subject: RE: [PATCH v2 4/6] net: fec: Increase buffer descriptor entry > number > > From: Fugang Duan > > In order to support SG, software TSO, let's increase BD entry number. > > > > CC: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > CC: Eric Dumazet <eric.dumazet@gmail.com> > > CC: David Laight <David.Laight@ACULAB.COM> > > Signed-off-by: Fugang Duan <B38611@freescale.com> > > --- > > drivers/net/ethernet/freescale/fec.h | 6 +++--- > > drivers/net/ethernet/freescale/fec_main.c | 21 ++++++++++++------- > -- > > 2 files changed, 15 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/net/ethernet/freescale/fec.h > b/drivers/net/ethernet/freescale/fec.h > > index 3b8d6d1..798ad88 100644 > > --- a/drivers/net/ethernet/freescale/fec.h > > +++ b/drivers/net/ethernet/freescale/fec.h > > @@ -240,14 +240,14 @@ struct bufdesc_ex { > > * the skbuffer directly. > > */ > > > > -#define FEC_ENET_RX_PAGES 8 > > +#define FEC_ENET_RX_PAGES 128 > > #define FEC_ENET_RX_FRSIZE 2048 > > #define FEC_ENET_RX_FRPPG (PAGE_SIZE / FEC_ENET_RX_FRSIZE) > > #define RX_RING_SIZE (FEC_ENET_RX_FRPPG * FEC_ENET_RX_PAGES) > > ... > > You are changing the number of rx descriptors as well. > This isn't mentioned in the description. > > And, as I said before, basing this on PAGE_SIZE cannot be right. > > David > The patch just increase tx and rx BD entry number, and from previous discuss, we set tx number to 512, rx number to 256. Thanks, Andy -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, David, From: David Laight <David.Laight@ACULAB.COM> Data: Wednesday, June 04, 2014 5:27 PM > To: Duan Fugang-B38611; davem@davemloft.net > Cc: netdev@vger.kernel.org; shawn.guo@linaro.org; Estevam Fabio-R49496; > ezequiel.garcia@free-electrons.com; bhutchings@solarflare.com; > stephen@networkplumber.org; Li Frank-B20596; eric.dumazet@gmail.com > Subject: RE: [PATCH v2 4/6] net: fec: Increase buffer descriptor entry > number > > From: Fugang Duan > > In order to support SG, software TSO, let's increase BD entry number. > > > > CC: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > CC: Eric Dumazet <eric.dumazet@gmail.com> > > CC: David Laight <David.Laight@ACULAB.COM> > > Signed-off-by: Fugang Duan <B38611@freescale.com> > > --- > > drivers/net/ethernet/freescale/fec.h | 6 +++--- > > drivers/net/ethernet/freescale/fec_main.c | 21 ++++++++++++--------- > > 2 files changed, 15 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/net/ethernet/freescale/fec.h > b/drivers/net/ethernet/freescale/fec.h > > index 3b8d6d1..798ad88 100644 > > --- a/drivers/net/ethernet/freescale/fec.h > > +++ b/drivers/net/ethernet/freescale/fec.h > > @@ -240,14 +240,14 @@ struct bufdesc_ex { > > * the skbuffer directly. > > */ > > > > -#define FEC_ENET_RX_PAGES 8 > > +#define FEC_ENET_RX_PAGES 128 > > #define FEC_ENET_RX_FRSIZE 2048 > > #define FEC_ENET_RX_FRPPG (PAGE_SIZE / FEC_ENET_RX_FRSIZE) > > #define RX_RING_SIZE (FEC_ENET_RX_FRPPG * FEC_ENET_RX_PAGES) > > ... > > You are changing the number of rx descriptors as well. > This isn't mentioned in the description. > > And, as I said before, basing this on PAGE_SIZE cannot be right. > > David Ok, I agree your advice. I will remove the change for RX BD entry. After test, the performance has no impact. My initial purpose of increasing it is for interrupt coalescing patch. Thanks, Andy -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index 3b8d6d1..798ad88 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -240,14 +240,14 @@ struct bufdesc_ex { * the skbuffer directly. */ -#define FEC_ENET_RX_PAGES 8 +#define FEC_ENET_RX_PAGES 128 #define FEC_ENET_RX_FRSIZE 2048 #define FEC_ENET_RX_FRPPG (PAGE_SIZE / FEC_ENET_RX_FRSIZE) #define RX_RING_SIZE (FEC_ENET_RX_FRPPG * FEC_ENET_RX_PAGES) #define FEC_ENET_TX_FRSIZE 2048 #define FEC_ENET_TX_FRPPG (PAGE_SIZE / FEC_ENET_TX_FRSIZE) -#define TX_RING_SIZE 16 /* Must be power of two */ -#define TX_RING_MOD_MASK 15 /* for this to work */ +#define TX_RING_SIZE 512 /* Must be power of two */ +#define TX_RING_MOD_MASK 511 /* for this to work */ #define BD_ENET_RX_INT 0x00800000 #define BD_ENET_RX_PTP ((ushort)0x0400) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index cf3c368..9de1660 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -173,10 +173,6 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); #endif #endif /* CONFIG_M5272 */ -#if (((RX_RING_SIZE + TX_RING_SIZE) * 32) > PAGE_SIZE) -#error "FEC: descriptor ring size constants too large" -#endif - /* Interrupt events/masks. */ #define FEC_ENET_HBERR ((uint)0x80000000) /* Heartbeat error */ #define FEC_ENET_BABR ((uint)0x40000000) /* Babbling receiver */ @@ -2061,9 +2057,20 @@ static int fec_enet_init(struct net_device *ndev) const struct platform_device_id *id_entry = platform_get_device_id(fep->pdev); struct bufdesc *cbd_base; + int bd_size; + + /* init the tx & rx ring size */ + fep->tx_ring_size = TX_RING_SIZE; + fep->rx_ring_size = RX_RING_SIZE; + + if (fep->bufdesc_ex) + bd_size = sizeof(struct bufdesc_ex); + else + bd_size = sizeof(struct bufdesc); + bd_size *= (fep->tx_ring_size + fep->rx_ring_size); /* Allocate memory for buffer descriptors. */ - cbd_base = dma_alloc_coherent(NULL, PAGE_SIZE, &fep->bd_dma, + cbd_base = dma_alloc_coherent(NULL, bd_size, &fep->bd_dma, GFP_KERNEL); if (!cbd_base) return -ENOMEM; @@ -2077,10 +2084,6 @@ static int fec_enet_init(struct net_device *ndev) /* make sure MAC we just acquired is programmed into the hw */ fec_set_mac_address(ndev, NULL); - /* init the tx & rx ring size */ - fep->tx_ring_size = TX_RING_SIZE; - fep->rx_ring_size = RX_RING_SIZE; - /* Set receive and transmit descriptor base. */ fep->rx_bd_base = cbd_base; if (fep->bufdesc_ex)
In order to support SG, software TSO, let's increase BD entry number. CC: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> CC: Eric Dumazet <eric.dumazet@gmail.com> CC: David Laight <David.Laight@ACULAB.COM> Signed-off-by: Fugang Duan <B38611@freescale.com> --- drivers/net/ethernet/freescale/fec.h | 6 +++--- drivers/net/ethernet/freescale/fec_main.c | 21 ++++++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-)