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=-18.9 required=3.0 tests=BAYES_00,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, URIBL_BLOCKED,USER_AGENT_SANE_1,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 03B03C47423 for ; Thu, 1 Oct 2020 17:33:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8CF8820872 for ; Thu, 1 Oct 2020 17:33:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ISKMXrHz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8CF8820872 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 1B2D1900011; Thu, 1 Oct 2020 13:33:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1645A900003; Thu, 1 Oct 2020 13:33:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 02BA1900011; Thu, 1 Oct 2020 13:33:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0103.hostedemail.com [216.40.44.103]) by kanga.kvack.org (Postfix) with ESMTP id CB3B8900003 for ; Thu, 1 Oct 2020 13:33:35 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 672A2180AD815 for ; Thu, 1 Oct 2020 17:33:35 +0000 (UTC) X-FDA: 77324053590.18.tail01_270942a2719d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 411791019768E for ; Thu, 1 Oct 2020 17:33:35 +0000 (UTC) X-HE-Tag: tail01_270942a2719d X-Filterd-Recvd-Size: 7675 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 17:33:34 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id z1so6764519wrt.3 for ; Thu, 01 Oct 2020 10:33:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=RyvBCHeBiWREspyplqvYLjTu6txMmCKxwBHGAY8/C40=; b=ISKMXrHzPpXTl6YH2OnZSzENPkot5q/TU0fdM+lM7cEzORvY2csaeJv0USOcQ18qxg 4gHudrdypoKEcHzgjxCMdPx0OjtnA/mwWlWA9odpTjHKy8i9KvkBQCnMa2p3niq83pgV tLdphnAJdBcirwAUcmQObo+rP2ol79CVlm4AbVX3awXXvk16lEMQfEbXfs2Xtrggo3Tr 6QA/N8S2wM/RoWIbOcjQ0q2biItuGoSHmqJ+qy9R7elOfPvBh/FMilibsC5bAWC/g7DL CEG1smLGq//pYv5uPxKJmfP/yrp8eFMbgPY8mes0LDIyZsMpTtK12DtZlsq6gHxFQimU MVtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=RyvBCHeBiWREspyplqvYLjTu6txMmCKxwBHGAY8/C40=; b=ObuVkWj1FiWCfvFD3u8AWwAfwfHYsArEj2BPoxDvHbBFVcxQpsGCW4keF4Tsoez/eP izaNXdHMUlRfSYYdpiSl+0S+MsvugMYRfyJYstALyadly0QO/66WnPNPB1d13ADJ0bWC XEXKZjsgsDxUcma+BAMDQKUHrcvqrreTshmAOdNxkxd+dAL92mgeli2FUpT8CLDvSrTY SMQobXzJW+5GwsyizvbIM7PlZYRXm5w3hZB10EjVe0YyIEJrPhhbcXvcXp3bZApuy+om Q6VaVSj0ssXi1arXJMMoc9Y8SVav6UtM3rxA6mUbRybtX9u5flnTh0P7miuGIzM+5QZS C/nA== X-Gm-Message-State: AOAM532/BKOK2cK5dF7/jADjbbs6qmM+6xNmULS3PtucpqFhX4BSYTzs Ks1pzqtsML4t9O0UKj/I/bwIWw== X-Google-Smtp-Source: ABdhPJyKBp6vSfk3WnfQaYYcClLpeCrmO8iYzQVF1oz9m7sTbW8cz5XqdtrqY4Lz27dwRrvMvQDMZQ== X-Received: by 2002:adf:9504:: with SMTP id 4mr10606938wrs.27.1601573613686; Thu, 01 Oct 2020 10:33:33 -0700 (PDT) Received: from elver.google.com ([100.105.32.75]) by smtp.gmail.com with ESMTPSA id k4sm10446478wrx.51.2020.10.01.10.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 10:33:32 -0700 (PDT) Date: Thu, 1 Oct 2020 19:33:26 +0200 From: elver@google.com To: Andrey Konovalov Cc: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com, Andrey Ryabinin , Alexander Potapenko , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 09/39] kasan: define KASAN_GRANULE_PAGE Message-ID: <20201001173326.GG4162920@elver.google.com> References: <92a351d2bc4b1235a772f343db06bedf69a3cec9.1600987622.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <92a351d2bc4b1235a772f343db06bedf69a3cec9.1600987622.git.andreyknvl@google.com> User-Agent: Mutt/1.14.5 (2020-06-23) 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, Sep 25, 2020 at 12:50AM +0200, Andrey Konovalov wrote: > Define KASAN_GRANULE_PAGE as (KASAN_GRANULE_SIZE << PAGE_SHIFT), which is > the same as (KASAN_GRANULE_SIZE * PAGE_SIZE), and use it across KASAN code > to simplify it. > > Signed-off-by: Andrey Konovalov > Signed-off-by: Vincenzo Frascino Reviewed-by: Marco Elver > --- > Change-Id: I0b627b24187d06c8b9bb2f1d04d94b3d06945e73 > --- > mm/kasan/init.c | 10 ++++------ > mm/kasan/kasan.h | 1 + > mm/kasan/shadow.c | 16 +++++++--------- > 3 files changed, 12 insertions(+), 15 deletions(-) > > diff --git a/mm/kasan/init.c b/mm/kasan/init.c > index 1a71eaa8c5f9..26b2663b3a42 100644 > --- a/mm/kasan/init.c > +++ b/mm/kasan/init.c > @@ -441,9 +441,8 @@ void kasan_remove_zero_shadow(void *start, unsigned long size) > addr = (unsigned long)kasan_mem_to_shadow(start); > end = 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_GRANULE_PAGE) || > + WARN_ON(size % KASAN_GRANULE_PAGE)) > return; > > for (; addr < end; addr = next) { > @@ -476,9 +475,8 @@ int kasan_add_zero_shadow(void *start, unsigned long size) > shadow_start = kasan_mem_to_shadow(start); > shadow_end = 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_GRANULE_PAGE) || > + WARN_ON(size % KASAN_GRANULE_PAGE)) > return -EINVAL; > > ret = kasan_populate_early_shadow(shadow_start, shadow_end); > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index c31e2c739301..1865bb92d47a 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -7,6 +7,7 @@ > > #define KASAN_GRANULE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) > #define KASAN_GRANULE_MASK (KASAN_GRANULE_SIZE - 1) > +#define KASAN_GRANULE_PAGE (KASAN_GRANULE_SIZE << PAGE_SHIFT) > > #define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ > #define KASAN_TAG_INVALID 0xFE /* inaccessible memory tag */ > diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c > index ca0cc4c31454..1fadd4930d54 100644 > --- a/mm/kasan/shadow.c > +++ b/mm/kasan/shadow.c > @@ -161,7 +161,7 @@ static int __meminit kasan_mem_notifier(struct notifier_block *nb, > shadow_end = 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_GRANULE_PAGE)) > return NOTIFY_BAD; > > switch (action) { > @@ -432,22 +432,20 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end, > unsigned long region_start, region_end; > unsigned long size; > > - region_start = ALIGN(start, PAGE_SIZE * KASAN_GRANULE_SIZE); > - region_end = ALIGN_DOWN(end, PAGE_SIZE * KASAN_GRANULE_SIZE); > + region_start = ALIGN(start, KASAN_GRANULE_PAGE); > + region_end = ALIGN_DOWN(end, KASAN_GRANULE_PAGE); > > - free_region_start = ALIGN(free_region_start, > - PAGE_SIZE * KASAN_GRANULE_SIZE); > + free_region_start = ALIGN(free_region_start, KASAN_GRANULE_PAGE); > > if (start != region_start && > free_region_start < region_start) > - region_start -= PAGE_SIZE * KASAN_GRANULE_SIZE; > + region_start -= KASAN_GRANULE_PAGE; > > - free_region_end = ALIGN_DOWN(free_region_end, > - PAGE_SIZE * KASAN_GRANULE_SIZE); > + free_region_end = ALIGN_DOWN(free_region_end, KASAN_GRANULE_PAGE); > > if (end != region_end && > free_region_end > region_end) > - region_end += PAGE_SIZE * KASAN_GRANULE_SIZE; > + region_end += KASAN_GRANULE_PAGE; > > shadow_start = kasan_mem_to_shadow((void *)region_start); > shadow_end = kasan_mem_to_shadow((void *)region_end); > -- > 2.28.0.681.g6f77f65b4e-goog >