From patchwork Wed Nov 29 22:40:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 171647 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:296:b0:164:83eb:24d7 with SMTP id ek22csp23485rwb; Wed, 29 Nov 2023 14:40:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IGkZUwovahs7uIeu6G3Bn3fHh8RTd+X487KOueaJaBjrOILClqrQxW7hoYK34o0qdplQ8Dk X-Received: by 2002:a17:90b:3846:b0:285:6d72:fd7 with SMTP id nl6-20020a17090b384600b002856d720fd7mr21816574pjb.26.1701297654214; Wed, 29 Nov 2023 14:40:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701297654; cv=none; d=google.com; s=arc-20160816; b=QIR4NXO2LcnNiV/uyqPjgNRcl8U0bzdsfrYdSr47zYnG++MNWaE5EoKXoClCnJ/7IC mbmhQHCkH6x17Bnoh/T92S+efzN908P3GTKm8VerCIfgFFFuZziSvGNVFruJRtYBXEFB JH0BM0+rUP4EyI7uqI5PIzVPM3bUlo/9fb1I5yw4llZlMD9HAhWOL6pNTVPpRS2RZsrN Nqoetf95PNbrXjiT65h0IlrxM7p/qCouYUFOXscGPrriUGQHuOLIq4e0t4GFWUgBgoJV l+Mz3tWxyaqDPxurSABreagwyOgLhDXgITXiVn6yWO3vWn35nCy+QlICO6mBuhnewtXm UaMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :reply-to:dkim-signature; bh=I+v1jFIXf64LmcoETe5BxvZaUtddzr4bC5h258OJRYc=; fh=a/B0iV5LWklS7QUR0cRnqbJdAtXzyhd2Xbve3+VFDMU=; b=mybGCdkopnIYHYyw7dDIprWBMUQ8sfrcr/44ETol5mFhVuDz4ybW7dQ/oCqM5aQ/AG qT0OICt8/YCcOrl4lIve6bpNZFt32YBqUa3blccGKUOFZpVz//naz+oNttQBdSVDZf1l WUcqXhBST0PBpjKNHQjdwbm3HflNf90QBuWdck3lTl0u46LrPTuI7nuM0Oi+pSt+R2ZN JvIgn0zlqO+KUcfhexw0z4T2TYfy3tn7uKK+nU3HC+Nnqszx8hKVV0+rnHeqbFv2j2a4 B1m1lbA4/501UpOVpEeHZF2/p9+X1oFT/nNQa12vfVHKcYweG9Wf1DiWYOdyL4CPjkOw KqSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=PHKVRTCk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id q15-20020a17090a68cf00b0028571ddddfasi2081786pjj.146.2023.11.29.14.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 14:40:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=PHKVRTCk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 8ACC380C3A13; Wed, 29 Nov 2023 14:40:51 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234683AbjK2Wkm (ORCPT + 99 others); Wed, 29 Nov 2023 17:40:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229959AbjK2Wkl (ORCPT ); Wed, 29 Nov 2023 17:40:41 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B8D112F for ; Wed, 29 Nov 2023 14:40:47 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1cf89e16993so5319465ad.0 for ; Wed, 29 Nov 2023 14:40:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701297647; x=1701902447; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=I+v1jFIXf64LmcoETe5BxvZaUtddzr4bC5h258OJRYc=; b=PHKVRTCknguXhqDUmvoRRFUu4bSAKjEzdVDF949SKeNHF7yvgSn279Prc1jFx7Df3G oDikiZ1EweFDjkDjVUTYQnqZ6T8jCXgaoWtXA5sdDYzOmdBzZaRAAqAWVVrAsvxA4Usv /xpYFWXiGj070fds/8A9+g8uy3SMkBpPM8aWbr7cL4ghCTl8pSMj32wPQqHfcZO27bu4 7rNjtoBVHXkuKp3xuhLAht0bJpI4u7Gr8m1FRBoy0xm8klWuGX8nmsJIFUuP/QJkxVbY zEmhyX8NbZz5dC3AaLH6Q5deLoF05Wys23HWYmS8wKoyy/N/Jb2rvhLdHMl0cR+0ZQo9 7n/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701297647; x=1701902447; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=I+v1jFIXf64LmcoETe5BxvZaUtddzr4bC5h258OJRYc=; b=j++wQnAXFyaTZtzTB4xHEOaR/NQRyMx83yONwfwQTEmb4v535pc2WNNsLwiyQihMu7 Jy2fG0mcY90UxKTmj/8WNlaWJhQdsoKHj9ebmRs5zTG67IviEOMd4kGhZbNOK4RIEyFA sfyQBfEfzqoDEc5SoxQxtumauCY5S4eF6KB0gZ/4wHz+pmI+baUa39zAu5p2Xa/1qy0u Q2RTTVbysO30PO267w33enArVUVTuWIW2WLe3z6PfxIGNb40Q5/dihpCoQEiJeLCi2Uo qnpnKCRMvMalxx3LJGN4AAZCX+KUDo4NO0x8zYV/0AuA0FztibeevqOV3dwUUIGpgB/2 2vGw== X-Gm-Message-State: AOJu0YyEaEVT24MNmCTbV0V+U3q1HanD27cbrP/2TzMevv2bImo8XJLn fr7vlyokh60NuwlPDjUQNENUcvfpWWM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:f68e:b0:1ce:5c2d:47e with SMTP id l14-20020a170902f68e00b001ce5c2d047emr4791132plg.5.1701297647010; Wed, 29 Nov 2023 14:40:47 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 29 Nov 2023 14:40:41 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129224042.530798-1-seanjc@google.com> Subject: [PATCH] KVM: selftests: Reword the NX hugepage test's skip message to be more helpful From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 29 Nov 2023 14:40:51 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783939888836007368 X-GMAIL-MSGID: 1783939888836007368 Rework the NX hugepage test's skip message regarding the magic token to provide all of the necessary magic, and to very explicitly recommended using the wrapper shell script. Opportunistically remove an overzealous newline; splitting the recommendation message across two lines of ~45 characters makes it much harder to read than running out a single line to 98 characters. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: 6803fb00772cc50cd59a66bd8caaee5c84b13fcf diff --git a/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c b/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c index 83e25bccc139..17bbb96fc4df 100644 --- a/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c +++ b/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c @@ -257,9 +257,9 @@ int main(int argc, char **argv) TEST_REQUIRE(kvm_has_cap(KVM_CAP_VM_DISABLE_NX_HUGE_PAGES)); __TEST_REQUIRE(token == MAGIC_TOKEN, - "This test must be run with the magic token %d.\n" - "This is done by nx_huge_pages_test.sh, which\n" - "also handles environment setup for the test.", MAGIC_TOKEN); + "This test must be run with the magic token via '-t %d'.\n" + "Running via nx_huge_pages_test.sh, which also handles " + "environment setup, is strongly recommended.", MAGIC_TOKEN); run_test(reclaim_period_ms, false, reboot_permissions); run_test(reclaim_period_ms, true, reboot_permissions);