Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935153Ab0BZDws (ORCPT ); Thu, 25 Feb 2010 22:52:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46002 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935056Ab0BZDwr (ORCPT ); Thu, 25 Feb 2010 22:52:47 -0500 Message-ID: <4B8745AC.2070702@redhat.com> Date: Thu, 25 Feb 2010 22:53:16 -0500 From: Masami Hiramatsu User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.7) Gecko/20100120 Fedora/3.0.1-1.fc11 Thunderbird/3.0.1 MIME-Version: 1.0 To: Mathieu Desnoyers CC: Ingo Molnar , Frederic Weisbecker , Ananth N Mavinakayanahalli , lkml , systemtap , DLE , Jim Keniston , Srikar Dronamraju , Christoph Hellwig , Steven Rostedt , "H. Peter Anvin" , Anders Kaseorg , Tim Abbott , Andi Kleen , Jason Baron Subject: Re: [PATCH -tip v3&10 07/18] x86: Add text_poke_smp for SMP cross modifying code References: <20100225133342.6725.26971.stgit@localhost6.localdomain6> <20100225133438.6725.80273.stgit@localhost6.localdomain6> <20100225153305.GC12635@Krystal> In-Reply-To: <20100225153305.GC12635@Krystal> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2066 Lines: 83 Mathieu Desnoyers wrote: > * Masami Hiramatsu (mhiramat@redhat.com) wrote: [...] >> + >> +/* >> + * Cross-modifying kernel text with stop_machine(). >> + * This code originally comes from immediate value. >> + */ >> +static atomic_t stop_machine_first; >> +static int wrote_text; >> + >> +struct text_poke_params { >> + void *addr; >> + const void *opcode; >> + size_t len; >> +}; >> + >> +static int __kprobes stop_machine_text_poke(void *data) >> +{ >> + struct text_poke_params *tpp = data; >> + >> + if (atomic_dec_and_test(&stop_machine_first)) { >> + text_poke(tpp->addr, tpp->opcode, tpp->len); >> + smp_wmb(); /* Make sure other cpus see that this has run */ >> + wrote_text = 1; >> + } else { >> + while (!wrote_text) >> + smp_rmb(); >> + sync_core(); > > Hrm, there is a problem in there. The last loop, when wrote_text becomes > true, does not perform any smp_mb(), so you end up in a situation where > cpus in the "else" branch may never issue any memory barrier. I'd rather > do: Hmm, so how about this? :) --- } else { do { smp_rmb(); while (!wrote_text); sync_core(); } --- > > +static volatile int wrote_text; > > ... > > +static int __kprobes stop_machine_text_poke(void *data) > +{ > + struct text_poke_params *tpp = data; > + > + if (atomic_dec_and_test(&stop_machine_first)) { > + text_poke(tpp->addr, tpp->opcode, tpp->len); > + smp_wmb(); /* order text_poke stores before store to wrote_text */ > + wrote_text = 1; > + } else { > + while (!wrote_text) > + cpu_relax(); > + smp_mb(); /* order wrote_text load before following execution */ > + } > > If you don't like the "volatile int" definition of wrote_text, then we > should probably use the ACCESS_ONCE() macro instead. hm, yeah, volatile will be required. Thank you, -- Masami Hiramatsu e-mail: mhiramat@redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/