From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 B44721E1A3D for ; Fri, 14 Nov 2025 08:50:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763110245; cv=none; b=do02Op7ZIgSMinNTaTxRwntnt+NGJQ21pTo/atrdggc/sKdcF31IlRp7iJ/L53ota18wmNXoyhT2wNotms+9RvROt5hTBbENKGtoeuY2kNhrLQwolFmjjkvMhkSxbHz7XGzKN6bwNbYJRsJP8pMkW+Z9bb4jRUGZn4nUeJQb6mA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763110245; c=relaxed/simple; bh=wJuWD0MuveK01y2CV7OtfnOu5LP9AOSHbvAMK9e4hpU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=QAp9XB3OY4bbLaUMowaKi5PJkvqgNkPxi7ZZCZ6y+ibuo6d9d13UbjQRG+zs8N/NCREIwGZvv1KglZlz2j0wvUWlciZehTnnMilzSu2PaXAvEMaEyV35IPH+BgxfTUAw9xdfUrFA1uG55Dij4axoNmnRXwQdS9H8JHFQlXxgnKE= 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=GRFEkyVL; arc=none smtp.client-ip=209.85.210.173 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="GRFEkyVL" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-7af603c06easo1934767b3a.0 for ; Fri, 14 Nov 2025 00:50:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763110243; x=1763715043; 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=DbBO36ew8VvzcbHlpegzL83pZYmO4COvdyAP3ks49tc=; b=GRFEkyVL95IM7t9pheCaHKXA9ckQjfy7paulsOoBpjXkHTPPCCJVvDDpmt89YYz6nB cd9W/ANe9kf6dGXWoGyM1ubPy6R1hsJVygutwnYMC/nzgmrLtgeFMwu3t8pcalW7Ibtv TKf0phxObszzkpTi6wlYcED5L2imxt2lMCmxikM7+6KWfJC4oS9G3xTjnR1vSlNZiTOX Ah6dMFzR1/CWMWNm2lIB2uFJy157vYLnqH4Jsul6xRaoOk773BKEPL0pxCimqicxaYHn Ynve36SUY4qzRLwonqIzCnwPE+/AIJzS0zMcjFI7K8Kiws66D8/Esb1hkR62d9007iFE 6mpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763110243; x=1763715043; 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=DbBO36ew8VvzcbHlpegzL83pZYmO4COvdyAP3ks49tc=; b=V5UF/hrbO0OQ/B8xYvX0aJGuXegSubdZsmtoQKJjC+CLOywMVsXrYkWuJjyu9Sah6e uQZg4ncQVhAwxqwQHydlrovyYlfXAmkd4ynmJovdlIXM3kI8v4FytDSJ/BzX5gTT/g5V lf8a7vIn4Nyjkh/7h9HUabvQigdAHLyOuDPGZsucTUbXUYAreDsB8vL5+fVNDsFtLEhn vDA5hFuRIocbdEQiA443Wtje4BAsHEV96QpqeP6dpdj4bWl8qOFCIrvg7Y4E0uftO6N2 h9/gtnBxvmaTQCSMXlbydSlkfQaxTpafNA3Wwi4fQnDBUX3DLdU4u1QK7ZCE70L8S6r9 OfiA== X-Forwarded-Encrypted: i=1; AJvYcCVdSsWUOvwoPenepXLBQb6b814Wuj/tiuipSi3frOxic+Vhuo3FLljk4HaCvQM7OlgjM1pMqqUTdat4GzY=@vger.kernel.org X-Gm-Message-State: AOJu0YzKcOy/KDYs3gGdVV5bwpUFGxAHhPg8Kgv/FkGiAlsQcLdEMJfc 8dKmYRdmdy6tqfe1X+WB8dU2yPRULc6Yv4IIMwg1UZgUvm2TAu96yvR4 X-Gm-Gg: ASbGnctS0n2zAbm7wxoZQ/Gch22EGmOHcIlhnzbx2LhnTz4oswbXTia1+M0gM4/ZD37 ox6jVKwVFG/Fac+oDE9H0GgoyD9efIUtZjye1bij2ZMlQxzTi0SJ3RHqGve9YJrp6a7pgHcItLN xvov9bWFLGwiv34MfMSr+gB1psDGI1qURAqMnQTbVcz4kalwFETN2pjqJ2uRHkUMdsi0bfX9wD4 U1cY8Uu+5IgO9+qofl8VBi+DBl+QcshFGjUE1Xi8+Kdtkx2poC4gK3Mhf9Kdi4/Hbsz7xVcEch1 aRmO5R8u5vDNX8bINR9uf/LYbdhFQNUZtALbRJCcO0smIE9M9O6UpqU5iU+KMQbAb1Gu/4QCm1S cLme3wnjoG6qbrwIUP5JnnFpppRY0OrT9KnoxBw8v4NFcbVee0xzBvHUD33K+zjmZeahYjTfWLf r4iHIl/sbanUVNeWeENpJo X-Google-Smtp-Source: AGHT+IEpAf8mh4p6tc0bF2EPa6kquDi0o2K/C4+seZIZFBNIulWX3tLB8uFYJ43/Pckyb+HcJ+hTrA== X-Received: by 2002:a05:6a00:94fc:b0:7aa:d1d4:bb7b with SMTP id d2e1a72fcca58-7ba3536b13cmr3366912b3a.16.1763110242963; Fri, 14 Nov 2025 00:50:42 -0800 (PST) Received: from gmail.com ([117.147.72.154]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7b924aedb73sm4459368b3a.12.2025.11.14.00.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Nov 2025 00:50:42 -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 1/2] Remove the "FOLL_TOUCH" test code from gup_test.c. Date: Fri, 14 Nov 2025 16:50:37 +0800 Message-ID: <20251114085038.191031-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" >From submission 0f20bba1688bdf3b32df0162511a67d4eda15790, we know that "FOLL_TOUCH" is only for internal scope use; 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 ]--- ok 1 ioctl status 0 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