Mainline patch-3.14.4-5.xz

PATCH Pavel Vasilyev 2 participants 6 messages May 31, 2014 – Jun 3, 2014

lore

Share & tools

lore

Pavel Vasilyev

author

2014-05-31 23:28 UTC #0 lore raw

Vanila patch:

include/linux/thread_info.h +0 -2

@@ -118,8 +118,6 @@ static inline __deprecated void set_need_resched(void)
          */
 }
 
-#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
-
 #if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK
 /*
  * An arch can define its own version of set_restore_sigmask() to get the

RT Code (same file):

#ifdef CONFIG_PREEMPT_LAZY
#define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED) || \
test_thread_flag(TIF_NEED_RESCHED_LAZY))
#define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED)) #define tif_need_resched_lazy() (test_thread_flag(TIF_NEED_RESCHED_LAZY))

#else
#define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED)) #define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED)) #define tif_need_resched_lazy() (0)

#endif

1 out of 1 hunk ignored -- saving rejects to file include/linux/thread_info.h.rej

What to do? :)

Signature · 1 line

                                                         Pavel.

Clark Williams

2014-06-02 16:47 UTC #1 lore raw

Quoted 28 lines · On Sun, 01 Jun 2014 03:27:14 +0400 Pavel Vasilyev <[email protected]> wrote:

Vanila patch:
include/linux/thread_info.h +0 -2
@@ -118,8 +118,6 @@ static inline __deprecated void set_need_resched(void)
           */
  }
 
-#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
-
  #if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK
  /*
   * An arch can define its own version of set_restore_sigmask() to get the
RT Code (same file):
#ifdef CONFIG_PREEMPT_LAZY
#define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED) || \
test_thread_flag(TIF_NEED_RESCHED_LAZY))
#define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED)) #define tif_need_resched_lazy() (test_thread_flag(TIF_NEED_RESCHED_LAZY))
#else
#define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED)) #define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED)) #define tif_need_resched_lazy() (0)

Quoted 7 lines

#endif
1 out of 1 hunk ignored -- saving rejects to file include/linux/thread_info.h.rej
What to do? :)

I thought I was the only one to do crazy rebasing like this :)

I kept the #ifdef CONFIG_PREEMPT_LAZY block (the RT code) in include/linux/thread_info.h and removed the definition of tif_need_resched() in include/linux/preempt.h.

Clark

Pavel Vasilyev

author

2014-06-02 22:03 UTC #2 lore raw

02.06.2014 20:46, Clark Williams пишет:

Quoted 8 lines

Quoted 3 lines
What to do? :)
I thought I was the only one to do crazy rebasing like this :)
I kept the #ifdef CONFIG_PREEMPT_LAZY block (the RT code) in include/linux/thread_info.h and removed the definition of tif_need_resched() in include/linux/preempt.h.

Code migrate from <linux/thread_info.h> to <linux/preempt.h>

https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=78

https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=82

Link http://marc.info/?l=linux-kernel&m=139705352130896

Signature · 5 lines

                                                         Pavel.
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Clark Williams

2014-06-02 22:07 UTC #3 lore raw

Quoted 10 lines · On Tue, 03 Jun 2014 02:02:34 +0400 Pavel Vasilyev <[email protected]> wrote:

02.06.2014 20:46, Clark Williams пишет:
Quoted 8 lines
Quoted 3 lines
What to do? :)
I thought I was the only one to do crazy rebasing like this :)
I kept the #ifdef CONFIG_PREEMPT_LAZY block (the RT code) in include/linux/thread_info.h and removed the definition of tif_need_resched() in include/linux/preempt.h.

Quoted 8 lines

Code migrate from <linux/thread_info.h> to <linux/preempt.h>
https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=78
https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=82
Link http://marc.info/?l=linux-kernel&m=139705352130896

Yes, I saw that right *after* I replied to your email :)

I'm on my second try now...

Clark

Pavel Vasilyev

author

2014-06-02 22:14 UTC #4 lore raw

03.06.2014 02:07, Clark Williams пишет:

Quoted 17 lines

Quoted 14 lines · On Tue, 03 Jun 2014 02:02:34 +0400 Pavel Vasilyev <[email protected]> wrote:
02.06.2014 20:46, Clark Williams пишет:
Quoted 8 lines
Quoted 3 lines
What to do? :)
I thought I was the only one to do crazy rebasing like this :)
I kept the #ifdef CONFIG_PREEMPT_LAZY block (the RT code) in include/linux/thread_info.h and removed the definition of tif_need_resched() in include/linux/preempt.h.
Code migrate from <linux/thread_info.h> to <linux/preempt.h>
https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=78

Quoted 8 lines

Quoted 4 lines
https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=82
Link http://marc.info/?l=linux-kernel&m=139705352130896
Yes, I saw that right *after* I replied to your email :)
I'm on my second try now...

I think need edit changes in our preempt-lazy-support.patch

Signature · 5 lines

                                                         Pavel.
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Pavel Vasilyev

author

2014-06-03 00:05 UTC #5 lore raw

In reply to Clark Williams

03.06.2014 02:07, Clark Williams пишет:

Quoted 17 lines

Quoted 14 lines · On Tue, 03 Jun 2014 02:02:34 +0400 Pavel Vasilyev <[email protected]> wrote:
02.06.2014 20:46, Clark Williams пишет:
Quoted 8 lines
Quoted 3 lines
What to do? :)
I thought I was the only one to do crazy rebasing like this :)
I kept the #ifdef CONFIG_PREEMPT_LAZY block (the RT code) in include/linux/thread_info.h and removed the definition of tif_need_resched() in include/linux/preempt.h.
Code migrate from <linux/thread_info.h> to <linux/preempt.h>
https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=78

Quoted 8 lines

Quoted 4 lines
https://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv3.x%2Fincr%2Fpatch-3.14.4-5.xz;z=82
Link http://marc.info/?l=linux-kernel&m=139705352130896
Yes, I saw that right *after* I replied to your email :)
I'm on my second try now...

I think need edit changes in our preempt-lazy-support.patch

something like this:

linux/preempt.h +12 -1

@@ -15,7 +15,18 @@
  */
 #define PREEMPT_NEED_RESCHED	0x80000000
 
-#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
+#ifdef CONFIG_PREEMPT_LAZY
+#define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED) || \
+               test_thread_flag(TIF_NEED_RESCHED_LAZY))
+#define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED))
+#define tif_need_resched_lazy() (test_thread_flag(TIF_NEED_RESCHED_LAZY))
+
+#else
+#define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED))
+#define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED))
+#define tif_need_resched_lazy() (0)
+
+#endif
 
 #include <asm/preempt.h>

Signature · 5 lines

                                                         Pavel.
--
To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html