From patchwork Wed May 19 15:15:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1480993 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Flbz165WPz9sXF; Thu, 20 May 2021 01:15:25 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ljNup-0001qH-Qu; Wed, 19 May 2021 15:15:19 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ljNuo-0001pw-UB for kernel-team@lists.ubuntu.com; Wed, 19 May 2021 15:15:18 +0000 Received: from mail-ej1-f70.google.com ([209.85.218.70]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1ljNuo-0003nC-MV for kernel-team@lists.ubuntu.com; Wed, 19 May 2021 15:15:18 +0000 Received: by mail-ej1-f70.google.com with SMTP id x20-20020a1709061354b02903cff4894505so3821001ejb.14 for ; Wed, 19 May 2021 08:15:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Qr3V8tN9A9/qmXBsM0myOC1JV++A9eMiGMfzj4XCkw=; b=G/YtfUjxgs0hKklJ4N8zCNMhxiWob1ucluxk6WewLyi9mWZ2/s17jvGD8K2I0QFXhP OUlDKyxKpWH6LGKeS19yneN8QDuV9FXmsWaRbkenDp/AAgaHMpIa/+fJzV3cn3u+veGx kdYD/A/utb/JqdsAFRNdGHXUa46MBZt2ChHex2UrUNBJRGP0xA9FWMxhvyJ52SfxWU6l 2lLHgWtUwN97uGZ67XXdUFbg/n37pwE7meL5tN09RBeUzrQs6QQxZIx7YftX6a7Ka6r4 IGiNqq/GSmp5um0dTKKfx22czQ2TnNqbWna91Q43ydAHOBhJ2/c4TmzSBLPc5yFJB0F7 b3ZA== X-Gm-Message-State: AOAM532fxIGg3slLxPZiT/iD4r5+JdNUCIB7CV5prYw8DGGtENoUiYnm 5rBDIvEcifcawEDW+w8lvg9eTLDpFDgOYwGqLhb8HXeyHdK1kmDsCQWtWdF3co6A1VlE+YHGgDx Op9HHjHFQfBRMuOKCIoXSGg+CiZwlsvrBoufPe9TuNA== X-Received: by 2002:a17:907:77c7:: with SMTP id kz7mr13577680ejc.54.1621437318415; Wed, 19 May 2021 08:15:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7Apq+L7nKKcYbAcUPswvA7aIN9EAyDT2G+imHd0j/gEUVZDUJ6GX90MmyDZDpdtKwfT9NoQ== X-Received: by 2002:a17:907:77c7:: with SMTP id kz7mr13577658ejc.54.1621437318194; Wed, 19 May 2021 08:15:18 -0700 (PDT) Received: from xps-13-7390.homenet.telecomitalia.it (host-87-19-3-42.retail.telecomitalia.it. [87.19.3.42]) by smtp.gmail.com with ESMTPSA id d17sm5624051ejp.90.2021.05.19.08.15.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 08:15:17 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [SRU][F/aws][PATCH v3 1/6] Revert "UBUNTU: SAUCE: aws: kvm: double the size of hv_clock_boot" Date: Wed, 19 May 2021 17:15:08 +0200 Message-Id: <20210519151513.309935-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210519151513.309935-1-andrea.righi@canonical.com> References: <20210519151513.309935-1-andrea.righi@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/1920944 This reverts commit b797d49573059dd6df7b929fa4b3eb7d02d6859e. Replace temporary workaround with a new patch set that addresses the problem in a better way (see next commits). Signed-off-by: Andrea Righi --- arch/x86/kernel/kvmclock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 4466df2b0fed..904494b924c1 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -46,7 +46,7 @@ early_param("no-kvmclock-vsyscall", parse_no_kvmclock_vsyscall); /* Aligned to page sizes to match whats mapped via vsyscalls to userspace */ #define HV_CLOCK_SIZE (sizeof(struct pvclock_vsyscall_time_info) * NR_CPUS) #define HVC_BOOT_ARRAY_SIZE \ - ((PAGE_SIZE * 2)/ sizeof(struct pvclock_vsyscall_time_info)) + (PAGE_SIZE / sizeof(struct pvclock_vsyscall_time_info)) static struct pvclock_vsyscall_time_info hv_clock_boot[HVC_BOOT_ARRAY_SIZE] __bss_decrypted __aligned(PAGE_SIZE);