From patchwork Tue Feb 20 11:36:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 203566 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp336749dyc; Tue, 20 Feb 2024 03:37:54 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXAaYsRoPN7FeFIJnD4sQQWEPh0Z0cH05+hLkgsrB6NgNOBmNQFbb6CRmojiQC4V/uM46M1fJQUVxShKz5iBSeLGmOBfA== X-Google-Smtp-Source: AGHT+IFNE1CvjYKnpzkpj1htvMmrCH5NWHxl4aKb4WdVJz5WAqyM/cXTzpBgEgm1Iddw79GNVnJ5 X-Received: by 2002:a17:906:1305:b0:a3e:d450:d3dc with SMTP id w5-20020a170906130500b00a3ed450d3dcmr2461372ejb.35.1708429073699; Tue, 20 Feb 2024 03:37:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708429073; cv=pass; d=google.com; s=arc-20160816; b=daVl9NhjizFV/8OViLVfwhuODPJuXAWt0fGGD5jCHDAyMchhOV/w+8LjPTfh5j07Ym 9bJK3nF5Y5UiGx1pO3+G3/pHC/uIsxvccbT470sM2XKOpPz1i5wL+NSUZifGHG5an4a2 048rGNKXmK+FL+MGyrFbg8NU5LegxfPimnnkpNXtiCqZwnhHsPqH8VIBeMtWjI+gcdpi KM0qfza476iaqeN7vV6PNL2MbemkCQ5Hv9TskdjKmSGP2YzC63r9F1EPRys/TMyb6g/4 fcTNEq24yBFTsZBOgz34tCx/icTyNEkAyn8wR7wj3CYXjJK4lh4KT7G7PEszQHuGkKwI 4KPA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=kzQqWreho0C7h7BUSKhkqs4L21k4ROBRD+6NpEqJHvk=; fh=936sdtmrkpSY5xs0isw6wBUcmfCvGttdxKwiAOV5ysg=; b=fa8mdaiS5MxTEfO440f+D8Dq4oN9dwzncfdtcSLAjave6wRFmqCcp+K5+dcM59F9vz 2vl+2kkY8lOHL00iU8ly14d2u3Ez4fZ/TRaJcL66Mt9ruryBNjALx7hyi0Qc6k3WLxaZ 9/R+8q2f+Yga8nbhEmK0GMz/hPwRXAcESR1bZOp4EuxAw814V2N3IL5Ek3wvbCu50NLZ wE70ipM6T8P9yhlgZtzCfV26SKw1TE8lf6AlCIEr+puo04os56N86eEcinT9/fyMXvdR xK890gqNj4Qiou3lHrGq61U4Fto0BEU9LGx7e4Z8Jf7LZSR+ooNd5hWqE/o7UaqImu6O wxHg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=hx+4yBZK; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-72920-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72920-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id l11-20020a1709061c4b00b00a3e5327b750si2473937ejg.10.2024.02.20.03.37.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 03:37:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72920-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=hx+4yBZK; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-72920-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72920-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 52EA41F21F1D for ; Tue, 20 Feb 2024 11:37:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8748C67E9B; Tue, 20 Feb 2024 11:37:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="hx+4yBZK" Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EECA867E63 for ; Tue, 20 Feb 2024 11:37:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708429051; cv=none; b=iItn5yb8Q4/NHhsWZWkhCWr+y/pb7guT3CShhnUMNuw8FVkNDLmZh+6vNvZGukzRssC8oCxmcnBqiCQUGBoCQg7O64uC8M7PqFa2Hn5JBVatsbsrZ5jvtL/Sds9Cs4dqIG4R98UkS/1ZodrheEJhONkfBEJoBBSlketTVaJHQBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708429051; c=relaxed/simple; bh=uHWg+XOhrK0zRFBt8wOq8bp9H9v8n5Lcorw+sL8Z3+E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mUNfXNj6RSVKWFKA6tNWLg5dN0v8jN85/NQMRlVESATL8B/eoSqakM+UeyZwJqtHGfoamevkoAsl+ANOGZSpgQTfpvITwV8XtJCs+oEtKV9I8xiPkDEMQmEPjh8vXdS9yjYvLnYwrN9jTFJV9oUDvnXV1t5nzNSjci30Q10graI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=hx+4yBZK; arc=none smtp.client-ip=91.218.175.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1708429047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kzQqWreho0C7h7BUSKhkqs4L21k4ROBRD+6NpEqJHvk=; b=hx+4yBZK6F1f+K+KobCMKspcH9mU4c02Ya7/2WJ8h1KS2L4WAHusTpcx6exILhAFInTUL7 SjK2RjNlhSZnKKiORgS17ixwOUfDdrDWC12dFCue+HGWSq6lKKLAGf7WKDev6RYIaevBYL y+iI/Zos7kTYfT5NxuryApctqyk8JNc= From: Chengming Zhou Date: Tue, 20 Feb 2024 11:36:58 +0000 Subject: [PATCH RESEND 1/3] mm/zsmalloc: fix migrate_write_lock() when !CONFIG_COMPACTION Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240219-b4-szmalloc-migrate-v1-1-fc21039bed7b@linux.dev> References: <20240219-b4-szmalloc-migrate-v1-0-fc21039bed7b@linux.dev> In-Reply-To: <20240219-b4-szmalloc-migrate-v1-0-fc21039bed7b@linux.dev> To: hannes@cmpxchg.org, Sergey Senozhatsky , Minchan Kim , Andrew Morton , nphamcs@gmail.com, yosryahmed@google.com Cc: linux-mm@kvack.org, Chengming Zhou , linux-kernel@vger.kernel.org X-Developer-Signature: v=1; a=ed25519-sha256; t=1708429041; l=2263; i=chengming.zhou@linux.dev; s=20240220; h=from:subject:message-id; bh=UHSVodPnpBiivncRsTV1Arftl0WePz5UFf9WpjK+7+4=; b=163nW1R+RMQ+orBAqT5aCtZHUFeStvc1n+OYnymxXb76UYU7LE63Rfti+6qmooU5Daaopmvrh ZVuF8XTU4yRCV6oUXqz5lv+X9XhHDAJCUFRaebMIpUHJhvKi7iKCv4M X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=5+68Wfci+T30FoQos5RH+hfToF6SlC+S9LMPSPBFWuw= X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791417724611260695 X-GMAIL-MSGID: 1791417724611260695 From: Chengming Zhou migrate_write_lock() is a empty function when !CONFIG_COMPACTION, in which case zs_compact() can be triggered from shrinker reclaim context. (Maybe it's better to rename it to zs_shrink()?) And zspage map object users rely on this migrate_read_lock() so object won't be migrated elsewhere. Fix it by always implementing the migrate_write_lock() related functions. Signed-off-by: Chengming Zhou Reviewed-by: Sergey Senozhatsky --- mm/zsmalloc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c937635e0ad1..64d5533fa5d8 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -278,18 +278,15 @@ static bool ZsHugePage(struct zspage *zspage) static void migrate_lock_init(struct zspage *zspage); static void migrate_read_lock(struct zspage *zspage); static void migrate_read_unlock(struct zspage *zspage); - -#ifdef CONFIG_COMPACTION static void migrate_write_lock(struct zspage *zspage); static void migrate_write_lock_nested(struct zspage *zspage); static void migrate_write_unlock(struct zspage *zspage); + +#ifdef CONFIG_COMPACTION static void kick_deferred_free(struct zs_pool *pool); static void init_deferred_free(struct zs_pool *pool); static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage); #else -static void migrate_write_lock(struct zspage *zspage) {} -static void migrate_write_lock_nested(struct zspage *zspage) {} -static void migrate_write_unlock(struct zspage *zspage) {} static void kick_deferred_free(struct zs_pool *pool) {} static void init_deferred_free(struct zs_pool *pool) {} static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage) {} @@ -1725,7 +1722,6 @@ static void migrate_read_unlock(struct zspage *zspage) __releases(&zspage->lock) read_unlock(&zspage->lock); } -#ifdef CONFIG_COMPACTION static void migrate_write_lock(struct zspage *zspage) { write_lock(&zspage->lock); @@ -1741,6 +1737,7 @@ static void migrate_write_unlock(struct zspage *zspage) write_unlock(&zspage->lock); } +#ifdef CONFIG_COMPACTION /* Number of isolated subpage for *page migration* in this zspage */ static void inc_zspage_isolation(struct zspage *zspage) {