From patchwork Wed Oct 25 02:17:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1854689 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 4SFXdS44wSz23jp for ; Wed, 25 Oct 2023 13:17:47 +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 1qvTSe-0001Zr-V1; Wed, 25 Oct 2023 02:17:33 +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 1qvTSY-0001YU-D5 for kernel-team@lists.ubuntu.com; Wed, 25 Oct 2023 02:17:27 +0000 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (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 E291D3F68F for ; Wed, 25 Oct 2023 02:17:25 +0000 (UTC) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-778b25af933so570164285a.3 for ; Tue, 24 Oct 2023 19:17:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698200245; x=1698805045; 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=/fTEs6VPWMyzomt5AZR2rQ5pmR+EIxeMJaDq2G5L2lQ=; b=uCxH99QktE0YadbyfKxCGv++7Epz/CGOgimq+UA6BrlOHQiKsbMK0SPUJX4AzhtN+E +vgzyXG3O+kbSmJQD5xyTMv+PHQTWLIbfCRyvC+JziC9MagIzfa09dqnIRqH/0zyTYAJ eAxYhN7WO/kcIffFQkl1FMte95j74nj6/WUlglEdkEvyi0P2TGvIsnFrRQW1xCBb5ecP bnW+mm/WHLG7QWTjLbAYKJkjJDJ8YUHQWRG4l1HJt0rK6c6h4z8GYE6B32+Sar0cZbsA lYQFBa0QEXZLs5dxU5zJmkvv6zbjt1fY1/JlO6OcevPGqVEHrkEWdfSSSTO0wPTFfB9b wrdw== X-Gm-Message-State: AOJu0YzqOUfriSVgBScVEIzXFMzgWwRRlseSuirF7vhWIgkwOHW3VAOv gxiTOtF3kYcLI/GGuWyp7haNT2NWcIJQrgzM9Rfz8bgEeiRaYp2zM1aN62WAe1MlehJP65kdcn1 GJPK+rJzlkAbJagU58kOF7OBPLcG4y7gBpfklmojSGPBB+cel7Q== X-Received: by 2002:a05:620a:2906:b0:779:db6b:77c8 with SMTP id m6-20020a05620a290600b00779db6b77c8mr8867027qkp.7.1698200244957; Tue, 24 Oct 2023 19:17:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG78aMLpopVq9qKZ76XKsoFaFWL0BpbDy6LgzfaaY/f1JpH4eSF+qZ+SBB6NFJXDI/tVzFGxQ== X-Received: by 2002:a05:620a:2906:b0:779:db6b:77c8 with SMTP id m6-20020a05620a290600b00779db6b77c8mr8867015qkp.7.1698200244713; Tue, 24 Oct 2023 19:17:24 -0700 (PDT) Received: from smtp.gmail.com (h69-130-246-116.mdtnwi.broadband.dynamic.tds.net. [69.130.246.116]) by smtp.gmail.com with ESMTPSA id m26-20020ae9e71a000000b00767dba7a4d3sm3831535qka.109.2023.10.24.19.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 19:17:24 -0700 (PDT) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][jammy/focal -gcp][PATCH 1/1] UBUNTU: SAUCE: (no-up) x86/mm: Fixing notify_range_enc_status_changed incorrect argument Date: Tue, 24 Oct 2023 21:17:22 -0500 Message-Id: <20231025021722.43875-2-john.cabaj@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231025021722.43875-1-john.cabaj@canonical.com> References: <20231025021722.43875-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/2040337 ac3f9c9f1b37 introduced change to notify_range_enc_status_changed() to accept page size instead of number of pages, but function was not updated. Signed-off-by: John Cabaj --- arch/x86/mm/pat/set_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index d72661f7c8ff..a749fde9a772 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2040,7 +2040,7 @@ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc) * Notify hypervisor that a given memory range is mapped encrypted * or decrypted. */ - notify_range_enc_status_changed(addr, numpages, enc); + notify_range_enc_status_changed(addr, numpages << PAGE_SHIFT, enc); return ret; }