From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 673F332ED36 for ; Fri, 14 Nov 2025 16:11:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763136697; cv=none; b=KMxeR69NwcWQwNdWQtfDZ/GwNNcrG8fz5vXUd8ji5AJMqz5UAYX3lNeU8Y0+WmRs1bXXOugsVoG7nza4IovQI/3WBCwMEncTOahuevzSoEdFi/w+fMxdgROPB/dVpWM/oicENuhfkvckNeGv6i1+uZpK84MkwlIgpRLCzjhQUbs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763136697; c=relaxed/simple; bh=ZcKS9F3EiSNNrg3UeGamXAZ3KxVPijo3xTtTYYnpUNg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=uVs96syvXCbcm4KwUXlJ/5srHhi0JRJ+04ickqeWOV/Ayz0uimP/e54bqhObjy2k9DZtABuiUGupK0f2Wx9ClZPN6Uq9YKTvSqj7EedUhvgP2E58ZwhcVT/PQmnOkab+KgEdE8skb0bMu17LPje+nTI7btfsLjgVzQG89Nbii7U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IaSqIa4m; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IaSqIa4m" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-29516a36affso23082015ad.3 for ; Fri, 14 Nov 2025 08:11:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763136695; x=1763741495; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sXxLeDqMnDfPoqZmJZs/OvhUlLPpJUJ3x7qA3NQ6GsU=; b=IaSqIa4ml5ce0mWqDueTPgKevQvyJ7VqlbjgI/g9pPP6g9Qu9FaYkcgu5cc+qTQ3oP jyeYi2gF9TZQbp5lIFSKuhNKK1LM0nxCOtjdPco8RduoSVeuybSGgBOzvmV14lrEea3P Ch12wtl7UVc2aZHO55+msk87pf2FTAC96d5H9uA1n5QFcItiUJr6Wc/oErhj5trytvnD OU2YAkys4hhS7E7t4NyoIdla8waX+UzMXHX3W9FoAgB/isghkbdnHIZp30Y37haEEwDk l/hCtefY0/C26rYsgRf4JujSFPVyhId4lmCJQ5MblAlsK84fVVPOgSZeAmjHjrH7+gu0 NYVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763136695; x=1763741495; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sXxLeDqMnDfPoqZmJZs/OvhUlLPpJUJ3x7qA3NQ6GsU=; b=SoBkxbvUJGrcDVnvJFAgYahRalcYPsxIirUYIE1SX8BCMPD+QLpowhurCs/D//5ORb uwNrs7R4UFWD4Ip33QJO8/0/cam2AqnZfD4GzM3bNRGQ67r7qRI7LveKaDelh9tkIklo GmB8i3GanJ7L49finqOyciwpZ+PXhS+vsCepqj08yPe4EAGnuUsgAg/dW5i3G/EH9F4+ nLSKZo/swfn9VmXJvpRKNFjnnPdQAowr7i6eR24MEYixunjotfHcaakkiWJdjlOTLXFj LEopDmvgqLUIgpt+Ej+cyhrqHotMGceRaQKAPbph4Nn8ZokVxLluiIb51yhb90tU+Dx0 elFw== X-Forwarded-Encrypted: i=1; AJvYcCV8lNOwa0zUSLkSKX90gxMTBq3ldJ8DcWqouULlf62o6u/+wGbKTA7uMb5MMkdNj09XuqbxA5SGKSufp+w=@vger.kernel.org X-Gm-Message-State: AOJu0Yyb9r7zwderL7wNZhbzFJW4WdMwYboY390+NVIsf+TBR991lRdm ib/FIl1kpkKYi8IEUB6WdH9ILk6kIAcYJ9DXCHpzpwSlskLbKYchc9VA X-Gm-Gg: ASbGncvF4ZQB2KkbZZkt5dR7hBto+vXSyLSumEVs9uH2EfrptBRxTBmJgdTQWwqSjE/ K9Yi21UFp9RARKgzg7D9TvoSBLx9P3ySuvvcGfwCh8AwkbrIQNAvijt6YpO2zmWbC+ORdkuikgx mLmcnk4F1IdxshjxDL4XIBGuQNlFiP1av3j40t8+hR3j0Oe55DzHCjBBthqpAiwsFX1lYPFB8AZ PNggZyug7rbFKV6bV44ZWfWt5JuJP6eznM/PONv83Ojaeu9Ve18+WT4Z0hyQYLe3phSlzOWLmr9 wZrfdcmktLk9z3A2LjyITuxoAFYway+7vaK1BQp3B5G7kR65XTNyMFD6bjWtUIpcn3GTNMc9psJ yqOXzox+WchmIz144A+FX6L/FD52MIYzugSwnFga34cYWphqkRFByzcBRLU2v/gGhI42ANhlzyA s= X-Google-Smtp-Source: AGHT+IF1ElFOKDrihllUTU0L6vNDsk/mc+c3pAUrsYHk9osHh8ET7eTJayTKBR+2Y0pyL5lQdTHUPg== X-Received: by 2002:a17:902:f70c:b0:298:3e3a:ae6 with SMTP id d9443c01a7336-2986a7420f6mr41150315ad.48.1763136694526; Fri, 14 Nov 2025 08:11:34 -0800 (PST) Received: from gmail.com ([117.147.72.154]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985ce19a20sm58384365ad.84.2025.11.14.08.11.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Nov 2025 08:11:34 -0800 (PST) From: peng8420.li@gmail.com To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: david@redhat.com, osalvador@suse.de, jgg@ziepe.ca, jhubbard@nvidia.com, peterx@redhat.com, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, "peng8420.li" Subject: [PATCH v2 1/2] Remove the "FOLL_TOUCH" test code from gup_test.c. Date: Sat, 15 Nov 2025 00:11:26 +0800 Message-ID: <20251114161127.193707-1-peng8420.li@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "peng8420.li" Ever since commit 0f20bba1688b ("mm/gup: explicitly define and check internal GUP flags, disallow FOLL_TOUCH") we marked FOLL_TOUCH as a GUP-internal flag. Therefore, remove the "FOLL_TOUCH" test code from gup_test.c; Otherwise, executing the test command "./gup_test -L -r 100 -z" will report the following warning log: TAP version 13 1..1 ENCHMARK: Time: [ 39.363371] WARNING: CPU: 1 PID: 117 at mm/gup.c:2512 is_valid_gup_args+0x66/0x8c get:2818 put:46 [ 39.364043] Modules linked in: us# , truncated [ 39.364311] CPU: 1 UID: 0 PID: 117 Comm: gup_test Not tainted 6.18.0-rc5-00324-gd09eaf415c87 #29 NONE (size: 0)# [ 39.364434] Hardware name: riscv-virtio,qemu (DT) [ 39.364546] epc : is_valid_gup_args+0x66/0x8c [ 39.364596] ra : pin_user_pages+0x38/0x78 [ 39.364630] epc : ffffffff802079e6 ra : ffffffff8020c214 sp : ff2000000041bd20 [ 39.364650] gp : ffffffff81a26068 tp : ff60000080b3b000 t0 : ff2000000041bdf8 [ 39.364678] t1 : 000000000000001e t2 : 0000000000000000 s0 : ff2000000041bd30 [ 39.364697] s1 : ff60000081300000 a0 : ff60000081300000 a1 : 0000000000000000 [ 39.364714] a2 : ff2000000041bd3c a3 : 0000000000080000 a4 : 0000000000000001 [ 39.364731] a5 : 0000000000010101 a6 : 0000000000000001 a7 : 0000000000000000 [ 39.364747] s2 : 00007fff7eeed000 s3 : 0000000000000001 s4 : 00007fff7eeee000 [ 39.364761] s5 : 00007fff7eeeb838 s6 : 0000000000000000 s7 : 00007fff7eeed000 [ 39.364825] s8 : ff60000081300000 s9 : 0000000000000000 s10: 0000000000000002 [ 39.364842] s11: 000000092869bfdc t3 : 2152ffffffffffc0 t4 : 00000000001fffff [ 39.364855] t5 : ffffffffffffffff t6 : 0000000000000000 [ 39.364867] status: 0000000200000120 badaddr: ffffffff802079e6 cause: 0000000000000003 [ 39.364949] [] is_valid_gup_args+0x66/0x8c [ 39.365036] [] pin_user_pages+0x38/0x78 [ 39.365049] [] gup_test_ioctl+0x2b4/0xc08 [ 39.365060] [] __riscv_sys_ioctl+0xba/0xc4 [ 39.365072] [] do_trap_ecall_u+0x296/0x370 [ 39.365093] [] handle_exception+0x146/0x152 [ 39.365220] ---[ end trace 0000000000000000 ]--- Signed-off-by: peng8420.li --- tools/testing/selftests/mm/gup_test.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/mm/gup_test.c b/tools/testing/selftests/mm/gup_test.c index 8900b840c17a..75f7134d529d 100644 --- a/tools/testing/selftests/mm/gup_test.c +++ b/tools/testing/selftests/mm/gup_test.c @@ -19,7 +19,6 @@ /* Just the flags we need, copied from mm.h: */ #define FOLL_WRITE 0x01 /* check pte is writable */ -#define FOLL_TOUCH 0x02 /* mark page accessed */ #define GUP_TEST_FILE "/sys/kernel/debug/gup_test" @@ -93,7 +92,7 @@ int main(int argc, char **argv) { struct gup_test gup = { 0 }; int filed, i, opt, nr_pages = 1, thp = -1, write = 1, nthreads = 1, ret; - int flags = MAP_PRIVATE, touch = 0; + int flags = MAP_PRIVATE; char *file = "/dev/zero"; pthread_t *tid; char *p; @@ -170,10 +169,6 @@ int main(int argc, char **argv) case 'H': flags |= (MAP_HUGETLB | MAP_ANONYMOUS); break; - case 'z': - /* fault pages in gup, do not fault in userland */ - touch = 1; - break; default: ksft_exit_fail_msg("Wrong argument\n"); } @@ -244,18 +239,9 @@ int main(int argc, char **argv) else if (thp == 0) madvise(p, size, MADV_NOHUGEPAGE); - /* - * FOLL_TOUCH, in gup_test, is used as an either/or case: either - * fault pages in from the kernel via FOLL_TOUCH, or fault them - * in here, from user space. This allows comparison of performance - * between those two cases. - */ - if (touch) { - gup.gup_flags |= FOLL_TOUCH; - } else { - for (; (unsigned long)p < gup.addr + size; p += psize()) - p[0] = 0; - } + /* Fault them in here, from user space. */ + for (; (unsigned long)p < gup.addr + size; p += psize()) + p[0] = 0; tid = malloc(sizeof(pthread_t) * nthreads); assert(tid); -- 2.43.0