From nobody Sun Dec 14 21:54:20 2025 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0FB2A15853C for ; Wed, 18 Dec 2024 06:35:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734503733; cv=none; b=mLbvXcdxXixRmBoGr2plJjATu7XZ2QwhOF3K6f5z9UKyPmZzagUlB87tV1KIc/AF4M49iGZT+OvaR9PNKYGalo/o1q0hGy28YM/+7Ijl+r5qSxDgVUwXFIWRbYV+I4znZaHXzUDeKjVhXGKsaW679hqtwN3It8P8T2SzHWGA7KY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734503733; c=relaxed/simple; bh=HiHrcfRXYSUA14GWIIG3XGVwz9lXXXRXJ9mmzmSAFzs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KxqJyeVgrJ5WZFIEkfwzYi9lD+RHWINnBDZUVahn39BdLBRJJuw5ZTxR6ER/yNur+KlzaZhlbWms718rRbSRjAV1ahA0haBEgIcfMaCJriZRKbukT5EPUGe9wjU+bgWdd9mgHYYKxy5meHF2RRXVz31F9eNhQ631j9W729a/1jQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=IKwXlEQh; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="IKwXlEQh" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-7fdc6e04411so3792992a12.2 for ; Tue, 17 Dec 2024 22:35:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1734503731; x=1735108531; darn=vger.kernel.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=K01D9WjQ4IDKLASlrrrpT/PTwcowLsveSV75IjoNXbE=; b=IKwXlEQhA9hDhCCmVaZ9E1CD6pe57rfQTIThgKATZiwmoLlc5/7qC8uWIVqMg+wzhh T/uUlVkYGgCKmGhDD2JtELVUxf9X/cItFQCc/ucAIRbmMh2cPWQ3QPnrmT7QVBoJn7v0 xpbIBJAGyD7LnqEan6bKYTQage2QaiqOPgQ8g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734503731; x=1735108531; 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=K01D9WjQ4IDKLASlrrrpT/PTwcowLsveSV75IjoNXbE=; b=BWT396jC9BAD00GOqoSXjgZYXFXE77SW8VifeDQczcrJFWGcL1xsxEOahJNwt7fzQg XqP7sE1RvHWZbDtHJZMHKz5Yzw8Wr499ucwKL6dOQGhmkk0J64sJIs/SdDqLWeiDzykm Sa3soJW2pZqkU7Yygp0iwoBemLuZCDDlohirP7ML3giYqSa1o6hywy6PLipbmpytBuuN Emu2eKVJV0BeNcbANVx1yJwK5ko5eMvz6z8hQizHj1p20xZOMaP7hfctkfksFVVrBSr1 4J6PXP6CIBMli9YMLjIQwk8s2uxva5m70HnqCErwmsjTZOcXxfQl75cleY+7PQdVKof5 zAig== X-Forwarded-Encrypted: i=1; AJvYcCXTx+QWJzchu9SD8Faot3ANaZWoQsYdjmHzAY0NPExbsvAxxkZSHro59uHKmF0US7s9KFEh4ZBREzMFmso=@vger.kernel.org X-Gm-Message-State: AOJu0YwSIugZp8sAw/I5hol0lDpTXaiYziIXQbX9lbEq0B7+Ev76M13P Ue/5UeCPkPQ4XAPK2yfQdambBbATI5vUrrzz/j5NoRxbNBUSCbX1NmwMd70f1A== X-Gm-Gg: ASbGncust2L+aPCwb9dyYP4o/15PKfA75RoAlEdewp+XAANU4QkCLaIMMzyddMUvOMr 0SGmUdIHnom2BMTYkwl3+7QPWIA+mVY3EaxGFFW0kNHZUXDTOixnF69nMYKnAGrIekxSUszY0/i 3MKEX6fbney9ffAo8ewXyt4SnikXAoxhLR/EHcV7LMaRyrL6BozTCaJXa1lxr4RwGi/iuuroFpW Z/ffDt0253W+Oz+4VMlsYogwcPzhGZiNLVHA0OSWm5+6dbfUVDkcOQcUkE= X-Google-Smtp-Source: AGHT+IFK5WlahiR5aGL0BTCtzr0kzih6dT4LaJYbmSnHINvLQ21PzUVu87JBr7NRGop1fXLHbUC5yg== X-Received: by 2002:a17:90b:2703:b0:2ee:ed1c:e451 with SMTP id 98e67ed59e1d1-2f2e91db281mr2864827a91.15.1734503731353; Tue, 17 Dec 2024 22:35:31 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:3bcc:36cc:b9fe:9379]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2f2ed52c3bdsm587770a91.10.2024.12.17.22.35.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 17 Dec 2024 22:35:30 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv2 3/7] zram: factor out ZRAM_SAME write Date: Wed, 18 Dec 2024 15:34:20 +0900 Message-ID: <20241218063513.297475-4-senozhatsky@chromium.org> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog In-Reply-To: <20241218063513.297475-1-senozhatsky@chromium.org> References: <20241218063513.297475-1-senozhatsky@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Handling of ZRAM_SAME now uses a goto to the final stages of zram_write_page() plus it introduces a branch and flags variable, which is not making the code any simpler. In reality, we can handle ZRAM_SAME immediately when we detect such pages and remove a goto and a branch. Factor out ZRAM_SAME handling into a separate routine to simplify zram_write_page(). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 37 ++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 8c71ddd17024..89f3aaa23329 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1624,6 +1624,20 @@ static int zram_bvec_read(struct zram *zram, struct = bio_vec *bvec, return zram_read_page(zram, bvec->bv_page, index, bio); } =20 +static int write_same_filled_page(struct zram *zram, unsigned long fill, + u32 index) +{ + zram_slot_lock(zram, index); + zram_set_flag(zram, index, ZRAM_SAME); + zram_set_handle(zram, index, fill); + zram_slot_unlock(zram, index); + + atomic64_inc(&zram->stats.same_pages); + atomic64_inc(&zram->stats.pages_stored); + + return 0; +} + static int zram_write_page(struct zram *zram, struct page *page, u32 index) { int ret =3D 0; @@ -1633,7 +1647,7 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) void *src, *dst, *mem; struct zcomp_strm *zstrm; unsigned long element =3D 0; - enum zram_pageflags flags =3D 0; + bool same_filled; =20 /* First, free memory allocated to this slot (if any) */ zram_slot_lock(zram, index); @@ -1641,14 +1655,10 @@ static int zram_write_page(struct zram *zram, struc= t page *page, u32 index) zram_slot_unlock(zram, index); =20 mem =3D kmap_local_page(page); - if (page_same_filled(mem, &element)) { - kunmap_local(mem); - /* Free memory associated with this sector now. */ - flags =3D ZRAM_SAME; - atomic64_inc(&zram->stats.same_pages); - goto out; - } + same_filled =3D page_same_filled(mem, &element); kunmap_local(mem); + if (same_filled) + return write_same_filled_page(zram, element, index); =20 compress_again: zstrm =3D zcomp_stream_get(zram->comps[ZRAM_PRIMARY_COMP]); @@ -1727,7 +1737,7 @@ static int zram_write_page(struct zram *zram, struct = page *page, u32 index) zcomp_stream_put(zram->comps[ZRAM_PRIMARY_COMP]); zs_unmap_object(zram->mem_pool, handle); atomic64_add(comp_len, &zram->stats.compr_data_size); -out: + zram_slot_lock(zram, index); if (comp_len =3D=3D PAGE_SIZE) { zram_set_flag(zram, index, ZRAM_HUGE); @@ -1735,13 +1745,8 @@ static int zram_write_page(struct zram *zram, struct= page *page, u32 index) atomic64_inc(&zram->stats.huge_pages_since); } =20 - if (flags) { - zram_set_flag(zram, index, flags); - zram_set_handle(zram, index, element); - } else { - zram_set_handle(zram, index, handle); - zram_set_obj_size(zram, index, comp_len); - } + zram_set_handle(zram, index, handle); + zram_set_obj_size(zram, index, comp_len); zram_slot_unlock(zram, index); =20 /* Update stats */ --=20 2.47.1.613.gc27f4b7a9f-goog