From patchwork Fri Jan 31 09:06:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13955137 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 6EC5EC0218D for ; Fri, 31 Jan 2025 09:07:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ECEE228028E; Fri, 31 Jan 2025 04:07:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E7D782800EF; Fri, 31 Jan 2025 04:07:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF6A928028E; Fri, 31 Jan 2025 04:07:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id ACB9C2800EF for ; Fri, 31 Jan 2025 04:07:53 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3073180945 for ; Fri, 31 Jan 2025 09:07:53 +0000 (UTC) X-FDA: 83067169626.29.BDDE29F Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf22.hostedemail.com (Postfix) with ESMTP id 4A97CC0018 for ; Fri, 31 Jan 2025 09:07:51 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=RT9OFZl+; spf=pass (imf22.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738314471; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=w3R6ZrvyVvJXmo0SkC31+WiXIWMORonA8dJRkgz1Hic=; b=xxa28zbnCz3liMjEr4xbLeMTNu5xSXXXQiH2bUn9sCR9YconnICo2hiSlbswYW7WrXubZr KveJsdxoJlEjLYKB/eKnN1o9Jj+1A1gOnXJPCMRBw23U87af+gC9z1bZ4K7crZIEYp6nzu v8HqzgtzxD5lvn9d5HZYgwkcdiGuHGM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=RT9OFZl+; spf=pass (imf22.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738314471; a=rsa-sha256; cv=none; b=DC0E95B7/VqYyuRbjTPR8AWE1V5esnESRBuASjBW9HO9wAfVpLIgPXMClgfpTaRYhSo+oj izC7qCexjsJrgzrf8EEe1h1ivc8Outh6jFKtqQKJJIbpHegoDcrZN6qDcD3yVZRAChE5b5 uGoCBv1Mr0Qf0/cP/+4nkreoZvfkJOw= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2165cb60719so32206905ad.0 for ; Fri, 31 Jan 2025 01:07:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1738314470; x=1738919270; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w3R6ZrvyVvJXmo0SkC31+WiXIWMORonA8dJRkgz1Hic=; b=RT9OFZl+ZaCu76KTs3+8Ns4vfCusBN6POghvD/PaSVeat1NuHUb3skPvaSDOGxVmyM qgBMt9KTMPncRvRBJ+J0BcyMLW55RXummkUAIysXepU6qd558kcx8oGgJv6eyE4ke33V V0yIDKqAIrprkI26kSOoZWhh6kX7N9sWoKvdY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738314470; x=1738919270; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w3R6ZrvyVvJXmo0SkC31+WiXIWMORonA8dJRkgz1Hic=; b=HR3uhLsNpYqBTV20QSmHuCiAiZobENp77FLoUyAH/kd/HT3Jhkgrsy5wqc4Rehl4Ge qjoEcwDJN5FpA6bj+RXXC5GODFbew7BulxPc6Wo+MIA56VKwFePq0jEQz9sfjMCTCWA/ SwEcTHhX7bLaGJnGXFCoDGf9e+gJ0Zhi/IuaddoX/jdmNpPCkI2d7RAykLn+sKGje20F p6uwU6ogvunmqV90WsvEbYSyNXKWbQJ5aJ4KLiDyv7wdCk1wC401vCkn6i8Pc2e3LhLY W2tbmNOFfosp++tNUagGtyv7zpZU1n8bamBocZr/EckHKVO7xJC4mFaSc1kZDHTzly53 mw0Q== X-Forwarded-Encrypted: i=1; AJvYcCU7+2UCgOdV7MKOa1UPKqq0fDfrl2sRQf1akce0/cKvbZS05dGs/iIATtktUPC7tfM8J36Dh6PtYQ==@kvack.org X-Gm-Message-State: AOJu0Yz7cbM5j/7gkLAaErD8e/7mFyrfexDg2BY4oWbtr/1OOhzyjSzX xWd3Y2YqOPu2QLL9q5i6lLGndFj0/A55NhVXyVTIy2ersG9CmZCTHspvZ8Tn7KqxmP0CyeG0EmY = X-Gm-Gg: ASbGncupwYpYJD1KpW+U0Fv/BhoOD732gtUb+ikMo4X87xpGRUiduE2E4wGiymkccbh 52vNyrJAvhm3z2snbsCEYlKF53kqC789QIIlQ1qnDC494Aq630BhVgr01re5Y5UvyxzrF4q3RDn 0Jl44qF2CTIOzqY4XBU5FMcICSlBVvncgbAf0K069fMlej6Vj5EnL1FqMhXEFVqBoNC2CPMy0Is V6ShVdMttaXnvj/kNKJFH6lHThnS/U0lr3MktOs9a2AjI+wqTDIVPVlWuseX87pR7R08MYIUDe/ 2uJGjAxELXQzd5SfPg== X-Google-Smtp-Source: AGHT+IHLXvsFhFTC2/CpnCNKtJm8HspbzNrFJ2stc8XPxlxgUVecxgwWhc2fHSMoQmdPv+pgQ7aEHA== X-Received: by 2002:a17:903:18c:b0:215:522d:72d6 with SMTP id d9443c01a7336-21dd7dcd025mr173931335ad.38.1738314470104; Fri, 31 Jan 2025 01:07:50 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:c752:be9d:3368:16fa]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-21de3302a68sm26120825ad.180.2025.01.31.01.07.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 Jan 2025 01:07:49 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv4 11/17] zram: unlock slot during recompression Date: Fri, 31 Jan 2025 18:06:10 +0900 Message-ID: <20250131090658.3386285-12-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.362.g079036d154-goog In-Reply-To: <20250131090658.3386285-1-senozhatsky@chromium.org> References: <20250131090658.3386285-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 4A97CC0018 X-Stat-Signature: 6yxonrhhnzr8rz3c4tm35e5chrc6xkpb X-Rspam-User: X-HE-Tag: 1738314471-921255 X-HE-Meta: U2FsdGVkX18nx9IADe5zScGa4TpHcOTPpwc1AFjroqeeWcxI38r0JikN91TVUOjGGnS2LdohZUTuzEsVcfZUjjcQ93pQgRzESNRyh9R/Z/J3zH9i8lMq24xjACvA9RxVAbc91EzUnkegfTcRjL7Js0VxpQQ44KqypkwbGfA9HaknYcCadULLM3cMr36T8o41iQdgs1Py3Hf6gCYyLpggitpTS8NJNC2wkB2EaqwjG8CqcDPnlEmlUgLH37K082cDwWiyoKmAv2lGS/xrqIBah3wJ7jDEMG+jFGKWb55w9O6208cy5D2iIPFHXwiFydgUgvdFC7dzAEE8tlBJLGh9XwRGLtRvewbmc05v7iA/T9xRUGn6iGDIbR5kuZRcpXnfDJ3zx+KYFWBh8QH1836DDoaAnm92rmPZS2pRjTlSl/BQgwc/bhh7QNpiyZrCDWC0OlJHKPyfTe+Hjde9wXD2TtEewrNP2naqPsBZUDHxzavVd3KPvdzAJGhpkvhha/DBQyemwqEQPsWwnYsZDOoiPVjGuoQXpAyWvaQsbV25HwTuNeWdCOh0pBfb9r9/ku956vKiFm86qdyTxbod+PlyV1Vx3o9INNxJKOvn8KcqYUKIOVEol8CO10OdHlFAlMAicRYtbfMOeDM3Z13msgpzo/9bxOyxWdVvXqboPlSkgWadFsmZJmrGnUQ4FiPhI7nhEaaWFlqq7BcKcbLdFBP2tY1L+EnIRRAlRagAWipxjlvGXzQ+k1EmSVuToukrr0jr+CCvh8wEpqrLaEnC9rN3a4ppAO494ghiOZVK06UBc6nG47eXjvAvpUj/IT5mH7q0Fo+h3ZvwZMZpISZeJVu3+IALSvQEIrNsnTAsokYbhSXVZtMTN4mVnCAWz0UFMOPDgPcGQSoThehJukalmzpSlxRn0aE0jSZ4EPEQQL0eLZeKJdsvS0dXC6af8UUfD6FMoosuVXV/9xbEDhMAKdV oh4mhN98 Qshg5qB3nJ9ImHbgsMNk9TgoWcTYA5RgRO/PVddwPKqqOvGj4lMq291MeMgnoKt59GU3AlD+JEPnCTpNN4jl6fp/Zd1eqHvRgevqY0w/pOSTDDugnMdG57wRHRH5wprIBRiuN7b4R7r7U5djOtVCJwEEVjCsWiJJwbbj9z3AQXvrnzqcixv6HpstKucftacBp1h8A2fTGGE/IA+yHtM//5NnU939nhFVJRDbF6Y4MnPQ8sfIH2igxECn35vyv9etO4Z08mnT8Vgx5nmjnrptJuREutM0zTiX56i1GoLhDn2N0LK4Q6J8S7LYTwkLVrQD3Vc2tUHb20rZOPyCIUrRMUJwehL3JwWuYvo9G 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: List-Subscribe: List-Unsubscribe: Recompression, like writeback, makes a local copy of slot data (we need to decompress it anyway) before post-processing so we can unlock slot-entry once we have that local copy. Unlock the entry write-lock before recompression loop (secondary algorithms can be tried out one by one, in order of priority) and re-acquire it right after the loop. There is one more potentially costly operation recompress_slot() does - new zs_handle allocation, which can schedule(). Release the slot-entry write-lock before zsmalloc allocation and grab it again after the allocation. In both cases, once the slot-lock is re-acquired we examine slot's ZRAM_PP_SLOT flag to make sure that the slot has not been modified by a concurrent operation. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 80 +++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 256439361367..cfbb3072ee9e 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1869,14 +1869,13 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, u64 *num_recomp_pages, u32 threshold, u32 prio, u32 prio_max) { - struct zcomp_strm *zstrm = NULL; + struct zcomp_strm *zstrm; unsigned long handle_old; unsigned long handle_new; unsigned int comp_len_old; unsigned int comp_len_new; unsigned int class_index_old; unsigned int class_index_new; - u32 num_recomps = 0; void *src, *dst; int ret; @@ -1903,6 +1902,13 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, zram_clear_flag(zram, index, ZRAM_IDLE); class_index_old = zs_lookup_class_index(zram->mem_pool, comp_len_old); + prio = max(prio, zram_get_priority(zram, index) + 1); + /* Slot data copied out - unlock its bucket */ + zram_slot_write_unlock(zram, index); + /* Recompression slots scan takes care of this, but just in case */ + if (prio >= prio_max) + return 0; + /* * Iterate the secondary comp algorithms list (in order of priority) * and try to recompress the page. @@ -1911,24 +1917,14 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, if (!zram->comps[prio]) continue; - /* - * Skip if the object is already re-compressed with a higher - * priority algorithm (or same algorithm). - */ - if (prio <= zram_get_priority(zram, index)) - continue; - - num_recomps++; zstrm = zcomp_stream_get(zram->comps[prio]); src = kmap_local_page(page); ret = zcomp_compress(zram->comps[prio], zstrm, src, &comp_len_new); kunmap_local(src); - if (ret) { - zcomp_stream_put(zram->comps[prio], zstrm); - return ret; - } + if (ret) + break; class_index_new = zs_lookup_class_index(zram->mem_pool, comp_len_new); @@ -1937,6 +1933,7 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, if (class_index_new >= class_index_old || (threshold && comp_len_new >= threshold)) { zcomp_stream_put(zram->comps[prio], zstrm); + zstrm = NULL; continue; } @@ -1944,14 +1941,7 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, break; } - /* - * We did not try to recompress, e.g. when we have only one - * secondary algorithm and the page is already recompressed - * using that algorithm - */ - if (!zstrm) - return 0; - + zram_slot_write_lock(zram, index); /* * Decrement the limit (if set) on pages we can recompress, even * when current recompression was unsuccessful or did not compress @@ -1961,37 +1951,55 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page, if (*num_recomp_pages) *num_recomp_pages -= 1; - if (class_index_new >= class_index_old) { + /* Compression error */ + if (ret) { + zcomp_stream_put(zram->comps[prio], zstrm); + return ret; + } + + if (!zstrm) { /* * Secondary algorithms failed to re-compress the page - * in a way that would save memory, mark the object as - * incompressible so that we will not try to compress - * it again. + * in a way that would save memory. * - * We need to make sure that all secondary algorithms have - * failed, so we test if the number of recompressions matches - * the number of active secondary algorithms. + * Mark the object incompressible if the max-priority + * algorithm couldn't re-compress it. */ - if (num_recomps == zram->num_active_comps - 1) + if (prio < zram->num_active_comps) + return 0; + if (zram_test_flag(zram, index, ZRAM_PP_SLOT)) zram_set_flag(zram, index, ZRAM_INCOMPRESSIBLE); return 0; } - /* Successful recompression but above threshold */ - if (threshold && comp_len_new >= threshold) + /* Slot has been modified concurrently */ + if (!zram_test_flag(zram, index, ZRAM_PP_SLOT)) { + zcomp_stream_put(zram->comps[prio], zstrm); return 0; + } - /* - * If we cannot alloc memory for recompressed object then we bail out - * and simply keep the old (existing) object in zsmalloc. - */ + /* zsmalloc handle allocation can schedule, unlock slot's bucket */ + zram_slot_write_unlock(zram, index); handle_new = zs_malloc(zram->mem_pool, comp_len_new, GFP_NOIO | __GFP_HIGHMEM | __GFP_MOVABLE); + zram_slot_write_lock(zram, index); + + /* + * If we couldn't allocate memory for recompressed object then bail + * out and simply keep the old (existing) object in mempool. + */ if (IS_ERR_VALUE(handle_new)) { zcomp_stream_put(zram->comps[prio], zstrm); return PTR_ERR((void *)handle_new); } + /* Slot has been modified concurrently */ + if (!zram_test_flag(zram, index, ZRAM_PP_SLOT)) { + zcomp_stream_put(zram->comps[prio], zstrm); + zs_free(zram->mem_pool, handle_new); + return 0; + } + dst = zs_map_object(zram->mem_pool, handle_new, ZS_MM_WO); memcpy(dst, zstrm->buffer, comp_len_new); zcomp_stream_put(zram->comps[prio], zstrm);