1. 05 4月, 2011 1 次提交
    • J
      jump label: Introduce static_branch() interface · d430d3d7
      Jason Baron 提交于
      Introduce:
      
      static __always_inline bool static_branch(struct jump_label_key *key);
      
      instead of the old JUMP_LABEL(key, label) macro.
      
      In this way, jump labels become really easy to use:
      
      Define:
      
              struct jump_label_key jump_key;
      
      Can be used as:
      
              if (static_branch(&jump_key))
                      do unlikely code
      
      enable/disale via:
      
              jump_label_inc(&jump_key);
              jump_label_dec(&jump_key);
      
      that's it!
      
      For the jump labels disabled case, the static_branch() becomes an
      atomic_read(), and jump_label_inc()/dec() are simply atomic_inc(),
      atomic_dec() operations. We show testing results for this change below.
      
      Thanks to H. Peter Anvin for suggesting the 'static_branch()' construct.
      
      Since we now require a 'struct jump_label_key *key', we can store a pointer into
      the jump table addresses. In this way, we can enable/disable jump labels, in
      basically constant time. This change allows us to completely remove the previous
      hashtable scheme. Thanks to Peter Zijlstra for this re-write.
      
      Testing:
      
      I ran a series of 'tbench 20' runs 5 times (with reboots) for 3
      configurations, where tracepoints were disabled.
      
      jump label configured in
      avg: 815.6
      
      jump label *not* configured in (using atomic reads)
      avg: 800.1
      
      jump label *not* configured in (regular reads)
      avg: 803.4
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <20110316212947.GA8792@redhat.com>
      Signed-off-by: NJason Baron <jbaron@redhat.com>
      Suggested-by: NH. Peter Anvin <hpa@linux.intel.com>
      Tested-by: NDavid Daney <ddaney@caviumnetworks.com>
      Acked-by: NRalf Baechle <ralf@linux-mips.org>
      Acked-by: NDavid S. Miller <davem@davemloft.net>
      Acked-by: NMathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      d430d3d7
  2. 30 10月, 2010 1 次提交
  3. 28 10月, 2010 2 次提交
    • J
      jump label: Fix deadlock b/w jump_label_mutex vs. text_mutex · 91bad2f8
      Jason Baron 提交于
      register_kprobe() downs the 'text_mutex' and then calls
      jump_label_text_reserved(), which downs the 'jump_label_mutex'.
      However, the jump label code takes those mutexes in the reverse
      order.
      
      Fix by requiring the caller of jump_label_text_reserved() to do
      the jump label locking via the newly added: jump_label_lock(),
      jump_label_unlock(). Currently, kprobes is the only user
      of jump_label_text_reserved().
      Reported-by: NIngo Molnar <mingo@elte.hu>
      Acked-by: NMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Signed-off-by: NJason Baron <jbaron@redhat.com>
      LKML-Reference: <759032c48d5e30c27f0bba003d09bffa8e9f28bb.1285965957.git.jbaron@redhat.com>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      91bad2f8
    • J
      jump label: Fix module __init section race · b842f8fa
      Jason Baron 提交于
      Jump label uses is_module_text_address() to ensure that the module
      __init sections are valid before updating them. However, between the
      check for a valid module __init section and the subsequent jump
      label update, the module's __init section could be freed out from under
      us.
      
      We fix this potential race by adding a notifier callback to the
      MODULE_STATE_LIVE state. This notifier is called *after* the __init
      section has been run but before it is going to be freed. In the
      callback, the jump label code zeros the key value for any __init jump
      code within the module, and we add a check for a non-zero key value when
      we update jump labels. In this way we require no additional data
      structures.
      
      Thanks to Mathieu Desnoyers for pointing out this race condition.
      Reported-by: NMathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
      Signed-off-by: NJason Baron <jbaron@redhat.com>
      LKML-Reference: <c6f037b7598777668025ceedd9294212fd95fa34.1285965957.git.jbaron@redhat.com>
      
      [ Renamed remove_module_init() to remove_jump_label_module_init()
        as suggested by Masami Hiramatsu. ]
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      b842f8fa
  4. 23 9月, 2010 2 次提交