From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 658FE14A8B for ; Mon, 29 Jun 2026 00:25:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782692709; cv=none; b=CmYNslGL77xttXwL12gd0OSBwyF932d3aIW+ABMZsFKYsS/hMwlmPep7Rzea3jm4K3hbI0hDqAbEhGiqrmo1XF12+S8Jn7TVp+Iq3WUqYI+xOMoAroG6mbg22IhUwzOZOpeoA5O2lX8AlTXrhiiIxQeFP5Oc4CNlWbG7lUOL23o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782692709; c=relaxed/simple; bh=Mo2yl8h22iAeedEefGbsjzYeGACnksm2mu1kISAkWFQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=aIbIDYLXtvf692Kg+XiR88MR0L6RiGzLtDvNW0nqLR3e+ri82UctdG4qdnsggyH/pkUE8UvX0iY3rZj7QLL4ueA353Ud9SJ88hVmhOOHxRC8bDTXM+TLOtpv+ukfUx71j3CjMdD14xlAxT7MD6MHsIQEp0QGiBplX0Bh55z3U2E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iJZx5x9R; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iJZx5x9R" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2c9c9913ddaso3840935ad.0 for ; Sun, 28 Jun 2026 17:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782692707; x=1783297507; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=P41Rhb2N/xDdm2LPMemS4Ju4/6Yg9XM5U4XcDkcrBgw=; b=iJZx5x9R2W36VUEOdBJ1wc4r4JxHUWtFXV/V3L24TWa1Vxo6cg9c46Vy9onhTS3+6K PTSCAZpK6YieODaIW5pFPuG2MXWNI5BHbBRRysadBRA/f/C2vfnXoaQcWOehFJ3ian+U lzWkywus0z7baDc96USL+Hi0qkcku4bSef11BISx5S5jL3cNj6PBL8TTfraaJJHHnHhL nMXvi8o8Xwbc6dQ1G/PDEm3wv4vLsUb+goAPKIvvQ4S43LaK+3Pewo5Fzf5EzNpKSnun PQsT2rch8oCOE4NVFhiOT0JleVy7tlWHwy74/dNL3F4TTr0oMBS4N8DO4A2VM+Qf5jjs uEhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782692707; x=1783297507; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=P41Rhb2N/xDdm2LPMemS4Ju4/6Yg9XM5U4XcDkcrBgw=; b=T+EGFKgPUZrks3Fsw3bG3dqSEYvKJhEqnOYnKc+HoNdEui9sPTM4sO1QREbiyO5wPE WjLFofhIRr13yZxnQjCOSPNj7LH5BGuPlfpN9F672xodChkT24jPsWszhLx0vR8FcF7s RQ7BkjyuMa/BvIWsI2MseYHL5MTyIxknA72TYcW8xrki8FK/lLKrGFCb8wjtrQQk3mAn fY7PgCmNDsMxddx2BtG2KQ9cHyhjadeuz/Vyt8hDXuEDRtdusTumoLTAbD76yXysBWHL mSgsA/dSSqo+MQgTNTe8NL3hkbI/CT9iwwr0zCNclBjxoF1DVGspGFkyT9sVcl1lTqnB We9Q== X-Forwarded-Encrypted: i=1; AHgh+RpZyoQuGPIBlRnFSrApTLmJR/V/ve+g9z+Wy8esbePh5VhVZzS3rJUZPloKocWn3rj2cdks4Z+ztYcQv6U=@vger.kernel.org X-Gm-Message-State: AOJu0YwF/EtiDf9KPLAzemQ5rTjQTNw5Hvzkk4PWz18KQ24e4BiDkZ5i P3Zz1Ekwu8VbV4NVALL9re8v7hR2TjYcSP1kxw8srrRJI+xneAJxrLcl X-Gm-Gg: AfdE7cnYIqELi39nQTdMOy28Q3XXrKLhAkVBAvH3Yajmc8o1RJZiJ8dNERUZrSH6Chk 13mHTfYTgM7Z8PzFLDJ4Iv5KGdXMcM1531yr93G1G5U0iQ9u9BXDYJYXKt1Og3gKyVCU+zcE50I RbZY1gLoXIyYNw7WtNoCtUmlS75dTA/9L7M0AAWpCN+09SijSNIZ3q2Q47uwlje0qp7fSUFtPl8 WiZNp1SiHkpy8c7HGaosSkJUpL/+PIv5UmI9jx/m6gHLdeTl0IAg/w3pR4O5PTe0YXz48X811ro WqV52PWi7hRKNyxCgPQPRUcb8gtLGGrKiZnwIgu7dICiLTzBEGzNTSnodHDRE79qvHP6EqDvZ9T jRiPaMxBczYaeGF73MXCULVHJEba7a1vZoEz9aBaIGQ/5hFMBj/+Ztri0pbmxFbT+LUOWFisot2 LG3pjSOitKuZNVIyYHCVU33BQvvDfI2T6HhTLvLsbFzBjxM33djlTT6HVkXgTDuQqyaqlj00anX jBUYAT6fg== X-Received: by 2002:a17:902:cf0f:b0:2bd:73f4:8e4f with SMTP id d9443c01a7336-2c7fca76990mr108263835ad.0.1782692707529; Sun, 28 Jun 2026 17:25:07 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c9e67a5d0dsm17093135ad.1.2026.06.28.17.25.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jun 2026 17:25:06 -0700 (PDT) From: Rosen Penev To: linux-btrfs@vger.kernel.org Cc: Chris Mason , David Sterba , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] btrfs: compression: allocate buckets with workspace Date: Sun, 28 Jun 2026 17:25:05 -0700 Message-ID: <20260629002505.1552238-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert 3 allocations into one. Simplifies code slightly. Signed-off-by: Rosen Penev --- fs/btrfs/compression.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index ffb6b52863a7..da6749ff5924 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -650,11 +650,11 @@ struct heuristic_ws { /* Partial copy of input data */ u8 *sample; u32 sample_size; - /* Buckets store counters for each byte value */ - struct bucket_item *bucket; /* Sorting buffer */ struct bucket_item *bucket_b; struct list_head list; + /* Buckets store counters for each byte value */ + struct bucket_item bucket[]; }; static void free_heuristic_ws(struct list_head *ws) @@ -664,8 +664,6 @@ static void free_heuristic_ws(struct list_head *ws) workspace = list_entry(ws, struct heuristic_ws, list); kvfree(workspace->sample); - kfree(workspace->bucket); - kfree(workspace->bucket_b); kfree(workspace); } @@ -673,22 +671,16 @@ static struct list_head *alloc_heuristic_ws(struct btrfs_fs_info *fs_info) { struct heuristic_ws *ws; - ws = kzalloc_obj(*ws); + ws = kzalloc(struct_size(ws, bucket, BUCKET_SIZE * 2), GFP_KERNEL); if (!ws) return ERR_PTR(-ENOMEM); + ws->bucket_b = ws->bucket + BUCKET_SIZE; + ws->sample = kvmalloc(MAX_SAMPLE_SIZE, GFP_KERNEL); if (!ws->sample) goto fail; - ws->bucket = kzalloc_objs(*ws->bucket, BUCKET_SIZE); - if (!ws->bucket) - goto fail; - - ws->bucket_b = kzalloc_objs(*ws->bucket_b, BUCKET_SIZE); - if (!ws->bucket_b) - goto fail; - INIT_LIST_HEAD(&ws->list); return &ws->list; fail: -- 2.54.0