From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 4BC393C5546 for ; Tue, 16 Jun 2026 03:13:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781579619; cv=none; b=sJUkBOaYNcmDLGg+TPd8Jy/I4tMKaVgGnQB/tvojuiAQQSIw+ee3RCzwvgO2+zUp+LGzJOz4V8cPc4Z0vIAaj2as6hsT0XjWvP3MOokQXrh0KxP8c6Ak93VzjG5Te0jTchHgGVGYgZ37ehCYY336pBuPDbyTYIOGTy153tmsSwI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781579619; c=relaxed/simple; bh=grv8tCexJ8EpVkO9dVNEIW79tsUx22D7Iuf7JDMDVQA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Zz1TNhXxxWOINXp4PwdaYQ03EkVdR1Ra6HxzHgK049zFPqIddd3GtdB4WgbbMhp+cqGk+JiJaCKNfKDM7hcIWkROKzLhQm3KQS6DPEPFZ1h5yDCzOmNBaCYKcn1PVzSO0TGY7A78/kNGZ2R/bnPUm6Tz7nCWS6kqFyX/7t4UWk4= 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=SKfCXGe6; arc=none smtp.client-ip=209.85.216.49 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="SKfCXGe6" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-36da151a152so2826654a91.1 for ; Mon, 15 Jun 2026 20:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781579618; x=1782184418; 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=oAA0GvzR2uNOJ0BNgmtlA7kpJcS02qAJ4po9Qn4gun4=; b=SKfCXGe6SfzlC1l4/xONeH+NP9JjW2AFcEd6UGQ7gGTXt1DXb9151lwBN7lpc5Ajxb koLSpiT2xda/K/yAubzUvphZV3knOK/+ZeLSc12lKl82CiiR/bmkod9kjy5GdeJ7bOI7 FelzmYiWxjq6nL7bOM/ubiXU2t+UrubAq+OjCaozTu0Lopd5/Z6gtb4DL+XVBoDx+9J8 oF+upedBHZpBohhgEaMmjCZhkQmYMel680gBp8wIoiEDHq+eO5QfmF6UBeRm+y4FEKHK ++iQcma58mbBkmcLEGEGAE2+O1Ks0IqCfH5C2zCXBQzBCFwb/ypE8oUqe8PmEkw7tHeU EfZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781579618; x=1782184418; 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=oAA0GvzR2uNOJ0BNgmtlA7kpJcS02qAJ4po9Qn4gun4=; b=L51ifql/JYkW1WkSdOeT8wJMOo48+LHJ1sQ+rfJ8iVG45mSQzjjhpx2jW5ifMVA8mF RroXGXoitjO0b6Q2721p6vljcfVRasPg2t6lYc3w//CkxLEHRQIZ6vwQmn9dMvBmm296 wGkJP1neoYZQvvSHXORjWwJyKk9JHUrc3eg9XI4lWZK3mbF9i5iyGNXea1nFUDwTlmZ+ 4XyGgDnGynLf0wM/uYwDK1zyqLWTvAmm7fn9qaZPL7F02G6QTG6NpSLby6XSvsHC/87n QDkr8LfxEmmyiNf5YELeAlvYquzZKF+CWdaOglCmmaBXQszC/WZj1AG1lzApnA2fxm3Z ZiHA== X-Forwarded-Encrypted: i=1; AFNElJ+/ClMjriWYBrMf+TKwlr0ICfN4xZVhD9PEkIGqMvQF9J3OhZR7eYSyN+hEGkKXg8lnQyVm2PuadKxf7qE=@vger.kernel.org X-Gm-Message-State: AOJu0Yyxc1nYMrpHYN4R8fagNoYLFMFz0CVCBe2yWrrzP5ax4aTTahgk N2h+EMGlkOGxrpabl8rmTXuHFVhWMGksg2bW5QaoLcbpYiPjTCm3gVNq X-Gm-Gg: Acq92OHoztQxIesQAjGMgu9qaUKWaGtqXGTpWDr9pnUXK229GjQP/RgKk22K6s9GkFf rYcxEiXKykvGZtHRgaAijmWa6R+y59Ewe2rGqFDSkBr9lkNpG7y0/13KCgu2h8yJFyZhlauBuki 7tIpbs9PJyA3a8wsxfbrxtCxjhlmSFkVzU/uIgYh1ZzQ7bHteI0Dpnz1XFkuiiY01g+pcXVBOgz WaxRZQ6/eUb2E4JjutvBe9vTYzMJoZIRNGz1Obh9oNX/SPQD1AxJ0IR/YcVSwH6YposnH2Ji7Qc kwdm8f+s16N+A5ZdTgDoN84A3kgqA4PIQXSLJedMZLv2IaMhazmBJGpaeAxKhKidZmFoZ/vJyEb VhGH+C9qEJKF/JbGCUjgmUhNFSgUdJLCOXoB4up9fskASSvipzkwqK0Or+c2jeZtLd8JiS/TgV7 /FGjrFOHGqOjV/lDqem10nHxBSAS2usAQUFf3F3eA= X-Received: by 2002:a17:90b:1a8b:b0:36a:5d1f:7b6 with SMTP id 98e67ed59e1d1-37c2bc5d322mr12991906a91.2.1781579617621; Mon, 15 Jun 2026 20:13:37 -0700 (PDT) Received: from ubuntu22.mioffice.cn ([43.224.245.232]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c42f2e5644sm118923385ad.4.2026.06.15.20.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 20:13:37 -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 v5 2/4] mm/zsmalloc: drop pool->lock from zs_free on 64-bit systems Date: Tue, 16 Jun 2026 11:13:07 +0800 Message-Id: <20260616031309.3036234-3-haowenchao22@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260616031309.3036234-1-haowenchao22@gmail.com> References: <20260616031309.3036234-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 With class_idx encoded in obj, zs_free() can locate the size_class without holding pool->lock on 64-bit systems. Page migration also takes class->lock and only rewrites the PFN field of obj, so: 1. read obj locklessly, 2. lock the size_class derived from obj's class_idx, 3. re-read obj under class->lock to get a stable PFN. This eliminates the rwlock read-side cacheline bouncing between zs_free() and migration/compaction on multi-core systems. Annotate handle_to_obj()/record_obj() with READ_ONCE()/WRITE_ONCE() to prevent load/store tearing on the lockless read path and silence KCSAN data race reports. When ZS_OBJ_CLASS_BITS == 0 (32-bit, or 64-bit with obj too narrow to hold class_idx), zs_free() keeps pool->lock. Reviewed-by: Nhat Pham Signed-off-by: Wenchao Hao --- mm/zsmalloc.c | 75 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c4fc06b259af..1e9a150cd255 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -21,6 +21,10 @@ * pool->lock * class->lock * zspage->lock + * + * When ZS_OBJ_CLASS_BITS > 0, zs_free() skips pool->lock; it picks + * the size_class from obj's encoded class_idx and serializes against + * page migration via class->lock. */ #include @@ -463,10 +467,13 @@ static void cache_free_zspage(struct zspage *zspage) kmem_cache_free(zspage_cachep, zspage); } -/* class->lock(which owns the handle) synchronizes races */ +/* + * Pairs with READ_ONCE() in handle_to_obj(): zs_free() may read the + * handle locklessly, so prevent store tearing here. + */ static void record_obj(unsigned long handle, unsigned long obj) { - *(unsigned long *)handle = obj; + WRITE_ONCE(*(unsigned long *)handle, obj); } static inline bool __maybe_unused is_first_zpdesc(struct zpdesc *zpdesc) @@ -823,7 +830,7 @@ static unsigned long location_to_obj(struct zpdesc *zpdesc, unsigned int obj_idx static unsigned long handle_to_obj(unsigned long handle) { - return *(unsigned long *)handle; + return READ_ONCE(*(unsigned long *)handle); } static inline bool obj_allocated(struct zpdesc *zpdesc, void *obj, @@ -1457,10 +1464,58 @@ static void obj_free(int class_size, unsigned long obj) mod_zspage_inuse(zspage, -1); } +/* + * Resolve @handle to its zspage / size_class and acquire class->lock. + * + * When class_idx is encoded in obj (ZS_OBJ_CLASS_BITS > 0), it is + * invariant under page migration, so the handle can be read locklessly + * to pick the size_class. Once class->lock is held migration is + * blocked and the handle is re-read to obtain a stable PFN. + * + * Otherwise (32-bit, or 64-bit fallback paths like UML where the + * encoding is disabled), fall back to pool->lock for the lookup. + */ +#if ZS_OBJ_CLASS_BITS > 0 +static inline void obj_handle_class_lock(struct zs_pool *pool, unsigned long handle, + unsigned long *objp, struct zspage **zspagep, + struct size_class **classp) + __acquires(&(*classp)->lock) +{ + struct zpdesc *f_zpdesc; + unsigned long obj; + + obj = handle_to_obj(handle); + *classp = pool->size_class[obj_to_class_idx(obj)]; + spin_lock(&(*classp)->lock); + /* Re-read under class->lock: PFN is now stable vs migration. */ + obj = handle_to_obj(handle); + obj_to_zpdesc(obj, &f_zpdesc); + *zspagep = get_zspage(f_zpdesc); + *objp = obj; +} +#else +static inline void obj_handle_class_lock(struct zs_pool *pool, unsigned long handle, + unsigned long *objp, struct zspage **zspagep, + struct size_class **classp) + __acquires(&(*classp)->lock) +{ + struct zpdesc *f_zpdesc; + unsigned long obj; + + read_lock(&pool->lock); + obj = handle_to_obj(handle); + obj_to_zpdesc(obj, &f_zpdesc); + *zspagep = get_zspage(f_zpdesc); + *classp = zspage_class(pool, *zspagep); + spin_lock(&(*classp)->lock); + read_unlock(&pool->lock); + *objp = obj; +} +#endif + void zs_free(struct zs_pool *pool, unsigned long handle) { struct zspage *zspage; - struct zpdesc *f_zpdesc; unsigned long obj; struct size_class *class; int fullness; @@ -1468,17 +1523,7 @@ void zs_free(struct zs_pool *pool, unsigned long handle) if (IS_ERR_OR_NULL((void *)handle)) return; - /* - * The pool->lock protects the race with zpage's migration - * so it's safe to get the page from handle. - */ - read_lock(&pool->lock); - obj = handle_to_obj(handle); - obj_to_zpdesc(obj, &f_zpdesc); - zspage = get_zspage(f_zpdesc); - class = zspage_class(pool, zspage); - spin_lock(&class->lock); - read_unlock(&pool->lock); + obj_handle_class_lock(pool, handle, &obj, &zspage, &class); class_stat_sub(class, ZS_OBJS_INUSE, 1); obj_free(class->size, obj); -- 2.34.1