From patchwork Fri Feb 5 15:39:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12070373 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=-16.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 0FC98C433DB for ; Fri, 5 Feb 2021 15:39:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8B73D650FC for ; Fri, 5 Feb 2021 15:39:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B73D650FC 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 D82C86B0072; Fri, 5 Feb 2021 10:39:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CE4236B0073; Fri, 5 Feb 2021 10:39:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA9ED6B0074; Fri, 5 Feb 2021 10:39:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0210.hostedemail.com [216.40.44.210]) by kanga.kvack.org (Postfix) with ESMTP id 9FE8E6B0072 for ; Fri, 5 Feb 2021 10:39:26 -0500 (EST) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 7050E1DEF for ; Fri, 5 Feb 2021 15:39:26 +0000 (UTC) X-FDA: 77784623532.09.print25_450ae3f275e5 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id 50825180AD807 for ; Fri, 5 Feb 2021 15:39:26 +0000 (UTC) X-HE-Tag: print25_450ae3f275e5 X-Filterd-Recvd-Size: 5205 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Fri, 5 Feb 2021 15:39:25 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id o14so5497603qtp.10 for ; Fri, 05 Feb 2021 07:39:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=tljlSxhBzcxqidAVSdVdhM6oUJ+nJ3d1xitEmX2Ppf0=; b=syVSGwpY7OBUajXhF+JU66oy4DayPtyhrZEKrCctZ7ZSEwdKPb5Fvf+ONRWcDtxp0K l36gKS8Yr71bsitJfXedVqVkHwOpQH2t/7/hBm4ZmVz/jpErYZ6yrtAzAzFjr4bLp1mg ZNGlS6epLYCc6jCq4C1m6SSWpMXkg7iVv0VbgQuORm2mYYrrw/8PmMphfXzVC3yZ6Lv6 f992UftKMf+GCjLbYmegMakIMsmuEpSMOCwEwtz+LdHiElyCXXWkfY9EjfKHBoHqkLxc tuCvq3A1ZCy11mG8Rs7N3bouZpjWecOu83K6/n5Uzv6c/sKJo2krn++2hCMlongp3G5K c3Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=tljlSxhBzcxqidAVSdVdhM6oUJ+nJ3d1xitEmX2Ppf0=; b=OpzQf5kml7FiwBgeMcgIIthrgBAuzyPujyqcgJXYPVhO1B5ItrByYbB0N4YGieIrG8 73RZWGnTxmN8yZkjnKTj0Iya2p36A0jN4wUGO2H2Rz3mzmYVATlvGIU1fxd9ZJON+R8e WOiD/pPGuiiC+c6pUWy2wXXcZUE5ayiEspa1IJ8/US+KLVcAIZlJ+4DSEX1TOxbFMOy1 j2jl4SKWOxOSoDIvGisrsj8bHwA7yDmh1HBK4voDrFt3MHHS9DvKa7sNdnl08VlKnFtz FOxY92SJVRIC3uwk27781FcMWGBn9FWWB2SzAgQiioj13Jqc14N/n54Tpa4pdkJy7rQq 58RQ== X-Gm-Message-State: AOAM532jfLQRp1ZhrJdbj7ZbFl2d8i/0UGNNSDfWwJQE5BzqFDzGVYG9 /Q1MsebECEUMmiLaOXjwx2tirHL5A7oRfLYh X-Google-Smtp-Source: ABdhPJyO1MocpYFwZ1RXJ8jVPh8e1tllN7Hw4na0XycrZ5x/iFUpbgSITGryg5kyrNeA7pCK+1dElwIgxYqVy2a5 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:edb8:b79c:2e20:e531]) (user=andreyknvl job=sendgmr) by 2002:a0c:f94a:: with SMTP id i10mr4890478qvo.22.1612539565151; Fri, 05 Feb 2021 07:39:25 -0800 (PST) Date: Fri, 5 Feb 2021 16:39:04 +0100 In-Reply-To: Message-Id: <97581e50e594596e0bf8dd5bb3598d5e13013f18.1612538932.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v2 03/12] kasan: optimize large kmalloc poisoning From: Andrey Konovalov To: Andrew Morton , Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Will Deacon , Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov 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: Similarly to kasan_kmalloc(), kasan_kmalloc_large() doesn't need to unpoison the object as it as already unpoisoned by alloc_pages() (or by ksize() for krealloc()). This patch changes kasan_kmalloc_large() to only poison the redzone. Reviewed-by: Marco Elver Signed-off-by: Andrey Konovalov --- mm/kasan/common.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 00edbc3eb32e..f2a6bae13053 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -494,7 +494,6 @@ EXPORT_SYMBOL(__kasan_kmalloc); void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags) { - struct page *page; unsigned long redzone_start; unsigned long redzone_end; @@ -504,12 +503,23 @@ void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size, if (unlikely(ptr == NULL)) return NULL; - page = virt_to_page(ptr); + /* + * The object has already been unpoisoned by kasan_alloc_pages() for + * alloc_pages() or by ksize() for krealloc(). + */ + + /* + * The redzone has byte-level precision for the generic mode. + * Partially poison the last object granule to cover the unaligned + * part of the redzone. + */ + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + kasan_poison_last_granule(ptr, size); + + /* Poison the aligned part of the redzone. */ redzone_start = round_up((unsigned long)(ptr + size), KASAN_GRANULE_SIZE); - redzone_end = (unsigned long)ptr + page_size(page); - - kasan_unpoison(ptr, size); + redzone_end = (unsigned long)ptr + page_size(virt_to_page(ptr)); kasan_poison((void *)redzone_start, redzone_end - redzone_start, KASAN_PAGE_REDZONE);