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=-0.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 36A4FC10F29 for ; Tue, 17 Mar 2020 15:12:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CDE1020714 for ; Tue, 17 Mar 2020 15:12:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="JGbggYpA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CDE1020714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2AB046B0005; Tue, 17 Mar 2020 11:12:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25B886B0006; Tue, 17 Mar 2020 11:12:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 170A86B0007; Tue, 17 Mar 2020 11:12:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0042.hostedemail.com [216.40.44.42]) by kanga.kvack.org (Postfix) with ESMTP id EF7056B0005 for ; Tue, 17 Mar 2020 11:12:18 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D36258248076 for ; Tue, 17 Mar 2020 15:12:18 +0000 (UTC) X-FDA: 76605195156.24.coast81_888d7a91ccd05 X-HE-Tag: coast81_888d7a91ccd05 X-Filterd-Recvd-Size: 2358 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Tue, 17 Mar 2020 15:12:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=pbLHB9V9NtrdlKy9LTVkFQnPf56Ydm4tI2ppPZSZNps=; b=JGbggYpACVXwkcRv8YuvmvHqoh y5eFeNBYa6g94ApVUyxyK/sE9DiqYjC45GjIAdSItbRLRasxKVptDYaysBrtbAhAuihaeEAhXBo9m LcIiQPMA54oLyAzkC3jQf9V/5CDFflNwmkMX9O5dUZHv6kmQr4A/3rUIe1ryA2vgzcSm3BnbcdOeT dzl01/yTzexypl6U1WoCpaOhuMCNvZygAQG2Kalw6cyoOgRiqC9EmiV2z2uUmOQM2dk2ZzbajADeP nROhJP2WDbmJwzevTdO7RNpoDlNT54Rc//2GeSQcyhmeoDcOGFut/5IWpX+OTpJUZWOrDyt7mhxuE OPae1xAw==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEDt8-0001yB-Mk; Tue, 17 Mar 2020 15:12:14 +0000 Date: Tue, 17 Mar 2020 08:12:14 -0700 From: Matthew Wilcox To: Jan Kara Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 3/8] xarray: Explicitely set XA_FREE_MARK in __xa_cmpxchg() Message-ID: <20200317151214.GB22433@bombadil.infradead.org> References: <20200204142514.15826-1-jack@suse.cz> <20200204142514.15826-4-jack@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200204142514.15826-4-jack@suse.cz> 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 Tue, Feb 04, 2020 at 03:25:09PM +0100, Jan Kara wrote: > __xa_cmpxchg() relies on xas_store() to set XA_FREE_MARK when storing > NULL into xarray that has free tracking enabled. Make the setting of > XA_FREE_MARK explicit similarly as its clearing currently it. > if (curr == old) { > xas_store(&xas, entry); > - if (xa_track_free(xa) && entry && !curr) > - xas_clear_mark(&xas, XA_FREE_MARK); > + if (xa_track_free(xa)) { > + if (entry && !curr) > + xas_clear_mark(&xas, XA_FREE_MARK); > + else if (!entry && curr) > + xas_set_mark(&xas, XA_FREE_MARK); > + } This isn't right because the entry might have a different mark set on it that would have been cleared before, but now won't be. I should add a test case for that ...