Messages in this thread | | | Date | Mon, 13 Dec 2021 17:11:49 +0100 | From | Peter Zijlstra <> | Subject | Re: [PATCH v2 0/9] refcount: Improve code-gen |
| |
On Mon, Dec 13, 2021 at 03:42:34PM +0100, Marco Elver wrote: > On Mon, Dec 13, 2021 at 01:20PM +0100, Peter Zijlstra wrote: > > > > Also, since this will conflict most mighty with Marco's kcsan work in > > the rcu tree, I've written the below patch as a replacement for the > > instrumentation patch in that series. > > > > It depends on other bits in that series so it cannot be applied here, > > but will come in handy when trying to resolve the merge conflict. > > > > --- > > Subject: locking/atomics, kcsan: Add instrumentation for barriers > > From: Peter Zijlstra <peterz@infradead.org> > > Date: Thu Dec 9 17:08:16 CET 2021 > > > > Adds the required KCSAN instrumentation for barriers of atomics. > > > > [adapted from https://lkml.kernel.org/r/20211130114433.2580590-17-elver@google.com] > > Originally-by: Marco Elver <elver@google.com> > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> > > Thanks! > > I wanted to test this, but can't quite figure out which branches I need > to merge together to get it to apply. I assume -rcu + your series? Or > the updated series not yet sent?
I think I applied the patches from your series up-to, but not including, the atomic-instrument patch, then the first few patches of this posting which cause the rejects and then this patch.
I've not attempted the actual git-merge or did much testing on the results.
| |