From patchwork Mon Mar 4 11:07:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 209504 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1348883dyc; Mon, 4 Mar 2024 03:10:25 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUAIe78dxru+Qno8yCSI1zi0v4RGyziuT5wUhlB+V0P8Jbgv9cT1e7Z1NhZF5ow8UIaL31RaTLqvZGe4YIm1rJ1XaGGeg== X-Google-Smtp-Source: AGHT+IE2ALr3zgbtC2ZKGVAELqlue4FfiWga3CtPlqJ547rgPrcWJkgBfCrH1AyMrX1QkBtuCjSu X-Received: by 2002:a17:906:c40d:b0:a3e:6aae:d342 with SMTP id u13-20020a170906c40d00b00a3e6aaed342mr5904054ejz.47.1709550624856; Mon, 04 Mar 2024 03:10:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709550624; cv=pass; d=google.com; s=arc-20160816; b=m9Jh90QQsg6IioUeVeCybP4cznmXloJAod0X8wEqGkhhjxSIFbspgs96Kzig7vgbmI gP5mYmGY0CxKrV4kclsb798gFmW2hhf9ooDKO1CUB3+jDnIUxyr0oQko6BRLmUC5M/4A 7awngPntjM2m/lzGGxFCndvlAglUyQGMD/xNEuMSHWurGRXQRmUWM9TDXaRLGmqCwXHJ 3gMkoHx3Y1eoHmlTKgvg4n/WPBDqqwgVEtf7PG+UAgj+ZX70YnxS2jZ6/6O57+YtPp3K C7wnSbKc71/BOQfJeZ4jCEGjWcM4J/+4Sw87KvkGWre985YT+JfudXhHWpimZtHodaLE ybUg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=KtIXFJcfM5neAeyBfBxq1hZ3fmqqVOtLZ2hkhXv5tMY=; fh=MLMhdBptDn7AePpuFvXyJLQG41lRnpDv138s13a22+A=; b=z5CD8R1xvyuy/Go5Y262hIuPZ9UDQ3GP+YaZLzx6PlkOOygPfZXyBeUH8oIx3oILMc b+zJBhxx/lVFABf8O2yUm1rx0tzw41AkoJvveJ4X/cW1VVWmS8DKuqgHeCxg2kAxRsJw JAfHsEHzVbgY3mdN/zOi5pYeht/yAOSG1XoTPRch9o+b7j8kFENe4tY1m5XCoJE9BXvd dtR4enuTZf1DkLJzJRI+lchmKQXaDcm/EprE4hg9W+2xLnxUwaQoxmR4jFxdVwTZu9z4 p/NwZWzjg6XCzZ8zS5V2zclxDbPH7u2vpscOC8Imt4uFB9BiMuGUeNZZHQmueEPDgBTw UXjg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=RLZ20rvC; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-90478-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90478-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id f11-20020a170906048b00b00a412f5dd982si3693926eja.176.2024.03.04.03.10.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 03:10:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90478-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=@bytedance.com header.s=google header.b=RLZ20rvC; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-90478-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90478-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com 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 592991F24494 for ; Mon, 4 Mar 2024 11:08:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DEDAC39AD0; Mon, 4 Mar 2024 11:08:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="RLZ20rvC" Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (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 B08F3383B4 for ; Mon, 4 Mar 2024 11:08:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709550494; cv=none; b=tIgiDeekAKXYMZ/hkXYxJUEUFJfUuiqverSUYxOKbyqneIbEvE3P7guUghlFaizQ65h3EIBNUy5MK546yKfJxbj2ZjbDewYHoIPOXTD+nWlD1TnA6Cze7ns0zzbb/Lx7rapnRa7XY5qeHESOeLufkrroaAekuxoCRu6t3uXjJNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709550494; c=relaxed/simple; bh=7ULQRPHFiQc0UrVTa9FvxBoC23iVoMzPSvJSRq+b56g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u72w9ekzzl1LNq4jt5TZvCyZimGkXrCqs2e1ykI5qRUJYRVGC5b5KDsjmft/3pZbM9/tHXlHe/Vxq/7tRx6XkLMJhYLN5LLiE3LrIMAPECQLq3ecwxl7ls9OC0fjpM7FXqqrL9N4t4FduWMZtVfc4A/t2M79KwxUuOgB/k+VqFc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=RLZ20rvC; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-55b5a37acb6so1700840a12.0 for ; Mon, 04 Mar 2024 03:08:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1709550492; x=1710155292; 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=KtIXFJcfM5neAeyBfBxq1hZ3fmqqVOtLZ2hkhXv5tMY=; b=RLZ20rvCN3D3IW3YTK8+pckgkstPyLiZUbk/cl4TIxdG713AAZLObcWoz4XnRDElj0 GTUMA/fanW/HnBvYIKRIwnQ/HCFm6Tsqo8cN74YgtgbVGc+GHUNLsZDajxy765ZbpbZ3 tEqJMH2WZAWVwrpwARYu0W6FnO2ML3A6n+kf5IYt1v4jLqXgewXIY9YMTRoNJRUPf0N9 b7hJjVyQBgz0dsEIzqnNtaL+SxGgps1HG80x8Qury5gA3xDmo+dB16iqj73qg3CsgbJA e0xFvG0ltS0XntXE4h9ezAKTr4ZGPxPyauGTD6CbjJlxHzCNXdmHet358QWE4nOitGxA nXoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709550492; x=1710155292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KtIXFJcfM5neAeyBfBxq1hZ3fmqqVOtLZ2hkhXv5tMY=; b=M4bL6Yk6nH4uyTE+aM5wP+IsiZJXolh6rSBIgj5J13DcblmZ15de5RwmxN9PlhUlAh rFubW8AYiB5KHn9X7s1k+NYZaNPZG9u8LX2jsbZthlL3CA0nNpsRGsbyZ4zv2UVKdpfT 5UT0OQiVM6Uvi8nsZUK8lwJdKzTUWvYVwSbNkxUMnW5kg/yUdFFwKwsRlBn/UlO/9bq1 j0THDuZroopRSAKpiLfgaPC6gEGEHb3tyJXNFuvm4mVofPujumFHl4YznatcsR9Zsh8+ h1JEPcUZ2mU3Z2TtXBKEZEDUbPjl2ZWWf3d9S4HlKD6SPWw8SwlvM6D10wxCdJ3te0+u hNuA== X-Forwarded-Encrypted: i=1; AJvYcCWat6UU1PBv/KShjLv12Tg7iF21pQIiWpaUP5V8su1G9bP1c5//LW1nl+bJTW7iiqdtb8w1YLhbN9AMVrjL3QDigEqwjoIuMlwyUCIr X-Gm-Message-State: AOJu0Yye9DTPHxjqz9XqRVx/y0bujtLJ/pIFDdAqhol5KIPOyzFZ4+5n EiUupR8j1n5uiMYKSFbYokALdDHgyRc2smQEiu2eAVqDiTYkml19DIS/FYNyQ8I= X-Received: by 2002:a17:90b:1908:b0:29b:309b:a200 with SMTP id mp8-20020a17090b190800b0029b309ba200mr5173828pjb.3.1709550492018; Mon, 04 Mar 2024 03:08:12 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.154]) by smtp.gmail.com with ESMTPSA id y5-20020a17090aca8500b0029b59bf77b4sm587410pjt.42.2024.03.04.03.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 03:08:11 -0800 (PST) From: Qi Zheng To: akpm@linux-foundation.org, vishal.moola@gmail.com, hughd@google.com, david@redhat.com, rppt@kernel.org, willy@infradead.org, muchun.song@linux.dev Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH 1/3] mm: pgtable: correct the wrong comment about ptdesc->__page_flags Date: Mon, 4 Mar 2024 19:07:18 +0800 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792593756317008296 X-GMAIL-MSGID: 1792593756317008296 The commit 32cc0b7c9d50 ("powerpc: add pte_free_defer() for pgtables sharing page") introduced the use of PageActive flag to page table fragments tracking, so the ptdesc->__page_flags is not unused, so correct the wrong comment. Signed-off-by: Qi Zheng --- include/linux/mm_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index a7223ba3ea1e..5ea77969daae 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -419,7 +419,7 @@ FOLIO_MATCH(compound_head, _head_2a); /** * struct ptdesc - Memory descriptor for page tables. - * @__page_flags: Same as page flags. Unused for page tables. + * @__page_flags: Same as page flags. Powerpc only. * @pt_rcu_head: For freeing page table pages. * @pt_list: List of used page tables. Used for s390 and x86. * @_pt_pad_1: Padding that aliases with page's compound head. From patchwork Mon Mar 4 11:07:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 209506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1350875dyc; Mon, 4 Mar 2024 03:14:25 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVA6hqkAx6WlM2YOaY+3KHhI3WPCrFlOULo+5c7eeoN/vnvGgTeJd+vjlMtw0pxP1k1oVpncZJQiURRHSb0tUdWVfYWvA== X-Google-Smtp-Source: AGHT+IG+cbw8QB0AwV2jg7UJO22gKnmaiu0d7uciASUlwvbgssrrgoT4VrDp9ORJRK/k1n7gNP15 X-Received: by 2002:aa7:88cd:0:b0:6e5:58a5:ceb2 with SMTP id k13-20020aa788cd000000b006e558a5ceb2mr11867338pff.29.1709550865729; Mon, 04 Mar 2024 03:14:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709550865; cv=pass; d=google.com; s=arc-20160816; b=ABQofmIwNk4ap1C1shpzQR3QcWFW0LIBRfSuoqMBU4Iq+/Y5nUgIg/kHVQD+7c3inf 3dlKJK8vAlTRTnycO4b8aTfyI0mY0naGiGO2YGBsZjTRw5y5C4tqeqAlHXjCRLadHJpE 2E0yj3CaSDFt9CFSKDK5M1N7ShWE4X5WISFFZOXY5IQqLEyq8CVaYR9uOHH346wsKm5r g3fnodKzzdtiOtosAqJaYjNFW0nzQjGPgDfW/dZDyUJuUSzXZXAJySqzDtPk3E+rIeqi BznOVLxuX+x81eTZva7/bheQYeB3B962qLywRRGJ/bmlaONMlc8DtXpk29rmzGGL9zbB X5MQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=MVpQb6gnXjWzSd7/4z2SbTtHslRCQp5WpZHkGdzmg3w=; fh=SXkgu47vhbNkpdFihk9DikRw+nrtyKXpRv45Fm/61cg=; b=OZQefjydqEXvhHsmJcpnsWzZ0JZoNvtyUYOoHCAZU8Z4HCMw81eeJ/6ZnrjoDVFMAl wfmpfocjby3AelR3oIFBm7s8V/uxziOnztW3xSRKt24SEDCXbayXffi1N7qhIsGYgM39 UxDvw4pf7teRqxpN5goC/IdOVaHI3lwS5mLnRSWOs4mj9Lvuf+PUl62Jgz15sWCNphA6 4vtEahqQ6axWHyxPoPzqS+rC4tY47Cg8Jaev1e7x2QMmZJCM7U5BIJOMHSPCTgHynFzi +sCgX54A1aBZt+2kaGEzbj7VZ7z8FEsvkEhilpYVSzuqbxPFUQrCIIP/AqlbB4y4iHHJ YbXg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=HUJMnwTC; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-90479-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90479-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id d25-20020a631d19000000b005be03f0da68si8125252pgd.13.2024.03.04.03.14.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 03:14:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90479-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=HUJMnwTC; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-90479-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90479-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id A5DF0B23F1D for ; Mon, 4 Mar 2024 11:08:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4915039FCB; Mon, 4 Mar 2024 11:08:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="HUJMnwTC" Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 E990E381D0 for ; Mon, 4 Mar 2024 11:08:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709550498; cv=none; b=nw5AQqMwBKAfS3HnlqlBra3xUWDGPhIY5LfAnbr/giY/IfvLFeCkm4t/1qgU6VDMv9Vi4dLgw/ZjLaLgofc6IgOQWsfGoBzFKwC9ancF/XTDxE2xvlkDOuDzuSXUg3GvU2/1WzoywQ4/hTbCBm6kB2q7uYo6hA7zqcSyJ//9jA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709550498; c=relaxed/simple; bh=iQTB6iQcjXpyDrCxjESHbO+MDvnl4uA6D+rBQbS5g3k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TGJnldvhYEX/71UCphqYn7o02vi+YPtdKp8Y3K2ag1qf6eUnqFJQ6AOUz58TUxGhpjxQkHJefdid1MICNt1cxklIRW1/o2wxrPJSP44OcZ+UEhNqWpkNX6oEZG6ypCMsy7pXJVMKmiB9MhP4XC+P3J0MQiyvPlGgI/0jpF9wzAo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=HUJMnwTC; arc=none smtp.client-ip=209.85.216.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-29ae0d292d4so470999a91.0 for ; Mon, 04 Mar 2024 03:08:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1709550496; x=1710155296; 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=MVpQb6gnXjWzSd7/4z2SbTtHslRCQp5WpZHkGdzmg3w=; b=HUJMnwTCyumRywqDrU5UBrgdmEZUoBETQ/jS3HvXCWvNXm+urLZZ5E8d0rDDZKaK2P W2EpwvVboehbvIaxs9ekD3IV+FTds5/PhGN5sn7eBC7j5DSl4Qu3hdumRETNIsnhJpSZ z3yZobtifa9TR32NaTqs/GXYHGQGh0zgqxUZmz1CAVOYhcQ6UEhJAcE0m0CDDkEjEznr QUwAIJrrzG/C/rab2H+xN+KJ9MShN5vWyqjI9bQEc1DZloBvgv81S8GRQyUnKAQZWZXI oYhbF+7bNQoj3xGwaYbjjf28ysg2MzGCy5UZdxcPekmLApGHyj2GboVF0SS1fEd5kTTa +M/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709550496; x=1710155296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MVpQb6gnXjWzSd7/4z2SbTtHslRCQp5WpZHkGdzmg3w=; b=dv2P5T2sQ7Y0T3pFEjbbI405EHqgtG2DbCVmagblCg2o54v19OBxvmKkfNZdIOGFVP L2SYIfhLLILOLYeXKvwOTK8YWjOtEpsGCAQW4J+XB3IqUJxX+TwarIbaL07rHvX/+z70 sVsQYjTFZ9RBQElhxsroNHyKmgZlU9siNcPFopIrl6OuLZ6Ro9++rz3xYiC+vxpRP8MX 0PdsiwsM8a7kBhJdY1XvUCgiGl46yH7y7eESyhbJ6rup+pHECuWnnOhpulBr9m2xztel OtXidDMyuVCBUk2vaWK0QmfCoM9+vmiHOSoEBy+MePMDVVutQkAH9i8Jr5kuQm42GTqQ IbCA== X-Forwarded-Encrypted: i=1; AJvYcCV4axub0CbitOoTJjg/cE8yNrrj5MCHBjhPTv9DYPILhnaj1+eUd6SS8T+udNIVVbzXtWVN/WfU4FwGIXDDLmIdqcS2z54KjN3y9azp X-Gm-Message-State: AOJu0YyUrEKwu60O1ruoWoq2JXVSG+rB0ct9hUi+jn62RvDyCp8ajwOJ h0Clf2R8OrNHHpzetbPq4r3zDnHFb+xoshMomDTWLMW18JAtaeSysHeTqM8K7Hg= X-Received: by 2002:a17:90a:804c:b0:299:dddb:3a92 with SMTP id e12-20020a17090a804c00b00299dddb3a92mr6941943pjw.1.1709550496198; Mon, 04 Mar 2024 03:08:16 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.154]) by smtp.gmail.com with ESMTPSA id y5-20020a17090aca8500b0029b59bf77b4sm587410pjt.42.2024.03.04.03.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 03:08:15 -0800 (PST) From: Qi Zheng To: akpm@linux-foundation.org, vishal.moola@gmail.com, hughd@google.com, david@redhat.com, rppt@kernel.org, willy@infradead.org, muchun.song@linux.dev Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH 2/3] mm: pgtable: add missing pt_index to struct ptdesc Date: Mon, 4 Mar 2024 19:07:19 +0800 Message-Id: <283624c2af45fb2090b41a6b1b5481bb0a45bad7.1709541697.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792594008398675043 X-GMAIL-MSGID: 1792594008398675043 In s390, the page->index field is used for gmap (see gmap_shadow_pgt()), so add the corresponding pt_index to struct ptdesc and add a comment to clarify this. Signed-off-by: Qi Zheng --- include/linux/mm_types.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 5ea77969daae..5240bd7bca33 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -425,6 +425,7 @@ FOLIO_MATCH(compound_head, _head_2a); * @_pt_pad_1: Padding that aliases with page's compound head. * @pmd_huge_pte: Protected by ptdesc->ptl, used for THPs. * @__page_mapping: Aliases with page->mapping. Unused for page tables. + * @pt_index: Used for s390 gmap. * @pt_mm: Used for x86 pgds. * @pt_frag_refcount: For fragmented page table tracking. Powerpc only. * @_pt_pad_2: Padding to ensure proper alignment. @@ -450,6 +451,7 @@ struct ptdesc { unsigned long __page_mapping; union { + pgoff_t pt_index; struct mm_struct *pt_mm; atomic_t pt_frag_refcount; }; @@ -475,6 +477,7 @@ TABLE_MATCH(flags, __page_flags); TABLE_MATCH(compound_head, pt_list); TABLE_MATCH(compound_head, _pt_pad_1); TABLE_MATCH(mapping, __page_mapping); +TABLE_MATCH(index, pt_index); TABLE_MATCH(rcu_head, pt_rcu_head); TABLE_MATCH(page_type, __page_type); TABLE_MATCH(_refcount, __page_refcount); From patchwork Mon Mar 4 11:07:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 209503 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1348708dyc; Mon, 4 Mar 2024 03:09:56 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWTydf8PZCPx+iCoIVASQx8fx+X1CCKejkrhwiPFeatZQRJY3JwvLEjDUDpiN7kaBGr/MN84mhj6POMn3DxbeZdYi0F7w== X-Google-Smtp-Source: AGHT+IGGQ4sGEnwwQDq8O8Qj5jjnI0uVvd+dVQRr6fZ+HgFMoLluZMckOLa5xPMiBDae4/CCWwCb X-Received: by 2002:a17:902:c105:b0:1dc:1878:84e2 with SMTP id 5-20020a170902c10500b001dc187884e2mr8773089pli.54.1709550596668; Mon, 04 Mar 2024 03:09:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709550596; cv=pass; d=google.com; s=arc-20160816; b=0x5GDOemcgpjvkQdb97zCyhqzIkwb7HB5lJDEPQdiYYCuNQDA5zGFaMk6DhHBVua5u whchn25jRIrZYSzhTRH/scHngkBKtOt8g+wK9ZX1U43brvPeoh5WqW+22YGbofUNDrsi KOtucC800TqPHnjkEBNk6oX2GcdTM44D6kriuVLEBTxOBcWy+G4yL9p966pAkv5JqmPd UAv5jW2dz1fBKGSosC4KNVABFoL26Z8FfAc75aK93dhkVrR2pMK0fluXToF0iALNACiY WR4du7Jlz14rNtwR64TRDaxSIIXCg9hrONYDGav5Uorqr0grL/lsZJgZhhLyf2aO7cQ9 DQSQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=2RLTgvH0qYoneoQ+N+6ayDYFDcXGD4luCEt+X8Py56w=; fh=S7bhFBj30rz8nWl0FOqKpNmiEFVcad6M7Ep4Dt0lCNw=; b=l7Uyos9AJRnnJLnGo0CN8v/RpivoWZq5PVnyQvR4AiBSoev//AQYKG5GYAmaSqL/9c k6kO6ncULI5xn8EAZNMSKm6bjX57WPyMVXpleZvYZy1H50R2Qq/gOTE3J5x0dadozyFc s3aNkZLn+FIH7KRYV5oivEVyekcMICoz8aY8ce+++WGdmGNPnYsYajZt7oGJXqdocW0n UGxr05JrViXNOHc5dBsUT9TRq/7uMB/S03fhwcBexlG0Vm4KreROOPwEyfAej+j4WudB Lo0wDObflwzwQTQDPPyPRA0KQr02/lDZL4OBWpxj0RTK+8i1d2RTAn5LiFePcHntYOCZ 8huA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=cio8SLAN; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-90480-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90480-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id q9-20020a17090311c900b001dc76ff8904si1572521plh.540.2024.03.04.03.09.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 03:09:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90480-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=cio8SLAN; arc=pass (i=1 spf=pass spfdomain=bytedance.com dkim=pass dkdomain=bytedance.com dmarc=pass fromdomain=bytedance.com); spf=pass (google.com: domain of linux-kernel+bounces-90480-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90480-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 2995E286854 for ; Mon, 4 Mar 2024 11:09:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A1E6838DFA; Mon, 4 Mar 2024 11:08:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="cio8SLAN" Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 9BF9739FE8 for ; Mon, 4 Mar 2024 11:08:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709550504; cv=none; b=VNchG/b8MkXaCzVOqId3qSERxwtdfVJa88Zm2Rjt9y1rqRe+ERtxdQkjqPoiDOkpth4KPLPjn7BGJ7p0Rsal6Opf2QQOU/0oSQVfzK7ouSJm7oPXDXjEEBnLuZ4dKViQSRUb9jm+MZ5Awi40TxOE+mPhD8GZV496ajTyFN56TAo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709550504; c=relaxed/simple; bh=FQ6sLDKliZQxGaM/0fZ2Dlbeq3FZV7uzrQlqY13q4kU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WcroKHtBwc0w4NUhz76DJqeYigjAzqHbGMdWObAQbUQXqwfdPTfhe0MZSgPIWrLFviW/yzqSEombSa5kx/yDpQv58ay5Vv0FVQOpErHjJ5hXAG6E28LcDnW6V2cQ8+OxqlZIVaVi7KU2FE6rox1RvEI7mSLS5+qKrhdtjU9edWY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=cio8SLAN; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5cfb8126375so673492a12.1 for ; Mon, 04 Mar 2024 03:08:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1709550502; x=1710155302; 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=2RLTgvH0qYoneoQ+N+6ayDYFDcXGD4luCEt+X8Py56w=; b=cio8SLANw7fertsc3r5ZmCdJ7hbRoaDpL1ZZveIYND2iSSCG0H3jQIvFnkg8NU4TrL 0jXiQF6nBkxU2381b8Szo8g8bZ2bHaiCYSXd0CrckzzeTdCC2+gxT+v1qEjlOzkP3mVV A+wdUOQT5UOx9rKNR+91muojmOi8zvj8aZ1zwLIhj80gHxqLE0F2pi3BhGT/UFyjO0Ch UYa8Bgj9W4YoQqshqox11kqr/yROvPVyk3JsylBheyYrJxy87YIUR5vV9bHfuPVU80GU pqmgvV14SD1/V7+nZVi578SwX33t1ItZZmC7KDWAPKMFRh5RNj6m9yaphnZiCeFxxLxY xbqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709550502; x=1710155302; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2RLTgvH0qYoneoQ+N+6ayDYFDcXGD4luCEt+X8Py56w=; b=XMWUikQqY9YwSVSg42XsuYmCt13ArZJ5yNhK59gGVU2p9m6+lM3zIGYQamsivi0Bms YuHwLQZ9G/7GFBfpOG30GK/V7AvkfxxNCDWWMYvCLWoybA0SdOj86+CgiJPVRnyLVz4Q jmeTCV1iCQe/gQxso10C3fxAv7JmOUHi+OVd0qNWUhAUb/nxBv7YeKPH+kVl8D3ZXDqL O5+Y1VODMtvk+gJLDlDpsdQ1IFARqcfg2GkoXy9pb51JRdAQ08AbNm3aeZ6JqqKroRUO zsBY547RwKslzNpPyMAULHHZlmiWEATVdM2mfXnM9pSXUfcf04Z1sxvQ8/HEh0+fcru/ QKXw== X-Forwarded-Encrypted: i=1; AJvYcCXgH0SzBJSI931Kloqj0cHvebiATKKS9AWnGNrhAuDs086K4XLYOpFk6ytMxjDUe+K+a5iB1DiOgd6EIcJquIvigaw/0fPFgN+GscY9 X-Gm-Message-State: AOJu0YwvfpsCjRJRLp7ejd/gEI5+noNwPVNK5eDjrYJABgZNvrnvFmzt TWUicyiT6th4k5Qm/keWK9YuVkCAIfdcqB5b/IS0rJdokI8dWwSODg4jvB/fzJk= X-Received: by 2002:a05:6a20:1b30:b0:1a1:480e:7711 with SMTP id ch48-20020a056a201b3000b001a1480e7711mr5045368pzb.0.1709550501853; Mon, 04 Mar 2024 03:08:21 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.154]) by smtp.gmail.com with ESMTPSA id y5-20020a17090aca8500b0029b59bf77b4sm587410pjt.42.2024.03.04.03.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 03:08:21 -0800 (PST) From: Qi Zheng To: akpm@linux-foundation.org, vishal.moola@gmail.com, hughd@google.com, david@redhat.com, rppt@kernel.org, willy@infradead.org, muchun.song@linux.dev Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH 3/3] s390: supplement for ptdesc conversion Date: Mon, 4 Mar 2024 19:07:20 +0800 Message-Id: <04beaf3255056ffe131a5ea595736066c1e84756.1709541697.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792593726692040378 X-GMAIL-MSGID: 1792593726692040378 After commit 6326c26c1514 ("s390: convert various pgalloc functions to use ptdescs"), there are still some positions that use page->{lru, index} instead of ptdesc->{pt_list, pt_index}. In order to make the use of ptdesc->{pt_list, pt_index} clearer, it would be better to convert them as well. Signed-off-by: Qi Zheng Cc: Christian Borntraeger Cc: Janosch Frank Cc: Claudio Imbrenda Cc: David Hildenbrand Cc: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org --- arch/s390/include/asm/pgalloc.h | 4 ++-- arch/s390/mm/gmap.c | 38 +++++++++++++++++---------------- arch/s390/mm/pgalloc.c | 8 +++---- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h index 502d655fe6ae..7b84ef6dc4b6 100644 --- a/arch/s390/include/asm/pgalloc.h +++ b/arch/s390/include/asm/pgalloc.h @@ -23,9 +23,9 @@ unsigned long *crst_table_alloc(struct mm_struct *); void crst_table_free(struct mm_struct *, unsigned long *); unsigned long *page_table_alloc(struct mm_struct *); -struct page *page_table_alloc_pgste(struct mm_struct *mm); +struct ptdesc *page_table_alloc_pgste(struct mm_struct *mm); void page_table_free(struct mm_struct *, unsigned long *); -void page_table_free_pgste(struct page *page); +void page_table_free_pgste(struct ptdesc *ptdesc); extern int page_table_allocate_pgste; static inline void crst_table_init(unsigned long *crst, unsigned long entry) diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 8da39deb56ca..4d2674f89322 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -206,9 +206,11 @@ static void gmap_free(struct gmap *gmap) /* Free additional data for a shadow gmap */ if (gmap_is_shadow(gmap)) { + struct ptdesc *ptdesc; + /* Free all page tables. */ - list_for_each_entry_safe(page, next, &gmap->pt_list, lru) - page_table_free_pgste(page); + list_for_each_entry_safe(ptdesc, next, &gmap->pt_list, pt_list) + page_table_free_pgste(ptdesc); gmap_rmap_radix_tree_free(&gmap->host_to_rmap); /* Release reference to the parent */ gmap_put(gmap->parent); @@ -1348,7 +1350,7 @@ static void gmap_unshadow_pgt(struct gmap *sg, unsigned long raddr) { unsigned long *ste; phys_addr_t sto, pgt; - struct page *page; + struct ptdesc *ptdesc; BUG_ON(!gmap_is_shadow(sg)); ste = gmap_table_walk(sg, raddr, 1); /* get segment pointer */ @@ -1361,9 +1363,9 @@ static void gmap_unshadow_pgt(struct gmap *sg, unsigned long raddr) *ste = _SEGMENT_ENTRY_EMPTY; __gmap_unshadow_pgt(sg, raddr, __va(pgt)); /* Free page table */ - page = phys_to_page(pgt); - list_del(&page->lru); - page_table_free_pgste(page); + ptdesc = page_ptdesc(phys_to_page(pgt)); + list_del(&ptdesc->pt_list); + page_table_free_pgste(ptdesc); } /** @@ -1377,7 +1379,7 @@ static void gmap_unshadow_pgt(struct gmap *sg, unsigned long raddr) static void __gmap_unshadow_sgt(struct gmap *sg, unsigned long raddr, unsigned long *sgt) { - struct page *page; + struct ptdesc *ptdesc; phys_addr_t pgt; int i; @@ -1389,9 +1391,9 @@ static void __gmap_unshadow_sgt(struct gmap *sg, unsigned long raddr, sgt[i] = _SEGMENT_ENTRY_EMPTY; __gmap_unshadow_pgt(sg, raddr, __va(pgt)); /* Free page table */ - page = phys_to_page(pgt); - list_del(&page->lru); - page_table_free_pgste(page); + ptdesc = page_ptdesc(phys_to_page(pgt)); + list_del(&ptdesc->pt_list); + page_table_free_pgste(ptdesc); } } @@ -2058,19 +2060,19 @@ int gmap_shadow_pgt(struct gmap *sg, unsigned long saddr, unsigned long pgt, { unsigned long raddr, origin; unsigned long *table; - struct page *page; + struct ptdesc *ptdesc; phys_addr_t s_pgt; int rc; BUG_ON(!gmap_is_shadow(sg) || (pgt & _SEGMENT_ENTRY_LARGE)); /* Allocate a shadow page table */ - page = page_table_alloc_pgste(sg->mm); - if (!page) + ptdesc = page_table_alloc_pgste(sg->mm); + if (!ptdesc) return -ENOMEM; - page->index = pgt & _SEGMENT_ENTRY_ORIGIN; + ptdesc->pt_index = pgt & _SEGMENT_ENTRY_ORIGIN; if (fake) - page->index |= GMAP_SHADOW_FAKE_TABLE; - s_pgt = page_to_phys(page); + ptdesc->pt_index |= GMAP_SHADOW_FAKE_TABLE; + s_pgt = page_to_phys(ptdesc_page(ptdesc)); /* Install shadow page table */ spin_lock(&sg->guest_table_lock); table = gmap_table_walk(sg, saddr, 1); /* get segment pointer */ @@ -2088,7 +2090,7 @@ int gmap_shadow_pgt(struct gmap *sg, unsigned long saddr, unsigned long pgt, /* mark as invalid as long as the parent table is not protected */ *table = (unsigned long) s_pgt | _SEGMENT_ENTRY | (pgt & _SEGMENT_ENTRY_PROTECT) | _SEGMENT_ENTRY_INVALID; - list_add(&page->lru, &sg->pt_list); + list_add(&ptdesc->pt_list, &sg->pt_list); if (fake) { /* nothing to protect for fake tables */ *table &= ~_SEGMENT_ENTRY_INVALID; @@ -2114,7 +2116,7 @@ int gmap_shadow_pgt(struct gmap *sg, unsigned long saddr, unsigned long pgt, return rc; out_free: spin_unlock(&sg->guest_table_lock); - page_table_free_pgste(page); + page_table_free_pgste(ptdesc); return rc; } diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index 008e487c94a6..abb629d7e131 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -135,7 +135,7 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long end) #ifdef CONFIG_PGSTE -struct page *page_table_alloc_pgste(struct mm_struct *mm) +struct ptdesc *page_table_alloc_pgste(struct mm_struct *mm) { struct ptdesc *ptdesc; u64 *table; @@ -147,12 +147,12 @@ struct page *page_table_alloc_pgste(struct mm_struct *mm) memset64(table, _PAGE_INVALID, PTRS_PER_PTE); memset64(table + PTRS_PER_PTE, 0, PTRS_PER_PTE); } - return ptdesc_page(ptdesc); + return ptdesc; } -void page_table_free_pgste(struct page *page) +void page_table_free_pgste(struct ptdesc *ptdesc) { - pagetable_free(page_ptdesc(page)); + pagetable_free(ptdesc); } #endif /* CONFIG_PGSTE */