From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 C300A3DA5AF for ; Fri, 5 Jun 2026 08:43:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780648991; cv=none; b=SzswDsUjWcsxPGeNYwPmxjz7vzdysXFjFqUAjHoMJ2USNSmKKtf9u2sG5//fcMrnMmFFHFd3vzeW6MW7iI0IEOEHHhvVSCks12nXmTXc7SI2SlQtSqn23KLNdDH58J8e36FvK/rkeQJYQltuzqy6JJSXznREhv0oKKp+KzIMj3o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780648991; c=relaxed/simple; bh=ylUxj8OGdLlBiqDfOwRXDS3h9yYALv05t16XWh+8C38=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JHAhk+brgv0+SiSd7vuBXATq6sQ7s2xduZ3RxgzrlNfmulDXJVxC8M+mSLkSS9Sd/0QpaYeA/GUZHZxLFV3lEXk+gWGw+n7S8FgCFV0wFR1q4qvcJGOYm+BQAWyEpYWUr2MtBga5F/IQLqjMKvTTl8pJP9r0u48j0NwUGlWc7Uw= 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=X8Wq7IUl; arc=none smtp.client-ip=209.85.216.46 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="X8Wq7IUl" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-36dac5d5da0so830263a91.2 for ; Fri, 05 Jun 2026 01:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780648989; x=1781253789; 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=quOGtfpkvwp2+8B7oBqQS3hulhtIRkQ3/ceADPVIKv0=; b=X8Wq7IUlifL2CqK3dfjNbGuH6Z8CHGigm3uNUWOkdFIcV9fU1Om94n/7bSuKeFE8c/ R+oKxjgGDcgVWlxl83rXaqZ8TROsI1SLpg/vNTtTwdUTali2qq+nC7zHATD451xrUU8r qdvAVBYvOKugxoN13fsflLOSbJB1AckcEkgDV+MO+OPEBI6IgtaKB92w3MIFLAwVN5Cp PKI5oNOIaI68nfhM6d55GPAKPhG2YgrgriIEw1Z3KMVpTZqK7krsYoyDrqAeOzYA2bwb mn/KspVA2qDl+HCK87M5xXKMEoflck9jSNU8j7Zjf+XrbCqcIS+e69pdvJTV27kSOQ4w SzTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780648989; x=1781253789; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=quOGtfpkvwp2+8B7oBqQS3hulhtIRkQ3/ceADPVIKv0=; b=PpvnN2LDqQG5ML/D3UMMlbUKjjhzfJNN8QLAKAcoEGjVunMFFZ3BLA8T71Sp6gdO+m XtL3D9wT6EbQfOZ9pnD6GMDxqMq62GojIbIVaN8Fv4Lbzvvvwk01rCHkgT05k+wgaZsV f0KAX23RhNm+6uCqEzb5iz5xtQW7YTlSjvyBHF+civf0vchhQVgOiYYMOE5L9WJu1dzY 4GRDFiqaaElu698bH+riAL365qu0Netkb3w6DIMnHjGTth7PaHLaIZdK6pYJvU7dU9t9 30WQVgoPpUq3JK8HcQ7tiu7D2s/q6NRE+VE9f3ALt1b1eGvOIjpNY2lOQrnGuc4hVCeR mkrg== X-Forwarded-Encrypted: i=1; AFNElJ8ChcwZ2zGRjUZTXG3p9Y18rrfP1lvRVsnlfGwH/KXjdF/hW24r3IUuVFs6R6DmUQ+RxtaahEGywi0BKbM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9vjCsrJh9DduLh1tRhcucSzULvG8a/v8lOyYBPlHA/qimtoCY f5eeD4JPKiEw39ya4UXGQ8WKhqlbReau74fA/0pVMZUJkqBlZBvFDD7p X-Gm-Gg: Acq92OEtjV23F22k97KBMWu7jj6ARngh6/AxyGfLI8Hgs32uNqOjWoFwBTwmOuihuDZ CT9ktn+lP/IApbx65gDCYxA/OKyQIlNtHy1FOlLZ+6EGqznEFEh1RLtbKCi3CfeV3StXopQj68N BQrJ21S7n/BSzVqHCh9OEcljGVTeyt0K0osFi4Rbb6rmByaH3mqafToa/JlieijQkshld3kvecK BWpphrUwNSafySEpGKN9gv27bzCcCxZrs00F0QvsZejSBDRPa+8rek4fL+ZNLZ9mnZaduo/t6dt etzza2aPB6YQNqRSvXHFF+oZqypHhgQWA5IcxdmZ8xGtpJFZSkoBYR0m3p1rdnR9sfJ4GJu5Sfg OgvNOqn5dYhlG6rHwMeB7BSfhpLFksjgZXRed8J0Cwtm8glBRYPjBkzRmiz5PnML09ghEn58mGf 67QBINh4feZLuYsM3AUiHoXc9OiDikYogBbYjW+yXj1D2Lu3t8F5rrp9Ir/cfJ X-Received: by 2002:a17:90b:38cc:b0:36d:f28b:72e0 with SMTP id 98e67ed59e1d1-370ee92adfdmr2924474a91.12.1780648988874; Fri, 05 Jun 2026 01:43:08 -0700 (PDT) Received: from ubuntu22.mioffice.cn ([43.224.245.232]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3712fcb2607sm926632a91.0.2026.06.05.01.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2026 01:43:08 -0700 (PDT) From: Wenchao Hao To: Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Minchan Kim , Sergey Senozhatsky Cc: Nhat Pham , Joshua Hahn , Barry Song , Wenchao Hao Subject: [PATCH v3 1/4] mm/zsmalloc: encode class index in obj value for lockless class lookup Date: Fri, 5 Jun 2026 16:42:39 +0800 Message-Id: <20260605084242.1549811-2-haowenchao22@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260605084242.1549811-1-haowenchao22@gmail.com> References: <20260605084242.1549811-1-haowenchao22@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Wenchao Hao Encode the size_class index (class_idx) into the obj value so that zs_free() can determine the correct size_class without dereferencing the handle->obj->PFN->zpdesc->zspage->class chain under pool->lock. class_idx is invariant across page migration (only PFN is rewritten), so a lockless read of obj always yields a valid class_idx. The space below the PFN field in obj is over-provisioned on 64-bit systems, with more bits than obj_idx needs. Split that space into class_idx and obj_idx subfields: |<-- _PFN_BITS -->|<-- ZS_OBJ_CLASS_BITS -->|<-- ZS_OBJ_IDX_BITS -->| +-----------------+-------------------------+-----------------------+ | PFN | class_idx | obj_idx | +-----------------+-------------------------+-----------------------+ MSB ^ LSB | +-- ZS_OBJ_PFN_SHIFT The macro layout changes as follows: Before After Meaning ---------------- ------------------ ---------------------------- OBJ_INDEX_BITS ZS_OBJ_IDX_BITS width of obj_idx subfield OBJ_INDEX_MASK ZS_OBJ_IDX_MASK mask of obj_idx subfield (n/a) ZS_OBJ_CLASS_BITS width of class_idx subfield (n/a) ZS_OBJ_CLASS_MASK mask of class_idx subfield (n/a) ZS_OBJ_PFN_SHIFT bit offset of PFN in obj On 32-bit systems there is no spare room for class_idx, so the encoding is disabled (ZS_OBJ_CLASS_BITS = 0) and the obj layout remains [PFN | obj_idx]. Reviewed-by: Nhat Pham Signed-off-by: Wenchao Hao --- mm/zsmalloc.c | 80 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 14 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 63128ddb7959..6b0014b43408 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -67,8 +67,8 @@ #define MAX_POSSIBLE_PHYSMEM_BITS MAX_PHYSMEM_BITS #else /* - * If this definition of MAX_PHYSMEM_BITS is used, OBJ_INDEX_BITS will just - * be PAGE_SHIFT + * If this definition of MAX_PHYSMEM_BITS is used, ZS_OBJ_PFN_SHIFT will + * just be PAGE_SHIFT */ #define MAX_POSSIBLE_PHYSMEM_BITS BITS_PER_LONG #endif @@ -88,8 +88,27 @@ #define OBJ_TAG_BITS 1 #define OBJ_TAG_MASK OBJ_ALLOCATED_TAG -#define OBJ_INDEX_BITS (BITS_PER_LONG - _PFN_BITS) -#define OBJ_INDEX_MASK ((_AC(1, UL) << OBJ_INDEX_BITS) - 1) +/* + * obj is encoded as [PFN | class_idx | obj_idx] within an unsigned long: + * + * |<-- _PFN_BITS -->|<-- ZS_OBJ_CLASS_BITS -->|<-- ZS_OBJ_IDX_BITS -->| + * +-----------------+-------------------------+-----------------------+ + * | PFN | class_idx | obj_idx | + * +-----------------+-------------------------+-----------------------+ + * MSB ^ LSB + * | + * +-- ZS_OBJ_PFN_SHIFT + * + * Encoding class_idx into obj lets zs_free() locate the size_class + * without holding pool->lock; class_idx is invariant across page + * migration (only PFN changes), so a lockless read of the obj value + * always yields a valid class_idx. + * + * On 32-bit systems there is no spare room for class_idx, so + * ZS_OBJ_CLASS_BITS is 0 and the layout collapses to the original + * [PFN | obj_idx] without any ifdef in callers. + */ +#define ZS_OBJ_PFN_SHIFT (BITS_PER_LONG - _PFN_BITS) #define HUGE_BITS 1 #define FULLNESS_BITS 4 @@ -98,9 +117,29 @@ #define ZS_MAX_PAGES_PER_ZSPAGE (_AC(CONFIG_ZSMALLOC_CHAIN_SIZE, UL)) +/* + * Reuse the width that struct zspage already reserves for its + * class field (zspage->class:CLASS_BITS + 1) for the class_idx + * field encoded in obj. On 32-bit there is no spare room, so set + * it to 0; the encoded class_idx then folds to a constant 0 and + * the layout collapses back to [PFN | obj_idx]. + */ +#if BITS_PER_LONG >= 64 +#define ZS_OBJ_CLASS_BITS (CLASS_BITS + 1) +#else +#define ZS_OBJ_CLASS_BITS 0 +#endif +#define ZS_OBJ_CLASS_MASK ((_AC(1, UL) << ZS_OBJ_CLASS_BITS) - 1) + +#define ZS_OBJ_IDX_BITS (ZS_OBJ_PFN_SHIFT - ZS_OBJ_CLASS_BITS) +#define ZS_OBJ_IDX_MASK ((_AC(1, UL) << ZS_OBJ_IDX_BITS) - 1) + +static_assert(ZS_OBJ_IDX_BITS > 0, + "zsmalloc: PFN + class_idx leave no room for obj_idx"); + /* ZS_MIN_ALLOC_SIZE must be multiple of ZS_ALIGN */ #define ZS_MIN_ALLOC_SIZE \ - MAX(32, (ZS_MAX_PAGES_PER_ZSPAGE << PAGE_SHIFT >> OBJ_INDEX_BITS)) + MAX(32, (ZS_MAX_PAGES_PER_ZSPAGE << PAGE_SHIFT >> ZS_OBJ_IDX_BITS)) /* each chunk includes extra space to keep handle */ #define ZS_MAX_ALLOC_SIZE PAGE_SIZE @@ -721,26 +760,38 @@ static struct zpdesc *get_next_zpdesc(struct zpdesc *zpdesc) static void obj_to_location(unsigned long obj, struct zpdesc **zpdesc, unsigned int *obj_idx) { - *zpdesc = pfn_zpdesc(obj >> OBJ_INDEX_BITS); - *obj_idx = (obj & OBJ_INDEX_MASK); + *zpdesc = pfn_zpdesc(obj >> ZS_OBJ_PFN_SHIFT); + *obj_idx = (obj & ZS_OBJ_IDX_MASK); } static void obj_to_zpdesc(unsigned long obj, struct zpdesc **zpdesc) { - *zpdesc = pfn_zpdesc(obj >> OBJ_INDEX_BITS); + *zpdesc = pfn_zpdesc(obj >> ZS_OBJ_PFN_SHIFT); +} + +/* + * On 32-bit systems ZS_OBJ_CLASS_BITS is 0 and ZS_OBJ_CLASS_MASK is 0, + * so this collapses to a constant 0. No ifdef needed at the call site. + */ +static unsigned int obj_to_class_idx(unsigned long obj) +{ + return (obj >> ZS_OBJ_IDX_BITS) & ZS_OBJ_CLASS_MASK; } /** - * location_to_obj - get obj value encoded from (, ) + * location_to_obj - encode (, , ) into obj value * @zpdesc: zpdesc object resides in zspage * @obj_idx: object index + * @class_idx: size class index; ignored on 32-bit (ZS_OBJ_CLASS_BITS == 0) */ -static unsigned long location_to_obj(struct zpdesc *zpdesc, unsigned int obj_idx) +static unsigned long location_to_obj(struct zpdesc *zpdesc, unsigned int obj_idx, + unsigned int class_idx) { unsigned long obj; - obj = zpdesc_pfn(zpdesc) << OBJ_INDEX_BITS; - obj |= obj_idx & OBJ_INDEX_MASK; + obj = zpdesc_pfn(zpdesc) << ZS_OBJ_PFN_SHIFT; + obj |= (unsigned long)(class_idx & ZS_OBJ_CLASS_MASK) << ZS_OBJ_IDX_BITS; + obj |= obj_idx & ZS_OBJ_IDX_MASK; return obj; } @@ -1276,7 +1327,7 @@ static unsigned long obj_malloc(struct zs_pool *pool, kunmap_local(vaddr); mod_zspage_inuse(zspage, 1); - obj = location_to_obj(m_zpdesc, obj); + obj = location_to_obj(m_zpdesc, obj, zspage->class); record_obj(handle, obj); return obj; @@ -1762,7 +1813,8 @@ static int zs_page_migrate(struct page *newpage, struct page *page, old_obj = handle_to_obj(handle); obj_to_location(old_obj, &dummy, &obj_idx); - new_obj = (unsigned long)location_to_obj(newzpdesc, obj_idx); + new_obj = location_to_obj(newzpdesc, obj_idx, + obj_to_class_idx(old_obj)); record_obj(handle, new_obj); } } -- 2.34.1