Received: by 2002:a05:6358:f14:b0:e5:3b68:ec04 with SMTP id b20csp849644rwj; Thu, 22 Dec 2022 16:12:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXsvt3YeraF089B54J9BFW0hS5xokBA3uK78GzLB4eQKlW6lGW08pME0o11ZRG4pdn/NHi3z X-Received: by 2002:a05:6a20:d909:b0:a7:8919:3312 with SMTP id jd9-20020a056a20d90900b000a789193312mr10257477pzb.29.1671754364897; Thu, 22 Dec 2022 16:12:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671754364; cv=none; d=google.com; s=arc-20160816; b=oZahE43UfoJhrPoISTwg8+IvJVGFzUFiVCIbaMM8zKMdUhH2o+YgFMMVUR/DwyBvYD I/s/d9HzIO9kfBM1D1ju55K4wrAg0hhpKM1k/YYtEJWX4ZHGS3F7Op/D1MC7iwfSPpNp I5RFcYlLW+cbcsflT/iLroxBQMegg0g4FdpucE7gjlMnjcUVPFzPmUtpOToyflnXGYLq 6KyWeRE2wMS6vpPNbIQlV3K+sKWjD8DTcLIvGdA8SRe3CX+mjXOcCzXAGkRuFsP8F6uH UVsinQoM/+BRV6toEgio5UBFyG4N+Ez0ol+pcZv/oXwkvIPIzMvY7JgBz0L6CO4wQIJn SJ2A== 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 :message-id:date:subject:cc:to:from:feedback-id:dkim-signature :dkim-signature; bh=Bwyalj77/Ba/0vMQnbq0zje7VuiWq5z0TaX6kKGRNR0=; b=VVD1GcmMbhVWmi05Jq5J4IgxBtpS1m8xm1zDQgwNoGW1qftRjYqiwGLo5dMtkyc58A 4WKRocklUT2rCQ1odz1H833fe/5o4i413GG+QP1ZH2GS1tfNw8LAz8E5OWfj3NODcHP1 6ZD4nFer1wgWbW9JeskCChL6Rw+mWJpkKx8SRoKO/VbBDbzr2odQrCdkOWH1eRF0WDRD Z24C2+D44rCnMQJIRwR3rkrs9qga6aqgY7Z43Yl9pnukT+OJSLenIxHc5Nrf0M6gAL0S K8z+Ufp+WxCyaL4+mM9G98Z0eYJN6A1U6CfIQu6cvj1DdtqaAV980mcTQsEl5NbaDUWM N9QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tyhicks.com header.s=fm1 header.b=KCy4dgfy; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=at+L0lCZ; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v62-20020a638941000000b00476c9ad73b6si2154370pgd.44.2022.12.22.16.12.29; Thu, 22 Dec 2022 16:12:44 -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=@tyhicks.com header.s=fm1 header.b=KCy4dgfy; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=at+L0lCZ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230303AbiLWAKL (ORCPT + 68 others); Thu, 22 Dec 2022 19:10:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbiLWAKJ (ORCPT ); Thu, 22 Dec 2022 19:10:09 -0500 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E68DF20BC7; Thu, 22 Dec 2022 16:10:08 -0800 (PST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 4F9775C0100; Thu, 22 Dec 2022 19:10:08 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 22 Dec 2022 19:10:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tyhicks.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm1; t=1671754208; x=1671840608; bh=Bwyalj77/Ba/0vMQnbq0zje7V uiWq5z0TaX6kKGRNR0=; b=KCy4dgfyUMeMeQmwfxGbv9cglnPrbxi/JR/SYW63c JdhPbBYtDlnEMuriLb335UXGrLgQJxMcZJotbIj44W1FgHs4ciqNN0A+MUUV0JVd N6N8V0erzUuBUaHMiC/U1xBfmuxUTGS1Oz+dEPezy5hJ8x9Tz2SL1jBjzVBH9TAE a+IqwM1bcb1IHe5egsxvDncLpXa1hjC797jKFMMVUe6N0HsXTUKeU38ZtdhbB8Q0 ak6yPt16qPuyAYlrY/O/LhJEzOO9QxwIX5UFygvNV4LqrXWOBIKauOCalgkhZeSH ixa/oCdY5Ja1AV11H/rHh3RBjL+fBTM3Pd+ADdjUPYzHw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1671754208; x=1671840608; bh=Bwyalj77/Ba/0vMQnbq0zje7VuiWq5z0TaX 6kKGRNR0=; b=at+L0lCZ2y9CRDrytM2QKfJqzz1N8lvcDIAT3gPyvqIrmf+wdHG Vj7Vb9RAkAdlODKtBbR6yIOg/7adluhcS17MV6HvWDceRrn0v2ZAyAju9fmvet14 74On8e6u+KjWKvtXpOrquvlhSe63nqwHrZ2pNFMKsXfN9aJilgjF/bG2Ca6mTV6S YM1JUwgXtphPmD74vRP+iOwmi7A9OEKvmSshegJAPhzlmCUubAwQk8VF5dawlUS3 fzYpAOGV+VNA91jq5ycHgvpoK8d8anoo5hclOqrjeaC8Ve3jxHWlQ4WLoaw24pB7 sxASflJMwnSU1ia8Ya9F12h2h1ABuUMiR/A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrhedugddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhihlvghrucfj ihgtkhhsuceotghouggvsehthihhihgtkhhsrdgtohhmqeenucggtffrrghtthgvrhhnpe ejteetjedvfeelkedutdfgleegjedufeeigeefkeejheetvdeggfefffdvgedukeenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtohguvgesth ihhhhitghkshdrtghomh X-ME-Proxy: Feedback-ID: i78e14604:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 22 Dec 2022 19:10:07 -0500 (EST) From: Tyler Hicks To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: "Tyler Hicks" , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Gavin Shan , Marc Zyngier , Karolina Drobnik , Mike Rapoport Subject: [PATCH 5.15 0/2] Fix kvm selftest build failures in linux-5.15.y Date: Thu, 22 Dec 2022 18:09:56 -0600 Message-Id: <20221223000958.729256-1-code@tyhicks.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham 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 From: "Tyler Hicks" The backport of commit 05c2224d4b04 ("KVM: selftests: Fix number of pages for memory slot in memslot_modification_stress_test") broke the build of the KVM selftest memslot_modification_stress_test.c source file in two ways: - Incorrectly assumed that max_t() was defined despite commit 5cf67a6051ea ("tools/include: Add _RET_IP_ and math definitions to kernel.h") not being present - Incorrectly assumed that kvm_vm struct members could be directly accessed despite b530eba14c70 ("KVM: selftests: Get rid of kvm_util_internal.h") not being present Backport the first commit, as it is simple enough. Work around the lack of the second commit by using the accessors to get to the kvm_vm struct members. Note that the linux-6.0.y backport of commit 05c2224d4b04 ("KVM: selftests: Fix number of pages for memory slot in memslot_modification_stress_test") is fine because the two prerequisite commits, mentioned above, are both present in v6.0. Tyler Karolina Drobnik (1): tools/include: Add _RET_IP_ and math definitions to kernel.h Tyler Hicks (Microsoft) (1): KVM: selftests: Fix build regression by using accessor function tools/include/linux/kernel.h | 6 ++++++ .../selftests/kvm/memslot_modification_stress_test.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) -- 2.34.1