From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DE38EB64D9 for ; Tue, 4 Jul 2023 21:03:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BEDD2800B9; Tue, 4 Jul 2023 17:03:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9739D2800B2; Tue, 4 Jul 2023 17:03:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80FA12800B9; Tue, 4 Jul 2023 17:03:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 71B122800B2 for ; Tue, 4 Jul 2023 17:03:55 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3034F1A0489 for ; Tue, 4 Jul 2023 21:03:55 +0000 (UTC) X-FDA: 80975156430.22.84DCBAC Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 23E8CC000D for ; Tue, 4 Jul 2023 21:03:52 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DCquZtGd; spf=pass (imf22.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688504633; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bTm5iRt8zflfiJ3ZPlJNpWMOOG3kiO0nsowNZ4n8eHM=; b=EcImfmtMYqImT5+/3wq0EdB5jDt5u6ZqbB/OOOuXEvuGfMlXRHaShps8yjEa+XjveWFi2a eh5L71it+2S1gn0Va93jEkmqBX3jT7ZplKolk/sjoiyq9eBbLKxpoScmca7Fy7uxIFwS8U uKwwilEOHZL9cnA2qJS5qPtINXuwOWM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688504633; a=rsa-sha256; cv=none; b=TaxLrk2hKpiliHOniAvWmWTrnWjBEmNuLOyC0nA77IkFqzMwK6n3P4KWaW6vfSYbvmAlKE ydhtRpxJbroOq+WpHFlZgmhe2yDhzITYdMUeEVLGjTNoxz6z4UWmbcKEu/WhkEgEENaKRw eoLqdXmw2mffaFb3Vjcz+qHW4PpZVZ8= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=DCquZtGd; spf=pass (imf22.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688504632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=bTm5iRt8zflfiJ3ZPlJNpWMOOG3kiO0nsowNZ4n8eHM=; b=DCquZtGd2/sBTpoCQIoiRFVQhgEoxublmgwL2tIXsd+AKsXG3czjiHm6Z7Q1QCaX1qO6+P qIsXZDO95VtV2aUesgIb9BG7T4i4LPXmMUEvTzPI0oyRCGQUN6ULhIpqTYpA24txDwOayT n4i7UH2kXzE06OkT+lbDCQCYjFBnywU= Received: from mail-yb1-f197.google.com (mail-yb1-f197.google.com [209.85.219.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-425-UHjyQL_pNKOvUBwWluu-fQ-1; Tue, 04 Jul 2023 17:03:51 -0400 X-MC-Unique: UHjyQL_pNKOvUBwWluu-fQ-1 Received: by mail-yb1-f197.google.com with SMTP id 3f1490d57ef6-bef331f4938so858964276.1 for ; Tue, 04 Jul 2023 14:03:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688504631; x=1691096631; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bTm5iRt8zflfiJ3ZPlJNpWMOOG3kiO0nsowNZ4n8eHM=; b=gYFddO+G0/70sIGjL/uEbzu+DQY9S6K3THjj7yDTv/HM7DXORB8Fj1y95HO7ZwEvtd F8DG7JgbzFurRnEtFBD3QwW1FnD1ZYk7cX1m7LPtbXOWhFZlrda6XV5AjhNe6Lr/Rm6i a+I6I+vWIQpHrmkLtP031RHII0qxzuokV0FwVXHBLPzWSvB+W7fLF0mUTelFrgb74MBe 2+5dTjPPL4IZlCzQbAbAk4mSl3vdJAchLaNxSvxHtpWSJyE3X9t7PACVFN7rvnbOro/F rCaXc7Nh2PugftpLfJFUsz2tHAc3pdqhhR3mnH7PNVxdAKTBQbAvwgkHZj9OKAtrcJ2K B/8Q== X-Gm-Message-State: ABy/qLZAWnJva57QY0vNIf9va/uQuTO4c1f0CxeKeql8irZp5r3fSKb/ AyoTi4SCI+3BAhR+pibvb6hkK/So/AD7CbfkRn5fJqr0GrFTbRcO6HRF5aGs8z4P90aX+emo1KW cJCVt6ihH8ok= X-Received: by 2002:a81:5256:0:b0:577:296:af5d with SMTP id g83-20020a815256000000b005770296af5dmr7772608ywb.0.1688504630733; Tue, 04 Jul 2023 14:03:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlEU/ddMX0V6QpVOJVqAhiVXSKzIzTOTMOOXQz51O8ktL/Z6iFKhrgoHJai7fICleSqWD0LAdw== X-Received: by 2002:a81:5256:0:b0:577:296:af5d with SMTP id g83-20020a815256000000b005770296af5dmr7772596ywb.0.1688504630457; Tue, 04 Jul 2023 14:03:50 -0700 (PDT) Received: from x1n (cpe5c7695f3aee0-cm5c7695f3aede.cpe.net.cable.rogers.com. [99.254.144.39]) by smtp.gmail.com with ESMTPSA id pv16-20020ad45490000000b0063019b482f8sm12934335qvb.85.2023.07.04.14.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 14:03:50 -0700 (PDT) Date: Tue, 4 Jul 2023 17:03:48 -0400 From: Peter Xu To: Axel Rasmussen Cc: Alexander Viro , Andrew Morton , Christian Brauner , David Hildenbrand , Huang Ying , Hugh Dickins , James Houghton , Jiaqi Yan , Jonathan Corbet , "Liam R. Howlett" , Miaohe Lin , Mike Kravetz , "Mike Rapoport (IBM)" , Muchun Song , Nadav Amit , Naoya Horiguchi , Shuah Khan , ZhangPeng , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH v2 4/6] selftests/mm: refactor uffd_poll_thread to allow custom fault handlers Message-ID: References: <20230629205040.665834-1-axelrasmussen@google.com> <20230629205040.665834-4-axelrasmussen@google.com> MIME-Version: 1.0 In-Reply-To: <20230629205040.665834-4-axelrasmussen@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspamd-Queue-Id: 23E8CC000D X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: gsbary91oyjd9qxjhbujdjoxnkszkf9e X-HE-Tag: 1688504632-504895 X-HE-Meta: U2FsdGVkX1/nXzoEZAFo6uW0s3ycRx41kP/OQ+2FgSSQi6yJp4L3wBgLRIXr+nywu7pfoanN3d2JOY5N3cJVrsvXuxyZJVhQfbBRjg6yD3PQQSsBgn9KSixN9xSqg3/+UVHh7i4WmIBzmeJzzx6MPO9yucdLRExDooEbIdRmD9hM5oN27mwGFknrVzL+qTVymAx0RcdosWEl/Ic/tsICu7Mumocces2r+/I0neaI1/LtQdWjtnD+AW9TD+o8ikL1IgozAC4FdDEDvalpGkQYkz27zYOBD1NNAoFMvflw2VPL9dobP/2Tf+4eiOgvZV3iXl5BgC0htnATHyAQOv5/DO1oUDCWxQOR6jy23yZK6haXDadMps2JaVmo+wILF47EJQpjYElvpD1Y34Q32rUa5zW6HuydrgixjD0904EtR9WLb2xjq3MKiqLLUIYzCZg0uPVNgQyyM51U3m4gD2pLLIkPnRczGHYR5cl7nyzpDdEl9W7SUaqd4qDcZX9FMBfno26ANq5wm5ZtcNsAWZ+V7STO3CK3tOFALvCdsMq7Q43VO5GUeUURINL0ulF55Yxx1LnDkG54fvF8xW2NFGfRC+3YqYioW22Mg4N6sPCaffKkqUmE8GxXYfdHumUEAlQ9S4IH9Zhjf9VcrI724bMSgp/bF74JHVzG9idpP0H1qeLh/rOCpZNPfFZ3HFbWURtl1bmAcv8MkO16cgs/VmTVY4erDIlBFxb8yqbp27O0RK3MZY9OoDV2IUDVsYlUN43+mQn3GiJNT6nEGfDMPuPwj+A/GI3/J15WCSeJnc/AbTLbQ8PmMtPHC8DU0MlPBSHwOzal7TmtC6hxYULpR1fXZJ5viJd/+IAYmthYRTD2Mp77NKAi43GuFjtiazyqeBBK0vfhZHcP/fEJAQtMsMk22K4t5vVtETT5UyQq3ZvL0JRIAwAOybQuUzMnKNz4UVpuh2J0TzWz+9Km7qlEM+B RDF1n971 qm+oarHpkYrSUgClL/qbI0SwLmF3oBcrrAERQ5/ImJUUAa5ml5aT3yVTmr5ImzRyV9RLDdef47wyfzqQoB4g4NsnXJX0bkRNjO9bQS5sTjZu2UjSdv8uN093/CiO6HlfMXdrlqhB3ChBSHFE3G7FMdjdMTPUeB2NQ25gW02gXy5jLDvavYEn8xR/138KJ3O4qCnFSsOw3cbw18aMwJurqLt+CJPIhVvVzT4y9vgHzwofl7+B08V2NsbZhJ7S2XeFQcfgJblWebEN2PHjl2hNbNrWYDzlCjcTjAXFgK9AOBzmKm11DwBeJ2Sd/5ljOoQXUcxFz95lz69ZiWp+oYU4EJMrF3trKakm2HtN80v6GIagyYGf8Je/MqaVRkTyrW+w7BYttLBqpqXEwx1YlQgLAoNttE7uliWIzUXr+rDvnlzC7B++srW1XVtRTnw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Jun 29, 2023 at 01:50:38PM -0700, Axel Rasmussen wrote: > Previously, we had "one fault handler to rule them all", which used > several branches to deal with all of the scenarios required by all of > the various tests. > > In upcoming patches, I plan to add a new test, which has its own > slightly different fault handling logic. Instead of continuing to add > cruft to the existing fault handler, let's allow tests to define custom > ones, separate from other tests. > > Signed-off-by: Axel Rasmussen > --- > tools/testing/selftests/mm/uffd-common.c | 5 ++++- > tools/testing/selftests/mm/uffd-common.h | 3 +++ > tools/testing/selftests/mm/uffd-stress.c | 12 +++++++----- > 3 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c > index ba20d7504022..02b89860e193 100644 > --- a/tools/testing/selftests/mm/uffd-common.c > +++ b/tools/testing/selftests/mm/uffd-common.c > @@ -499,6 +499,9 @@ void *uffd_poll_thread(void *arg) > int ret; > char tmp_chr; > > + if (!args->handle_fault) > + args->handle_fault = uffd_handle_page_fault; > + > pollfd[0].fd = uffd; > pollfd[0].events = POLLIN; > pollfd[1].fd = pipefd[cpu*2]; > @@ -527,7 +530,7 @@ void *uffd_poll_thread(void *arg) > err("unexpected msg event %u\n", msg.event); > break; > case UFFD_EVENT_PAGEFAULT: > - uffd_handle_page_fault(&msg, args); > + args->handle_fault(&msg, args); > break; > case UFFD_EVENT_FORK: > close(uffd); > diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h > index 197f5262fe0d..7c4fa964c3b0 100644 > --- a/tools/testing/selftests/mm/uffd-common.h > +++ b/tools/testing/selftests/mm/uffd-common.h > @@ -77,6 +77,9 @@ struct uffd_args { > unsigned long missing_faults; > unsigned long wp_faults; > unsigned long minor_faults; > + > + /* A custom fault handler; defaults to uffd_handle_page_fault. */ > + void (*handle_fault)(struct uffd_msg *msg, struct uffd_args *args); > }; > > struct uffd_test_ops { > diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c > index 995ff13e74c7..50b1224d72c7 100644 > --- a/tools/testing/selftests/mm/uffd-stress.c > +++ b/tools/testing/selftests/mm/uffd-stress.c > @@ -189,10 +189,8 @@ static int stress(struct uffd_args *args) > locking_thread, (void *)cpu)) > return 1; > if (bounces & BOUNCE_POLL) { > - if (pthread_create(&uffd_threads[cpu], &attr, > - uffd_poll_thread, > - (void *)&args[cpu])) > - return 1; > + if (pthread_create(&uffd_threads[cpu], &attr, uffd_poll_thread, &args[cpu])) > + err("uffd_poll_thread create"); irrelevant change? > } else { > if (pthread_create(&uffd_threads[cpu], &attr, > uffd_read_thread, > @@ -247,9 +245,13 @@ static int userfaultfd_stress(void) > { > void *area; > unsigned long nr; > - struct uffd_args args[nr_cpus]; > + struct uffd_args *args; > uint64_t mem_size = nr_pages * page_size; > > + args = calloc(nr_cpus, sizeof(struct uffd_args)); > + if (!args) > + err("allocating args array failed"); > + It's leaked? Isn't "args[] = { 0 }" already working? Thanks, > if (uffd_test_ctx_init(UFFD_FEATURE_WP_UNPOPULATED, NULL)) > err("context init failed"); > > -- > 2.41.0.255.g8b1d071c50-goog > -- Peter Xu