Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <3a372c25-7ce1-e931-8d7e-a2e14b82c8f0@intel.com>
Date:   Fri, 28 Oct 2022 10:51:12 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.4.1
Subject: Re: [PATCH] x86/kasan: map shadow for percpu pages on demand
Content-Language: en-US
To:     Andrey Ryabinin <ryabinin.a.a@gmail.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        "kernel test robot" <yujie.liu@intel.com>
CC:     Seth Jenkins <sethjenkins@google.com>,
        Kees Cook <keescook@chromium.org>,
        <linux-kernel@vger.kernel.org>, <x86@kernel.org>,
        Alexander Potapenko <glider@google.com>,
        Andrey Konovalov <andreyknvl@gmail.com>,
        Dmitry Vyukov <dvyukov@google.com>,
        Vincenzo Frascino <vincenzo.frascino@arm.com>,
        <kasan-dev@googlegroups.com>, Thomas Gleixner <tglx@linutronix.de>,
        "Ingo Molnar" <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        "H. Peter Anvin" <hpa@zytor.com>, Andy Lutomirski <luto@kernel.org>
References: <864b4fbe-4462-9962-7afd-9140d5165cdb@intel.com>
 <20221027213105.4905-1-ryabinin.a.a@gmail.com>
From:   "Yin, Fengwei" <fengwei.yin@intel.com>
In-Reply-To: <20221027213105.4905-1-ryabinin.a.a@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WVVNSGE3L1ZGcWVlM3VUTnRpTFdKNytpYVdFSnFKZ29ZQjFFOE1GaXVDblZB?=
 =?utf-8?B?R3pPblpMdUcyc2lnTkZNREQ2dGp0Nyt6ZG5Fbm9TWGNBdG9XV0lFU05CMU55?=
 =?utf-8?B?YTJYWEpOM2xRQmN6cFczamdidEdENmY2ZDdkMzFraHE4ZlB0S2E3NDBYaU1y?=
 =?utf-8?B?RTZwOUI2UEJXOVZOajRPR1VNYTZTQkxibytjRlJJL1QzRjdzWTdWRlVVMzNJ?=
 =?utf-8?B?RWgyRFV5VHZvK2JFOU40Y09UWGRBa3hhOG9maUIwR3pZSEFiUFFRL3hLc0dk?=
 =?utf-8?B?WTVJemVYRktPNUhoNkw5MDNDaGgraEVab1I0bUF4YlExcWFQdzlSTFV2RDhJ?=
 =?utf-8?B?UFpQbi94SXlSbWV2ZGNHYi9YYTZ3ckVHUlVaSDFGekN0WFpQODJiTUNtbGd6?=
 =?utf-8?B?elplN3FZekxoSDFsUDZ3c0ZRZW82OXZUa1crL2NpNHdBNHhaZmVFRE11T29C?=
 =?utf-8?B?Y2Y4RkNaSTB2UVBUVXZkcUZGZHJXWVFKdnNJdkJYTkRwYXQ3K0hlQkJURHRX?=
 =?utf-8?B?R2U5MlBoS3daME94bDg1Y2F4MVh6RmkxamdqS2ZFZy9IZ2ovYmVaemUxajYw?=
 =?utf-8?B?ZDBuZkpYWjNZQktmOTdtb1RKUHRnT0ZkSGdBbDYwdEREeHdlYmdNblNIcldz?=
 =?utf-8?B?VUhKcXlIbjhiZ2tPaEt4R1ZJZit6YW1zY0xuc0tZalYvNUJqK0ZHZEFQZDIy?=
 =?utf-8?B?czVmWFhhN1d2eGZSaWRwajlNYmxjUTB5T1hrcmVHZjNkdnRKV0N3N0pnWEtz?=
 =?utf-8?B?ejFvL2RrbU1wRVB0VmFHamdiYlM5bWdaeVRNQmgwZUVlNUJGUFRUS04xcGpQ?=
 =?utf-8?B?UVdaeDFneGYvMFplbEZhNzE0b2tOUnpjNWt6UnBYLzdTajVMMVJQbk9VRS9C?=
 =?utf-8?B?ajV3Ym0rSHdQMTRqNjVPQ0g2VjFiUVNFV2JUUnkwTXd2cW5VQlQxWkZZaS9o?=
 =?utf-8?B?SzA3MjZSdGhqaGN3YU9uRTg2WWFETjRndHpoUkN6ek9oUFdpS0JPbXk4M0E4?=
 =?utf-8?B?MDZ6Z2k4WXFmS0xGSENCYnQ5cFFRS2FvWTVid1B6OTlKR25Kem9lczk1RklK?=
 =?utf-8?B?ZWxjN3JmYU9XaGllaU9lUFFLaExxZmRFdzVoSFQ1Q25iQVBPamF1R2FJcWR2?=
 =?utf-8?B?WkVzaUZrZTVGNDczN2dmdXdvKzd3cFhYN05uQ0xUQ0pTU2lwQ2N2STVoMERX?=
 =?utf-8?B?bHIxNVRLYUNIWUFyL3ZiOHNKVXRzODJRM0VNZExONEQvb2VzdHIyY2V6ZGxu?=
 =?utf-8?B?dWVTd3Y3eUpveDduMG9XVDJNT1I2bUFFbzU2STNHa3RmUWMrUDVJREs5cnpN?=
 =?utf-8?B?NDA3V3VLMXRqdHhzQ2tBTklhMkRCY2ZXN04vOER4dXRpd3BNcEcydEFUT0d2?=
 =?utf-8?B?RE5xeXg4TkpWTGY4QTRVTVVhL290cVZCMzdONDVzMzh1Z3NKZ2tEdnBHZ0x2?=
 =?utf-8?B?Q3U4N1VzYzVJVEttV2gvZkVRVWVFUm5pNDV4eHVYa3lNZWkxTWNkV1ZxSGtl?=
 =?utf-8?B?eEJ4cmJXVXQ3UUhBZlNvNENxSUtyTm1YbWhYcUpLNVJ3aGpHVVlvS1IyeC9V?=
 =?utf-8?B?RHdQcnlZSzUwZGpUZ3F5K3VpVWx6WHNid2o0TnRzMUV4eG1tN1pWZzNGWWVU?=
 =?utf-8?B?cTZneHNtaElPRVY2Uk5DQjBPZ2xDS3V4b3RkSzVGbmRrREx3KzUrdXF6dytH?=
 =?utf-8?B?RWtWcTZmSWx1NzUrTks3OHVmYzdaQ2dHeC9QaG9FZnM3MzBPbDBma2F2MUJ5?=
 =?utf-8?B?MFg0czMyV2tJc0RyZ2xyT09IQktjMndNTHFlZHZMSFcvbDdFcFJ5UjZIemtq?=
 =?utf-8?B?T2kzTmp5SE5nZHpsV1pEdVdzRVFXM0poRjdJbnBIeWw1dHFMbUNRNDFEUFpI?=
 =?utf-8?B?d0dlQVJuWmlWSHR1NkJsNk1idS9qb3lqVHJrREhocTRaKy93MGNwWUFDVXFu?=
 =?utf-8?B?dXJuWFBzOTIxcm5RbHdpWWFTUk9SVldDZk9mc1dTQ09PV2lPWHJwTHQrNjdU?=
 =?utf-8?B?cVQ1SWVCVmp5RFhQaUNVRGhyZ2VDazdtREdJUXlnTlVhQUszdEUxSVBDSVdD?=
 =?utf-8?B?YTc1cXRaL2RCWEJSSzhMNnJmV2EycHQrZlFaTU5oWnBWQ0VCN2MwS3hNVTM2?=
 =?utf-8?Q?mTWT9fDDbGvTPcjdrFD3VkEgN?=
