From nobody Mon Apr 6 18:46:06 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B52CECAAA1 for ; Mon, 5 Sep 2022 08:23:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237468AbiIEIX4 (ORCPT ); Mon, 5 Sep 2022 04:23:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237124AbiIEIXj (ORCPT ); Mon, 5 Sep 2022 04:23:39 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E835C32BAD for ; Mon, 5 Sep 2022 01:23:38 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id u9-20020a17090a1f0900b001fde6477464so11468698pja.4 for ; Mon, 05 Sep 2022 01:23:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=MkTg5zDd6KOHOk4vuhlZ6bZv6q468yLoqf3LP8Ucpys=; b=aBW0CzvUuC+9cpiQKHMHT4SxOa0dqdX9qcC0OeaH2oTG9UqvrH0ukdB3JZ7lmnZaK1 VdAc05X22+fwuejVr/A6GdinKG1g1K1SBS7ez9ArjHcla+rPv8ipxo8Yi9oPbQwCQgJv UU9+00W+8lN1ehv0b8sc1WMusT8LsTHOLvdtI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=MkTg5zDd6KOHOk4vuhlZ6bZv6q468yLoqf3LP8Ucpys=; b=O9xiXVJzl3KQrlyyw+UMrb7c5E+69cnVdQ6lpaOLhCnNsWeOCUZpH1fF+GInFc/s7l lgKigL0kl6jI7wG+VKvOHWSu3HzdH4Ozf9FIqJi6VNKfb0ebHWQo3oak2n9X9kmtMOhm VlFwsazfgyCDM3xiJzhazKqTJngC2nD910ODX9HAQhNfY/4pBJeJCBy2VpmSybKybYm0 W+8Pjk0PH6lLQlhq6eoMTCA/jxxlO1K6y2aMGEWCs2BKceP5GM/QJSUxU/wfVE1lhlTh dyd+9Mu4eS/3ICm8I373dHxUwbGQLMMvn59xEAtYpDG0cR3a7DsfGqfWwWXIwu3pvJt/ Zx/w== X-Gm-Message-State: ACgBeo0knC+6vgjPe4Iw0v6fZwEzTeJ2up6H6BI6o1cl/y1hgIyETUL7 ZfhKv+W2tL/NdZuEVC0WAM0oCA== X-Google-Smtp-Source: AA6agR4lNcvveVFlXXdtwEAmkiYZqSZRN9hbkPQmEKvUm6TBQRaHKnlN12fNUgikdMzmOnrz5ExqYg== X-Received: by 2002:a17:902:ab55:b0:176:8906:a3c5 with SMTP id ij21-20020a170902ab5500b001768906a3c5mr9869367plb.72.1662366217811; Mon, 05 Sep 2022 01:23:37 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:71e2:8444:42d9:4bb0]) by smtp.gmail.com with ESMTPSA id p14-20020a170902e74e00b001641b2d61d4sm6807093plf.30.2022.09.05.01.23.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 01:23:37 -0700 (PDT) From: Sergey Senozhatsky To: Minchan Kim , Andrew Morton Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCH RFC 3/7] zram: Factor out WB and non-WB zram read functions Date: Mon, 5 Sep 2022 17:23:19 +0900 Message-Id: <20220905082323.2742399-4-senozhatsky@chromium.org> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog In-Reply-To: <20220905082323.2742399-1-senozhatsky@chromium.org> References: <20220905082323.2742399-1-senozhatsky@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We will use non-WB variant in ZRAM page recompression path. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 66 +++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 694c8c426cb2..de2970865b7b 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1325,8 +1325,33 @@ static void zram_free_page(struct zram *zram, size_t= index) ~(1UL << ZRAM_LOCK | 1UL << ZRAM_UNDER_WB)); } =20 -static int __zram_bvec_read(struct zram *zram, struct page *page, u32 inde= x, - struct bio *bio, bool partial_io) +/* + * Reads a page from the writeback devices. Corresponding ZRAM slot + * should be unlocked. + */ +static int zram_read_from_writeback(struct zram *zram, + struct page *page, + u32 index, + struct bio *bio, + bool partial_io) +{ + struct bio_vec bvec; + + bvec.bv_page =3D page; + bvec.bv_len =3D PAGE_SIZE; + bvec.bv_offset =3D 0; + return read_from_bdev(zram, &bvec, + zram_get_element(zram, index), + bio, partial_io); +} + +/* + * Reads (decompresses if needed) a page from zspool (zsmalloc). + * Corresponding ZRAM slot should be locked. + */ +static int zram_read_from_zspool(struct zram *zram, + struct page *page, + u32 index) { struct zcomp_strm *zstrm; unsigned long handle; @@ -1334,20 +1359,6 @@ static int __zram_bvec_read(struct zram *zram, struc= t page *page, u32 index, void *src, *dst; int ret; =20 - zram_slot_lock(zram, index); - if (zram_test_flag(zram, index, ZRAM_WB)) { - struct bio_vec bvec; - - zram_slot_unlock(zram, index); - - bvec.bv_page =3D page; - bvec.bv_len =3D PAGE_SIZE; - bvec.bv_offset =3D 0; - return read_from_bdev(zram, &bvec, - zram_get_element(zram, index), - bio, partial_io); - } - handle =3D zram_get_handle(zram, index); if (!handle || zram_test_flag(zram, index, ZRAM_SAME)) { unsigned long value; @@ -1357,7 +1368,6 @@ static int __zram_bvec_read(struct zram *zram, struct= page *page, u32 index, mem =3D kmap_atomic(page); zram_fill_page(mem, PAGE_SIZE, value); kunmap_atomic(mem); - zram_slot_unlock(zram, index); return 0; } =20 @@ -1379,7 +1389,25 @@ static int __zram_bvec_read(struct zram *zram, struc= t page *page, u32 index, zcomp_stream_put(zram->comps[ZRAM_PRIMARY_ZCOMP]); } zs_unmap_object(zram->mem_pool, handle); - zram_slot_unlock(zram, index); + return ret; +} + +static int __zram_bvec_read(struct zram *zram, struct page *page, u32 inde= x, + struct bio *bio, bool partial_io) +{ + int ret; + + zram_slot_lock(zram, index); + if (!zram_test_flag(zram, index, ZRAM_WB)) { + /* Slot should be locked through out the function call */ + ret =3D zram_read_from_zspool(zram, page, index); + zram_slot_unlock(zram, index); + } else { + /* Slot should be unlocked before the function call */ + zram_slot_unlock(zram, index); + ret =3D zram_read_from_writeback(zram, page, index, bio, + partial_io); + } =20 /* Should NEVER happen. Return bio error if it does. */ if (WARN_ON(ret)) @@ -1389,7 +1417,7 @@ static int __zram_bvec_read(struct zram *zram, struct= page *page, u32 index, } =20 static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec, - u32 index, int offset, struct bio *bio) + u32 index, int offset, struct bio *bio) { int ret; struct page *page; --=20 2.37.2.789.g6183377224-goog