tracehook: clear TIF_NOTIFY_RESUME in tracehook_notify_resume()

All the callers currently do this, clean it up and move the clearing
into tracehook_notify_resume() instead.

Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 15bc9d1e79f4d70cead96ffed802c879499efea1..3739efce1ec02821a43ea322b3e956d3433777bc 100644 (file)
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -531,7 +531,6 @@ do_work_pending(struct pt_regs *regs, unsigned long thread_flags,
                                do_signal(regs, r0, r19);
                                r0 = 0;
                        } else {
-                               clear_thread_flag(TIF_NOTIFY_RESUME);
                                tracehook_notify_resume(regs);
                        }
                }

diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
index 8222f8c546902950abd7f4568e785a8de9122e9e..2be55fb96d870ad9f3e3a21048f53d71b20e1b52 100644 (file)
--- a/arch/arc/kernel/signal.c
+++ b/arch/arc/kernel/signal.c
@@ -394,6 +394,6 @@ void do_notify_resume(struct pt_regs *regs)
         * ASM glue gaurantees that this is only called when returning to
         * user mode
         */
-       if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
+       if (test_thread_flag(TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
 }

diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index c1892f733f208da0b2a0a419e296dd2fc0b03675..585edbfccf6df93c6b97d37a50cb87d6afab6010 100644 (file)
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -669,7 +669,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
                        } else if (thread_flags & _TIF_UPROBE) {
                                uprobe_notify_resume(regs);
                        } else {
-                               clear_thread_flag(TIF_NOTIFY_RESUME);
                                tracehook_notify_resume(regs);
                                rseq_handle_notify_resume(NULL, regs);
                        }

diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index bdcaaf091e1e8974d1826aa907ce21cb50fabc66..a8184cad889075ebc665bd30e018a77a6ec5986e 100644 (file)
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -946,7 +946,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs,
                                do_signal(regs);
 
                        if (thread_flags & _TIF_NOTIFY_RESUME) {
-                               clear_thread_flag(TIF_NOTIFY_RESUME);
                                tracehook_notify_resume(regs);
                                rseq_handle_notify_resume(NULL, regs);
                        }

diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c
index d05c78eace1bf7f6ca1dc5f5e689dd12e637b0e0..a3f15b9a79daecb3bc62ae633cb3a2212b894656 100644 (file)
--- a/arch/c6x/kernel/signal.c
+++ b/arch/c6x/kernel/signal.c
@@ -316,8 +316,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags,
        if (thread_info_flags & (1 << TIF_SIGPENDING))
                do_signal(regs, syscall);
 
-       if (thread_info_flags & (1 << TIF_NOTIFY_RESUME)) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
+       if (thread_info_flags & (1 << TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
-       }
 }

diff --git a/arch/csky/kernel/signal.c b/arch/csky/kernel/signal.c
index 970895df75ec3ea1186528c036e2a0965eb5a089..8b068cf37447839152227f3df7629a06fcfa6ae9 100644 (file)
--- a/arch/csky/kernel/signal.c
+++ b/arch/csky/kernel/signal.c
@@ -261,7 +261,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs,
                do_signal(regs);
 
        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
                tracehook_notify_resume(regs);
                rseq_handle_notify_resume(NULL, regs);
        }

diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c
index 69e68949787febb37f24931a254f9489d876b2bf..75d9b7e626b2faf7b3b92e444a0b47d0afe05a39 100644 (file)
--- a/arch/h8300/kernel/signal.c
+++ b/arch/h8300/kernel/signal.c
@@ -282,8 +282,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags)
        if (thread_info_flags & _TIF_SIGPENDING)
                do_signal(regs);
 
-       if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
+       if (thread_info_flags & _TIF_NOTIFY_RESUME)
                tracehook_notify_resume(regs);
-       }
 }

diff --git a/arch/hexagon/kernel/process.c b/arch/hexagon/kernel/process.c
index dfd322c5ce83a252ce4a15b5165b93e4f4e6725a..5a0a95d93ddb7d03cc5d168ded46b3886c37a13d 100644 (file)
--- a/arch/hexagon/kernel/process.c
+++ b/arch/hexagon/kernel/process.c
@@ -180,7 +180,6 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags)
        }
 
        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
                tracehook_notify_resume(regs);
                return 1;
        }

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index f25f2f7231969439400754abcae8026ef39671ad..6b61a703bcf55b35801d13083cf512db265651e8 100644 (file)
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -176,7 +176,7 @@ do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
                ia64_do_signal(scr, in_syscall);
        }
 
