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 64966C3DA61 for ; Wed, 24 Jul 2024 15:10:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 926B46B0088; Wed, 24 Jul 2024 11:10:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D69A6B0089; Wed, 24 Jul 2024 11:10:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 777126B008A; Wed, 24 Jul 2024 11:10:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 584CC6B0088 for ; Wed, 24 Jul 2024 11:10:07 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CA3E8140A79 for ; Wed, 24 Jul 2024 15:10:06 +0000 (UTC) X-FDA: 82374981612.14.9640149 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by imf07.hostedemail.com (Postfix) with ESMTP id C375C4001C for ; Wed, 24 Jul 2024 15:10:04 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=aCjh2gaI; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.43 as permitted sender) smtp.mailfrom=urezki@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721833769; a=rsa-sha256; cv=none; b=jtTLhqNsTNSz9dSlwYNBxcN0n3cpSLyg9fbWMvDQqGQGoYGgEuZLr057xfMzgNfbukyLzX oT4Tw2C4MNABy2AmuSeamFo7O9B0xfj7Up9YhvS9Lx4xdiNdKhKojtcAEqxdxPJe4+cP5A ELjuBWFAjnyS/kEzJAh7HpmeHE0Q88A= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=aCjh2gaI; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of urezki@gmail.com designates 209.85.167.43 as permitted sender) smtp.mailfrom=urezki@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721833769; 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=wrn+2L2J3l+O5LKB4lMvA6eRmgJO2t1OuP7DCfHiNX0=; b=gIBubpIFhyc8OQRkgeUiLO+S2A0bWc7Y/U6T5vmnJo3TK20yUA2vg78eP9lWuQW0zYjEtZ 39uD2LpZK+clj5c7SdNEdPsFl/6rNhJn5obcT+ZpAMFGCovbW6LxESAJkIin1uiZqeuJfr Cf3VDQ/aS8ImxqTrfLsVMUozOkj0P+s= Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-52fc14d6689so3423328e87.1 for ; Wed, 24 Jul 2024 08:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721833803; x=1722438603; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=wrn+2L2J3l+O5LKB4lMvA6eRmgJO2t1OuP7DCfHiNX0=; b=aCjh2gaIGJKVRskFYJE1ReT21kMBCfkgwpL46ZCOnloJ4UsPstQ+75WoT3uPsnT73+ s62vgU72dlgyurVcP2KGyEFjHQD3hp9lJ4Hur1konXzvbvmCnoHJ+BpL5KfNS9aketQL 6yZvMNLbxBPxDZVa7aeoF2qwuBqa5AlEzTKJfehqAL87HDWDbIGaKVk5mMsrLjm+jiNt fljYwUNvrVQfpjYiQe3w6PMuG3qmmXrXhNe/XGE80E9DIHtOU3Z/mA+K62H5i5ILcrpp TdkI9CzuDBeof1CJixm5dVQPAKdBfJ1SRylw7Z7EMSr9WqO3UB8RT1V4bLhKN7Zg5IzT Tnzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721833803; x=1722438603; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wrn+2L2J3l+O5LKB4lMvA6eRmgJO2t1OuP7DCfHiNX0=; b=r5NQdBYmVC1QwhyZrtL3iWL+TnOmV13QUK5EUa8KRXIDMPC9YfnY/nUYFgpeUrGdC9 imf1FuQpdew9KO9jPwy7qeJ/XnHbVHRDa6Ha5IO9YP2KSRJcIKzswf37Xe7tK8M2Q4+f npqfPm+zzQiyxK/nBEEApie6l8WQWNdExs3CxCKCJPAU2uNHumeypx7tQI6Mv2LqTykP QSerO+8rkdRRxGLIC0AJN3N9Nlx5iby63fBfWGQ2+IsVIwYaeYA7k9Qox86Kjb87DlVf akr5Hg1goP32vfyw6JALup2bIMxRPhogP8v66B422HPtHQBnNsnqdolu8DNLN4zcHXfE S6+A== X-Forwarded-Encrypted: i=1; AJvYcCXizSQEwkweZYCusbVq1Aem7JOIsw3oxqWxZkI4EMTSK0cRNaKoWcJTfjytKqxL1RwBTU1GzExMkZUE/jtEJDZOx14= X-Gm-Message-State: AOJu0Yzlj2tDU3g97DSSM6KHILO7eT7hUQl8RfvKpxZBHq5Ppm/0fvjl yyUE31TYPcafgE238tnrQBx0bmK/sIbXkAJTAIxL6b1janlmiTnI X-Google-Smtp-Source: AGHT+IHDPBxN5xxAPAbJb/lsNABWyt8VCCzYmydonGh2j7ufP5sX07N9OjQ8QuGnBhkMCvodEU94WQ== X-Received: by 2002:a05:6512:ea1:b0:52c:d9b3:2b06 with SMTP id 2adb3069b0e04-52efb859ef2mr9666902e87.58.1721833802485; Wed, 24 Jul 2024 08:10:02 -0700 (PDT) Received: from pc636 (host-90-233-213-186.mobileonline.telia.com. [90.233.213.186]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52fd10f7ea1sm177759e87.22.2024.07.24.08.10.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 08:10:02 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Wed, 24 Jul 2024 17:09:59 +0200 To: Adrian Huang Cc: Adrian Huang , ahuang12@lenovo.com, akpm@linux-foundation.org, hch@infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, peterz@infradead.org, sunjw10@lenovo.com Subject: Re: [PATCH 1/1] mm/vmalloc: Add preempt point in purge_vmap_node() when enabling kasan Message-ID: References: <20240724124624.27673-1-ahuang12@lenovo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: C375C4001C X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 1spxgdbfdx3mtt37uc4dw74ksfzi1h4f X-HE-Tag: 1721833804-28801 X-HE-Meta: U2FsdGVkX1+QfiJnXdlkPIIJ6hroWLCm1yd6DjmDR7+utfF+jXrPyfumF3vhKiD1lgzW4PBbap8tiMVKMmEl0PRWPCg/iYMCMebXdAsqBs47/EfI5eyNI5yD63VlGiaLsy2o9KKU1HSmkLevuOXfJ22GKcHZ1p6ciJcYTr4dekv9C7Mr/8sGyJuvqRtkLRsYMnc06PAzbX1P1Ti8/ggdixQCDoSvVV3XsDceotJr4HLX+DOZm1QYUDAXzSrix8yIbMUqSL3PsOFbWSpfyGdVkeHvd9R82nkGow8QE3vA+/0AbmOSoomprw6pVNp9RWan5KMhSE+pJPXIeZm2C6d8QtxfCWdDFuDNalEtxnHSk1G0tgT0KRt2ml9AAH1A1alK/MbgDJ52mwn501UNB3uwrpZ1O1+X7tJVYjcue2PjEqFG4VV+/WUabAkYhJQYPdsAkWs2GGTjvMjNwAnsYnO3DxvBf/I0Zj9Js/Z4goC2Erqz4anxd3FjboYXmBjuBSYnWWuSLufLT4iy2GazxQUctAP/OP8FZUxPxJUcURw28gr5EeEqKR7IiHKpxH0apekWdlUpnqbN6dgp1jJ1k87WUqRn00IIDF918jhi/FT/s1H5ky2GKk5xNThrl6FvSjztkOBILCP8uvjZzmualAIwSjPTb4YQNhkms4BLvoz9uH5d2cyTZRFORxVnIL4feXkYv3WFJTKc8Swj7ctzdfoucBrrJM8LAPYcu0eMsD2kjFqfSfm59+2GwP7FdQUCXdXBq5Etcb4gAsra9MOZw6Q3Jar/wiozuTA8H9bucIjTbK5iwrGJp3fcnuXWhGWQzBbxdkZD8YkM7DH+b/vLGoluPJQHGUrjOB8O+xwCaIeOS93OYPLWuAsDd7A8AJhWh3NjL0xj5d/7WSg4JXdZBc5lmELJuvYsyQM+WjmSvUOOcHuWtXeERGFTVYeWa+mJCv/wCJ+9+YpqrPpkDVvaXsG m2exdw4V GGqW8VHS5kdDrUHS080OLB8hN3qcCvD024EH1xD1Ss3xeqzKszmtES0P+2f7jShHb8UOAx9DVzWyur+ewlUDi8hePnyMFFm2lVIe0T6Q9jo1lb7gHoVGpk6W6CyDie1h65DyBhDuYDZPkkI5s1/tckKOQn+1mue3cL/Z6FYY3+KIMJBb/bt0dm1EUR54tADsnwEjc+fwY+V/bl0NzmGNLnukoPt6/i01/bi6bscY11bmIVypX4Vtu4lb1wxWH1AXTFH6C2cY5U8YCVUKnioQPMUqNhwEYkNOiHGhd2qSKM94IS+pAB2tkUQNzcgS5obN0lqp4sAMe4WfLcDgVz9mwKTEwDzg0c2CXbP98okKmx12TbcO3r0soOUt0wW2rZUAPHltTVyXjtBZgTqZlEYEvF6qQfSrdg4Ch+myTCj2vYGzKTuxURc7hVT3fbxuJyrQeIabw 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: List-Subscribe: List-Unsubscribe: On Wed, Jul 24, 2024 at 04:32:37PM +0200, Uladzislau Rezki wrote: > On Wed, Jul 24, 2024 at 08:46:24PM +0800, Adrian Huang wrote: > > > It works great and does not generate the soft-lock-up splat :) > > > See below some comments: > > > > Great. Thanks for the confirmation. > > > > > > > > >> + kasan_release_vmalloc(start, end, start, end, KASAN_VMALLOC_TLB_FLUSH); > > >> + > > >> > > > Do we need it here? We just did the TLB flush for en entire range in the > > > __purge_vmap_area_lazy(). So, it is two times invoked and looks odd to me. > > > > > > Am i missing something? > > > > 1. The TLB flush for the entire range in __purge_vmap_area_lazy() is for > > the vmalloc virtual address (VMALLOC_START->VMALLOC_END). > > > > 2. The TLB flush in purge_vmap_node() is for the KASAN shadow virtual address > > (the shadow offset 'CONFIG_KASAN_SHADOW_OFFSET' is defined in .config). > > > Correct. It deals with a shadow region! > > > > > BTW, I found my first patch has the potential risk. We need to flush TLB of > > the KASAN shadow virtual address firstly. Please see the following patch for > > detail. (I put the comment in the following patch). The following patch > > also works well on my 256-core machine. > > > I noticed that and it would be my second question :) > > > > > If you're ok with the patch, I'll submit it for upstream review. And, may I > > have your tag(s): tested-by/reviewed-by? (If possible, could you please have > > a test for the following patch). > > > I am OK. I will test and get back soon. > > > Thanks. > > > > --- > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > > index 70d6a8f6e25d..ddbf42a1a7b7 100644 > > --- a/include/linux/kasan.h > > +++ b/include/linux/kasan.h > > @@ -55,6 +55,9 @@ extern p4d_t kasan_early_shadow_p4d[MAX_PTRS_PER_P4D]; > > int kasan_populate_early_shadow(const void *shadow_start, > > const void *shadow_end); > > > > +#define KASAN_VMALLOC_PAGE_RANGE 0x1 /* Apply exsiting page range */ > > +#define KASAN_VMALLOC_TLB_FLUSH 0x2 /* TLB flush */ > > + > > #ifndef kasan_mem_to_shadow > > static inline void *kasan_mem_to_shadow(const void *addr) > > { > > @@ -511,7 +514,8 @@ void kasan_populate_early_vm_area_shadow(void *start, unsigned long size); > > int kasan_populate_vmalloc(unsigned long addr, unsigned long size); > > void kasan_release_vmalloc(unsigned long start, unsigned long end, > > unsigned long free_region_start, > > - unsigned long free_region_end); > > + unsigned long free_region_end, > > + unsigned long flags); > > > > #else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ > > > > @@ -526,7 +530,8 @@ static inline int kasan_populate_vmalloc(unsigned long start, > > static inline void kasan_release_vmalloc(unsigned long start, > > unsigned long end, > > unsigned long free_region_start, > > - unsigned long free_region_end) { } > > + unsigned long free_region_end, > > + unsigned long flags) { } > > > > #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ > > > > @@ -561,7 +566,8 @@ static inline int kasan_populate_vmalloc(unsigned long start, > > static inline void kasan_release_vmalloc(unsigned long start, > > unsigned long end, > > unsigned long free_region_start, > > - unsigned long free_region_end) { } > > + unsigned long free_region_end, > > + unsigned long flags) { } > > > > static inline void *kasan_unpoison_vmalloc(const void *start, > > unsigned long size, > > diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c > > index d6210ca48dda..88d1c9dcb507 100644 > > --- a/mm/kasan/shadow.c > > +++ b/mm/kasan/shadow.c > > @@ -489,7 +489,8 @@ static int kasan_depopulate_vmalloc_pte(pte_t *ptep, unsigned long addr, > > */ > > void kasan_release_vmalloc(unsigned long start, unsigned long end, > > unsigned long free_region_start, > > - unsigned long free_region_end) > > + unsigned long free_region_end, > > + unsigned long flags) > > { > > void *shadow_start, *shadow_end; > > unsigned long region_start, region_end; > > @@ -522,12 +523,17 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end, > > __memset(shadow_start, KASAN_SHADOW_INIT, shadow_end - shadow_start); > > return; > > } > > - apply_to_existing_page_range(&init_mm, > > + > > + > > + if (flags & KASAN_VMALLOC_PAGE_RANGE) > > + apply_to_existing_page_range(&init_mm, > > (unsigned long)shadow_start, > > size, kasan_depopulate_vmalloc_pte, > > NULL); > > - flush_tlb_kernel_range((unsigned long)shadow_start, > > - (unsigned long)shadow_end); > > + > > + if (flags & KASAN_VMALLOC_TLB_FLUSH) > > + flush_tlb_kernel_range((unsigned long)shadow_start, > > + (unsigned long)shadow_end); > > } > > } > > > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > > index e34ea860153f..12cdc92cdb83 100644 > > --- a/mm/vmalloc.c > > +++ b/mm/vmalloc.c > > @@ -2193,8 +2193,22 @@ static void purge_vmap_node(struct work_struct *work) > > struct vmap_area *va, *n_va; > > LIST_HEAD(local_list); remove the space. > > > > + unsigned long start; > > + unsigned long end; > > + > > vn->nr_purged = 0; > > > > + start = list_first_entry(&vn->purge_list, struct vmap_area, list)->va_start; no need to have an extra space. > > + > > + end = list_last_entry(&vn->purge_list, struct vmap_area, list)->va_end; > > + > > + /* > > + * Since node_pool_add_va() returns vmap_area(s) to its pool, the > > + * returned vmap_area(s) might be grabbed immediately via node_alloc() > > + * by other core. We need to flush TLB firstly. > > + */ > > + kasan_release_vmalloc(start, end, start, end, KASAN_VMALLOC_TLB_FLUSH); > > + > > list_for_each_entry_safe(va, n_va, &vn->purge_list, list) { > > unsigned long nr = (va->va_end - va->va_start) >> PAGE_SHIFT; > > unsigned long orig_start = va->va_start; > > @@ -2205,7 +2219,8 @@ static void purge_vmap_node(struct work_struct *work) > > > > if (is_vmalloc_or_module_addr((void *)orig_start)) > > kasan_release_vmalloc(orig_start, orig_end, > > - va->va_start, va->va_end); > > + va->va_start, va->va_end, > > + KASAN_VMALLOC_PAGE_RANGE); > orig_start and orig_end are unnecessary now. But it can be removed by an extra patch! > > > > atomic_long_sub(nr, &vmap_lazy_nr); > > vn->nr_purged++; > > @@ -4726,7 +4741,8 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, > > &free_vmap_area_list); > > if (va) > > kasan_release_vmalloc(orig_start, orig_end, > > - va->va_start, va->va_end); > > + va->va_start, va->va_end, > > + KASAN_VMALLOC_PAGE_RANGE | KASAN_VMALLOC_TLB_FLUSH); > > vas[area] = NULL; > > } > > > > @@ -4776,7 +4792,8 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, > > &free_vmap_area_list); > > if (va) > > kasan_release_vmalloc(orig_start, orig_end, > > - va->va_start, va->va_end); > > + va->va_start, va->va_end, > > + KASAN_VMALLOC_PAGE_RANGE | KASAN_VMALLOC_TLB_FLUSH); > > vas[area] = NULL; > > kfree(vms[area]); > > } Reviewed-by: Uladzislau Rezki (Sony) Tested-by: Uladzislau Rezki (Sony) Thank you. -- Uladzislau Rezki