From patchwork Tue May 18 15:25:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1480322 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 4Fl0FY2WVXz9sW8; Wed, 19 May 2021 01:25:53 +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 1lj1bR-0001LR-C2; Tue, 18 May 2021 15:25:49 +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 1lj1bN-0001KG-Qu for kernel-team@lists.ubuntu.com; Tue, 18 May 2021 15:25:45 +0000 Received: from mail-ed1-f72.google.com ([209.85.208.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lj1bN-0008Ao-Il for kernel-team@lists.ubuntu.com; Tue, 18 May 2021 15:25:45 +0000 Received: by mail-ed1-f72.google.com with SMTP id y15-20020aa7d50f0000b02903885ee98723so5939361edq.16 for ; Tue, 18 May 2021 08:25:45 -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=Zbktzc8JGwFCn7h8x5cdJmrAsexnZdHbRVELFyqG0QA=; b=Jt2+Yck6w3D5h+BQu61NiP+R2fP/GaPaPaCQJsSTJc76PNnvZ6G6mX9lRyp1fo4zzB 7hztp2fnUbJYWYbJ97H/8VhlHrmwKwnSYI/RC7BCjTyxwcJCGA/fvs9GJy58rMDZgDEJ 4buRNl+X20TlMbpv83NFtwloqi0XyAKE9tdHs6Hn3VswQqDasRKRT05OIWMlNIUtUArH lbxZ+hH8ztnqSnY8tMJAR6lKxdfGJnPgjjf+S90HEJhFBqN36CeDZG+cS+9FXaNsdmiE tkQaEoEXuvA66JUviyYPDCRXQ5SIG8JWKaeor+SKpHS6wNZiwSyGuWs7m9CznjnDwOUt csKg== X-Gm-Message-State: AOAM533iuYxt/t8zRGwJ52A475hd4Ecr0ptnH/eIizfnUzcmPfXwFS8O OaCSS5JnouaCE0DGnFBICBOhcHtcYRQkaOzu1TLwveCNrBzfAiZ23HFSlRPqtxhonVY93xOjJme /xKFtZs7aF5yWsLY/44ouPW6qb4MwnXMzoDjT8sQRVA== X-Received: by 2002:a05:6402:13c3:: with SMTP id a3mr7893530edx.18.1621351545332; Tue, 18 May 2021 08:25:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFmK0c2vjMqw76a2v7TleGu/7BXFn9J1vKd8WkPjb8JAH0Vi7ePswJwmabK+GFIvMgjI8Pfg== X-Received: by 2002:a05:6402:13c3:: with SMTP id a3mr7893512edx.18.1621351545093; Tue, 18 May 2021 08:25:45 -0700 (PDT) Received: from xps-13-7390.homenet.telecomitalia.it (host-79-19-135-103.retail.telecomitalia.it. [79.19.135.103]) by smtp.gmail.com with ESMTPSA id d11sm4969896ejr.58.2021.05.18.08.25.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 08:25:44 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [SRU][F/aws][PATCH v2 1/6] Revert "UBUNTU: SAUCE: aws: kvm: double the size of hv_clock_boot" Date: Tue, 18 May 2021 17:25:33 +0200 Message-Id: <20210518152538.197174-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210518152538.197174-1-andrea.righi@canonical.com> References: <20210518152538.197174-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);