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 5EB83C27C4F for ; Wed, 26 Jun 2024 14:47:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E1D1D6B008A; Wed, 26 Jun 2024 10:47:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DCD606B008C; Wed, 26 Jun 2024 10:47:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C94E66B0092; Wed, 26 Jun 2024 10:47:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AA3416B008A for ; Wed, 26 Jun 2024 10:47:25 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2AD9AC10C4 for ; Wed, 26 Jun 2024 14:47:25 +0000 (UTC) X-FDA: 82273318050.15.44308AB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 60FF140027 for ; Wed, 26 Jun 2024 14:47:22 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hy7oK2+o; spf=pass (imf11.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719413230; 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=wisZg/aFZE5WteLo7J7P34UhgnjvqpXMSCIrSOFt5XA=; b=QA9s603EA492xD0JY/6PB6/Td6h2qox78Seu8ZOkv+GKeTRfpqC+kQ0QBIJeRjAcYe7eHk 2dOQ+3/Y/SPLp0vS9hFp4PJBG1yL/t7904k9cuOXL1hrfJMHY2Q6MicBRzrtNU6ddkcxiL IoqSdyMYTgMfLS0xeFWAvug6FUpIdmA= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Hy7oK2+o; spf=pass (imf11.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719413230; a=rsa-sha256; cv=none; b=Nr3qMBNQWg6qu5wEHqBbktxf7BH9G5DzD7sSrff0s9D7P+t6Z314x0aOjh7qJgkkuCENlR QdILMpvlDvta6XRI+VXlj4CDWrMEgNnDcMi8Kyzv7ZCYliropl59/rKQciQWMlbj1x5REk UCdCcl0700D7T7NyUK8gmj+SxK/pmf0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719413241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wisZg/aFZE5WteLo7J7P34UhgnjvqpXMSCIrSOFt5XA=; b=Hy7oK2+oormc70so4hMo0zEb8WOqlSeAdeoGNOiIZPKrKfJOldsn9jkkLaD1isBvZUSXrv GkDS4+NrOvnYKsgCZiqtuaYuP7orTk1IGzjsbJ/bkAP7lyfOeW3PKlFZB05bGD1OcvQwsa /YJK68fd5Y7NcVJWGeCMa4cyfZQXmI4= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-160-F_XHNrgrNB-CxNeZjy46Vg-1; Wed, 26 Jun 2024 10:47:18 -0400 X-MC-Unique: F_XHNrgrNB-CxNeZjy46Vg-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 83B42195609F; Wed, 26 Jun 2024 14:47:16 +0000 (UTC) Received: from localhost (unknown [10.72.116.83]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1BBD81955E91; Wed, 26 Jun 2024 14:47:14 +0000 (UTC) Date: Wed, 26 Jun 2024 22:47:09 +0800 From: Baoquan He To: "Uladzislau Rezki (Sony)" Cc: linux-mm@kvack.org, Andrew Morton , LKML , Hailong Liu , Christoph Hellwig , Nick Bowler , Oleksiy Avramchenko Subject: Re: [PATCH v2] mm: vmalloc: Check if a hash-index is in cpu_possible_mask Message-ID: References: <20240626140330.89836-1-urezki@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240626140330.89836-1-urezki@gmail.com> X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Stat-Signature: fuz959mmrpczgkjwwq7matghf5ea7wwa X-Rspam-User: X-Rspamd-Queue-Id: 60FF140027 X-Rspamd-Server: rspam02 X-HE-Tag: 1719413242-959585 X-HE-Meta: U2FsdGVkX1+ndlyMOXt3jp0pGVUILxXuyR9I2NePh8tTDgVadgJsPwRAwrC7dKuogtGknSD/moKnWc5LHV3i/m3truPTxqYmOl13fY2ph/ia0BEi2A9HeBXPWHT1NtVo9R1LWrgaIl437FyZpod0TVbTR8NusA3bm1wmRD3cNA8RCrCBVh+YVGOicOzSyLj9IvQ1UdAIl4JPUSmLba3y2YCCKbUvtKxw+4iHy0TmKmQc/p4iq3n/kYU655OsuYCo2pblO3rmtqlhq4XvgEtH5fvFtjv2HXC2/l1eLq9lpACbYP5wKBwt/ENq6DYiSzCrpa5W/puNwb6GckjW1xFZp87yRDsCbcRw2wFeawIiufbrntOGtJjCdZzKAVEgE+qiaP5BcsLmtSx7t98v4H1GlsCD9W/Gf3hkFayql7D38coU28Fya4O2+XEK+5ciAuo3vhSNKvO64xI1qkq18lVdH5EEO28f/2zvixLJ7xTC5z8KopR2hRJfiB15AYvTxpcnLytdrh6BEZimCyivHYLIRk85AV0fCtQTSzZBeH/HJqLfKaLpLY94+wxtmjtkwQwd2uXhG/FSsJ6qMoFZi0HooxZPyR4fnmHCBNjhX9KusQ+6xEaDRMH5euNWZQKR6tV6JIKRna0ywr7cV1Iu8dmP4lGWRisxhpVOMdWl2Kso/Jg9WqeZ8coA9d31xqlmf6S5M3z+RDm/J8gZqHso91gGEYyMcGxdvFxtmaGl91S7g6GA+ldgJp+xq9DHVCDZ/j+jVPjZ2AZQoE2jIEhJ6wrqIJKPbxNjCORbmugaxF84Ki6Jm2SqE3wmueSL0U78CFGlhchUrG0XuU3skIdZvbE8ToJ0Qe8AZQ1PxdP0QVOxkt6nk4nv86znV0XoAjT48tSeFDBVY9dWtoSklm0LSZNuDxZLpdznQxXRfOSXa0hWsl11bwmWI2hEvW1jMS6iNN5O+FBDYbQwENj9VhEN3ms JgGVXB3M cXT8IDejFQk64EO4oiwDULw1jLVL3Ta4/KFAwalOEdLQq859JBEJlLmI7p6YpQ45dFj944tZY4yl9cw40wDK5wm4Lw14I4vR5+mgGKUpPfXzBXRHdMh6ONXn5yaN54+AZgzeFRRJR+Bz7HS2G8GQbz9MgO2NRbOdFCIBJdpIpF2v/bh2rwgG1j/9bP/Y8QMT8W4bjsB64gKQihZEiVeoTitiPa3tjCkhJc1M5nBIPZ6AYr8IQfR5p0EK/Dis+8KDpXaNWrtTP3B9N1uHJYaBzWgU6a1xd4dsxVt3uJVTgJdpNN38Z/5ZgyTu9Opzzv9fiNKmoLaFc2WneAdk+LOd1wcg9ApZdVSXPte7qzUoMutzvLOhKuEtOSsJeyJKYX8NIxyByRdwYuymKnb0vZTRBPBtpmhX7jh0yCV+BMvPPy6GfU5hCmfl/BkEeTI9/rVYlxqm3/ghacUoNqabD5dXWt9bF65A9P6MVfjXapk2rHoIA4Z8htB0qAiVr5cvFCnPz0a0SKeIXH0iphwLAstRbDqa9ow== 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 06/26/24 at 04:03pm, Uladzislau Rezki (Sony) wrote: > The problem is that there are systems where cpu_possible_mask > has gaps between set CPUs, for example SPARC. In this scenario > addr_to_vb_xa() hash function can return an index which accesses > to not-possible and not setup CPU area using per_cpu() macro. > > A per-cpu vmap_block_queue is also used as hash table, incorrectly > assuming the cpu_possible_mask has no gaps. Fix it by adjusting an > index to a next possible CPU. > > v1 -> v2: > - update a commit message. > > Fixes: 062eacf57ad9 ("mm: vmalloc: remove a global vmap_blocks xarray") > Reported-by: Nick Bowler > Closes: https://lore.kernel.org/linux-kernel/ZntjIE6msJbF8zTa@MiWiFi-R3L-srv/T/ > Signed-off-by: Uladzislau Rezki (Sony) > --- > mm/vmalloc.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) LGTM, Reviewed-by: Baoquan He > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index b4c42da9f3901..6b783baf12a14 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -2544,7 +2544,15 @@ static DEFINE_PER_CPU(struct vmap_block_queue, vmap_block_queue); > static struct xarray * > addr_to_vb_xa(unsigned long addr) > { > - int index = (addr / VMAP_BLOCK_SIZE) % num_possible_cpus(); > + int index = (addr / VMAP_BLOCK_SIZE) % nr_cpu_ids; > + > + /* > + * Please note, nr_cpu_ids points on a highest set > + * possible bit, i.e. we never invoke cpumask_next() > + * if an index points on it which is nr_cpu_ids - 1. > + */ > + if (!cpu_possible(index)) > + index = cpumask_next(index, cpu_possible_mask); > > return &per_cpu(vmap_block_queue, index).vmap_blocks; > } > -- > 2.39.2 >