From patchwork Mon Feb 13 16:33:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 56389 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2442891wrn; Mon, 13 Feb 2023 08:34:17 -0800 (PST) X-Google-Smtp-Source: AK7set9BOO3no/pz6ICRQT064M7lvOEdVbwY3Jf+YktAa6dytBKd3kFhpWlsZu8Qy6jC7+NNr5yl X-Received: by 2002:a17:907:c21:b0:8af:514f:1078 with SMTP id ga33-20020a1709070c2100b008af514f1078mr14800045ejc.31.1676306057542; Mon, 13 Feb 2023 08:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676306057; cv=none; d=google.com; s=arc-20160816; b=KmgAk57MO5XjeIPjOkq1+KxuW5tatdi/asCQBzOZawKDVaD1gh4MBlWDLuaJWlkp6l a+5a8hR1dmCyEywlw52Kul3OYv4BKRfedaGmNK3Cz519I1/hRkDwLN9j/Bj0K44BY6Fm BetAuG7VtmIstiA9oIjx/XQNDtlb3sVNQwEN/OaF55dPJhy22h5Qonz9cA5nu9Q2Dgcb vO7XHvhpnf4th5wNOmnAEzvayjMcYtgu+48/4EhK74BzK9piNOTP3GOPURFkCnZnoEBN FCy151v/+OwdhUugMtks2hOe25HuTEdGtT418YSQiy2m/NxAuz6zJt9PiCaHJBacggsn Gu6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qNEDXzKGcLxGE5vSCOn4Gl1824w8NdzbMa0+BJPShNE=; b=s5mpcVb0wiVkzZTWwzovZRRJaZWfWwPGqZ7BtWI6QQxJJEATAnJhlvS6uhclBq7sRo PyFnoXhnmknzsO5Pc+wCVcVZndJZ1meG2/mrGZJpNxcLvPXD/PBJYKj/xVuoGcccylJH be30MnTB+AOHJzjSZbwwySejZmObJ3KFiaMdH8eLnCbLinE79jZSMXSy8T93Xpa2HYO/ P68+F3ZLC0gX9/H1ag4ws4jRwcC1NsaHzZDB0DD3hoRd6XpLRIGzNtgi1v5loE8uvWFR NG9EBxgIXVOEWVD+9+gmPNiERbT4+qDUWkOkkZuq30BxFntEVsALO7JBLT5dLFJF2AzS +04Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grsecurity.net header.s=grsec header.b=b2NaKfo1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=grsecurity.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e13-20020a170906748d00b008af2b251709si16048987ejl.956.2023.02.13.08.33.54; Mon, 13 Feb 2023 08:34:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@grsecurity.net header.s=grsec header.b=b2NaKfo1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=grsecurity.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231161AbjBMQcD (ORCPT + 99 others); Mon, 13 Feb 2023 11:32:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230507AbjBMQbt (ORCPT ); Mon, 13 Feb 2023 11:31:49 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAD3D1E1FB for ; Mon, 13 Feb 2023 08:31:42 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id o18so12885078wrj.3 for ; Mon, 13 Feb 2023 08:31:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=grsecurity.net; s=grsec; 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=qNEDXzKGcLxGE5vSCOn4Gl1824w8NdzbMa0+BJPShNE=; b=b2NaKfo18h8EQ0ckZNBtyxLzCyw5M9p4fhmVsYeoz0XiLrx8boQvjYY21CLoNE1E3l H2uKeunpMpjc+4/RcIpCjUOFvo5V5nIvIHtgLSh2lVO0FW8OgZi1NfbTMWhbOHibIBxs 5jJ1DPqKsLjmJeU6t5Ic1ZjRykllSad8RqWA+6ZU/GJDJpmmrDDnBr+JpjL/ET+8ogU+ 1XGH9acCYd2vKMnrzWIs7LrbpER/2dfdUV24Ux6YMuwQ5jDUN6s6bF663wPubApxlPhv iecR8CIbWzOtqjCLXu9oCTSgZxTZm1srzQXDdvH4enhvnQgNSAOW5E2PyoF1rWUytJkY tZAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=qNEDXzKGcLxGE5vSCOn4Gl1824w8NdzbMa0+BJPShNE=; b=pbXE3arJT4q5Quq7Ew5y2ni0ej3R+ad+uajpUHI5HtuTXHht3hPVHHJ8GASymZIwPf decaSXtWMvLefEkpXq07pItKXBWytqSTZZTfurUehHDpVdmk1ifDo511idRTITiomUDN bfmk5FOqy4+gGSci1pigM/22gnCVXgGB4HakHwL9ob23JEMl8g53mY0ExHs6TcDvns9J Ek+TfLabbssnMR1B7dxn5ie9b/737ndWlBo3EmSFMkLg7UpZJ2hoEWkP+EiEQYqck5IF 9FL+eKproF3qi5JynLOegrhiITsAJrLTQBN0LupShKJwVV+w+SKseUGZf47aFxPn6PvD k+Zw== X-Gm-Message-State: AO0yUKUVoXOevY/7O+XxEcCk8qPeWCohEGK1hoM3IHVWMOkDFGQF5IUF nvPukJmqFYa5/6X6kKmkf2fFEQ== X-Received: by 2002:a05:6000:1c7:b0:2c5:585d:74c6 with SMTP id t7-20020a05600001c700b002c5585d74c6mr4064199wrx.12.1676305901519; Mon, 13 Feb 2023 08:31:41 -0800 (PST) Received: from nuc.fritz.box (p200300f6af2efd00225e3e97da45b943.dip0.t-ipconnect.de. [2003:f6:af2e:fd00:225e:3e97:da45:b943]) by smtp.gmail.com with ESMTPSA id s7-20020a5d5107000000b002c556a4f1casm3877993wrt.42.2023.02.13.08.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 08:31:41 -0800 (PST) From: Mathias Krause To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sean Christopherson , Paolo Bonzini , Mathias Krause Subject: [PATCH 5/5] KVM: Shrink struct kvm_vcpu Date: Mon, 13 Feb 2023 17:33:51 +0100 Message-Id: <20230213163351.30704-6-minipli@grsecurity.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230213163351.30704-1-minipli@grsecurity.net> References: <20230213163351.30704-1-minipli@grsecurity.net> MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757734300477617462?= X-GMAIL-MSGID: =?utf-8?q?1757734300477617462?= Reshuffle the members of struct kvm_vcpu to make use of otherwise unused padding holes, allowing denser packing without disrupting the grouping nor introducing wrong cacheline sharing. The embedded mutex and spinlocks continue to not share cachelines, so no regressions because of lock contention leading to cacheline trashing is expected. This allows us to save 40 bytes for 64 bit builds. Signed-off-by: Mathias Krause --- include/linux/kvm_host.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 4f26b244f6d0..6e3e5a540037 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -330,8 +330,8 @@ struct kvm_vcpu { int srcu_depth; #endif int mode; + unsigned int guest_debug; u64 requests; - unsigned long guest_debug; struct mutex mutex; struct kvm_run *run; @@ -340,8 +340,8 @@ struct kvm_vcpu { struct rcuwait wait; #endif struct pid __rcu *pid; - int sigset_active; sigset_t sigset; + int sigset_active; unsigned int halt_poll_ns; bool valid_wakeup; @@ -356,10 +356,10 @@ struct kvm_vcpu { #ifdef CONFIG_KVM_ASYNC_PF struct { - u32 queued; struct list_head queue; struct list_head done; spinlock_t lock; + u32 queued; } async_pf; #endif