netdev - Re: [PATCH] tg3: fix ring init when there are more TX than RX channels

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20141125195721.GB3933@oc0812247204.br.ibm.com>
Date:	Tue, 25 Nov 2014 17:57:21 -0200
From:	cascardo@...ux.vnet.ibm.com
To:	David Miller <davem@...emloft.net>
Cc:	netdev@...r.kernel.org, prashant@...adcom.com, mchan@...adcom.com
Subject: Re: [PATCH] tg3: fix ring init when there are more TX than RX
 channels

On Tue, Nov 25, 2014 at 02:33:52PM -0500, David Miller wrote:
> From: Thadeu Lima de Souza Cascardo <cascardo@...ux.vnet.ibm.com>
> Date: Tue, 25 Nov 2014 14:21:11 -0200
> 
> > @@ -8563,7 +8563,8 @@ static int tg3_init_rings(struct tg3 *tp)
> >  		if (tnapi->rx_rcb)
> >  			memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp));
> >  
> > -		if (tg3_rx_prodring_alloc(tp, &tnapi->prodring)) {
> > +		if (tnapi->prodring.rx_std &&
> > +		    tg3_rx_prodring_alloc(tp, &tnapi->prodring)) {
> >  			tg3_free_rings(tp);
> >  			return -ENOMEM;
> 
> Maybe a better test is "i < tp->rxq_cnt"?  This is what is used in
> tg3_mem_rx_acquire() to determine if tg3_rx_prodring_init() happens.
> 

Well, what we have in net-next/master does:

	for (i = 0; i < limit; i++) {
		struct tg3_napi *tnapi = &tp->napi[i];

		if (tg3_rx_prodring_init(tp, &tnapi->prodring))
			goto err_out;

where limit is:

	limit = tp->rxq_cnt;

	if (tg3_flag(tp, ENABLE_RSS))
		limit++;

So, I thought that, instead of rewriting that same logic in
tg3_init_rings, that we should better just check that the rx_std has
been allocated, which is going to happen in tg3_rx_prodring_init.

So, the alternative would be:

 
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index dbb41c19..51d45aa 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -8540,7 +8540,11 @@ static void tg3_free_rings(struct tg3 *tp)
  */
 static int tg3_init_rings(struct tg3 *tp)
 {
-	int i;
+	int i, limit;
+
+	limit = tp->rxq_cnt;
+	if (tg3_flag(tp, ENABLE_RSS))
+		limit++;
 
 	/* Free up all the SKBs. */
 	tg3_free_rings(tp);
@@ -8563,7 +8567,8 @@ static int tg3_init_rings(struct tg3 *tp)
 		if (tnapi->rx_rcb)
 			memset(tnapi->rx_rcb, 0, TG3_RX_RCB_RING_BYTES(tp));
 
-		if (tg3_rx_prodring_alloc(tp, &tnapi->prodring)) {
+		if (i < limit &&
+		    tg3_rx_prodring_alloc(tp, &tnapi->prodring)) {
 			tg3_free_rings(tp);
 			return -ENOMEM;
 		}

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html