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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 283BFC4332F for ; Wed, 10 Nov 2021 18:54:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CDE9161178 for ; Wed, 10 Nov 2021 18:54:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CDE9161178 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 9B3616B0081; Wed, 10 Nov 2021 13:54:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 847936B0082; Wed, 10 Nov 2021 13:54:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 736A86B0083; Wed, 10 Nov 2021 13:54:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0096.hostedemail.com [216.40.44.96]) by kanga.kvack.org (Postfix) with ESMTP id 5B7706B0081 for ; Wed, 10 Nov 2021 13:54:47 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 0D712811FA for ; Wed, 10 Nov 2021 18:54:47 +0000 (UTC) X-FDA: 78793922214.20.38CB8CF Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf02.hostedemail.com (Postfix) with ESMTP id 89D0F7001707 for ; Wed, 10 Nov 2021 18:54:40 +0000 (UTC) Received: by mail-pj1-f49.google.com with SMTP id o6-20020a17090a0a0600b001a64b9a11aeso2602313pjo.3 for ; Wed, 10 Nov 2021 10:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8wcW5LIxS/gGo25o/SsACT1yjO+sMZFXHQyUyEBJmYc=; b=oU2QmAga8b0XPnBG03xwz2I/X9vwXbFEfJ3JWITeYYDre0AIlK+5+7LTUcNMiQrjOj MQX3LabJzRNA87h/ignyW9DA0mP/L6lHBeFY9jHbRK1SGuCUSkRNneAvhmG1mgzbfDv4 p1mCEsir9p9/rsbzT0bstuROQMbe6N9qmtF1cuZMMiUl2uu16BRc3RljV5RjENndqv32 1NW2Z4lNf86vhHA7CmJ+Wm3pz4Fy3z5rFn2go4HeInClhEZBx7GRT6LPre2fj2wnX/eo gKrgUITMe1RQUdUCA8dET6m5wDAGrZGEwKX+OdzIJ2nzmnh5WWD4IAPjCN289+ZKkhtc rUog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8wcW5LIxS/gGo25o/SsACT1yjO+sMZFXHQyUyEBJmYc=; b=1ZYghH4dahq23ntVX41b7tPvU41aFxB/MIJWohLnWtuHDQK74XM9IJgJju6SEOVidT nZYjsAhE0ART0k46XG2+ISaMDY9OpeVr/v8YbJ2ZsIbb5pg7ve2v0zm6ydDOKZCRlD+e teYLXvXVKHG1O/FwEUN2+DMe87WFyk1HT0Ws7IEC3oH6gIvZKi0pMica7LDvTgM+KH8b v8YvnDKLJiIglIn08h13UirMw7Hkvva5NIMvOKe23dRpO+AW9a/6ymQhqhl53yaMXQFp eAKg3aPuXIf1OIvkGMmScZAmSTR/g2YTn8ot+qtPCkTGSpwiAYE1QH+ULBprZiqIM3KH wwiA== X-Gm-Message-State: AOAM5316k1AjmoQHfpQSEHdIeJEOiRBc3k6jsuLS+2iuzj8oe7fInLDK yZsboZyTTKY3Ste0t5p4RngkXBmikP0= X-Google-Smtp-Source: ABdhPJxfZ05T76m0YsS5FsnTenOQaAjmRMUxqTHxIqRYURSL9J/32EqIIbRTuOyj+2JlqNwIO6LBhw== X-Received: by 2002:a17:90b:4f83:: with SMTP id qe3mr19635529pjb.56.1636570485732; Wed, 10 Nov 2021 10:54:45 -0800 (PST) Received: from bbox-1.mtv.corp.google.com ([2620:15c:211:201:11d4:2de3:ab82:be64]) by smtp.gmail.com with ESMTPSA id g13sm325253pjc.39.2021.11.10.10.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 10:54:45 -0800 (PST) From: Minchan Kim To: Andrew Morton Cc: Sergey Senozhatsky , linux-mm , Minchan Kim , Sebastian Andrzej Siewior Subject: [PATCH 8/8] zsmalloc: replace get_cpu_var with local_lock Date: Wed, 10 Nov 2021 10:54:33 -0800 Message-Id: <20211110185433.1981097-9-minchan@kernel.org> X-Mailer: git-send-email 2.34.0.rc1.387.gb447b232ab-goog In-Reply-To: <20211110185433.1981097-1-minchan@kernel.org> References: <20211110185433.1981097-1-minchan@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 89D0F7001707 X-Stat-Signature: p59bs1uhirg1upzywkkykjwssa5bnr4d Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=oU2QmAga; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=pass (imf02.hostedemail.com: domain of minchan.kim@gmail.com designates 209.85.216.49 as permitted sender) smtp.mailfrom=minchan.kim@gmail.com X-HE-Tag: 1636570480-651155 Content-Transfer-Encoding: quoted-printable 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: From: Sebastian Andrzej Siewior The usage of get_cpu_var() in zs_map_object() is problematic because it disables preemption and makes it impossible to acquire any sleeping lock on PREEMPT_RT such as a spinlock_t. Replace the get_cpu_var() usage with a local_lock_t which is embedded struct mapping_area. It ensures that the access the struct is synchronized against all users on the same CPU. Signed-off-by: Sebastian Andrzej Siewior [minchan: remove the bit_spin_lock part and change the title] Signed-off-by: Minchan Kim --- mm/zsmalloc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 5d4c4d254679..7e03cc9363bb 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -65,6 +65,7 @@ #include #include #include +#include =20 #define ZSPAGE_MAGIC 0x58 =20 @@ -276,6 +277,7 @@ struct zspage { }; =20 struct mapping_area { + local_lock_t lock; char *vm_buf; /* copy buffer for objects that span pages */ char *vm_addr; /* address of kmap_atomic()'ed pages */ enum zs_mapmode vm_mm; /* mapping mode */ @@ -451,7 +453,9 @@ MODULE_ALIAS("zpool-zsmalloc"); #endif /* CONFIG_ZPOOL */ =20 /* per-cpu VM mapping areas for zspage accesses that cross page boundari= es */ -static DEFINE_PER_CPU(struct mapping_area, zs_map_area); +static DEFINE_PER_CPU(struct mapping_area, zs_map_area) =3D { + .lock =3D INIT_LOCAL_LOCK(lock), +}; =20 static __maybe_unused int is_first_page(struct page *page) { @@ -1269,7 +1273,8 @@ void *zs_map_object(struct zs_pool *pool, unsigned = long handle, class =3D zspage_class(pool, zspage); off =3D (class->size * obj_idx) & ~PAGE_MASK; =20 - area =3D &get_cpu_var(zs_map_area); + local_lock(&zs_map_area.lock); + area =3D this_cpu_ptr(&zs_map_area); area->vm_mm =3D mm; if (off + class->size <=3D PAGE_SIZE) { /* this object is contained entirely within a page */ @@ -1320,7 +1325,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned= long handle) =20 __zs_unmap_object(area, pages, off, class->size); } - put_cpu_var(zs_map_area); + local_unlock(&zs_map_area.lock); =20 migrate_read_unlock(zspage); } --=20 2.34.0.rc1.387.gb447b232ab-goog