-       if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME)) {
+       if (test_thread_flag(TIF_NOTIFY_RESUME)) {
                local_irq_enable();     /* force interrupt enable */
                tracehook_notify_resume(&scr->pt);
        }

diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index a98fca97707375aab338e9f06ab6e9611da97bdf..29e174a80bf6915ea0207a4c438543a0e6450e26 100644 (file)
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -1134,6 +1134,6 @@ void do_notify_resume(struct pt_regs *regs)
        if (test_thread_flag(TIF_SIGPENDING))
                do_signal(regs);
 
-       if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
+       if (test_thread_flag(TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
 }

diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index 4a96b59f0beed3835854c266d4ac4c39ee89ff04..f11a0ccccabc47f155ee02e176eb1b47234e94a8 100644 (file)
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -316,6 +316,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall)
        if (test_thread_flag(TIF_SIGPENDING))
                do_signal(regs, in_syscall);
 
-       if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
+       if (test_thread_flag(TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
 }

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index f44265025281c4a5c7ef0b8d2a829ed639541a7d..50d0515bea21f486d1f7a3d51a6457f171300b29 100644 (file)
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -907,7 +907,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused,
                do_signal(regs);
 
        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
                tracehook_notify_resume(regs);
                rseq_handle_notify_resume(NULL, regs);
        }

diff --git a/arch/nds32/kernel/signal.c b/arch/nds32/kernel/signal.c
index 36e25a410bb0ec27eb4971d191ba6a0ee2846e53..2acb94812af987882ead1c1ab72c9a99e87d4e75 100644 (file)
--- a/arch/nds32/kernel/signal.c
+++ b/arch/nds32/kernel/signal.c
@@ -379,8 +379,6 @@ do_notify_resume(struct pt_regs *regs, unsigned int thread_flags)
        if (thread_flags & _TIF_SIGPENDING)
                do_signal(regs);
 
-       if (thread_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
+       if (thread_flags & _TIF_NOTIFY_RESUME)
                tracehook_notify_resume(regs);
-       }
 }

diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c
index d8a087cf2b42467af3525d4951590c6d1fbeccf4..cf2dca2ac7c37d8f49af4a0a725a03509cd37629 100644 (file)
--- a/arch/nios2/kernel/signal.c
+++ b/arch/nios2/kernel/signal.c
@@ -317,7 +317,7 @@ asmlinkage int do_notify_resume(struct pt_regs *regs)
                         */
                        return restart;
                }
-       } else if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
+       } else if (test_thread_flag(TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
 
        return 0;

diff --git a/arch/openrisc/kernel/signal.c b/arch/openrisc/kernel/signal.c
index c779364f0cd09bf1b1aa57c188711498b9831a2e..af66f968dd4590b7e53b813e0379ed5f56f32553 100644 (file)
--- a/arch/openrisc/kernel/signal.c
+++ b/arch/openrisc/kernel/signal.c
@@ -311,7 +311,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
                                }
                                syscall = 0;
                        } else {
-                               clear_thread_flag(TIF_NOTIFY_RESUME);
                                tracehook_notify_resume(regs);
                        }
                }

diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 3c037fc960387bb7b5cad81b2c4c450a8dcaae9f..9f43eaeb0b0afca78cf82297d35372727a18e6c8 100644 (file)
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -606,8 +606,6 @@ void do_notify_resume(struct pt_regs *regs, long in_syscall)
        if (test_thread_flag(TIF_SIGPENDING))
                do_signal(regs, in_syscall);
 
-       if (test_thread_flag(TIF_NOTIFY_RESUME)) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
+       if (test_thread_flag(TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
-       }
 }

diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index d15a98c758b8b4740c6ac8a6cb8828d29ee93001..74a94a125f0d0c8f3764127b2ab826b2eca8481e 100644 (file)
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -327,7 +327,6 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags)
        }
 
        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
                tracehook_notify_resume(regs);
                rseq_handle_notify_resume(NULL, regs);
        }

diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c
index e996e08f1061e5e46bd38acd01623ae8ee87e532..bc6841867b5122eef4ac3c49e21338b840ed5367 100644 (file)
--- a/arch/riscv/kernel/signal.c
+++ b/arch/riscv/kernel/signal.c
@@ -313,8 +313,6 @@ asmlinkage __visible void do_notify_resume(struct pt_regs *regs,
        if (thread_info_flags & _TIF_SIGPENDING)
                do_signal(regs);
 
-       if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
+       if (thread_info_flags & _TIF_NOTIFY_RESUME)
                tracehook_notify_resume(regs);
-       }
 }

diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index b295090e2ce676f91e274361d2f0ecb760702c39..9e900a8977bd2110f798439e1fc464c20a769e9b 100644 (file)
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -535,7 +535,6 @@ void do_signal(struct pt_regs *regs)
 
 void do_notify_resume(struct pt_regs *regs)
 {
-       clear_thread_flag(TIF_NOTIFY_RESUME);
        tracehook_notify_resume(regs);
        rseq_handle_notify_resume(NULL, regs);
 }

diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 4fe3f00137bc0d173aff33d121ce3602254408a2..1add47fd31f62d0e8e0eb3030e1d506415092fde 100644 (file)
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -502,8 +502,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0,
        if (thread_info_flags & _TIF_SIGPENDING)
                do_signal(regs, save_r0);
 
