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 X-Spam-Level: X-Spam-Status: No, score=-11.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FSL_HELO_FAKE,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7205EC433E0 for ; Mon, 21 Dec 2020 17:24:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E08FA224D3 for ; Mon, 21 Dec 2020 17:24:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E08FA224D3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2669D6B0036; Mon, 21 Dec 2020 12:24:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F05D6B005D; Mon, 21 Dec 2020 12:24:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B82E6B0068; Mon, 21 Dec 2020 12:24:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0227.hostedemail.com [216.40.44.227]) by kanga.kvack.org (Postfix) with ESMTP id E21926B0036 for ; Mon, 21 Dec 2020 12:24:06 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 7410E3641 for ; Mon, 21 Dec 2020 17:24:06 +0000 (UTC) X-FDA: 77617962492.19.step53_090767c27459 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 442DE1AD1B9 for ; Mon, 21 Dec 2020 17:24:06 +0000 (UTC) X-HE-Tag: step53_090767c27459 X-Filterd-Recvd-Size: 5877 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Mon, 21 Dec 2020 17:24:05 +0000 (UTC) Received: by mail-pj1-f41.google.com with SMTP id w1so90033pjc.0 for ; Mon, 21 Dec 2020 09:24:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=40GBo3X0+Lrvzi5cvjSPDdF0U8u9NgzOSx3DdfzINbI=; b=SQEnSB0HBrmaH+UzR0ysajDAvziE8a2bcVt4twrfo+sI8uwNPnXKkZV5VWjAt90+cq Kw2K0XfbwcXwe7Ade3h64UR8qas2ooCyt+jvZzwWUAeNZQU7q43lRlrmqvSnDr3y+kL3 /ZV2gHY52ggE6JCTbJzxAXWmXMvz76WKV3T5dyK23g/rXusg9S5gCNbW/8r2sD7DgbWn SCnX9xJsHLoXuHwi5uGC3q2Lg0OLjRwe8cles2Y5nhDhIW0rkBstwzkjfESASimYA2j5 DUxpg8gI8ROZpBddYKXwy2fyWjYVgUQzqOP3B3BPpQ3ouP8iuL5foHxP3ISE7omH++zf SVWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=40GBo3X0+Lrvzi5cvjSPDdF0U8u9NgzOSx3DdfzINbI=; b=HqyyzYCN9GpCRfD+7fGMDu9lDX883tGAKiKuryVSFHl6/3OsfGgPrNdjrXbUaUJeg+ BSxECQn599ei6TuKwDUz5cHh7zr8bJ0mfTzZabZ32LMDuv680Ccs+DHoW4p3tRqjLFbP 2KYyTRGBb+dyDaMz2nn6LL71vzyFcxjZ+Kt/hbaOgY6fN8PsDDgdeesMHBkSmY6gVNNF b1LBNyYuytNoDFw8sb+xDzy0SashTK5xNsFAXKbDswtW6cGtw32RxzPYrNLEWcioviOM 8WOgN0v8I6+/Uf5ty0C5P8ITxPeXzXfinsuZnBwcAaxuce9rcEa9QUWFvh4cg6CIUN47 Oc+w== X-Gm-Message-State: AOAM532MR5aVWCBSapAR7UpRZRrrniCrsAg+HewLbDwXtha+8Tk83Yal ABg/WpcMQN5ZKPpUMZUSy2Q= X-Google-Smtp-Source: ABdhPJwBFLD8FyWMUfLtymfObKqKVKNdEHUvBnxB2nPRxZsdxQR5SM9zYoT63SLgbhbZp0T7wCPvVg== X-Received: by 2002:a17:90a:fa8e:: with SMTP id cu14mr18409199pjb.140.1608571444542; Mon, 21 Dec 2020 09:24:04 -0800 (PST) Received: from google.com ([2620:15c:211:201:7220:84ff:fe09:5e58]) by smtp.gmail.com with ESMTPSA id z15sm16555935pfn.34.2020.12.21.09.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Dec 2020 09:24:03 -0800 (PST) Date: Mon, 21 Dec 2020 09:24:01 -0800 From: Minchan Kim To: Vitaly Wool Cc: Mike Galbraith , LKML , linux-mm , Barry Song , Sebastian Andrzej Siewior , NitinGupta , sergey.senozhatsky.work@gmail.com, akpm@linux-foundation.org, shakeelb@google.com Subject: Re: [PATCH] zsmalloc: do not use bit_spin_lock Message-ID: References: <18669bd607ae9efbf4e00e36532c7aa167d0fa12.camel@gmx.de> <20201220002228.38697-1-vitaly.wool@konsulko.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201220002228.38697-1-vitaly.wool@konsulko.com> 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 Sun, Dec 20, 2020 at 02:22:28AM +0200, Vitaly Wool wrote: > zsmalloc takes bit spinlock in its _map() callback and releases it > only in unmap() which is unsafe and leads to zswap complaining > about scheduling in atomic context. > > To fix that and to improve RT properties of zsmalloc, remove that > bit spinlock completely and use a bit flag instead. I don't want to use such open code for the lock. I see from Mike's patch, recent zswap change introduced the lockdep splat bug and you want to improve zsmalloc to fix the zswap bug and introduce this patch with allowing preemption enabling. https://lore.kernel.org/linux-mm/fae85e4440a8ef6f13192476bd33a4826416fc58.camel@gmx.de/ zs_[un/map]_object is designed to be used in fast path(i.e., zs_map_object/4K page copy/zs_unmap_object) so the spinlock is perfectly fine for API point of view. However, zswap introduced using the API with mutex_lock/crypto_wait_req where allowing preemption, which was wrong. Furthermore, the zs_map_object already has a few more places where disablepreemptions(migrate_read_lock, get_cpu_var and kmap_atomic). Without making those locks preemptible all at once, zswap will still see the lockdep warning. > > Signed-off-by: Vitaly Wool > --- > mm/zsmalloc.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c > index 7289f502ffac..ff26546a7fed 100644 > --- a/mm/zsmalloc.c > +++ b/mm/zsmalloc.c > @@ -876,22 +876,25 @@ static unsigned long obj_to_head(struct page *page, void *obj) > > static inline int testpin_tag(unsigned long handle) > { > - return bit_spin_is_locked(HANDLE_PIN_BIT, (unsigned long *)handle); > + return test_bit(HANDLE_PIN_BIT, (unsigned long *)handle); > } > > static inline int trypin_tag(unsigned long handle) > { > - return bit_spin_trylock(HANDLE_PIN_BIT, (unsigned long *)handle); > + return !test_and_set_bit(HANDLE_PIN_BIT, (unsigned long *)handle); > } > > -static void pin_tag(unsigned long handle) __acquires(bitlock) > +static void pin_tag(unsigned long handle) > { > - bit_spin_lock(HANDLE_PIN_BIT, (unsigned long *)handle); > + preempt_disable(); > + while(test_and_set_bit(HANDLE_PIN_BIT, (unsigned long *)handle)) > + cpu_relax(); > + preempt_enable(); > } > > static void unpin_tag(unsigned long handle) __releases(bitlock) > { > - bit_spin_unlock(HANDLE_PIN_BIT, (unsigned long *)handle); > + clear_bit(HANDLE_PIN_BIT, (unsigned long *)handle); > } > > static void reset_page(struct page *page) > -- > 2.20.1 >