Skip to contentSkip to conversation

ixgbe: Use refcount_t for refcount

PATCH In review Chuhong Yuan 4 participants 5 messages Aug 2, 2019 – Aug 5, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 ixgbe: Use refcount_t for refcount

refcount_t is better for reference counters since its implementation can prevent overflows.
So convert atomic_t ref counters to refcount_t.

Also convert refcount from 0-based to 1-based.

This patch depends on PATCH 1/2.

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 6 +++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +3 -3
index 00710f43cfd2..d313d00065cd 100644
@@ -773,7 +773,7 @@ int ixgbe_setup_fcoe_ddp_resources(struct ixgbe_adapter *adapter)
 
 	fcoe->extra_ddp_buffer = buffer;
 	fcoe->extra_ddp_buffer_dma = dma;
-	atomic_set(&fcoe->refcnt, 0);
+	refcount_set(&fcoe->refcnt, 1);
 
 	/* allocate pci pool for each cpu */
 	for_each_possible_cpu(cpu) {
@@ -837,7 +837,7 @@ int ixgbe_fcoe_enable(struct net_device *netdev)
 	struct ixgbe_adapter *adapter = netdev_priv(netdev);
 	struct ixgbe_fcoe *fcoe = &adapter->fcoe;
 
-	atomic_inc(&fcoe->refcnt);
+	refcount_inc(&fcoe->refcnt);
 
 	if (!(adapter->flags & IXGBE_FLAG_FCOE_CAPABLE))
 		return -EINVAL;
@@ -883,7 +883,7 @@ int ixgbe_fcoe_disable(struct net_device *netdev)
 {
 	struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
-	if (!atomic_dec_and_test(&adapter->fcoe.refcnt))
+	if (!refcount_dec_and_test(&adapter->fcoe.refcnt))
 		return -EINVAL;
 
 	if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h +1 -1
index 724f5382329f..7ace5fee6ede 100644
@@ -51,7 +51,7 @@ struct ixgbe_fcoe_ddp_pool {
 
 struct ixgbe_fcoe {
 	struct ixgbe_fcoe_ddp_pool __percpu *ddp_pool;
-	atomic_t refcnt;
+	refcount_t refcnt;
 	spinlock_t lock;
 	struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX_X550];
 	void *extra_ddp_buffer;
Signature · 1 line
2.20.1
#1 lore raw
Quoted 20 lines · Chuhong Yuan

refcount_t is better for reference counters since its implementation can prevent overflows.
So convert atomic_t ref counters to refcount_t.

Also convert refcount from 0-based to 1-based.

This patch depends on PATCH 1/2.

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 6 +++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +0 -0
index 00710f43cfd2..d313d00065cd 100644

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c int ixgbe_setup_fcoe_ddp_resources(struct ixgbe_adapter *adapter) · line 776

Quoted 5 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +1 -1
@@ -773,7 +773,7 @@ int ixgbe_setup_fcoe_ddp_resources(struct ixgbe_adapter *adapter)
 
        fcoe->extra_ddp_buffer = buffer;
        fcoe->extra_ddp_buffer_dma = dma;
-       atomic_set(&fcoe->refcnt, 0);
+       refcount_set(&fcoe->refcnt, 1);

Same point as in the cxgb4 driver patch: how can you just change the initial value without modifying the condition for release?

This is not a suggestion to resubmit all these changes again with a change to the release condition.

#2 lore raw
Quoted 31 lines · Willem de Bruijn
Quoted 20 lines · Chuhong Yuan

refcount_t is better for reference counters since its implementation can prevent overflows.
So convert atomic_t ref counters to refcount_t.

Also convert refcount from 0-based to 1-based.

This patch depends on PATCH 1/2.

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 6 +++---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +0 -0
index 00710f43cfd2..d313d00065cd 100644

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c int ixgbe_setup_fcoe_ddp_resources(struct ixgbe_adapter *adapter) · line 776

Quoted 5 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +1 -1
@@ -773,7 +773,7 @@ int ixgbe_setup_fcoe_ddp_resources(struct ixgbe_adapter *adapter)
 
        fcoe->extra_ddp_buffer = buffer;
        fcoe->extra_ddp_buffer_dma = dma;
-       atomic_set(&fcoe->refcnt, 0);
+       refcount_set(&fcoe->refcnt, 1);

Same point as in the cxgb4 driver patch: how can you just change the initial value without modifying the condition for release?

Quoted 2 lines

This is not a suggestion to resubmit all these changes again with a change to the release condition.

So I am pretty sure this patch is badly broken. It doesn't make any sense to be resetting with the refcnt in ixgbe_setup_fcoe_ddp_resources. The value is initialized to zero when the adapter structure was allocated.

Consider this a NAK from me.

Tested-by on v1 2/2
#3 lore raw
In reply to Chuhong Yuan
Quoted 15 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Chuhong Yuan
Sent: Friday, August 2, 2019 3:55 AM
Cc: netdev at vger.kernel.org; Chuhong Yuan <[email protected]>; linux- kernel at vger.kernel.org; intel-wired-lan at lists.osuosl.org; David S . Miller <[email protected]>
Subject: [Intel-wired-lan] [PATCH 2/2] ixgbe: Use refcount_t for refcount

refcount_t is better for reference counters since its implementation can prevent overflows.
So convert atomic_t ref counters to refcount_t.

Also convert refcount from 0-based to 1-based.

Quoted 7 lines

This patch depends on PATCH 1/2.

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 6 +++---
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
#4 lore raw
Quoted 18 lines · AndrewX
Quoted 18 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Chuhong Yuan
Sent: Friday, August 2, 2019 3:55 AM
Cc: netdev at vger.kernel.org; Chuhong Yuan <[email protected]>; linux- kernel at vger.kernel.org; intel-wired-lan at lists.osuosl.org; David S . Miller <[email protected]>
Subject: [Intel-wired-lan] [PATCH 2/2] ixgbe: Use refcount_t for refcount

refcount_t is better for reference counters since its implementation can prevent overflows.
So convert atomic_t ref counters to refcount_t.

Also convert refcount from 0-based to 1-based.

This patch depends on PATCH 1/2.

Quoted 7 lines
Quoted 5 lines
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 6 +++---
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

To reiterate, this patchset should not be applied as is. It is not correct to simply change the initial refcount.