From patchwork Wed Mar 22 17:03:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 73535 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2454591wrt; Wed, 22 Mar 2023 10:05:39 -0700 (PDT) X-Google-Smtp-Source: AK7set9e5U9VaeEZc/hAL5XpiacMYnW7vAZuSyR8wvffGGlm18aWZAungKBJ6pfev8cTbABsA6FA X-Received: by 2002:aa7:d913:0:b0:4ac:d34b:c2a9 with SMTP id a19-20020aa7d913000000b004acd34bc2a9mr7931937edr.14.1679504739150; Wed, 22 Mar 2023 10:05:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679504739; cv=none; d=google.com; s=arc-20160816; b=bLIO3By9A/TqmeCjO0mysEQucHC/3lq8aeepwIbWzxFuCOFmQX7iTcx5rFYBzO9nSl Pner9W3o8/tzkbc6gXFXDlXmRZj1CQsr8vfqa5Ogc3zq2YEIoNCRl+mEIoHKT0UkcSVu lJveuAdXu2pBxIPWGTvQTk7szRS9Sb2tbc5tapOZcf0lPbHFuOftJGftYO9/1MhN+RRh ZUIcE3pIUoEIM1bxdJFGT29gJmaB8N52ymh1q8/CLx2JZepRZqNWGdoshUhtpEcBpMQQ ya9D1Pix76l+0S9R9OJZzYZkt2jErK9ImU+aqBnWPYIQZN0NLWNg3dXadreTglh/i3st nWOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=qIOQQ6QAOhmEc1Jv3UNJoeUJNGrkot34nIu0dzXOFaA=; b=roQIw0ww7MVdwCl82Fn/K9sI4JTdV2/DXcYjRhcM/W0jqRYzz6hnHkdjwB/4CO/QNq 1gjxncIaDMAUnem1JeONT84l137sd3bpFKmZ03ZTnrFXWQIUgPWhJVu5wNBg4zg3Azhh PCvr+NVyUNDGxldbdzF7AKGf35rTDmL3rs7ARNWSl3iqhiopBmFm2e6HImAqMvpHSrmB sZApWhb93ENRYLHLUTPmKTkdHjGSnb+KtQsnVYzzfRsajTbDGRSSClayGm7SRnfhOWap UE8ORxXhfgIzroGLqGHv1hVvsO2IEeUNXEj3VTI3XIIiPUZL3cF7QDknCfjRI2uvgHT0 5KVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="jP64/fpY"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=KDU6M4Uz; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y19-20020a50e613000000b00501ded7c46asi4901546edm.651.2023.03.22.10.05.15; Wed, 22 Mar 2023 10:05:39 -0700 (PDT) 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=@linutronix.de header.s=2020 header.b="jP64/fpY"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=KDU6M4Uz; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231384AbjCVRD5 (ORCPT + 99 others); Wed, 22 Mar 2023 13:03:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231230AbjCVRDa (ORCPT ); Wed, 22 Mar 2023 13:03:30 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD3CB3E1CF; Wed, 22 Mar 2023 10:03:09 -0700 (PDT) Date: Wed, 22 Mar 2023 17:03:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1679504585; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIOQQ6QAOhmEc1Jv3UNJoeUJNGrkot34nIu0dzXOFaA=; b=jP64/fpYNpaH4RgGfdyvszLN1CGkPfLiWbYjwFIPDgV52rxVIABCy9HUJ3EoV41MtiwY38 g6Xo0w18bgrMwc4SbwOMb/y+/xPT7Vtu27XNIkFBULKNvpWtINUzk3/xP9sHGI/ZCfNdI+ UpUOi2ildz4EKXWnOy9TXwSrK5gYZQTkPSeSsjTd4nERKk6/K+KY4IVSI9uBQ30zOKXZUE YXh8YmiipMeKNJt2fO5Hn7QpSasX2+CdrNIeu3+21/d0rZ3MUTja0GVBipoERU7balGd5Y 8WtcrYeWieHK48v7PT2eHr3erN3IywNyH017Eo+IxgtfnvN6erXZDVwlWDycVQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1679504585; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIOQQ6QAOhmEc1Jv3UNJoeUJNGrkot34nIu0dzXOFaA=; b=KDU6M4UzogOhwYj2St5lJo8ly04Uhzc7C0kOMxgNMiNIZkKT8SjI0QYCFahZ2c2ejntUrS B/MXXGnonnpQUFCw== From: "tip-bot2 for Weihong Zhang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] selftests/x86/lam: Add inherit test cases for linear-address masking Cc: Weihong Zhang , "Kirill A. Shutemov" , Dave Hansen , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167950458499.5837.336137416334759518.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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?1761088361321111321?= X-GMAIL-MSGID: =?utf-8?q?1761088361321111321?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 833c12ce0f4307675beb60b194833c6c7cb506d7 Gitweb: https://git.kernel.org/tip/833c12ce0f4307675beb60b194833c6c7cb506d7 Author: Weihong Zhang AuthorDate: Sun, 12 Mar 2023 14:26:10 +03:00 Committer: Dave Hansen CommitterDate: Thu, 16 Mar 2023 13:08:40 -07:00 selftests/x86/lam: Add inherit test cases for linear-address masking LAM is enabled per-thread and gets inherited on fork(2)/clone(2). exec() reverts LAM status to the default disabled state. There are two test scenarios: - Fork test cases: These cases were used to test the inheritance of LAM for per-thread, Child process generated by fork() should inherit LAM feature from parent process, Child process can get the LAM mode same as parent process. - Execve test cases: Processes generated by execve() are different from processes generated by fork(), these processes revert LAM status to disabled status. Signed-off-by: Weihong Zhang Signed-off-by: Kirill A. Shutemov Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/all/20230312112612.31869-16-kirill.shutemov%40linux.intel.com --- tools/testing/selftests/x86/lam.c | 125 ++++++++++++++++++++++++++++- 1 file changed, 121 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/x86/lam.c b/tools/testing/selftests/x86/lam.c index 52750eb..ebabd43 100644 --- a/tools/testing/selftests/x86/lam.c +++ b/tools/testing/selftests/x86/lam.c @@ -37,8 +37,9 @@ #define FUNC_MMAP 0x4 #define FUNC_SYSCALL 0x8 #define FUNC_URING 0x10 +#define FUNC_INHERITE 0x20 -#define TEST_MASK 0x1f +#define TEST_MASK 0x3f #define LOW_ADDR (0x1UL << 30) #define HIGH_ADDR (0x3UL << 48) @@ -174,6 +175,28 @@ static unsigned long get_default_tag_bits(void) return lam; } +/* + * Set tagged address and read back untag mask. + * check if the untag mask is expected. + */ +static int get_lam(void) +{ + uint64_t ptr = 0; + int ret = -1; + /* Get untagged mask */ + if (syscall(SYS_arch_prctl, ARCH_GET_UNTAG_MASK, &ptr) == -1) + return -1; + + /* Check mask returned is expected */ + if (ptr == ~(LAM_U57_MASK)) + ret = LAM_U57_BITS; + else if (ptr == -1ULL) + ret = LAM_NONE; + + + return ret; +} + /* According to LAM mode, set metadata in high bits */ static uint64_t set_metadata(uint64_t src, unsigned long lam) { @@ -581,7 +604,7 @@ out: switch (lam) { case LAM_U57_BITS: /* Clear bits 62:57 */ - addr = (addr & ~(0x3fULL << 57)); + addr = (addr & ~(LAM_U57_MASK)); break; } free((void *)addr); @@ -632,6 +655,72 @@ static int fork_test(struct testcases *test) return ret; } +static int handle_execve(struct testcases *test) +{ + int ret, child_ret; + int lam = test->lam; + pid_t pid; + + pid = fork(); + if (pid < 0) { + perror("Fork failed."); + ret = 1; + } else if (pid == 0) { + char path[PATH_MAX]; + + /* Set LAM mode in parent process */ + if (set_lam(lam) != 0) + return 1; + + /* Get current binary's path and the binary was run by execve */ + if (readlink("/proc/self/exe", path, PATH_MAX) <= 0) + exit(-1); + + /* run binary to get LAM mode and return to parent process */ + if (execlp(path, path, "-t 0x0", NULL) < 0) { + perror("error on exec"); + exit(-1); + } + } else { + wait(&child_ret); + ret = WEXITSTATUS(child_ret); + if (ret != LAM_NONE) + return 1; + } + + return 0; +} + +static int handle_inheritance(struct testcases *test) +{ + int ret, child_ret; + int lam = test->lam; + pid_t pid; + + /* Set LAM mode in parent process */ + if (set_lam(lam) != 0) + return 1; + + pid = fork(); + if (pid < 0) { + perror("Fork failed."); + return 1; + } else if (pid == 0) { + /* Set LAM mode in parent process */ + int child_lam = get_lam(); + + exit(child_lam); + } else { + wait(&child_ret); + ret = WEXITSTATUS(child_ret); + + if (lam != ret) + return 1; + } + + return 0; +} + static void run_test(struct testcases *test, int count) { int i, ret = 0; @@ -740,11 +829,26 @@ static struct testcases mmap_cases[] = { }, }; +static struct testcases inheritance_cases[] = { + { + .expected = 0, + .lam = LAM_U57_BITS, + .test_func = handle_inheritance, + .msg = "FORK: LAM_U57, child process should get LAM mode same as parent\n", + }, + { + .expected = 0, + .lam = LAM_U57_BITS, + .test_func = handle_execve, + .msg = "EXECVE: LAM_U57, child process should get disabled LAM mode\n", + }, +}; + static void cmd_help(void) { printf("usage: lam [-h] [-t test list]\n"); printf("\t-t test list: run tests specified in the test list, default:0x%x\n", TEST_MASK); - printf("\t\t0x1:malloc; 0x2:max_bits; 0x4:mmap; 0x8:syscall; 0x10:io_uring.\n"); + printf("\t\t0x1:malloc; 0x2:max_bits; 0x4:mmap; 0x8:syscall; 0x10:io_uring; 0x20:inherit;\n"); printf("\t-h: help\n"); } @@ -764,7 +868,7 @@ int main(int argc, char **argv) switch (c) { case 't': tests = strtoul(optarg, NULL, 16); - if (!(tests & TEST_MASK)) { + if (tests && !(tests & TEST_MASK)) { ksft_print_msg("Invalid argument!\n"); return -1; } @@ -778,6 +882,16 @@ int main(int argc, char **argv) } } + /* + * When tests is 0, it is not a real test case; + * the option used by test case(execve) to check the lam mode in + * process generated by execve, the process read back lam mode and + * check with lam mode in parent process. + */ + if (!tests) + return (get_lam()); + + /* Run test cases */ if (tests & FUNC_MALLOC) run_test(malloc_cases, ARRAY_SIZE(malloc_cases)); @@ -793,6 +907,9 @@ int main(int argc, char **argv) if (tests & FUNC_URING) run_test(uring_cases, ARRAY_SIZE(uring_cases)); + if (tests & FUNC_INHERITE) + run_test(inheritance_cases, ARRAY_SIZE(inheritance_cases)); + ksft_set_plan(tests_cnt); return ksft_exit_pass();