From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 144DA3D9052 for ; Fri, 5 Jun 2026 08:43:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780648994; cv=none; b=KiS5vbFTe6tjj9ozmiXTAuLPXhcyG2QjhhuSHLA49v+eVLsH417eSOy3KdYA6k0S5f+IZ6kBIjhQrvn9i6+1XjbClNiEutPNwzZDe8zAimFTldY1irrcZZxHgeWN3/YNsywkzLM3vf1p8ZHD/L+S07LlclQYPUXRMo1mKPTLfyw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780648994; c=relaxed/simple; bh=0lGVAQZ5P+uA0ou7wGsBYz/mnzlFu7PDqqeo3PvK4Cw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tAPDdF/1FXPt1Yx02yT13TCZnLA82TjGLiw2AH3uiSlr9bWFlU2skkSS4qNEirOrXS75yn9AUj4m7UHwonXiSC+rZ3AqGxPTOTQbsQCHjPGs6UqIh+GEOM9KYf8aczrb7JbWfg77Igni2gIYeDwnQvPdSJayETJGI0lf/NYRnnA= 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=QX2VBl7l; arc=none smtp.client-ip=209.85.216.41 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="QX2VBl7l" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-36d98b68d68so1178375a91.2 for ; Fri, 05 Jun 2026 01:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780648992; x=1781253792; 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=Z1nQOtmsuSqcQUPuYJZAkaLb8MkxxRia+eZsD/iG1mU=; b=QX2VBl7lU5n44nxgeHROzSGEij8dYbbJPyypY3Xm6Faxj+Iz3InWFGj2mn3rqUm6AP CqwGZCAaZE6LPIR5lPyWmc+mDOrEqyRw3C/ukM5jkY0le0evID33UZMp0N2xDrxxrCRd icWIRKxMDvc5jaozLb+xegjZf9GnwTcY4ZCFAgh8VfgxAFuWybrmoQau7cUeE8eZ+leu s6B38n7uq/1xWF4+7HTzHUZsYAyrGesO1vQdU/lZawawgpN1PVgrmZs03n5q76LAccv3 4na7h9zz31dCmJGo27FO9lVOwclIG+W4cHDXd4KVdhFvkGCLGtYoQHQYtSEYbMmujmet ynUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780648992; x=1781253792; 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=Z1nQOtmsuSqcQUPuYJZAkaLb8MkxxRia+eZsD/iG1mU=; b=lu5R+KCpVfrMeL0t/sSbVT44aTjSwvCnbYKot3v7yiXO8iktvIedQFMJ1/paXTP0YY jbImEu4XCajkG6JrZ3B88tO8MLGAGN/P+Igda6CWp6WyMLIe0ss93Q5V3zUit/z/q4zb 4Kr7TE+LkeKRiYoE3A8Zfo+RhNoll4Dju0xAyUTcscyfXjKgWUKQKXsauTCBKMUUajBJ Q83sHQFSzqh0bQQ0Y7XUdpuJoVTSiwRbtLYmKvWynGkspvOvDY6ELOqtDu961ULRxhgi FoUCEg65IfNgB7jNqAGvCUJVGEXSXnOnEvcUVhRXG64Peqm68+HFRtuLn8fQksS9iQ7M jHQg== X-Forwarded-Encrypted: i=1; AFNElJ87cNGzE3jdG6iuzn4TBQycBwUxPy6dkLTufg1DwrvurEVfe7WnX6Pdpm7QR7T8o5m3YMQBRFRCN6jP6i8=@vger.kernel.org X-Gm-Message-State: AOJu0Yypd25j8MBsoDKcFGXOu3Gacx4glo49UkJu4fHlAfhNYhEJKsKN t2ngrbc+asmbk/7Urhi5gOjrT6MKXLNWViR0W/7ET7mCtk4N7MuDiV5V X-Gm-Gg: Acq92OHwXSY6Od1iq9I9rWql2zxpu6dgKf+dXcLtZ/SeSKZqliC9tCEzXYokWc1islJ awLsZ0EuCtEC3RdrdX0nbqOWtVTQv/d5kORt49jD+mJtKFuvIExDe1ZzucLhfpU7IxaLWGhFdwQ Yapps8xhov0AtTfwVy9SvMp8Ozk2ItTs8M/hHhKb1BkII5ZB65QTTF7iqTBBOVMYEAr0pybigrI IZSFPniNxWe5C+dh8p/LR+FnIR9vvHBnA3I71POHUUtuOlzy04MfZ4U35tP9Eb5K67z69hNyB67 bCOFgD7J5akDm8c2IjHdnBEyxQ3hiQOfZvNhgZnwSqdRHXYFP5BOwWynqALdEWzq2MZecYAdbVa nOq8Doz+SLLCnlgZM403w8MAkHyTmkbfamYdiqOBBkWrkyvao0YaG1PibXDlg2JiQiu/VcXFcqW r0rV5gaojrEJdozPAWjEVi6bnUvWLKRFosxGLb1iX2Yq1Z8jOWjafKs7pJWM7G X-Received: by 2002:a17:90b:38cc:b0:368:f179:ba07 with SMTP id 98e67ed59e1d1-370eec125f1mr2950361a91.9.1780648992235; Fri, 05 Jun 2026 01:43:12 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2026 01:43:11 -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 2/4] mm/zsmalloc: drop pool->lock from zs_free on 64-bit systems Date: Fri, 5 Jun 2026 16:42:40 +0800 Message-Id: <20260605084242.1549811-3-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 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. On 32-bit systems pool->lock is preserved. Reviewed-by: Nhat Pham Signed-off-by: Wenchao Hao --- mm/zsmalloc.c | 67 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 6b0014b43408..88d10f814da9 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -21,6 +21,10 @@ * pool->lock * class->lock * zspage->lock + * + * On 64-bit systems zs_free() does not take pool->lock; it locates + * the size_class using class_idx encoded in obj and serializes against + * page migration via class->lock. */ #include @@ -1432,10 +1436,59 @@ 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. + * + * 64-bit: class_idx is encoded in obj and 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. + * + * 32-bit: the unlocked load of *(unsigned long *)handle is not + * single-copy atomic and class_idx is not encoded (ZS_OBJ_CLASS_BITS + * == 0), so fall back to pool->lock for the lookup. + */ +#if BITS_PER_LONG >= 64 +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; @@ -1443,17 +1496,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