X-MS-Exchange-CrossTenant-Network-Message-Id: c18a73d3-fe47-4c68-da9f-08dab88f4ca5
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4820.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 02:51:23.9460
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jXBcQBixbWCwdIsEa4lDmhulPKtfXFV1lnmlhePxdCIyoA4baiRJHvt2UelkmM2mWCpX6F2gZA/dnLLj8IksFg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB7251
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Andrey,

On 10/28/2022 5:31 AM, Andrey Ryabinin wrote:
> KASAN maps shadow for the entire CPU-entry-area:
>   [CPU_ENTRY_AREA_BASE, CPU_ENTRY_AREA_BASE + CPU_ENTRY_AREA_MAP_SIZE]
> 
> This explodes after commit 1248fb6a8201 ("x86/mm: Randomize per-cpu entry area")
> since it increases CPU_ENTRY_AREA_MAP_SIZE to 512 GB and KASAN fails
> to allocate shadow for such big area.
> 
> Fix this by allocating KASAN shadow only for really used cpu entry area
> addresses mapped by cea_map_percpu_pages()
> 
> Fixes: 1248fb6a8201 ("x86/mm: Randomize per-cpu entry area")
> Reported-by: kernel test robot <yujie.liu@intel.com>
> Link: https://lore.kernel.org/r/202210241508.2e203c3d-yujie.liu@intel.com
> Tested-by: Yujie Liu <yujie.liu@intel.com>
> Signed-off-by: Andrey Ryabinin <ryabinin.a.a@gmail.com>
> ---
>  arch/x86/include/asm/kasan.h |  3 +++
>  arch/x86/mm/cpu_entry_area.c |  8 +++++++-
>  arch/x86/mm/kasan_init_64.c  | 15 ++++++++++++---
>  3 files changed, 22 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h
> index 13e70da38bed..de75306b932e 100644
> --- a/arch/x86/include/asm/kasan.h
> +++ b/arch/x86/include/asm/kasan.h
> @@ -28,9 +28,12 @@
>  #ifdef CONFIG_KASAN
>  void __init kasan_early_init(void);
>  void __init kasan_init(void);
> +void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid);
>  #else
>  static inline void kasan_early_init(void) { }
>  static inline void kasan_init(void) { }
> +static inline void kasan_populate_shadow_for_vaddr(void *va, size_t size,
> +						   int nid) { }
>  #endif
>  
>  #endif
> diff --git a/arch/x86/mm/cpu_entry_area.c b/arch/x86/mm/cpu_entry_area.c
> index ad1f750517a1..ac2e952186c3 100644
> --- a/arch/x86/mm/cpu_entry_area.c
> +++ b/arch/x86/mm/cpu_entry_area.c
> @@ -9,6 +9,7 @@
>  #include <asm/cpu_entry_area.h>
>  #include <asm/fixmap.h>
>  #include <asm/desc.h>
> +#include <asm/kasan.h>
>  
>  static DEFINE_PER_CPU_PAGE_ALIGNED(struct entry_stack_page, entry_stack_storage);
>  
> @@ -91,8 +92,13 @@ void cea_set_pte(void *cea_vaddr, phys_addr_t pa, pgprot_t flags)
>  static void __init
>  cea_map_percpu_pages(void *cea_vaddr, void *ptr, int pages, pgprot_t prot)
>  {
> +	phys_addr_t pa = per_cpu_ptr_to_phys(ptr);
> +
> +	kasan_populate_shadow_for_vaddr(cea_vaddr, pages * PAGE_SIZE,
> +					early_pfn_to_nid(PFN_DOWN(pa)));
> +
>  	for ( ; pages; pages--, cea_vaddr+= PAGE_SIZE, ptr += PAGE_SIZE)
> -		cea_set_pte(cea_vaddr, per_cpu_ptr_to_phys(ptr), prot);
> +		cea_set_pte(cea_vaddr, pa, prot);
>  }
>  
>  static void __init percpu_setup_debug_store(unsigned int cpu)
> diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
> index e7b9b464a82f..d1416926ad52 100644
> --- a/arch/x86/mm/kasan_init_64.c
> +++ b/arch/x86/mm/kasan_init_64.c
> @@ -316,6 +316,18 @@ void __init kasan_early_init(void)
>  	kasan_map_early_shadow(init_top_pgt);
>  }
>  
> +void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid)
> +{
> +	unsigned long shadow_start, shadow_end;
> +
> +	shadow_start = (unsigned long)kasan_mem_to_shadow(va);
> +	shadow_start = round_down(shadow_start, PAGE_SIZE);
> +	shadow_end = (unsigned long)kasan_mem_to_shadow(va + size);
> +	shadow_end = round_up(shadow_end, PAGE_SIZE);
> +
> +	kasan_populate_shadow(shadow_start, shadow_end, nid);
> +}
> +
>  void __init kasan_init(void)
>  {
>  	int i;
> @@ -393,9 +405,6 @@ void __init kasan_init(void)
>  		kasan_mem_to_shadow((void *)VMALLOC_END + 1),
>  		shadow_cpu_entry_begin);
>  
> -	kasan_populate_shadow((unsigned long)shadow_cpu_entry_begin,
> -			      (unsigned long)shadow_cpu_entry_end, 0);
> -
There will be address in the range (shadow_cpu_entry_begin, shadow_cpu_entry_end)
which has no KASAN shadow mapping populated after the patch. Not sure whether
it could be a problem. Thanks.

Regards
Yin, Fengwei

>  	kasan_populate_early_shadow(shadow_cpu_entry_end,
>  			kasan_mem_to_shadow((void *)__START_KERNEL_map));
>