From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9471CC2D0DB for ; Mon, 20 Jan 2020 16:25:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DFF82087E for ; Mon, 20 Jan 2020 16:25:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="A1XqDsGu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726876AbgATQZo (ORCPT ); Mon, 20 Jan 2020 11:25:44 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:40252 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726885AbgATQZn (ORCPT ); Mon, 20 Jan 2020 11:25:43 -0500 Received: by mail-ot1-f65.google.com with SMTP id w21so243627otj.7 for ; Mon, 20 Jan 2020 08:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7cSDWZohrZmB4Lsh7kYAZSQYpOg12wvWZ6eMxNAuFio=; b=A1XqDsGutwFYPrzCqsKq2d73/8yvcyJB2N6mF7qLKpxGRtCDQBJhJNDfiIp0E4b04M jLdXD9eC1j56EauzFYnsgq6TAZRDs8Q7vxfxbCgD3Df/4Mv8pkNU4Ui73qOxG1dpFTKO ozGG9ypd8Lpbp9MkJApJbOseJQtLs9MMNFzddPXErWHa3zc8xtbpQ779xaPZspAF4FMe zEbYXgFSUilSpJpyfogMDbnBuhrG++MGfxtDebXb7B2/TNzO6rxxEk8RLXt1q8XP46U/ DYkBHnWfaOb+D0mPBibSXr10JIhJCq7R+8JGaBx3F6a0T6ij3tm//YzNE76wAOpTrj05 zTXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7cSDWZohrZmB4Lsh7kYAZSQYpOg12wvWZ6eMxNAuFio=; b=KPXsAbRQi8T0V3L2+XVm0B8zKnOErYzPZBqPsR1dd4LsM539REUt+ajkI2i2NNKdmC 3B2HKX/GBCDpvltPisQY9i9ls26XXMMC6V6DpKIPI/vw5ZcNVcE5TDdjFv95w7deC+3S 6Rojn6+jr42O+eZAcEJ9GIxVkvdxBjVg6wJ70hOMcOOA/220rjFJ+sJTwu0PFw6FG1zN FFK08HeGdFJuzswbnW/a5OdiEu5eMxvKAcF30NQ01dx5TG8dXv240bPxDl7/pNwKR+FQ wT21AuSd1ye9GkQXuS01GQDG6upBJX7Zn7LxXedFVHKcG06EdBhQsBqjRDn89LiAXaTb GSZw== X-Gm-Message-State: APjAAAUvzJpe1wjkLxrYVWb7IMdPQffyicEZvgnczyfdUEZ0uwnLFjW6 IJIHjEgx2dB/yx7hxHBSEUhHJn9facIbPdD2jv76mQ== X-Google-Smtp-Source: APXvYqx80QzaPWpNwaBjtr4lRxleoT9Gpjc00N18ryoIv2GI2DE3IQCFsyL079bZbygHNdnGpGbmw+e6WM5ylFg7V3w= X-Received: by 2002:a05:6830:1d7b:: with SMTP id l27mr136144oti.251.1579537542903; Mon, 20 Jan 2020 08:25:42 -0800 (PST) MIME-Version: 1.0 References: <20200120141927.114373-1-elver@google.com> In-Reply-To: From: Marco Elver Date: Mon, 20 Jan 2020 17:25:31 +0100 Message-ID: Subject: Re: [PATCH 1/5] include/linux: Add instrumented.h infrastructure To: Dmitry Vyukov Cc: "Paul E. McKenney" , Andrey Konovalov , Alexander Potapenko , kasan-dev , LKML , Mark Rutland , Will Deacon , Peter Zijlstra , Boqun Feng , Arnd Bergmann , Al Viro , Christophe Leroy , Daniel Axtens , Michael Ellerman , Steven Rostedt , Masami Hiramatsu , Ingo Molnar , Christian Brauner , Daniel Borkmann , cyphar@cyphar.com, Kees Cook , linux-arch Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 20 Jan 2020 at 17:06, Dmitry Vyukov wrote: > > On Mon, Jan 20, 2020 at 4:40 PM Marco Elver wrote: > > > > > > This adds instrumented.h, which provides generic wrappers for memory > > > > > > access instrumentation that the compiler cannot emit for various > > > > > > sanitizers. Currently this unifies KASAN and KCSAN instrumentation. In > > > > > > future this will also include KMSAN instrumentation. > > > > > > > > > > > > Note that, copy_{to,from}_user require special instrumentation, > > > > > > providing hooks before and after the access, since we may need to know > > > > > > the actual bytes accessed (currently this is relevant for KCSAN, and is > > > > > > also relevant in future for KMSAN). > > > > > > > > > > > > Suggested-by: Arnd Bergmann > > > > > > Signed-off-by: Marco Elver > > > > > > --- > > > > > > include/linux/instrumented.h | 153 +++++++++++++++++++++++++++++++++++ > > > > > > 1 file changed, 153 insertions(+) > > > > > > create mode 100644 include/linux/instrumented.h > > > > > > > > > > > > diff --git a/include/linux/instrumented.h b/include/linux/instrumented.h > > > > > > new file mode 100644 > > > > > > index 000000000000..9f83c8520223 > > > > > > --- /dev/null > > > > > > +++ b/include/linux/instrumented.h > > > > > > @@ -0,0 +1,153 @@ > > > > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > > > > + > > > > > > +/* > > > > > > + * This header provides generic wrappers for memory access instrumentation that > > > > > > + * the compiler cannot emit for: KASAN, KCSAN. > > > > > > + */ > > > > > > +#ifndef _LINUX_INSTRUMENTED_H > > > > > > +#define _LINUX_INSTRUMENTED_H > > > > > > + > > > > > > +#include > > > > > > +#include > > > > > > +#include > > > > > > +#include > > > > > > + > > > > > > +/** > > > > > > + * instrument_read - instrument regular read access > > > > > > + * > > > > > > + * Instrument a regular read access. The instrumentation should be inserted > > > > > > + * before the actual read happens. > > > > > > + * > > > > > > + * @ptr address of access > > > > > > + * @size size of access > > > > > > + */ > > > > > > > > > > Based on offline discussion, that's what we add for KMSAN: > > > > > > > > > > > +static __always_inline void instrument_read(const volatile void *v, size_t size) > > > > > > +{ > > > > > > + kasan_check_read(v, size); > > > > > > + kcsan_check_read(v, size); > > > > > > > > > > KMSAN: nothing > > > > > > > > KMSAN also has instrumentation in > > > > copy_to_user_page/copy_from_user_page. Do we need to do anything for > > > > KASAN/KCSAN for these functions? > > > > copy_to_user_page/copy_from_user_page can be instrumented with > > instrument_copy_{to,from}_user_. I prefer keeping this series with no > > functional change intended for KASAN at least. > > > > > There is also copy_user_highpage. > > > > > > And ioread/write8/16/32_rep: do we need any instrumentation there. It > > > seems we want both KSAN and KCSAN too. One may argue that KCSAN > > > instrumentation there is to super critical at this point, but KASAN > > > instrumentation is important, if anything to prevent silent memory > > > corruptions. How do we instrument there? I don't see how it maps to > > > any of the existing instrumentation functions. > > > > These should be able to use the regular instrument_{read,write}. I > > prefer keeping this series with no functional change intended for > > KASAN at least. > > instrument_{read,write} will not contain any KMSAN instrumentation, > which means we will effectively remove KMSAN instrumentation, which is > weird because we instrumented these functions because of KMSAN in the > first place... > > > > There is also kmsan_check_skb/kmsan_handle_dma/kmsan_handle_urb that > > > does not seem to map to any of the instrumentation functions. > > > > For now, I would rather that there are some one-off special > > instrumentation, like for KMSAN. Coming up with a unified interface > > here that, without the use-cases even settled, seems hard to justify. > > Once instrumentation for these have settled, unifying the interface > > would have better justification. > > I would assume they may also require an annotation that checks the > memory region under all 3 tools and we don't have such annotation > (same as the previous case and effectively copy_to_user). I would > expect such annotation will be used in more places once we start > looking for more opportunities. Agreed, I'm certainly not against adding these. We may need to introduce 'instrument_dma_' etc. However, would it be reasonable to do this in a separate follow-up patch-series, to avoid stalling bitops instrumentation? Assuming that the 8 hooks in instrumented.h right now are reasonable, and such future changes add new hooks, I think that would be the more pragmatic approach. Thanks, -- Marco > > > This patch series is merely supposed to introduce instrumented.h and > > replace the kasan_checks (also implicitly introducing kcsan_checks > > there), however, with no further functional change intended. > > > > I propose that adding entirely new instrumentation for both KASAN and > > KCSAN, we should send a separate patch-series. > > > > Thanks, > > -- Marco From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marco Elver Subject: Re: [PATCH 1/5] include/linux: Add instrumented.h infrastructure Date: Mon, 20 Jan 2020 17:25:31 +0100 Message-ID: References: <20200120141927.114373-1-elver@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Dmitry Vyukov Cc: "Paul E. McKenney" , Andrey Konovalov , Alexander Potapenko , kasan-dev , LKML , Mark Rutland , Will Deacon , Peter Zijlstra , Boqun Feng , Arnd Bergmann , Al Viro , Christophe Leroy , Daniel Axtens , Michael Ellerman , Steven Rostedt , Masami Hiramatsu , Ingo Molnar , Christian Brauner , Daniel Borkmann , cyphar@cyphar.comK List-Id: linux-arch.vger.kernel.org On Mon, 20 Jan 2020 at 17:06, Dmitry Vyukov wrote: > > On Mon, Jan 20, 2020 at 4:40 PM Marco Elver wrote: > > > > > > This adds instrumented.h, which provides generic wrappers for memory > > > > > > access instrumentation that the compiler cannot emit for various > > > > > > sanitizers. Currently this unifies KASAN and KCSAN instrumentation. In > > > > > > future this will also include KMSAN instrumentation. > > > > > > > > > > > > Note that, copy_{to,from}_user require special instrumentation, > > > > > > providing hooks before and after the access, since we may need to know > > > > > > the actual bytes accessed (currently this is relevant for KCSAN, and is > > > > > > also relevant in future for KMSAN). > > > > > > > > > > > > Suggested-by: Arnd Bergmann > > > > > > Signed-off-by: Marco Elver > > > > > > --- > > > > > > include/linux/instrumented.h | 153 +++++++++++++++++++++++++++++++++++ > > > > > > 1 file changed, 153 insertions(+) > > > > > > create mode 100644 include/linux/instrumented.h > > > > > > > > > > > > diff --git a/include/linux/instrumented.h b/include/linux/instrumented.h > > > > > > new file mode 100644 > > > > > > index 000000000000..9f83c8520223 > > > > > > --- /dev/null > > > > > > +++ b/include/linux/instrumented.h > > > > > > @@ -0,0 +1,153 @@ > > > > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > > > > + > > > > > > +/* > > > > > > + * This header provides generic wrappers for memory access instrumentation that > > > > > > + * the compiler cannot emit for: KASAN, KCSAN. > > > > > > + */ > > > > > > +#ifndef _LINUX_INSTRUMENTED_H > > > > > > +#define _LINUX_INSTRUMENTED_H > > > > > > + > > > > > > +#include > > > > > > +#include > > > > > > +#include > > > > > > +#include > > > > > > + > > > > > > +/** > > > > > > + * instrument_read - instrument regular read access > > > > > > + * > > > > > > + * Instrument a regular read access. The instrumentation should be inserted > > > > > > + * before the actual read happens. > > > > > > + * > > > > > > + * @ptr address of access > > > > > > + * @size size of access > > > > > > + */ > > > > > > > > > > Based on offline discussion, that's what we add for KMSAN: > > > > > > > > > > > +static __always_inline void instrument_read(const volatile void *v, size_t size) > > > > > > +{ > > > > > > + kasan_check_read(v, size); > > > > > > + kcsan_check_read(v, size); > > > > > > > > > > KMSAN: nothing > > > > > > > > KMSAN also has instrumentation in > > > > copy_to_user_page/copy_from_user_page. Do we need to do anything for > > > > KASAN/KCSAN for these functions? > > > > copy_to_user_page/copy_from_user_page can be instrumented with > > instrument_copy_{to,from}_user_. I prefer keeping this series with no > > functional change intended for KASAN at least. > > > > > There is also copy_user_highpage. > > > > > > And ioread/write8/16/32_rep: do we need any instrumentation there. It > > > seems we want both KSAN and KCSAN too. One may argue that KCSAN > > > instrumentation there is to super critical at this point, but KASAN > > > instrumentation is important, if anything to prevent silent memory > > > corruptions. How do we instrument there? I don't see how it maps to > > > any of the existing instrumentation functions. > > > > These should be able to use the regular instrument_{read,write}. I > > prefer keeping this series with no functional change intended for > > KASAN at least. > > instrument_{read,write} will not contain any KMSAN instrumentation, > which means we will effectively remove KMSAN instrumentation, which is > weird because we instrumented these functions because of KMSAN in the > first place... > > > > There is also kmsan_check_skb/kmsan_handle_dma/kmsan_handle_urb that > > > does not seem to map to any of the instrumentation functions. > > > > For now, I would rather that there are some one-off special > > instrumentation, like for KMSAN. Coming up with a unified interface > > here that, without the use-cases even settled, seems hard to justify. > > Once instrumentation for these have settled, unifying the interface > > would have better justification. > > I would assume they may also require an annotation that checks the > memory region under all 3 tools and we don't have such annotation > (same as the previous case and effectively copy_to_user). I would > expect such annotation will be used in more places once we start > looking for more opportunities. Agreed, I'm certainly not against adding these. We may need to introduce 'instrument_dma_' etc. However, would it be reasonable to do this in a separate follow-up patch-series, to avoid stalling bitops instrumentation? Assuming that the 8 hooks in instrumented.h right now are reasonable, and such future changes add new hooks, I think that would be the more pragmatic approach. Thanks, -- Marco > > > This patch series is merely supposed to introduce instrumented.h and > > replace the kasan_checks (also implicitly introducing kcsan_checks > > there), however, with no further functional change intended. > > > > I propose that adding entirely new instrumentation for both KASAN and > > KCSAN, we should send a separate patch-series. > > > > Thanks, > > -- Marco