Skip to contentSkip to conversation

ipc/sem.c: Convert kfree_rcu() to call_rcu() in freeary function

PATCH In review [email protected] 2 participants 3 messages Dec 30, 2020 – Dec 31, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipc/sem.c: Convert kfree_rcu() to call_rcu() in freeary function

From: Zqiang <[email protected]>

Due to freeary function is called with spinlock be held, the synchronize_rcu function may be called in kfree_rcu function, the schedule may be happen in spinlock critical region, need to replace kfree_rcu() with call_rcu().

Fixes 693a8b6eecce ("ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()")
---
 ipc/sem.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
ipc/sem.c +8 -1
index f6c30a85dadf..12c3184347d9 100644
@@ -1132,6 +1132,13 @@ static int count_semcnt(struct sem_array *sma, ushort semnum,
 	return semcnt;
 }
 
+static void free_un(struct rcu_head *head)
+{
+	struct sem_undo *un = container_of(head, struct sem_undo, rcu);
+
+	kfree(un);
+}
+
 /* Free a semaphore set. freeary() is called with sem_ids.rwsem locked
  * as a writer and the spinlock for this semaphore set hold. sem_ids.rwsem
  * remains locked on exit.
@@ -1152,7 +1159,7 @@ static void freeary(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
 		un->semid = -1;
 		list_del_rcu(&un->list_proc);
 		spin_unlock(&un->ulp->lock);
-		kfree_rcu(un, rcu);
+		call_rcu(&un->rcu, free_un);
 	}
 
 	/* Wake up all pending processes and let them fail with EIDRM. */
Signature · 1 line
2.17.1
#1 lore raw
Quoted 6 lines · On Wed, Dec 30, 2020 at 08:00:38PM +0800, [email protected] wrote:

From: Zqiang <[email protected]>

Due to freeary function is called with spinlock be held, the synchronize_rcu function may be called in kfree_rcu function, the schedule may be happen in spinlock critical region, need to replace kfree_rcu() with call_rcu().

Except that the call to kfree_rcu() below has two arguments, and thus provides a link for queuing the callback. It will never directly invoke synchronize_rcu(). It is only the single-argument variant of kfree_rcu() that might invoke synchronize_rcu().

Or are you seeing lockdep or might-sleep failures with the current code? If so, please post the relevant portions of the console output.

Thanx, Paul

Quoted 36 lines
Fixes 693a8b6eecce ("ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()")
---
 ipc/sem.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
ipc/sem.c +8 -1
index f6c30a85dadf..12c3184347d9 100644
@@ -1132,6 +1132,13 @@ static int count_semcnt(struct sem_array *sma, ushort semnum,
 	return semcnt;
 }
 
+static void free_un(struct rcu_head *head)
+{
+	struct sem_undo *un = container_of(head, struct sem_undo, rcu);
+
+	kfree(un);
+}
+
 /* Free a semaphore set. freeary() is called with sem_ids.rwsem locked
  * as a writer and the spinlock for this semaphore set hold. sem_ids.rwsem
  * remains locked on exit.
@@ -1152,7 +1159,7 @@ static void freeary(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
 		un->semid = -1;
 		list_del_rcu(&un->list_proc);
 		spin_unlock(&un->ulp->lock);
-		kfree_rcu(un, rcu);
+		call_rcu(&un->rcu, free_un);
 	}
 
 	/* Wake up all pending processes and let them fail with EIDRM. */
Signature · 1 line
2.17.1
#2 lore raw

________________________________________
发件人: Paul E. McKenney <[email protected]>
发送时间: 2020年12月31日 0:19
收件人: Zhang, Qiang
抄送: [email protected]; [email protected]; [email protected]; [email protected] 主题: Re: [PATCH] ipc/sem.c: Convert kfree_rcu() to call_rcu() in freeary function

Quoted 11 lines · On Wed, Dec 30, 2020 at 08:00:38PM +0800, [email protected] wrote:

From: Zqiang <[email protected]>

Due to freeary function is called with spinlock be held, the synchronize_rcu function may be called in kfree_rcu function, the schedule may be happen in spinlock critical region, need to replace kfree_rcu() with call_rcu().

Except that the call to kfree_rcu() below has two arguments, and >thus provides a link for queuing the callback. It will never directly invoke synchronize_rcu(). It is only the single-argument variant of >kfree_rcu() that might invoke synchronize_rcu().

Sorry. It was my mistake, please ignore this patch.

Thanks
Qiang

Quoted 41 lines

Or are you seeing lockdep or might-sleep failures with the current >code? If so, please post the relevant portions of the console output.

Thanx, Paul

Fixes 693a8b6eecce ("ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()")
---
 ipc/sem.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
ipc/sem.c +8 -2
index f6c30a85dadf..12c3184347d9 100644
@@ -1132,6 +1132,13 @@ static int count_semcnt(struct sem_array *sma, ushort semnum,
      return semcnt;
 }
 
+static void free_un(struct rcu_head *head)
+{
+     struct sem_undo *un = container_of(head, struct sem_undo, rcu);
+
+     kfree(un);
+}
+
 /* Free a semaphore set. freeary() is called with sem_ids.rwsem locked
  * as a writer and the spinlock for this semaphore set hold. sem_ids.rwsem
  * remains locked on exit.
@@ -1152,7 +1159,7 @@ static void freeary(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
              un->semid = -1;
              list_del_rcu(&un->list_proc);
              spin_unlock(&un->ulp->lock);
-             kfree_rcu(un, rcu);
+             call_rcu(&un->rcu, free_un);
      }
 
      /* Wake up all pending processes and let them fail with EIDRM. */
--

2.17.1