-       if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
+       if (thread_info_flags & _TIF_NOTIFY_RESUME)
                tracehook_notify_resume(regs);
-       }
 }

diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
index d0e0025ee3ba82eaef7e79bcb9db85230ce1dbd2..741d0701003af072bf2be08ac6ff8529da81dd6a 100644 (file)
--- a/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@ -523,10 +523,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0,
 {
        if (thread_info_flags & _TIF_SIGPENDING)
                do_signal(regs, orig_i0);
-       if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
+       if (thread_info_flags & _TIF_NOTIFY_RESUME)
                tracehook_notify_resume(regs);
-       }
 }
 
 asmlinkage int do_sys_sigstack(struct sigstack __user *ssptr,

diff --git a/arch/sparc/kernel/signal_64.c b/arch/sparc/kernel/signal_64.c
index 255264bcb46a7cf6906060250addd2aeeee06c23..f7ef7edcd5c1a53338b1e48275d197a82d9fc9c4 100644 (file)
--- a/arch/sparc/kernel/signal_64.c
+++ b/arch/sparc/kernel/signal_64.c
@@ -551,10 +551,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long
                uprobe_notify_resume(regs);
        if (thread_info_flags & _TIF_SIGPENDING)
                do_signal(regs, orig_i0);
-       if (thread_info_flags & _TIF_NOTIFY_RESUME) {
-               clear_thread_flag(TIF_NOTIFY_RESUME);
+       if (thread_info_flags & _TIF_NOTIFY_RESUME)
                tracehook_notify_resume(regs);
-       }
        user_enter();
 }
 

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index 26b5e243d3fc078f7f7d43e72915781f09a01be1..3bed09538dd951766fd6bc3219433577cf73fc5b 100644 (file)
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -101,7 +101,7 @@ void interrupt_end(void)
                schedule();
        if (test_thread_flag(TIF_SIGPENDING))
                do_signal(regs);
-       if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
+       if (test_thread_flag(TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
 }
 

diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index b3b17d6c50f079997a84f673ffd53a6c641c5bc7..1fb1047f905ca79fbfa7d0b42e1e73fdaa0d4f72 100644 (file)
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -501,6 +501,6 @@ void do_notify_resume(struct pt_regs *regs)
        if (test_thread_flag(TIF_SIGPENDING))
                do_signal(regs);
 
-       if (test_and_clear_thread_flag(TIF_NOTIFY_RESUME))
+       if (test_thread_flag(TIF_NOTIFY_RESUME))
                tracehook_notify_resume(regs);
 }

diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 36fb3bbed6b2bb8710431f195e2b4af641679cab..b480e1a07ed85198e4d43dde761ae9420734dc95 100644 (file)
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -178,9 +178,9 @@ static inline void set_notify_resume(struct task_struct *task)
  */
 static inline void tracehook_notify_resume(struct pt_regs *regs)
 {
+       clear_thread_flag(TIF_NOTIFY_RESUME);
        /*
-        * The caller just cleared TIF_NOTIFY_RESUME. This barrier
-        * pairs with task_work_add()->set_notify_resume() after
+        * This barrier pairs with task_work_add()->set_notify_resume() after
         * hlist_add_head(task->task_works);
         */
        smp_mb__after_atomic();

diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index 145ab11b83183b55a5f5b27ef6dcbd082a16fd12..971ef788b9ae1376a292d2bcb297e38554888f9a 100644 (file)
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -161,7 +161,6 @@ static unsigned long exit_to_user_mode_loop(struct pt_regs *regs,
                        arch_do_signal(regs);
 
                if (ti_work & _TIF_NOTIFY_RESUME) {
-                       clear_thread_flag(TIF_NOTIFY_RESUME);
                        tracehook_notify_resume(regs);
                        rseq_handle_notify_resume(NULL, regs);
                }

diff --git a/kernel/entry/kvm.c b/kernel/entry/kvm.c
index eb1a8a4c867c7b8d661c42520edb54afac66e824..b6678a5e3cf64807f73852445183d27e554f5c58 100644 (file)
--- a/kernel/entry/kvm.c
+++ b/kernel/entry/kvm.c
@@ -16,10 +16,8 @@ static int xfer_to_guest_mode_work(struct kvm_vcpu *vcpu, unsigned long ti_work)
                if (ti_work & _TIF_NEED_RESCHED)
                        schedule();
 
-               if (ti_work & _TIF_NOTIFY_RESUME) {
-                       clear_thread_flag(TIF_NOTIFY_RESUME);
+               if (ti_work & _TIF_NOTIFY_RESUME)
                        tracehook_notify_resume(NULL);
-               }
 
                ret = arch_xfer_to_guest_mode_handle_work(vcpu, ti_work);
                if (ret)