From patchwork Mon Feb 13 16:33:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 56386 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2441936wrn; Mon, 13 Feb 2023 08:32:27 -0800 (PST) X-Google-Smtp-Source: AK7set8kbreCjtVrSv0DRRVuyFuntfo4T82lK4gA2FS6jDnplZmu9ryZZ61vVnJztcliKeP0mZyx X-Received: by 2002:a17:906:b148:b0:88c:d0b3:27d7 with SMTP id bt8-20020a170906b14800b0088cd0b327d7mr29715821ejb.24.1676305947830; Mon, 13 Feb 2023 08:32:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676305947; cv=none; d=google.com; s=arc-20160816; b=owozn5qQb/ZgCV7++80CLf3WsjBTi1/aoL03HuL32qcJJK2oySin+GiIZxOmI4RqDA 2hLqe6LkSEycKDXJRO4mR3uN74W3bIxlI6AdO9YsD4KogXcULq3BxK5fylyjb+M9nCVI GhUzdetYlnM83mxo78RuX95x/PlbHpA3Zu4bkGShJ4L8KfX3FgKXMARLAnQ5HlRLOfJy PXnRdRpeXD1thGN7PJFYn2p4BFhhPTfk5byEBBlIRV2JUB+/+1vCN9s9UmKsQQhd7Rx5 EKi83EhRIbdyrnZEqjQVZ25cLviJ/VOh10k9vqAQDACIww/1wfGmTfZO4zyYQjnGd8dk QrZw== 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=h3qVJ0bF2LOwR9FYE4JKJYonbraLFt3EzjvQr+HEt5I=; b=FFaC+6Xh76v0Y5ykQIbZtY8ubVD/Rv3V/m0j8CPtZM5dYHzZYaTG23IHNXSWzP3joD aWdq/p76G1iS+EUCBjrLwER6GnKTMxwHdV/OKxwWLAzrQS702nLEkFlC17j5NzC26K6X pW+jIVEBbfZmuczeNUPIz3sFCqQ0svhRppayQr0Ob6JFXzKhWeMZvINbZ0MaQBLRHkWM 3oS/dP/a3grW866fVSxRooOMDUDAMlTIkc1TzMAMP84vcWZhBwn8SIJ6+/LFRro63c4V Tj/5gp75mG8DbLkzKJ5KxhuxTaa5IAIj/8FF5a7CgyHG7M6FGtMspbLtmIXM3yyGgB8K i5lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grsecurity.net header.s=grsec header.b=liepqDU8; 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 vs24-20020a170907139800b00887ba300062si11843448ejb.322.2023.02.13.08.32.04; Mon, 13 Feb 2023 08:32:27 -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=liepqDU8; 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 S230475AbjBMQbv (ORCPT + 99 others); Mon, 13 Feb 2023 11:31:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230225AbjBMQbr (ORCPT ); Mon, 13 Feb 2023 11:31:47 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4019CC0E for ; Mon, 13 Feb 2023 08:31:39 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id o15so9554916wrc.9 for ; Mon, 13 Feb 2023 08:31:39 -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=h3qVJ0bF2LOwR9FYE4JKJYonbraLFt3EzjvQr+HEt5I=; b=liepqDU8BjQRRlqGydEYdx93GNpUuRUB4f8PDXBkqBGH0W6S0XWpBVYCZsc9iErDlS fF+K4LR1GHvjQnpF97bj/CVsvnrKoJ523VRQayK+4FQ7p1fY2/qYxbtJBsMNefPNWGKN XA13eaXGPssEhfaDk12KteXLktoHVOBNblEcY/nfGVKsN2sGa9yaPvAtmd/psdS1iQAT E2sx58UlnbcY1v+x8cApav0t2D/1s4vjuSakMZuzpx9Mys26KSYeBriJ9kqLXl5Xgw67 oNYZqiPvoHBjCx4Xivs0PRtVRLTvZt6YolFwluFRmg/D3UgEr1RSKjW/o2UsOVlxLsIc /z6A== 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=h3qVJ0bF2LOwR9FYE4JKJYonbraLFt3EzjvQr+HEt5I=; b=tFHEWIC4pkqrHp17geD/HELzbGpFpNQ6qPaB2gfUrQVs79pTYcLmB5cUwdJZ/xBX+K Xj2lWme06bOI66iHBL2JzBCGk87M57+w5bzPoI/QRuyj6BkNk/7RFaYssY//OV6ot4vx +nlDBXa+obW/pywwANqRjAJt6lsLQpRq73TJCt3iG1xhNqbavr/0yswJhWxE6kGb9aVq wvikPPiTnT0QcNRSJZTkwGMfF+B5N6bNbNcRA/z3f29Z5QgKsUT40EnP0PpVc9OX5jd8 bnf0RzEXGowk10nrx5FIXMzlf16h1roQz0DAvL88Ilag9/3tJoIh4PH0+2MoP5VFdhtW APQQ== X-Gm-Message-State: AO0yUKUP6Y+P+mDuxg9vmM9mcZAq2m5H2F0TUOwGQbACCCexK9D3+WyD ZdNlyQSW4Q8cV0/FjpxBR2fG5Q== X-Received: by 2002:a5d:42c9:0:b0:2c5:4f29:c103 with SMTP id t9-20020a5d42c9000000b002c54f29c103mr7902079wrr.52.1676305898353; Mon, 13 Feb 2023 08:31:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 08:31:38 -0800 (PST) From: Mathias Krause To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sean Christopherson , Paolo Bonzini , Mathias Krause Subject: [PATCH 1/5] KVM: x86: Shrink struct kvm_pmu Date: Mon, 13 Feb 2023 17:33:47 +0100 Message-Id: <20230213163351.30704-2-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?1757734185495826904?= X-GMAIL-MSGID: =?utf-8?q?1757734185495826904?= Move the 'version' member to the beginning of the structure to reuse an existing hole instead of introducing another one. This allows us to save 8 bytes for 64 bit builds. Signed-off-by: Mathias Krause --- arch/x86/include/asm/kvm_host.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 6aaae18f1854..43329c60a6b5 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -516,6 +516,7 @@ struct kvm_pmc { #define KVM_PMC_MAX_FIXED 3 #define KVM_AMD_PMC_MAX_GENERIC 6 struct kvm_pmu { + u8 version; unsigned nr_arch_gp_counters; unsigned nr_arch_fixed_counters; unsigned available_event_types; @@ -528,7 +529,6 @@ struct kvm_pmu { u64 global_ovf_ctrl_mask; u64 reserved_bits; u64 raw_event_mask; - u8 version; struct kvm_pmc gp_counters[KVM_INTEL_PMC_MAX_GENERIC]; struct kvm_pmc fixed_counters[KVM_PMC_MAX_FIXED]; struct irq_work irq_work; From patchwork Mon Feb 13 16:33:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 56387 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2442464wrn; Mon, 13 Feb 2023 08:33:29 -0800 (PST) X-Google-Smtp-Source: AK7set9JaNMcnFD98tMGgGFiRcM21ltanALMe7JraDLYKggKmu5ExwtoXSw4TITLS6yh7t+qp4WS X-Received: by 2002:a17:906:28d7:b0:86b:935d:37f0 with SMTP id p23-20020a17090628d700b0086b935d37f0mr23548622ejd.55.1676306009115; Mon, 13 Feb 2023 08:33:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676306009; cv=none; d=google.com; s=arc-20160816; b=YUkYnxodyAk2orNNVYdF4fk/mcWcFx5gqtIuKTqBkLjOyzcFOiF27/EcrQw5H8E6IP zYCJ2lL3q6OuCoiYm6K1X7pWcr2zyAj7Iy4UeV00+RpalbklY1AzT78B7W5D+ybypKWd OJ1Se2lBv5B//fgg1bApJE7cDSy/oVL4cLlTzwFqkgBXDpdqIYh5L+t0qJybSVAht89X iVITx6FhHnh3ha4rBdwiXVlD1cGpVPvoleT6fBt6Ygd6Gn3saPbnBPsQFz5zNai+H1PN cSIx1j/r9Jj8OBs4mYS5FpYGBx6M2WcKRWqALkLzwf0N7j0BSJJJgO4Qo8ayzV8PwUho JuRg== 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=gL3WY5uINlzkgyRq7H7dB8gj8YytqwpDUD1ql7z7pK4=; b=jOxW7s60acS9IqcLr4UiQepTF7/d+8s7/p9XHBK7RlIJNZJv65fVwO3OiVrjRRA3Vp HiFtLFUWY3Qx3k0iKA/hjUAExlLBN+OSnYk/tcjdSvA5/L8iss72/lijHYmPzz+i0jcu rjofT+MB7sA4TNsQtqA74pGykGdWg6PoV++v0zk+zekhs4oQnu6cb83S65sqVtlPALMn fgRuP4lyvtHTrpjeknsfyOzC5HzqwM0lgE5ZX5gTd8X3lxafKKJ8cYLtPUr1vwsmfwNm ci9QwxBDuDrzTwA3scUlDZUfrlSZ99iWMU4VBXRg32CNrqubUCKuotakSmaR4oJaVOJT ZgPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grsecurity.net header.s=grsec header.b=hPTxoCu4; 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 cq22-20020a170906d51600b0087bd501de66si14072640ejc.828.2023.02.13.08.33.06; Mon, 13 Feb 2023 08:33:29 -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=hPTxoCu4; 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 S230504AbjBMQbz (ORCPT + 99 others); Mon, 13 Feb 2023 11:31:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230347AbjBMQbr (ORCPT ); Mon, 13 Feb 2023 11:31:47 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8367AE38E for ; Mon, 13 Feb 2023 08:31:40 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id j29-20020a05600c1c1d00b003dc52fed235so9489726wms.1 for ; Mon, 13 Feb 2023 08:31:40 -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=gL3WY5uINlzkgyRq7H7dB8gj8YytqwpDUD1ql7z7pK4=; b=hPTxoCu4/JNwETqutr1XeI0h2A+vQZHDu54xpEqdCBR+IiDlUtuV/j4MxbmdYjgfT0 BqUUIcAHdOCLwtamrYQuCY66ss1l5mfGSbv9idlxRI8p/BgqUCO2HCXDbduL0kwnpcxu Ko6jubB915WKqxj/jqW1yi5Vw1LyFiUqh/dM7fIlGEC4O1dUZoPSOag6xbrHj4AoiimM ELFRh1jdJsQq5xnsYHnF955YXk9HZ+zs/bZqnwbsYEyjVVWBQXnuNxHYQZvPLmEtO7hr ozn5jcy0D74BwZc5gNHRMgBvW7880niRu+QHMQjDSoqg5HcH/ehq6VWrObnqQLkt8KXD OiQA== 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=gL3WY5uINlzkgyRq7H7dB8gj8YytqwpDUD1ql7z7pK4=; b=4cttk3v9/TjcRB5+VhJLc1WqVZC2GUkBiiGoCyVAMgd3iGtTVegeBPgEFk3xzf9rOd 3WrAvZqWVL9+dYfXKviH8yEdMz19xTczRXndtyx0Gx+f8VNnzpXyQCqy/mZ66+szzkzx 9xMwnohpLZsYhMl9CMfIB/Dlo7b5uthpDYuqS5q800KHUSEdsTy74Wwc19XRLfONTH/L Nk/LDY8DaLSSkl67CcFjeI7lppVu5VDyNATWFQfspNVcr9BQfOGqP1qAkkekxwkGJN55 Qkad4keOb0ks3d2OYia9hONVEq2rLS1Jjo+gjgm5jJYHYYRQRVa6oAvtm9/tcTv0/sgm tufA== X-Gm-Message-State: AO0yUKW21Koq0CpfycF1pMHLAInbMy6TQuLpEJ7YsCh97SFvOuM5eT7d ZJCaaiIVHKMnbqDMf/v3Em2iGA== X-Received: by 2002:a05:600c:16d4:b0:3e0:fad:675a with SMTP id l20-20020a05600c16d400b003e00fad675amr18623402wmn.38.1676305899157; Mon, 13 Feb 2023 08:31:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 08:31:38 -0800 (PST) From: Mathias Krause To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sean Christopherson , Paolo Bonzini , Mathias Krause Subject: [PATCH 2/5] KVM: x86: Shrink struct kvm_queued_exception Date: Mon, 13 Feb 2023 17:33:48 +0100 Message-Id: <20230213163351.30704-3-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?1757734249934537024?= X-GMAIL-MSGID: =?utf-8?q?1757734249934537024?= Reshuffle the boolean members of struct kvm_queued_exception and make them individual bits, allowing denser packing. This allows us to shrink the object size from 24 to 16 bytes for 64 bit builds. Signed-off-by: Mathias Krause --- arch/x86/include/asm/kvm_host.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 43329c60a6b5..040eee3e9583 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -701,13 +701,13 @@ struct kvm_vcpu_xen { }; struct kvm_queued_exception { - bool pending; - bool injected; - bool has_error_code; + u8 pending : 1; + u8 injected : 1; + u8 has_error_code : 1; + u8 has_payload : 1; u8 vector; u32 error_code; unsigned long payload; - bool has_payload; }; struct kvm_vcpu_arch { From patchwork Mon Feb 13 16:33:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 56388 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2442768wrn; Mon, 13 Feb 2023 08:34:06 -0800 (PST) X-Google-Smtp-Source: AK7set/OUUSmVFBbosehpf9PMPxT4qx6M1imYD95d4tAqGrhOSh+jZtbO3QQQ9vJa30gHD4qpDW0 X-Received: by 2002:a17:906:942:b0:888:7ac8:c0f4 with SMTP id j2-20020a170906094200b008887ac8c0f4mr26098925ejd.25.1676306046754; Mon, 13 Feb 2023 08:34:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676306046; cv=none; d=google.com; s=arc-20160816; b=ejfZb0kNt3qfIt0UpIxJ2baBomqxRi1+2ouiRI/aUdIsbvUkPCuowzbelMGOz/Fh0p IrhEX6J+3p8GwJgY0FaOo9V0s8h4ZVVIQtcerrNjFfJT1gCnWUKZKweaWWkK50ZWsJGi RRgsUXEB7JHytWlkTeW86rEiCQUdowtxP9u6n2W7+b80Wh07J8pVM7Hf+cjk1BcK8i7t lPJW+NgrRvN8Ch+pjnZhmMdFQCJVMLpaxQ55hnKeeDkbYSlknKXXU2FUz5/ggAw8ZmKM XLTZxEU/C4uHl5mlF058HwaOiR+vVY/EhgOf9dZkz2yZSSp6lfaLbDgZTpWdfKHtx3JP NdiA== 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=M1IcDb7o/gYGclSpaFMTR0Z6rRoV6K10f7w16ZZ0sHg=; b=iQdtfAReKOLbqbNJPvhVwvpS9kpmDnCsAx6vqYZHBc0wa3fuLlCNNeUvB+yZpITxrW el4o3tV+QYA3fy0pACQUQN4vftQYBQ1VemG66HlNcsukPLfy1565m1d6YiYLy1cTJWUX CD4zuizsBZEs5l+aBZIksT+SIHSoIfZBM12uXTzVtnfZyWoMRBM9SWJvj9P0cJp6h2Wm wlQOUkWIX397eCFEBWOBaKjvlpz0GaJI2U789sA3XjD1iWfQZ6mJuwK+G3CBNXeE3lbi eY0LwrcJiSvMI2t+nWVij081mv+KjF341CurBJnHFSUKlUfdtXmj1ukuT/mCEKuolwgs Uv8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grsecurity.net header.s=grsec header.b=EAEv2qg0; 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 mt19-20020a170907619300b007c1753251a4si13068292ejc.928.2023.02.13.08.33.43; Mon, 13 Feb 2023 08:34:06 -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=EAEv2qg0; 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 S231190AbjBMQb6 (ORCPT + 99 others); Mon, 13 Feb 2023 11:31:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230425AbjBMQbs (ORCPT ); Mon, 13 Feb 2023 11:31:48 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 642C41DBAA for ; Mon, 13 Feb 2023 08:31:41 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id bu23so12850349wrb.8 for ; Mon, 13 Feb 2023 08:31:41 -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=M1IcDb7o/gYGclSpaFMTR0Z6rRoV6K10f7w16ZZ0sHg=; b=EAEv2qg0oPGOf8z7OLWgmMYZJNXgIakX8VzrnhYE0qmI1XNlgtTc3jEmA/zL/eEPvH 7uzW8RC5fI5YNdFUjtulJwA6m35Izs+lVhJxM/E8UMzi3lyI6YMUOFRNvq2PbHDWM0pj xXOjGoHkZVrFDnR9XkCG60Za8tTWfWHE74nnFCoMMmUoauismMhg5jDSCdbB5/cg2VP5 MnyEV8WBnfel0PY3ANXLB8kBPhRREzFAekvWpOJBxyuVg6LuDGsJP3PTun0H+P59/vuT GanQZqrhhBygyaIs/m/PiJyxCUa68RmyjaVB/daFvEcM2qIdrXvadBqvFIWCtjqb13TJ pSNQ== 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=M1IcDb7o/gYGclSpaFMTR0Z6rRoV6K10f7w16ZZ0sHg=; b=gLECYO3h5H2gX8Bx8TiSSZwxQ9MnORtHPZgRqVEk5khiENM38mi+rZm9XYjghw3VON DEAyfGygCXHc1YYFNmvwZ8J8n2SWTqmdrsGD9418y+ZGHO3EVKTkjK2OEHOQ3a8mEEyD t655Edq2o+V6nMl0k4PnZz2Bz6br1YE2CiQ1XpqUXIb+7r9awJzOk4IVOsMPdosgTlqn jfdsAeJs5L4AajX9aNVybYSd/aFuBaSkGUbcxZKcXKRHzjxM+MhvwiznssEUuKuDirRn +gIzaqAakOAtiI5N2lZGzhOdWi4ZOw41gdF11A8Z1+qqktmq1SY2dIc6budyuoHqSVOj E1vw== X-Gm-Message-State: AO0yUKXIjK/hqudN6vZrNCjefg5dNesp0FC5fGF4dwlRtAl4xO5VNuaN vfn5ORtrhrvsTOLP4OTHCANigJTN5duss4/6 X-Received: by 2002:adf:fa04:0:b0:2c5:59e8:30cd with SMTP id m4-20020adffa04000000b002c559e830cdmr2574422wrr.9.1676305899993; Mon, 13 Feb 2023 08:31:39 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 08:31:39 -0800 (PST) From: Mathias Krause To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sean Christopherson , Paolo Bonzini , Mathias Krause Subject: [PATCH 3/5] KVM: Shrink struct kvm_mmu_memory_cache Date: Mon, 13 Feb 2023 17:33:49 +0100 Message-Id: <20230213163351.30704-4-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?1757734289346768142?= X-GMAIL-MSGID: =?utf-8?q?1757734289346768142?= Move the 'capacity' member around to make use of the padding hole on 64 bit systems instead of introducing yet another one. This allows us to save 8 bytes per instance for 64 bit builds of which, e.g., x86's struct kvm_vcpu_arch has a few. Signed-off-by: Mathias Krause --- include/linux/kvm_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h index 76de36e56cdf..8e4f8fa31457 100644 --- a/include/linux/kvm_types.h +++ b/include/linux/kvm_types.h @@ -92,10 +92,10 @@ struct gfn_to_pfn_cache { */ struct kvm_mmu_memory_cache { int nobjs; + int capacity; gfp_t gfp_zero; gfp_t gfp_custom; struct kmem_cache *kmem_cache; - int capacity; void **objects; }; #endif From patchwork Mon Feb 13 16:33:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 56390 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2442962wrn; Mon, 13 Feb 2023 08:34:23 -0800 (PST) X-Google-Smtp-Source: AK7set8NIyfYxQU1Pe8q/kP3W+hqhl4yLCdd0DOkBKwSljVOqRvN7zHgok+9F8420pjAVpbqrLsR X-Received: by 2002:a17:907:961d:b0:8af:2a4e:8f00 with SMTP id gb29-20020a170907961d00b008af2a4e8f00mr23438004ejc.74.1676306062948; Mon, 13 Feb 2023 08:34:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676306062; cv=none; d=google.com; s=arc-20160816; b=KqiNDzBUbXM3NwozaCkUUJCVlGbkeZbEB11e4K0l2RQ2TbrtCxSLQt1xM60zmHeduy L/gPgyGHc5NfsRmvn5Sxxb584zprv5zL4dLTrzNZ8XKA0CGmvFQYLvIngXk/uNFDbwdp VJA9q4vYxIWSAIuYxNs7oNHr86asKw4m1nLdUAJqRcyG/mIHD0JHlamGaO40sMrOzYwo DLQ1J+PKpLtf673MZroqj2KZZP4MLIQS/p13r554Pi1djk0BWfW7liI5phpiJlJivMd9 hbAcLMDc8hHqcjv0F+Mp/+j2pfgTE8t0MLWro04gRjollllZAuN6QTeHoYsrRrphZmEh 1oTg== 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=5R9IHW3Vc8hHuytFcQqc/EbsgNLSr+qUBtW2LZuwhKo=; b=c+NtTjfBAaXsKISMsUF8Hq+zaTZ3QLJdX8/5q3XZ9cNQPqara1U0CDW+wXtSlEXXKa CORbEpCNEX8WL65oYYAa0vCt5isTm2D9Rwlbcx/5amEJ0CD2s28IrYMd9Hvpf4Mvi9vg f7oTjjEjSJvD8Yrx8UnHDF2rID0UYdtqojllq/G0N066IqIf3RE0jqu6EdrX3YismGzf Owa1ZpPKXbJKI0daIV+T9d1++DhL2ua+a3i8ikULHUqm9ECcZwRqLknetVznOB45xCg+ 9lBKwfaeDGDR+PdhbTov86DH8HsjMwMBi53t8HRaHSuOsWuMOfwDFxgpVpPIM6BjUV5D a5Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@grsecurity.net header.s=grsec header.b=mOvd2eMD; 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 vf2-20020a170907238200b0087cc469b195si12959872ejb.423.2023.02.13.08.33.53; Mon, 13 Feb 2023 08:34:22 -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=mOvd2eMD; 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 S231200AbjBMQcA (ORCPT + 99 others); Mon, 13 Feb 2023 11:32:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230478AbjBMQbs (ORCPT ); Mon, 13 Feb 2023 11:31:48 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BC1FCA3E for ; Mon, 13 Feb 2023 08:31:42 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id j29-20020a05600c1c1d00b003dc52fed235so9489776wms.1 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=5R9IHW3Vc8hHuytFcQqc/EbsgNLSr+qUBtW2LZuwhKo=; b=mOvd2eMD6QLHz2v4lsp37mHHKKF2WTr+lT6m5AFMibytX39ZrCQbcVZetFrpk3Sbte n2nZyb0KnigW310tkHtMVoZFiKAs21VD9w0dDzFqZ9mVJkmYFMqbaV+g5HqlTEZ9NxBs B0iOyOY0hcMJXZx9zk6sYcq2ioZMpRdHc2bQ6v4meVPLWQyAhoGoJzeChBqUvxBt7M3/ uSfVEdSBzXvkyd/Mvi1Qn4oLnZ6DLhzZHWOrSGz1T5lkZLvYWOnm6q4Hw98GLsmRXttH tVi2OwnbYHUMlJH+S30PuIpcBbKoJaHTSdYi+uf+EDWuGHuUXQe8OQsY3l70kE6eKjO7 oXPA== 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=5R9IHW3Vc8hHuytFcQqc/EbsgNLSr+qUBtW2LZuwhKo=; b=aGU90Nff6na1KmDez7ShFUK+URQF0TcC4sHXsOx2baA0jWfmTroEmhA/EsnXPTquAR Kvk2JFBtQvBhXXecgzMMZqd3z9488ds32WqaOjKZM1f1mvs8Z2BX/MxtyAppVnujHZvW 0XQBaYvGQ0B1lHDYYDIvKoxcmWz+GFcpRS6IGXkr8lr6hARX0c0+DejsN4qVedsVN+cP uElRI8bFxzeptYFDxlR02cOID8xngrXh3vlKLcoy7XIVS2HKFIS7IfiryN1NKYqukkbt SuFOCIZA+dD6TO2ZsCm9JXiY9K7YJfC+WmToLonbQKxXUAs+uC0uL5pY/iHzC4wWbL7D 39vw== X-Gm-Message-State: AO0yUKVn9z0l0/WxaRHB/0oAsnY2F4zkV11AJk9uMqNPZV1b9OUpnBKq Sm1VacarhDj9fqWFA9hfhfAaPA== X-Received: by 2002:a05:600c:330a:b0:3df:de27:4191 with SMTP id q10-20020a05600c330a00b003dfde274191mr19226786wmp.16.1676305900763; Mon, 13 Feb 2023 08:31:40 -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:40 -0800 (PST) From: Mathias Krause To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sean Christopherson , Paolo Bonzini , Mathias Krause Subject: [PATCH 4/5] KVM: x86: Shrink struct kvm_vcpu_arch Date: Mon, 13 Feb 2023 17:33:50 +0100 Message-Id: <20230213163351.30704-5-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?1757734306419412757?= X-GMAIL-MSGID: =?utf-8?q?1757734306419412757?= Reshuffle the members of struct kvm_vcpu_arch to make use of otherwise unused padding holes, allowing denser packing without disrupting their grouping. This allows us to shrink the object size by 48 bytes for 64 bit builds. Signed-off-by: Mathias Krause --- Instead of attempting to create an optimal shuffle by sorting members by their alignment constraints, I intended to keep the members grouped by their meaning to keep the maintainability of the code. arch/x86/include/asm/kvm_host.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 040eee3e9583..5036456b05b0 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -824,18 +824,18 @@ struct kvm_vcpu_arch { int halt_request; /* real mode on Intel only */ + u32 kvm_cpuid_base; int cpuid_nent; struct kvm_cpuid_entry2 *cpuid_entries; - u32 kvm_cpuid_base; u64 reserved_gpa_bits; int maxphyaddr; /* emulate context */ - struct x86_emulate_ctxt *emulate_ctxt; bool emulate_regs_need_sync_to_vcpu; bool emulate_regs_need_sync_from_vcpu; + struct x86_emulate_ctxt *emulate_ctxt; int (*complete_userspace_io)(struct kvm_vcpu *vcpu); gpa_t time; @@ -916,17 +916,17 @@ struct kvm_vcpu_arch { unsigned long last_retry_addr; struct { - bool halted; gfn_t gfns[ASYNC_PF_PER_VCPU]; struct gfn_to_hva_cache data; u64 msr_en_val; /* MSR_KVM_ASYNC_PF_EN */ u64 msr_int_val; /* MSR_KVM_ASYNC_PF_INT */ - u16 vec; u32 id; + u16 vec; bool send_user_only; u32 host_apf_flags; bool delivery_as_pf_vmexit; bool pageready_pending; + bool halted; } apf; /* OSVW MSRs (AMD only) */ @@ -942,6 +942,9 @@ struct kvm_vcpu_arch { u64 msr_kvm_poll_control; + /* set at EPT violation at this point */ + unsigned long exit_qualification; + /* * Indicates the guest is trying to write a gfn that contains one or * more of the PTEs used to translate the write itself, i.e. the access @@ -959,9 +962,6 @@ struct kvm_vcpu_arch { */ bool write_fault_to_shadow_pgtable; - /* set at EPT violation at this point */ - unsigned long exit_qualification; - /* pv related host specific info */ struct { bool pv_unhalted; @@ -979,9 +979,6 @@ struct kvm_vcpu_arch { /* Host CPU on which VM-entry was most recently attempted */ int last_vmentry_cpu; - /* AMD MSRC001_0015 Hardware Configuration */ - u64 msr_hwcr; - /* pv related cpuid info */ struct { /* @@ -1006,6 +1003,9 @@ struct kvm_vcpu_arch { */ bool pdptrs_from_userspace; + /* AMD MSRC001_0015 Hardware Configuration */ + u64 msr_hwcr; + #if IS_ENABLED(CONFIG_HYPERV) hpa_t hv_root_tdp; #endif 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