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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 43697C47423 for ; Thu, 1 Oct 2020 17:34:56 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7B1C2085B for ; Thu, 1 Oct 2020 17:34:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CbZxuyPq"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="ISKMXrHz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7B1C2085B Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rSkgtlxtnr3scZJyuJE3ynDZhkv6T/9bu7faRwXWfUY=; b=CbZxuyPqPs0+ybya7oxU0SCzn exISPjtDW5edVUFwV1JMOZ98uWy8nRYK6UQSpUih4JEPuiUYi9xyUWNqCODcVzEdDLoiz94Ki1OUV AOlz2jH5ax/Aj1VLUBIPP+RSuCJEs9phA12NauasrQJqoaGGf1X+/nwJcvdvzmpjwLaY6BTXuSNjd +wF60vgqiFGk5gzGquIGSKmOOARGyOp8paMFJjaLFK4Iukafmfjlk71Llu8hPCb5i7bnOqXD+UfAv lxB9Y3iNvAs2gHKmrDmiBEiriRgapZNRXkxxqFCrPSHxdkDDasRQONaX1phBYzWi3Cux/+HeVQH4T dLMJvF/bw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kO2SZ-0001Up-2D; Thu, 01 Oct 2020 17:33:39 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kO2SU-0001TD-Nx for linux-arm-kernel@lists.infradead.org; Thu, 01 Oct 2020 17:33:36 +0000 Received: by mail-wr1-x441.google.com with SMTP id j2so6758419wrx.7 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=CW5PgIh5JlkyxDoESmoKp7+YLWUxH+o0CsN3KEZGsMOjnOB4NMnX0OC7yeWgIKTtkK X0N4/BRzT96nHhWwoDeFEYIqQqpHbSStT7QXkTfaxyN779cWnJ8XagRXhhr+vfNk0ZMm dtEeJksh/FK3PfCvQv+MEDvIMJR3BE/Wuotv1zoNGRnSOuAWRjTUKgHIcS6D4NZrT3ts amAoKRrtfXCnVTWmozOdwHd2s+kNIq5huHOfd1pM9URrDaPgT00JAUUOKQaxnAX9ZLbc LSZaIGo9jioknxcDBZOv1OSycSLXHH1xzRWPrhUEli53pK07KyaHL6I2TGkCNUHfB20h VKwQ== X-Gm-Message-State: AOAM532L+3HVZda/G8De36LhD++C+JNi+AXucvGIzasRcRqj67buD2DU rm81yo5+9l/CFb+PqOFw+9pzzw== 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 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-Disposition: inline In-Reply-To: <92a351d2bc4b1235a772f343db06bedf69a3cec9.1600987622.git.andreyknvl@google.com> User-Agent: Mutt/1.14.5 (2020-06-23) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201001_133334_819402_65A8B5D6 X-CRM114-Status: GOOD ( 21.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Branislav Rankov , Elena Petrova , Catalin Marinas , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel