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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3E9FC77B71 for ; Tue, 18 Apr 2023 10:10:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BD376B0071; Tue, 18 Apr 2023 06:10:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 36D2B8E0002; Tue, 18 Apr 2023 06:10:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25C4D8E0001; Tue, 18 Apr 2023 06:10:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 177B86B0071 for ; Tue, 18 Apr 2023 06:10:42 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E1D84A017F for ; Tue, 18 Apr 2023 10:10:41 +0000 (UTC) X-FDA: 80694092682.29.3C36CE7 Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) by imf16.hostedemail.com (Postfix) with ESMTP id 3DEC5180026 for ; Tue, 18 Apr 2023 10:10:40 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=q6JfMBnu; spf=pass (imf16.hostedemail.com: domain of elver@google.com designates 209.85.166.50 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681812640; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=galNuw/biFG4LXA5HDGOsFD5DzMSzVWuBOk2kSXMjaQ=; b=ZpJ9o1UrTwysh2Eyi4kmwqQTtdhGSeVB8Rgwspbv6t+A0hDGnYHHKLFHLNfOpUikVOwC1J +vhHE6s1YQQzDkmpmkSJdU2Sgp7oZcK+Rncp/JyQv9sl99u/XYVLfyxbvFg8J07XzV1d8o ZJ1cBwpUkyYmWcvXDFb0WMZ10XFVqFM= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=q6JfMBnu; spf=pass (imf16.hostedemail.com: domain of elver@google.com designates 209.85.166.50 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681812640; a=rsa-sha256; cv=none; b=k9/fwj/s+rYZTX2TXRx3/9j/vqns0FSQ47JyEszvjgaYcgA/6vOqi/jAbB0NXg5SwfpGkW u3dR0kBVbakhhCMclUx+dWQK2DNgwUA0UcHWwlasO/MSQT7HwFIusx5GjaYQsGHPMDGn+c mvS5mOirt1M1jcyuWMBNffXOXmILSPY= Received: by mail-io1-f50.google.com with SMTP id ca18e2360f4ac-7606d44e074so50711239f.1 for ; Tue, 18 Apr 2023 03:10:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1681812639; x=1684404639; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=galNuw/biFG4LXA5HDGOsFD5DzMSzVWuBOk2kSXMjaQ=; b=q6JfMBnuReWJl6/1zXE1nYutbcRaaaEXv9F9KYqOh9WNYwM5cV8dnLrLMS+ab/Rmg4 R6MjOR4zcSFzibYpW9dVsQ5kjBb7ktKYbFqhAPu/RKUPlBBSk4cTBOyhTeyUzVFL4MMC iGd2gKTsXoA+auZkAJ0G3MGxsjD+fpQNdJoNd8fMZn2IQCueMK08vv3be4hFgzNDFkEO OUPZsBH6fnKrKkLAZXkZCemQUFhVLHF5q5v50gfyX72O23eEv0eiITQjTqHWhaWQGtjx 8zL7/u4WJ9DGqs3nuQ8ujsdMTpTL6JW0sQvb3pHJErvJJkQeLrWfh/R4g1536x28rmMI 4hWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681812639; x=1684404639; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=galNuw/biFG4LXA5HDGOsFD5DzMSzVWuBOk2kSXMjaQ=; b=knlodWMTSgHnBuNBglnk9/IRD120OlMMRsI2HM3lCsgfhdhP6D+OgdpZcIzF7HGf8x A7cW/pG0hn/FkFRq+0MzEhGFx/ww4RPUCQNPOxTTUMx79bClaX8FthK2hhopBVruFGRX FoDIj1SF6qtd05UIclIRXpfu7Z5xatXxkdE1Hue9l0LvYqXamGx4gd4Bk3hOgn37Z4Ip 6wuHFnuZUsY+CKBOE1IM0HPazpTj+ALu+ME2mCn9u8yufAu8UhMoikyDFR+UTOxY8Ded ytx09FipIyqL939uG7KVA3k+I0JzqZhfgEQsQG/Dak2f/HISnjswEIT2UaNUHt+dOWai BJzg== X-Gm-Message-State: AAQBX9crGTso83p3FnGA3mPYGrf/wkPuYRhtZs3NDk/IooYA8l7elA2Z ib7NtMRDrz/F9zlReMFIG69XhpyxDApVWadNFeuRtg== X-Google-Smtp-Source: AKy350YVy3JmfQcviI31LBq4X5LNVqsne/W6d19FhvX/nKVWXNgZd5NpWsZ4AsaUF6j81qIqnDHEcwqg1ATjJVoXzj4= X-Received: by 2002:a6b:7210:0:b0:75d:b1:b718 with SMTP id n16-20020a6b7210000000b0075d00b1b718mr1205992ioc.9.1681812639142; Tue, 18 Apr 2023 03:10:39 -0700 (PDT) MIME-Version: 1.0 References: <20230413131223.4135168-1-glider@google.com> In-Reply-To: <20230413131223.4135168-1-glider@google.com> From: Marco Elver Date: Tue, 18 Apr 2023 12:10:02 +0200 Message-ID: Subject: Re: [PATCH v2 1/4] mm: kmsan: handle alloc failures in kmsan_vmap_pages_range_noflush() To: Alexander Potapenko Cc: urezki@gmail.com, hch@infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, dvyukov@google.com, kasan-dev@googlegroups.com, Dipanjan Das Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 3DEC5180026 X-Stat-Signature: zernmznzxt6wc15f6odm9yft5w6zs1nw X-Rspam-User: X-HE-Tag: 1681812640-904053 X-HE-Meta: U2FsdGVkX18XBVaBfD8V5pJS+CdEUlekgxtxDaMIonD4Lkndb3kVmvTThSKbNoRPzWX1AyhDQABqc5D5hzQ7KH4Ju7fwG6N1z6J1BzcH/MZsR/nBnzCR8xQS3MD78Q7fqC0ItA2GPQdPx4gUPPJKqiRt12hpbMOCJFS36OewbJOmqAdusdlxyhPrRNhc9M2gu2HwqOtaSSk4wxLyA6z4o4C+ZsQS9N/dQsPtZEz/E9mbA4//o1blkkDaM5cErV6ZzXnXkMHr6Y3YamerU5uQOfvUze5x3+ofWbxsuVWhV1nlO7IOQyK3HD+QRBn1MQfV9krAcJSg5FRVcwBcqEmQLrYScsN2sgQG6RrVwcQEjuQdMe3S5dzW7Ozt8dRXjbIdhVyith/0BwHSckf4x/WUzvam5cyWOz1gU6MUJyhl815CMaCI8Jc5KllRypXM6ElYVltXXjLR4spnY1fgTIYNbr+zzbDXBJ0vMuifMFnJdZV0Rzc/zjwgT9KzT1ciC6Rv346JUHwp6BbZHYto83WFmBDmiF7KoJBJb0fKmkl+1BaN8jfaIThtbriOxyqSJ4B48Qmv7ts0gBrpa3yWh/SDCHiF8UeTaElr7a/MlKp8wiWTUb3IEiFaKWHivwXFnw7psQhmy2kSbSlv2XNexIVPsWqCJpv+9sJc5NzwUHb2feAj1Nt0n6QnWnnHlkHTvidd/Xn43grdLS7M4mKtfHbRvU4IcHJSUIcs5nAocW1/DsZo4td6LJW1EYWQC2f7X+orbYpwrjIvX3r6cFHuPH6RL1V7yHthEkYkQYAYlALH14s7tuo+R3ibv3VSx6zu0mtgxtzrqMiA0o2Q7kv+aSQzFj4upGxvuOaZEadNrb9De3p56GDn8cRo7icMKSA3qrdHshdWCVdOGO3QI874OleexBSkgZIL0iGl6dc/8rOAQkpBOBZJkmOusVKar+AxmjHaQPBXpHwe2/3a/0sLDYQ fKx7cg7r KxX0raUGvlkca9fDHs3NjVE941p8FuIDzhgZ0fcEyhavUDw4UYd4WpYzGxQ1JW7Uuf9HowF7O9wFWTn3FvCMxpUIBuFv+RRDj4ZE0rTe/wYqlSRqgDXq5u9aIHVkeZolNRdkC7NN1XTXDalkbDH9fg/O9vxoNhajxCXWflBBtdUhEfD1+Hw4R36OEBY1ViH6ddyixTqA5HE3WnXviiortbo5IqgbmrNR73SbEqnZguAgOvbT/EVWs26DWZGVU7/d3dXaB1sGCTaVaTGNh9JTUtG1Ha1YgSRDv0BJMAjCenWwz8vMmcS4oCHl40YvIXdFKXTLBazPGlyHiakUO4Gtc3FRMMGX5IFtCZG/gf5tU75m/RP16ZLAGthVVVIKJAMAQypjXxo9aRWQdOY+2eYyvwiByYxhYeVBd7XqUBFvOE/qwsNhhj9nyYezy/AvqqSHjshSu/t4SsGaEPo/bR4XTO4P65u8VTorBkewbHy/Xd/g+kV0= 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 Thu, 13 Apr 2023 at 15:12, Alexander Potapenko wrote: > > As reported by Dipanjan Das, when KMSAN is used together with kernel > fault injection (or, generally, even without the latter), calls to > kcalloc() or __vmap_pages_range_noflush() may fail, leaving the > metadata mappings for the virtual mapping in an inconsistent state. > When these metadata mappings are accessed later, the kernel crashes. > > To address the problem, we return a non-zero error code from > kmsan_vmap_pages_range_noflush() in the case of any allocation/mapping > failure inside it, and make vmap_pages_range_noflush() return an error > if KMSAN fails to allocate the metadata. > > This patch also removes KMSAN_WARN_ON() from vmap_pages_range_noflush(), > as these allocation failures are not fatal anymore. > > Reported-by: Dipanjan Das > Link: https://lore.kernel.org/linux-mm/CANX2M5ZRrRA64k0hOif02TjmY9kbbO2aCBPyq79es34RXZ=cAw@mail.gmail.com/ > Fixes: b073d7f8aee4 ("mm: kmsan: maintain KMSAN metadata for page operations") > Signed-off-by: Alexander Potapenko Reviewed-by: Marco Elver Looks reasonable, thanks. > --- > v2: > -- return 0 from the inline version of kmsan_vmap_pages_range_noflush() > (spotted by kernel test robot ) > --- > include/linux/kmsan.h | 20 +++++++++++--------- > mm/kmsan/shadow.c | 27 ++++++++++++++++++--------- > mm/vmalloc.c | 6 +++++- > 3 files changed, 34 insertions(+), 19 deletions(-) > > diff --git a/include/linux/kmsan.h b/include/linux/kmsan.h > index e38ae3c346184..c7ff3aefc5a13 100644 > --- a/include/linux/kmsan.h > +++ b/include/linux/kmsan.h > @@ -134,11 +134,12 @@ void kmsan_kfree_large(const void *ptr); > * @page_shift: page_shift passed to vmap_range_noflush(). > * > * KMSAN maps shadow and origin pages of @pages into contiguous ranges in > - * vmalloc metadata address range. > + * vmalloc metadata address range. Returns 0 on success, callers must check > + * for non-zero return value. > */ > -void kmsan_vmap_pages_range_noflush(unsigned long start, unsigned long end, > - pgprot_t prot, struct page **pages, > - unsigned int page_shift); > +int kmsan_vmap_pages_range_noflush(unsigned long start, unsigned long end, > + pgprot_t prot, struct page **pages, > + unsigned int page_shift); > > /** > * kmsan_vunmap_kernel_range_noflush() - Notify KMSAN about a vunmap. > @@ -281,12 +282,13 @@ static inline void kmsan_kfree_large(const void *ptr) > { > } > > -static inline void kmsan_vmap_pages_range_noflush(unsigned long start, > - unsigned long end, > - pgprot_t prot, > - struct page **pages, > - unsigned int page_shift) > +static inline int kmsan_vmap_pages_range_noflush(unsigned long start, > + unsigned long end, > + pgprot_t prot, > + struct page **pages, > + unsigned int page_shift) > { > + return 0; > } > > static inline void kmsan_vunmap_range_noflush(unsigned long start, > diff --git a/mm/kmsan/shadow.c b/mm/kmsan/shadow.c > index a787c04e9583c..b8bb95eea5e3d 100644 > --- a/mm/kmsan/shadow.c > +++ b/mm/kmsan/shadow.c > @@ -216,27 +216,29 @@ void kmsan_free_page(struct page *page, unsigned int order) > kmsan_leave_runtime(); > } > > -void kmsan_vmap_pages_range_noflush(unsigned long start, unsigned long end, > - pgprot_t prot, struct page **pages, > - unsigned int page_shift) > +int kmsan_vmap_pages_range_noflush(unsigned long start, unsigned long end, > + pgprot_t prot, struct page **pages, > + unsigned int page_shift) > { > unsigned long shadow_start, origin_start, shadow_end, origin_end; > struct page **s_pages, **o_pages; > - int nr, mapped; > + int nr, mapped, err = 0; > > if (!kmsan_enabled) > - return; > + return 0; > > shadow_start = vmalloc_meta((void *)start, KMSAN_META_SHADOW); > shadow_end = vmalloc_meta((void *)end, KMSAN_META_SHADOW); > if (!shadow_start) > - return; > + return 0; > > nr = (end - start) / PAGE_SIZE; > s_pages = kcalloc(nr, sizeof(*s_pages), GFP_KERNEL); > o_pages = kcalloc(nr, sizeof(*o_pages), GFP_KERNEL); > - if (!s_pages || !o_pages) > + if (!s_pages || !o_pages) { > + err = -ENOMEM; > goto ret; > + } > for (int i = 0; i < nr; i++) { > s_pages[i] = shadow_page_for(pages[i]); > o_pages[i] = origin_page_for(pages[i]); > @@ -249,10 +251,16 @@ void kmsan_vmap_pages_range_noflush(unsigned long start, unsigned long end, > kmsan_enter_runtime(); > mapped = __vmap_pages_range_noflush(shadow_start, shadow_end, prot, > s_pages, page_shift); > - KMSAN_WARN_ON(mapped); > + if (mapped) { > + err = mapped; > + goto ret; > + } > mapped = __vmap_pages_range_noflush(origin_start, origin_end, prot, > o_pages, page_shift); > - KMSAN_WARN_ON(mapped); > + if (mapped) { > + err = mapped; > + goto ret; > + } > kmsan_leave_runtime(); > flush_tlb_kernel_range(shadow_start, shadow_end); > flush_tlb_kernel_range(origin_start, origin_end); > @@ -262,6 +270,7 @@ void kmsan_vmap_pages_range_noflush(unsigned long start, unsigned long end, > ret: > kfree(s_pages); > kfree(o_pages); > + return err; > } > > /* Allocate metadata for pages allocated at boot time. */ > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index a50072066221a..1355d95cce1ca 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -605,7 +605,11 @@ int __vmap_pages_range_noflush(unsigned long addr, unsigned long end, > int vmap_pages_range_noflush(unsigned long addr, unsigned long end, > pgprot_t prot, struct page **pages, unsigned int page_shift) > { > - kmsan_vmap_pages_range_noflush(addr, end, prot, pages, page_shift); > + int ret = kmsan_vmap_pages_range_noflush(addr, end, prot, pages, > + page_shift); > + > + if (ret) > + return ret; > return __vmap_pages_range_noflush(addr, end, prot, pages, page_shift); > } > > -- > 2.40.0.577.gac1e443424-goog >