Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp4734020imu; Tue, 15 Jan 2019 05:12:15 -0800 (PST) X-Google-Smtp-Source: ALg8bN6sGGSaWQP/m/x0OCgn0ymHoGbccamjiLM4tuj4Hz6VHzaXXsLdlM1yRZdsOqQf5lWpmper X-Received: by 2002:a17:902:2b84:: with SMTP id l4mr4061141plb.191.1547557935494; Tue, 15 Jan 2019 05:12:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547557935; cv=none; d=google.com; s=arc-20160816; b=vQEWaLOy6VF0WCNMOW0KC/23Lh3KVbMBHg/JcCxfZA25K3qmoVmGGyBmvuI3W0gwqT oT/JPfax7M+XKZEfH8mW5ABJj5JvOaP0KBKjqGALy4bojkYexPmgbq2a7hzBJPJUiEPJ Oyf+VeE2W7pGA5nI/En4SSJB/RekpCFVZQemiq4sBL4ym+qbqfq2zzqm+iclhfTQCr50 mrK8ND2xiBUbKU4Q/f8oHboetEL6lKo2KHIvQNxVhg1yI1JgG8j7OoRxNxLDnXNOyKpE asr5JBHlK6S8wpVgHLgsz9DXvd8zG9ObpHZtxOz6Xl9pHndwi8F+ZtCNCH03kf+ilisr DVig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=qsV+aqXVBvoYu4pL4QZpfvMi167TM8gOAx6NETd+SBM=; b=pIEIIakopUT+hS2lcK29/trvVSYs8H+XiUNuZ7lYVktN7KkeRshdioWdNAU3/UJwas 6OC59O5JhtUStmiswm7pbHCKOp64ijwCKlaMUl75IhoTscObYqEDfe8PtI2U8cWwuH0H eyye8vFRtEdi/sbiiu4YNwo8Spd5ZGOuVKc6qtlZ7SDfuM6CWQL+SabYPXzE5l/ms84P 5TkxqwJAmvVhFyM0FVgIv5JJMD5SqZ6ZCBF5+qrOZFMNA2ZjMn4/heDtnGh3NOjw/V0d +Mh4R7+Nm82ybwf3NPvK/7Mrgvsww9cJu0w2aKk8VZIXhGLjwDoo1ZqsRyBTpBghGbjD gitw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="SwjA/ixW"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u7si3354522pfu.270.2019.01.15.05.11.56; Tue, 15 Jan 2019 05:12:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="SwjA/ixW"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729170AbfAOLOs (ORCPT + 99 others); Tue, 15 Jan 2019 06:14:48 -0500 Received: from mail-io1-f68.google.com ([209.85.166.68]:42147 "EHLO mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727352AbfAOLOr (ORCPT ); Tue, 15 Jan 2019 06:14:47 -0500 Received: by mail-io1-f68.google.com with SMTP id x6so1715736ioa.9 for ; Tue, 15 Jan 2019 03:14:47 -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=qsV+aqXVBvoYu4pL4QZpfvMi167TM8gOAx6NETd+SBM=; b=SwjA/ixW7FNY+NX5f46xAM5B3PubG5co1+eOpVbM9y2UCXzByTOzV/5dBCYSUP7eL7 kkkIC7Vl3TuHao0CJbSzkfetOUm/CKmc9u4Gz3WWnVEBRnuW6uXGI2OQMiaN8N2r2FL+ +jtO8sdGOSov5N4ZZdAS45Ivd5BJ+gCshu4G3Z7+kGx5H5iakFTG5il+BSCtWAYc8F1X S9g7e11ZjFCC5Chim2p+3UwQ6MmosH8X9LWKBRW6UofLIk7S9hbBFyhuJG4QC/X+RzWq uIZq1vmdw07F7UwXCYQXKkx5qGEnjpIFkRd570XpBMqdJWFLznEu39sLmZHZnJOJUVad U61A== 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=qsV+aqXVBvoYu4pL4QZpfvMi167TM8gOAx6NETd+SBM=; b=twtayfOWyJBUasjWtOnI9rpgADoHk4kxPYqfyPdJfyy2OOB1+z7WcSmwhff+Jlt1Lj e9AmUw/8blsm1rEvRD0AFrO5C81TY3VeENISwZM2IkyQA1dHcUkYEWKgzIp3GVfc7F+T qvzq1H1aLDC9e/pRCwrKl4P0OROSlaxjBldwIq3KEanwPafg71eeKqXZhqsF6s8A162+ UIw6rOkqdFztUGBE30BkkhvNCJ4b8NybGjg1ITfunflvc1cWgmsVSQQrGxnC+ypkFpY/ OOv1hkP6/69NE7GtS3RjsRs41Hga4au0L4Bz46EX1sGEOx4p+Dp/iKxR0SQPp3nF7QhV RbJw== X-Gm-Message-State: AJcUukcVexmcmw2wbVkT4sdUPHt/COk7D1y1hm7/Bl35QLMwUG73edbH 8fzyzdr9aD2Sr9eEOZ8yL4R+F4gPPYtd3SEtIiu/mw== X-Received: by 2002:a5d:9456:: with SMTP id x22mr1377869ior.282.1547550886384; Tue, 15 Jan 2019 03:14:46 -0800 (PST) MIME-Version: 1.0 References: <0c854dd6b110ac2b81ef1681f6e097f59f84af8b.1547289808.git.christophe.leroy@c-s.fr> <801c7d58-417d-1e65-68a0-b8cf02f9f956@c-s.fr> In-Reply-To: <801c7d58-417d-1e65-68a0-b8cf02f9f956@c-s.fr> From: Dmitry Vyukov Date: Tue, 15 Jan 2019 12:14:35 +0100 Message-ID: Subject: Re: [PATCH v3 1/3] powerpc/mm: prepare kernel for KAsan on PPC32 To: Christophe Leroy Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Nicholas Piggin , "Aneesh Kumar K.V" , Andrey Ryabinin , Alexander Potapenko , LKML , linuxppc-dev@lists.ozlabs.org, kasan-dev , Linux-MM 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 Tue, Jan 15, 2019 at 8:27 AM Christophe Leroy wrote: > > > > On 01/14/2019 09:34 AM, Dmitry Vyukov wrote: > > On Sat, Jan 12, 2019 at 12:16 PM Christophe Leroy > > wrote: > > > > > > In kernel/cputable.c, explicitly use memcpy() in order > > > to allow GCC to replace it with __memcpy() when KASAN is > > > selected. > > > > > > Since commit 400c47d81ca38 ("powerpc32: memset: only use dcbz once cache is > > > enabled"), memset() can be used before activation of the cache, > > > so no need to use memset_io() for zeroing the BSS. > > > > > > Signed-off-by: Christophe Leroy > > > --- > > > arch/powerpc/kernel/cputable.c | 4 ++-- > > > arch/powerpc/kernel/setup_32.c | 6 ++---- > > > 2 files changed, 4 insertions(+), 6 deletions(-) > > > > > > diff --git a/arch/powerpc/kernel/cputable.c > > b/arch/powerpc/kernel/cputable.c > > > index 1eab54bc6ee9..84814c8d1bcb 100644 > > > --- a/arch/powerpc/kernel/cputable.c > > > +++ b/arch/powerpc/kernel/cputable.c > > > @@ -2147,7 +2147,7 @@ void __init set_cur_cpu_spec(struct cpu_spec *s) > > > struct cpu_spec *t = &the_cpu_spec; > > > > > > t = PTRRELOC(t); > > > - *t = *s; > > > + memcpy(t, s, sizeof(*t)); > > > > Hi Christophe, > > > > I understand why you are doing this, but this looks a bit fragile and > > non-scalable. This may not work with the next version of compiler, > > just different than yours version of compiler, clang, etc. > > My felling would be that this change makes it more solid. > > My understanding is that when you do *t = *s, the compiler can use > whatever way it wants to do the copy. > When you do memcpy(), you ensure it will do it that way and not another > way, don't you ? It makes this single line more deterministic wrt code-gen (though, strictly saying compiler can turn memcpy back into inlines instructions, it knows memcpy semantics anyway). But the problem I meant is that the set of places that are subject to this problem is not deterministic. So if we go with this solution, after this change it's in the status "works on your machine" and we either need to commit to not using struct copies and zeroing throughout kernel code or potentially have a long tail of other similar cases, and since they can be triggered by another compiler version, we may need to backport these changes to previous releases too. Whereas if we would go with compiler flags, it would prevent the problem in all current and future places and with other past/future versions of compilers. > My problem is that when using *t = *s, the function set_cur_cpu_spec() > always calls memcpy(), not taking into account the following define > which is in arch/powerpc/include/asm/string.h (other arches do the same): > > #if defined(CONFIG_KASAN) && !defined(__SANITIZE_ADDRESS__) > /* > * For files that are not instrumented (e.g. mm/slub.c) we > * should use not instrumented version of mem* functions. > */ > #define memcpy(dst, src, len) __memcpy(dst, src, len) > #define memmove(dst, src, len) __memmove(dst, src, len) > #define memset(s, c, n) __memset(s, c, n) > #endif > > void __init set_cur_cpu_spec(struct cpu_spec *s) > { > struct cpu_spec *t = &the_cpu_spec; > > t = PTRRELOC(t); > *t = *s; > > *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec; > } > > 00000000 : > 0: 94 21 ff f0 stwu r1,-16(r1) > 4: 7c 08 02 a6 mflr r0 > 8: bf c1 00 08 stmw r30,8(r1) > c: 3f e0 00 00 lis r31,0 > e: R_PPC_ADDR16_HA .data..read_mostly > 10: 3b ff 00 00 addi r31,r31,0 > 12: R_PPC_ADDR16_LO .data..read_mostly > 14: 7c 7e 1b 78 mr r30,r3 > 18: 7f e3 fb 78 mr r3,r31 > 1c: 90 01 00 14 stw r0,20(r1) > 20: 48 00 00 01 bl 20 > 20: R_PPC_REL24 add_reloc_offset > 24: 7f c4 f3 78 mr r4,r30 > 28: 38 a0 00 58 li r5,88 > 2c: 48 00 00 01 bl 2c > 2c: R_PPC_REL24 memcpy > 30: 38 7f 00 58 addi r3,r31,88 > 34: 48 00 00 01 bl 34 > 34: R_PPC_REL24 add_reloc_offset > 38: 93 e3 00 00 stw r31,0(r3) > 3c: 80 01 00 14 lwz r0,20(r1) > 40: bb c1 00 08 lmw r30,8(r1) > 44: 7c 08 03 a6 mtlr r0 > 48: 38 21 00 10 addi r1,r1,16 > 4c: 4e 80 00 20 blr > > > When replacing *t = *s by memcpy(t, s, sizeof(*t)), GCC replace it by > __memcpy() as expected. > > > > > Does using -ffreestanding and/or -fno-builtin-memcpy (-memset) help? > > No it doesn't and to be honest I can't see how it would. My > understanding is that it could be even worse because it would mean > adding calls to memcpy() also in all trivial places where GCC does the > copy itself by default. The idea was that with -ffreestanding compiler must not assume presence of any runtime support library, so it must not emit any calls that are not explicitly present in the source code. However, after reading more docs, it seems that even with -ffreestanding gcc and clang still assume presence of a runtime library that provides at least memcpy, memmove, memset and memcmp. There does not seem to be a way to prevent clang and gcc from doing it. So I guess this approach is our only option: Acked-by: Dmitry Vyukov Though, a comment may be useful so that a next person does not try to revert it back. > Do you see any alternative ? > > Christophe > > > If it helps, perhaps it makes sense to add these flags to > > KASAN_SANITIZE := n files. > > > > > >> *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec; > >> } > >> @@ -2162,7 +2162,7 @@ static struct cpu_spec * __init setup_cpu_spec(unsigned long offset, > >> old = *t; > >> > >> /* Copy everything, then do fixups */ > >> - *t = *s; > >> + memcpy(t, s, sizeof(*t)); > >> > >> /* > >> * If we are overriding a previous value derived from the real > >> diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c > >> index 947f904688b0..5e761eb16a6d 100644 > >> --- a/arch/powerpc/kernel/setup_32.c > >> +++ b/arch/powerpc/kernel/setup_32.c > >> @@ -73,10 +73,8 @@ notrace unsigned long __init early_init(unsigned long dt_ptr) > >> { > >> unsigned long offset = reloc_offset(); > >> > >> - /* First zero the BSS -- use memset_io, some platforms don't have > >> - * caches on yet */ > >> - memset_io((void __iomem *)PTRRELOC(&__bss_start), 0, > >> - __bss_stop - __bss_start); > >> + /* First zero the BSS */ > >> + memset(PTRRELOC(&__bss_start), 0, __bss_stop - __bss_start); > >> > >> /* > >> * Identify the CPU type and fix up code sections > >> -- > >> 2.13.3 > >>