Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3556338pxu; Tue, 8 Dec 2020 15:31:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJxS1IRzyqq9LYCoYNX2niVsWwyu7iymzw7Mevp1GNBoZakAnJT0qKytWpODRHJ9dswhvneX X-Received: by 2002:a17:906:c289:: with SMTP id r9mr47904ejz.311.1607470316146; Tue, 08 Dec 2020 15:31:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607470316; cv=none; d=google.com; s=arc-20160816; b=rLhUhBOcJW8J4UxCdWpGJRoHz1W3/IVslkVxSCL6aS0bRkzUwvJYdcljd+EBCjkNvC McOK6HrledLcvSbWhKY0E0t9LCVXfjQ3ORLtothO8HBjY231kQ7VTucW9zMMBC9srCRL W4vl/UwLV59rwQhgfzbDHiblOgj4w6QTyVCkprepymK6hQ8N9MacluVcprJcUn3wOD9s WALioqKThShuCz2A8OEh6LUDS5cA7CcBJkcVVRaqLf8DBxxNRkTzRs/4JWHcD/CYkIRb omkDiIT/RvXvG8VwdF6nzQxSSzwAsdT9+86TtlMpcmkb3gGwpU/jUPr3aNT+7uM7P3DL YUEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=UyyMs/oundYi4iw7+VRZ21wCa2Y/3Ei9nnkOvReF5i0=; b=OHQ8Kj35oYlPg8Zbs/avgypvztCqap3zu1TRqbpK2yVIAwSuKD3uy4Mle3LjnjnRaI Vy2WYGXiqrUjiFLG+BO+RCpP+eYl2EM1Bppj1txBrDoTdO89p93A4nM5gXQlcIRraqPH blGtiThEET2aOMqZMJ2cu0559Z0UlYHm05gJIWEpe0AvQCzHex+UbQLB1JZD9jfqGPsi JzdhimV/RxN5y2Adx06ZGBkTXrTei2t1YmgidGRNH33NeIVKSmcTBTZoRIuZFxOyWRKf IE9kvTZOBNEWHofN4xldAbaThkvq3NucxGc/QYVS4SqibgJE+M5LNfg/Msr/701prO9s WAvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@konsulko.com header.s=google header.b=izOsAMnN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o11si680edq.506.2020.12.08.15.31.32; Tue, 08 Dec 2020 15:31:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@konsulko.com header.s=google header.b=izOsAMnN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731716AbgLHX10 (ORCPT + 99 others); Tue, 8 Dec 2020 18:27:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730364AbgLHX10 (ORCPT ); Tue, 8 Dec 2020 18:27:26 -0500 Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93FDCC0613CF for ; Tue, 8 Dec 2020 15:26:45 -0800 (PST) Received: by mail-lf1-x143.google.com with SMTP id y19so708546lfa.13 for ; Tue, 08 Dec 2020 15:26:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=UyyMs/oundYi4iw7+VRZ21wCa2Y/3Ei9nnkOvReF5i0=; b=izOsAMnNbCt3VEYvCAsuFPjfgWxcYaLddnsLDkaGqm3f0wWcCu3RTvF1F0efccLHFW VDJT1jWs4gRD/DuuWrHOSVuEfO1kAWNeOuS0lXzhYzZo8x8Px9i7+/NHhvlJ8iebgGP7 h9nJv8rrMp0GUv0bvtE0OmV5j8KoqKTl55X0c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=UyyMs/oundYi4iw7+VRZ21wCa2Y/3Ei9nnkOvReF5i0=; b=MGE97vrL/EfrosNhvNmYDoYXb3agg5i2IkpvXcGZW5O+5WXAi+eAp0LI0UVzWSHu3l 94Qn3N9ym5OUGiUOGHPgY53ziSRje8YDxQRpPameqF7tbFoIuMKdEVSMnGjEWPAOvoej jgzMKhVQeVta5gWszMs+5TLsz/jQGJKX1iWUM8y+z/sTqIA9qnAFzG/6EN+HhW4BM7QK twW9Yf3rWs6fFfdBH20klnQu7zFJDJH9hHMiDtR0GMhfYZiXpLO4HSB/+GSDy8CTsD71 p1FEIGIEfQqzWqBWtst0jYDiS6O/wsdmS3rX1MFNgb+V63FpMrgOHDfJmsSBj25vZHq8 Udlw== X-Gm-Message-State: AOAM531Etkp7DBvd98hHf8V5XuKXghGFmQCAOHyFp1uDGfDV0yNStpjS ks00oB/v8kWFt+FQ+PI53u9aMbrRs217fq2ArHU= X-Received: by 2002:a19:f11e:: with SMTP id p30mr5783058lfh.395.1607470004123; Tue, 08 Dec 2020 15:26:44 -0800 (PST) Received: from [192.168.10.101] (c83-250-124-157.bredband.comhem.se. [83.250.124.157]) by smtp.gmail.com with ESMTPSA id m11sm31985lfl.5.2020.12.08.15.26.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Dec 2020 15:26:43 -0800 (PST) Subject: Re: scheduling while atomic in z3fold To: Mike Galbraith Cc: Sebastian Andrzej Siewior , Oleksandr Natalenko , LKML , Linux-MM , Andrew Morton , Steven Rostedt , Thomas Gleixner , linux-rt-users@vger.kernel.org References: <90c4857c53b657147bfb71a281ece9839b0373c2.camel@gmx.de> <856b5cc2a3d4eb673743b52956bf1e60dcdf87a1.camel@gmx.de> <20201130145229.mhbkrfuvyctniaxi@linutronix.de> <05121515e73891ceb9e5caf64b6111fc8ff43fab.camel@gmx.de> <20201130160327.ov32m4rapk4h432a@linutronix.de> <20201202220826.5chy56mbgvrwmg3d@linutronix.de> <64ab382309c41ca5c7a601fc3efbb6d2a6e68602.camel@gmx.de> <20201203133934.37aotbdjnd36lrxv@linutronix.de> <10d5088861ba219f3f7cd657fc95b0bedc19010a.camel@gmx.de> <3ffed6172820f2e8e821e1b8817dbd0bdd693c26.camel@gmx.de> <3ec93680c6a27626b23e99d552aa778be7b2ecec.camel@gmx.de> <9bd908b65ef15149458aa060c0daf065f9d45615.camel@gmx.de> From: Vitaly Wool Message-ID: <159ce32b-a7c4-08be-9283-9e38a7c27848@konsulko.com> Date: Wed, 9 Dec 2020 00:26:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <9bd908b65ef15149458aa060c0daf065f9d45615.camel@gmx.de> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Mike, On 2020-12-07 16:41, Mike Galbraith wrote: > On Mon, 2020-12-07 at 16:21 +0100, Vitaly Wool wrote: >> On Mon, Dec 7, 2020 at 1:34 PM Mike Galbraith wrote: >>> >> >>> Unfortunately, that made zero difference. >> >> Okay, I suggest that you submit the patch that changes read_lock() to >> write_lock() in __release_z3fold_page() and I'll ack it then. >> I would like to rewrite the code so that write_lock is not necessary >> there but I don't want to hold you back and it isn't likely that I'll >> complete this today. > > Nah, I'm in no rush... especially not to sign off on "Because the > little voices in my head said this bit should look like that bit over > yonder, and testing _seems_ to indicate they're right about that" :) > > -Mike > okay, thanks. Would this make things better: diff --git a/mm/z3fold.c b/mm/z3fold.c index 18feaa0bc537..340c38a5ffac 100644 --- a/mm/z3fold.c +++ b/mm/z3fold.c @@ -303,10 +303,9 @@ static inline void put_z3fold_header(struct z3fold_header *zhdr) z3fold_page_unlock(zhdr); } -static inline void free_handle(unsigned long handle) +static inline void free_handle(unsigned long handle, struct z3fold_header *zhdr) { struct z3fold_buddy_slots *slots; - struct z3fold_header *zhdr; int i; bool is_free; @@ -316,22 +315,13 @@ static inline void free_handle(unsigned long handle) if (WARN_ON(*(unsigned long *)handle == 0)) return; - zhdr = handle_to_z3fold_header(handle); slots = handle_to_slots(handle); write_lock(&slots->lock); *(unsigned long *)handle = 0; - if (zhdr->slots == slots) { - write_unlock(&slots->lock); - return; /* simple case, nothing else to do */ - } + if (zhdr->slots != slots) + zhdr->foreign_handles--; - /* we are freeing a foreign handle if we are here */ - zhdr->foreign_handles--; is_free = true; - if (!test_bit(HANDLES_ORPHANED, &slots->pool)) { - write_unlock(&slots->lock); - return; - } for (i = 0; i <= BUDDY_MASK; i++) { if (slots->slot[i]) { is_free = false; @@ -343,6 +333,8 @@ static inline void free_handle(unsigned long handle) if (is_free) { struct z3fold_pool *pool = slots_to_pool(slots); + if (zhdr->slots == slots) + zhdr->slots = NULL; kmem_cache_free(pool->c_handle, slots); } } @@ -525,8 +517,6 @@ static void __release_z3fold_page(struct z3fold_header *zhdr, bool locked) { struct page *page = virt_to_page(zhdr); struct z3fold_pool *pool = zhdr_to_pool(zhdr); - bool is_free = true; - int i; WARN_ON(!list_empty(&zhdr->buddy)); set_bit(PAGE_STALE, &page->private); @@ -536,21 +526,6 @@ static void __release_z3fold_page(struct z3fold_header *zhdr, bool locked) list_del_init(&page->lru); spin_unlock(&pool->lock); - /* If there are no foreign handles, free the handles array */ - read_lock(&zhdr->slots->lock); - for (i = 0; i <= BUDDY_MASK; i++) { - if (zhdr->slots->slot[i]) { - is_free = false; - break; - } - } - if (!is_free) - set_bit(HANDLES_ORPHANED, &zhdr->slots->pool); - read_unlock(&zhdr->slots->lock); - - if (is_free) - kmem_cache_free(pool->c_handle, zhdr->slots); - if (locked) z3fold_page_unlock(zhdr); @@ -973,6 +948,9 @@ static inline struct z3fold_header *__z3fold_alloc(struct z3fold_pool *pool, } } + if (zhdr && !zhdr->slots) + zhdr->slots = alloc_slots(pool, + can_sleep ? GFP_NOIO : GFP_ATOMIC); return zhdr; } @@ -1270,7 +1248,7 @@ static void z3fold_free(struct z3fold_pool *pool, unsigned long handle) } if (!page_claimed) - free_handle(handle); + free_handle(handle, zhdr); if (kref_put(&zhdr->refcount, release_z3fold_page_locked_list)) { atomic64_dec(&pool->pages_nr); return; @@ -1429,19 +1407,19 @@ static int z3fold_reclaim_page(struct z3fold_pool *pool, unsigned int retries) ret = pool->ops->evict(pool, middle_handle); if (ret) goto next; - free_handle(middle_handle); + free_handle(middle_handle, zhdr); } if (first_handle) { ret = pool->ops->evict(pool, first_handle); if (ret) goto next; - free_handle(first_handle); + free_handle(first_handle, zhdr); } if (last_handle) { ret = pool->ops->evict(pool, last_handle); if (ret) goto next; - free_handle(last_handle); + free_handle(last_handle, zhdr); } next: if (test_bit(PAGE_HEADLESS, &page->private)) { -- Best regards, Vitaly