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=-23.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 C3AE3C63777 for ; Wed, 18 Nov 2020 15:36:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0576724770 for ; Wed, 18 Nov 2020 15:36:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PCVKLLBR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0576724770 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E29916B006C; Wed, 18 Nov 2020 10:36:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DD83D6B0070; Wed, 18 Nov 2020 10:36:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C9F8D6B0071; Wed, 18 Nov 2020 10:36:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0095.hostedemail.com [216.40.44.95]) by kanga.kvack.org (Postfix) with ESMTP id 9E6636B006C for ; Wed, 18 Nov 2020 10:36:24 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 33237180AD830 for ; Wed, 18 Nov 2020 15:36:24 +0000 (UTC) X-FDA: 77497940688.19.rule18_5e0389a2733b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 0CB901ACEBC for ; Wed, 18 Nov 2020 15:36:24 +0000 (UTC) X-HE-Tag: rule18_5e0389a2733b X-Filterd-Recvd-Size: 8532 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 18 Nov 2020 15:36:23 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id j31so1869279qtb.8 for ; Wed, 18 Nov 2020 07:36:23 -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:content-transfer-encoding; bh=DAmalSkle6LseckfE0Oz3lBRGT6/gmH8HIzwoCuD14c=; b=PCVKLLBRHYl043FjQjIsPmGX7j3TlSec/OQUdfpcm4pq3DA+xtMRXQ1jINWibM3i39 osN1Rlq20l3aNZq2Jz/0vqsZsniGguLBP0pcNh53D/rSiY6Boh07OaA5dXVwKTt+Ffpi bJ7KRcAY/kLS0BUHcZpk6Q+NZyGxONOoUM1uhc3hNC23kR8Gs0Gsnq5oL9FIeufLVvwe 9FqMyvG3r6Km4TPxC6C8ZNqsFPj1Lh6s7VA8dU31GPXU0bFRPPdCHf+PiU7PbWJ0ctCF sDfk9PRf8/PasW742kyCj7crJTz/99XXm4IBQgv82CoX4jivVbUo1+HxgSg1lk0rSmVR /IOw== 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:content-transfer-encoding; bh=DAmalSkle6LseckfE0Oz3lBRGT6/gmH8HIzwoCuD14c=; b=BjhdeaSmaSsmZidV4qeYeebPtKouBzVP1fsN9cemr10VcTWNRXy96UGR1bSNboO6im PYzBspcytYeplJ4FPurvXKgLGm8BstFPpzr+X26xHcKo2CHoRYKLgggTPE5sRHLqgs16 sEf/6cMotk8PBN2y4ZmO9GLyjMd0+ayJFlvs8GLdTbEaJZsWFjDBj6ZGYAFR38GgqW4G R+NrrSuUYz+tTi535X+qZJz06dQXuFKCGMGGRoZx1LPfvO4kx2Q5BZX7+voq3kd+UqvB gPuOzHvW/L23td5kmhUOgfTuMdKnDDts0BmtSkKbmn0zoN9NuwoIqHNA09WWdabyJVUZ SuDw== X-Gm-Message-State: AOAM533FXaaRek4ap0Xvjy+SfIiVRW/z4qgQIrRJUP+cPYbWDA5Pf33A PYM8M1loACIYx2dOmJtYW3eihyI109gB4BvUT+/rEg== X-Google-Smtp-Source: ABdhPJzSQfkub20IJSqj/+wbaZPCpGATqv/FYVyT3KxnaJLpklHYozX1ctQotjKQ5XKjGJMN0mAolRH8/V6la+oox8Q= X-Received: by 2002:ac8:5c85:: with SMTP id r5mr5115177qta.8.1605713782397; Wed, 18 Nov 2020 07:36:22 -0800 (PST) MIME-Version: 1.0 References: <19601c2110760228adf7594385db4508f62a5721.1605305705.git.andreyknvl@google.com> In-Reply-To: <19601c2110760228adf7594385db4508f62a5721.1605305705.git.andreyknvl@google.com> From: Alexander Potapenko Date: Wed, 18 Nov 2020 16:36:10 +0100 Message-ID: Subject: Re: [PATCH mm v10 09/42] kasan: define KASAN_MEMORY_PER_SHADOW_PAGE To: Andrey Konovalov Cc: Andrew Morton , Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev , Linux ARM , Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Nov 13, 2020 at 11:16 PM Andrey Konovalov w= rote: > > Define KASAN_MEMORY_PER_SHADOW_PAGE as (KASAN_GRANULE_SIZE << PAGE_SHIFT)= , > which is the same as (KASAN_GRANULE_SIZE * PAGE_SIZE) for software modes > that use shadow memory, and use it across KASAN code to simplify it. > > Signed-off-by: Andrey Konovalov > Signed-off-by: Vincenzo Frascino > Reviewed-by: Marco Elver Reviewed-by: Alexander Potapenko > --- > Change-Id: I0b627b24187d06c8b9bb2f1d04d94b3d06945e73 > --- > mm/kasan/init.c | 10 ++++------ > mm/kasan/kasan.h | 2 ++ > mm/kasan/shadow.c | 16 +++++++--------- > 3 files changed, 13 insertions(+), 15 deletions(-) > > diff --git a/mm/kasan/init.c b/mm/kasan/init.c > index 1a71eaa8c5f9..bc0ad208b3a7 100644 > --- a/mm/kasan/init.c > +++ b/mm/kasan/init.c > @@ -441,9 +441,8 @@ void kasan_remove_zero_shadow(void *start, unsigned l= ong size) > addr =3D (unsigned long)kasan_mem_to_shadow(start); > end =3D addr + (size >> KASAN_SHADOW_SCALE_SHIFT); > > - if (WARN_ON((unsigned long)start % > - (KASAN_GRANULE_SIZE * PAGE_SIZE)) || > - WARN_ON(size % (KASAN_GRANULE_SIZE * PAGE_SIZE))) > + if (WARN_ON((unsigned long)start % KASAN_MEMORY_PER_SHADOW_PAGE) = || > + WARN_ON(size % KASAN_MEMORY_PER_SHADOW_PAGE)) > return; > > for (; addr < end; addr =3D next) { > @@ -476,9 +475,8 @@ int kasan_add_zero_shadow(void *start, unsigned long = size) > shadow_start =3D kasan_mem_to_shadow(start); > shadow_end =3D shadow_start + (size >> KASAN_SHADOW_SCALE_SHIFT); > > - if (WARN_ON((unsigned long)start % > - (KASAN_GRANULE_SIZE * PAGE_SIZE)) || > - WARN_ON(size % (KASAN_GRANULE_SIZE * PAGE_SIZE))) > + if (WARN_ON((unsigned long)start % KASAN_MEMORY_PER_SHADOW_PAGE) = || > + WARN_ON(size % KASAN_MEMORY_PER_SHADOW_PAGE)) > return -EINVAL; > > ret =3D kasan_populate_early_shadow(shadow_start, shadow_end); > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 53b095f56f28..eec88bf28c64 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -8,6 +8,8 @@ > #define KASAN_GRANULE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) > #define KASAN_GRANULE_MASK (KASAN_GRANULE_SIZE - 1) > > +#define KASAN_MEMORY_PER_SHADOW_PAGE (KASAN_GRANULE_SIZE << PAGE_SHIFT= ) > + > #define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ > #define KASAN_TAG_INVALID 0xFE /* inaccessible memory tag */ > #define KASAN_TAG_MAX 0xFD /* maximum value for random tags */ > diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c > index 4264bfbdca1a..80522d2c447b 100644 > --- a/mm/kasan/shadow.c > +++ b/mm/kasan/shadow.c > @@ -174,7 +174,7 @@ static int __meminit kasan_mem_notifier(struct notifi= er_block *nb, > shadow_end =3D shadow_start + shadow_size; > > if (WARN_ON(mem_data->nr_pages % KASAN_GRANULE_SIZE) || > - WARN_ON(start_kaddr % (KASAN_GRANULE_SIZE << PAGE_SHIFT))= ) > + WARN_ON(start_kaddr % KASAN_MEMORY_PER_SHADOW_PAGE)) > return NOTIFY_BAD; > > switch (action) { > @@ -445,22 +445,20 @@ void kasan_release_vmalloc(unsigned long start, uns= igned long end, > unsigned long region_start, region_end; > unsigned long size; > > - region_start =3D ALIGN(start, PAGE_SIZE * KASAN_GRANULE_SIZE); > - region_end =3D ALIGN_DOWN(end, PAGE_SIZE * KASAN_GRANULE_SIZE); > + region_start =3D ALIGN(start, KASAN_MEMORY_PER_SHADOW_PAGE); > + region_end =3D ALIGN_DOWN(end, KASAN_MEMORY_PER_SHADOW_PAGE); > > - free_region_start =3D ALIGN(free_region_start, > - PAGE_SIZE * KASAN_GRANULE_SIZE); > + free_region_start =3D ALIGN(free_region_start, KASAN_MEMORY_PER_S= HADOW_PAGE); > > if (start !=3D region_start && > free_region_start < region_start) > - region_start -=3D PAGE_SIZE * KASAN_GRANULE_SIZE; > + region_start -=3D KASAN_MEMORY_PER_SHADOW_PAGE; > > - free_region_end =3D ALIGN_DOWN(free_region_end, > - PAGE_SIZE * KASAN_GRANULE_SIZE); > + free_region_end =3D ALIGN_DOWN(free_region_end, KASAN_MEMORY_PER_= SHADOW_PAGE); > > if (end !=3D region_end && > free_region_end > region_end) > - region_end +=3D PAGE_SIZE * KASAN_GRANULE_SIZE; > + region_end +=3D KASAN_MEMORY_PER_SHADOW_PAGE; > > shadow_start =3D kasan_mem_to_shadow((void *)region_start); > shadow_end =3D kasan_mem_to_shadow((void *)region_end); > -- > 2.29.2.299.gdc1121823c-goog > --=20 Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Stra=C3=9Fe, 33 80636 M=C3=BCnchen Gesch=C3=A4ftsf=C3=BChrer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg