From patchwork Mon Feb 5 17:00:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1895324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TTCMM0M3Tz23g7 for ; Tue, 6 Feb 2024 04:01:18 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rX2LC-0000vK-HZ; Mon, 05 Feb 2024 17:01:06 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rX2L4-0000uK-3U for kernel-team@lists.ubuntu.com; Mon, 05 Feb 2024 17:00:58 +0000 Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id BA9CB3FE49 for ; Mon, 5 Feb 2024 17:00:57 +0000 (UTC) Received: by mail-oi1-f197.google.com with SMTP id 5614622812f47-3bbb6fd2cceso5508277b6e.2 for ; Mon, 05 Feb 2024 09:00:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707152454; x=1707757254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1K8kkHkOUQRC0ETvhwM3lqGH6eMQ3pT/9OOQLoGSOoM=; b=nJ9CoYVej3YZg1jq9F0zRAL0NE8uE2iL8Ia3BbNmNbmEROMjfqHreCxZjV+cUOMXJ6 dkSEEqUYtvi3+iDDZ5k01wbu0Ia54C/g/0K9U7vVEpzUS7/z4qR3ZpMzeOa7HSyWlqbl 5mmLiElOliLGJ77W3kHq9L+vdTDJVtJwM2TSP9DmF6IxBKibmE0WMfzDiOv3H30e50EX fuAPfifyir/xf7QDwiOw9zynYUoVjQBtKv/tPcj4rWuc+9RLvBGzUnhZfmn1E5tq5JE2 8D1/J0f82x69X7nWcURBhOpAred5O7eMgUHx2e4UPVSDfzyJ5tI+3i+OUqywtqRBYZk8 G2GA== X-Gm-Message-State: AOJu0Yx+h0/YUVUGS/p8KJKLSQQWurkkKYSf6HBwdXardaPrmB55J+3+ C8Y31hbGVHjfXrTyueXkPHG1C3SBCCZYZASheVnSeChmW42WtxAThZ/PIW//y66iq2nOsxjjdhX H+eVbT63u3B2pw00wcrjeSlgSnsRYUBLO2a+vwsi5MZ9XUwWlGWg0gG9nr70d8kI+xEgW/jvi0p Pf/PpXI/MUww== X-Received: by 2002:a05:6808:d47:b0:3bf:e324:708d with SMTP id w7-20020a0568080d4700b003bfe324708dmr294507oik.10.1707152454550; Mon, 05 Feb 2024 09:00:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHyGWFnXtm9WPHL0zs37xadRmavDnJRyEl3Dl33gULXq0PuhZWzz+4944KpxI9jhxVGQ+TjQ== X-Received: by 2002:a05:6808:d47:b0:3bf:e324:708d with SMTP id w7-20020a0568080d4700b003bfe324708dmr294494oik.10.1707152454236; Mon, 05 Feb 2024 09:00:54 -0800 (PST) Received: from smtp.gmail.com (h208-73-92-250.mdtnwi.broadband.dynamic.tds.net. [208.73.92.250]) by smtp.gmail.com with ESMTPSA id ic14-20020a05622a68ce00b0042c25a4c3b6sm106817qtb.58.2024.02.05.09.00.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 09:00:53 -0800 (PST) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][jammy:gcp][PATCH 1/1] UBUNTU: SAUCE (no-up): x64/mm: Fix incorrect argument to notify_page_enc_status_changed() Date: Mon, 5 Feb 2024 11:00:52 -0600 Message-Id: <20240205170052.606221-2-john.cabaj@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240205170052.606221-1-john.cabaj@canonical.com> References: <20240205170052.606221-1-john.cabaj@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2052451 27ba8c7 modified notify_page_enc_status_changed(), when it should not have. Revert this portion of the change to correct the incorrect arguments. Signed-off-by: John Cabaj --- arch/x86/mm/mem_encrypt_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c index ff51890ce49f..468d15c05f28 100644 --- a/arch/x86/mm/mem_encrypt_amd.c +++ b/arch/x86/mm/mem_encrypt_amd.c @@ -315,7 +315,7 @@ void notify_range_enc_status_changed(unsigned long vaddr, unsigned long size, bo psize = page_level_size(level); pmask = page_level_mask(level); - notify_page_enc_status_changed(pfn, size, enc); + notify_page_enc_status_changed(pfn, psize >> PAGE_SHIFT, enc); vaddr = (vaddr & pmask) + psize; }