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 8AF39CD4846 for ; Fri, 22 Sep 2023 17:42:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 20E5E6B02F3; Fri, 22 Sep 2023 13:42:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BEEF6B02F5; Fri, 22 Sep 2023 13:42:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0871D6B02FC; Fri, 22 Sep 2023 13:42:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id ECD846B02F3 for ; Fri, 22 Sep 2023 13:42:29 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C09C4A1133 for ; Fri, 22 Sep 2023 17:42:29 +0000 (UTC) X-FDA: 81264952818.09.7F401ED Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by imf01.hostedemail.com (Postfix) with ESMTP id 3B61540015 for ; Fri, 22 Sep 2023 17:42:27 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=cc1Fw9jv; spf=pass (imf01.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.41 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695404547; a=rsa-sha256; cv=none; b=GQ2jNfVvzw9gnQU4k9e4v+rebEag5xubwqn2d/C7RfafOW9aqB9rQyTJs96iZZPyWn5FqI qzCBkD5SqhYrnuH/dvgyVuukZVZVMuQYF96a1E2kxsoTKNdLAX2RmygzRLT9rQOhskDiZg d+KA59wJrQfxJM25xWHfzs1sYX45Va4= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=cc1Fw9jv; spf=pass (imf01.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.41 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org; dmarc=pass (policy=none) header.from=cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695404547; 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=aQa3pRp/TxyEpxN+Z9CHPWpvvaFg6Q8xxs5ZCg46zy8=; b=rC3jcmd/4DjaiW7GHfBkqQvdfs/XCGyEWQ71fspi85g7a6y7udp1dRCohVek+XJEFoO7z8 WyO5i2F5vmckhMj6sXjJ148/4es5MZLwSRBJdVR92rYDMT+2TZ6BibO0/Q6XN5I2EnqLjL MvXxBLaz/mVB6gkEy/bWWDwQYy+g+xg= Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6563bca1b38so13079436d6.1 for ; Fri, 22 Sep 2023 10:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1695404546; x=1696009346; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=aQa3pRp/TxyEpxN+Z9CHPWpvvaFg6Q8xxs5ZCg46zy8=; b=cc1Fw9jvNOuuQayVlpzLrKyEM5/C+iZwg/0prtFpLQA63sy7uxqEzbwYn4L9W4tJZ6 MKR3PS3/Qc/P/GlglilImqSezzAhtvmzifaElmsHsUiLSYDtuMYC0NZmi78JSrPAjtBP CCOrjAKq3lYL8rarYdgUo+MJ5safPIMOvxFm8v9iq3zfkeoF5sA1jRToxCfioh+wB4XY Q8erm6z716Ov69GgROaggIiOZ7obB8H8l5jqkC4LfOLXCKrNXo0QDfx65MK/ue2i/LrK fYUnVwoe+8emaXTB+GiGgCyIP+1Bx+ftoQ2NkQAy8Jgr258J109LQ7evhuEDsW5cw5zz j6dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695404546; x=1696009346; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aQa3pRp/TxyEpxN+Z9CHPWpvvaFg6Q8xxs5ZCg46zy8=; b=KMC6vWl8qi6DlohiQ4/r4TRhi/SGiLB1hezlZxdUvmj6hSAhsd4Dvbq50qjCU8agjF MeLmKidhy5uAs6z47R8mC85RqrC+QhoCngtPUqSOXuXds+xXCpiX0nPtCgNUIrYkPK8C 6seBfwvETdxpuUeWshxj6bbtGFh1u9IXh+QwzSDLL5IUFPol5RWFyYdeJX96m8OsvUL0 +0DM5AGwsgPfuepAL8+WrmgUxQpP+PacvGFgOdO66X7GkZzBIqsxoN5WbUif9EOcg5by DeC5odHHklaqQGIeZ9po6N0tUrFKhiXT770uBSPQ0cSSf7KrArRvgVuzSPks5Q9HT+1A z79g== X-Gm-Message-State: AOJu0Yz0L8bmcTwe6M74yRdNW3iDsjQSEn27612AKmHd0p0pOSnzMAJj U6UawHvEltetZR3j1kmKH/uxNA== X-Google-Smtp-Source: AGHT+IFZcHBDUXE8br71jwRtkuR0aGa7+rh/7j9LTF7C5c0v7LVwR+KxlQZbhHg80+DaFOFn/zf+tQ== X-Received: by 2002:a0c:a801:0:b0:64f:91de:3aab with SMTP id w1-20020a0ca801000000b0064f91de3aabmr8139129qva.29.1695404546179; Fri, 22 Sep 2023 10:42:26 -0700 (PDT) Received: from localhost ([2620:10d:c091:400::5:ba06]) by smtp.gmail.com with ESMTPSA id x20-20020a0ce0d4000000b0064f732aa463sm1583210qvk.105.2023.09.22.10.42.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:42:25 -0700 (PDT) Date: Fri, 22 Sep 2023 13:42:25 -0400 From: Johannes Weiner To: Domenico Cerasuolo Cc: sjenning@redhat.com, ddstreet@ieee.org, vitaly.wool@konsulko.com, akpm@linux-foundation.org, nphamcs@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Subject: Re: [PATCH] mm: zswap: fix potential memory corruption on duplicate store Message-ID: <20230922174225.GF124289@cmpxchg.org> References: <20230922172211.1704917-1-cerasuolodomenico@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230922172211.1704917-1-cerasuolodomenico@gmail.com> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 3B61540015 X-Stat-Signature: 9xtxjckk86kcmodrgymf7otj73wmdbqm X-Rspam-User: X-HE-Tag: 1695404547-723910 X-HE-Meta: U2FsdGVkX1+SUz4J2Kq6eGH+MJcmHbTTbg7FKLTzI0tVhQZd7tFZJjOHqtPZLBa221O0+N9q2ozUtYNbPdxNUaolWtkusEFoHWXLkYOn9dKYGcZP9ARHta0QaSZ3HE6rhmDK0MH2rslM6nmqS2/KqWXLpTJY+dlIdxRb6m4aMTeIPg+VcuZpYP/aT/HMKFK7P9dw830s6qodsyZhubVebO+nMVefiZAEnOYKET2mM59u+zVQcjmEyX5OB1D5BZzIqpYTWAAMDfe0LH7IvHupE/QrOgAm5MFQSNfppvs7irxDME7r9uUkWf4goziFDkbLge+8NJHeKLqChJmFsjxzpRNzgo9aeOXIiGDAauif9mjZ0Xb/qP2ZV7+jxVGnC5yAMrlc0zRVpYMM19+b6DFYlDJtpcPp54nnj0quK/2uXFq+UIKpiLIxSmKJzPr6l1LEekg0O0TepzztTPFKptdvPdrTecbvlkxUJMtPxtl037G8ghfLS3D8WCSFOV/nFjkV6Y1m5tJzzchTTDe8CPfdRGQFOTBtskpT6Bxy7oIYWoD/9qmNjieKI9m5I2FV3g48rLh9SXPNxH1AMwahpAa4cjTSUvhsFfr3MEhh0ZJHkMyrIr7rmfH14BS7f4vrnb6IEdbXR88ga1u9p57m5EI8MSatSiLUujLie5fXF8wwMGtsueYh4FqoS7MiffzdBUjRT98YlTU2w/9TToIAExtvFztTB2iIa0qlDfjEsB4H8N1804eRfmdPwhG7J0TSoJSk5JtU+naGMnyonnpWk+HRz6M2dore2NG3D1ywDLA+Pss4FBs9Qg6HgFvpmb+cxaHhx0g9CDQTTruuS+WYj2CtERcFHHTTjpGDezOB9ZD7jYcEtxOWXOE37Dzf4jdAoV54Cbdo2/GOaNJkxL7slPIKhPfE309p/7IX0Im0Rcij7LDduDTjTHhtMYXkmdf9keA6+nhnF1ckeOl/teNjb04 Lm35w0En fpnXDvlmVooiP7MmdpZPtzWNV+8CCV6Ie81ioKxYGpaUDpTXD83cvV1XvRXmzSPIGIb6NR5P9AO3RrspQFD3TiHtHcEFow/3FTgb3U0j4ntAv+qLnboRFuCViwDKePbICC5fGMZjRocpr7vE9cj0vqsqDWSChK8LiEyBtcZk9hyd2oBNfecdNTXfkatDjTaRNJUvlXXjZccex/Gs98hU6kQC/mYm3GqHEEf1FBKGAxLB6GTxJjrHrJ0ATW9d0yzFzM0JfGoUf3y4Nfkg0N0A05/KZ2jAAK46plkHKsjrYvjOFPG5gyUPirlBfLmUyWyF++KpE9Z2AMWirVweVXYR2M5x8Dnm4C9/qv2Oi4RCwh8yCvLpOeFs6wtofe/qgLek0Mju63shqwIIWumYfBIJ5v4OYBlEn7fqasQhTLRdmkZM3XBYptxVQh8fbxAr++xo3FQYyokEY18HFFDCjGV5nlDEa+loQjlfBQeCoSEA9xP5sb/wWEdprw38nYw== 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 Fri, Sep 22, 2023 at 07:22:11PM +0200, Domenico Cerasuolo wrote: > While stress-testing zswap a memory corruption was happening when writing > back pages. __frontswap_store used to check for duplicate entries before > attempting to store a page in zswap, this was because if the store fails > the old entry isn't removed from the tree. This change removes duplicate > entries in zswap_store before the actual attempt. > > Based on commit ce9ecca0238b ("Linux 6.6-rc2") > > Fixes: 42c06a0e8ebe ("mm: kill frontswap") > Signed-off-by: Domenico Cerasuolo Acked-by: Johannes Weiner > @@ -1218,6 +1218,19 @@ bool zswap_store(struct folio *folio) > if (!zswap_enabled || !tree) > return false; > > + /* > + * If this is a duplicate, it must be removed before attempting to store > + * it, otherwise, if the store fails the old page won't be removed from > + * the tree, and it might be written back overriding the new data. > + */ > + spin_lock(&tree->lock); > + dupentry = zswap_rb_search(&tree->rbroot, offset); > + if (dupentry) { > + zswap_duplicate_entry++; > + zswap_invalidate_entry(tree, dupentry); > + } > + spin_unlock(&tree->lock); Do we still need the dupe handling at the end of the function then? The dupe store happens because a page that's already in swapcache has changed and we're trying to swap_writepage() it again with new data. But the page is locked at this point, pinning the swap entry. So even after the tree lock is dropped I don't see how *another* store to the tree at this offset could occur while we're compressing.