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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE3AFEB64DA for ; Tue, 4 Jul 2023 21:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231248AbjGDVEx (ORCPT ); Tue, 4 Jul 2023 17:04:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229895AbjGDVEw (ORCPT ); Tue, 4 Jul 2023 17:04:52 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 870291706 for ; Tue, 4 Jul 2023 14:03:53 -0700 (PDT) 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-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-IHNzaEzXNEuWusgzhzNZmw-1; Tue, 04 Jul 2023 17:03:51 -0400 X-MC-Unique: IHNzaEzXNEuWusgzhzNZmw-1 Received: by mail-yb1-f198.google.com with SMTP id 3f1490d57ef6-b96a5d9abfbso860234276.0 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=d2fX2Ol5luBqMy7Nt3Q+7jBseLycqh03NaCG2H6Nr7gnteieVbqfzzNpjJj5Y9zbvd VDk6k+REfIyy5aTO0gsEuqdgWuStpZjvahpTe9XnRvyAHj7rUyDi7z1uShzdNCrZKbeT ptEOFuGY9SyGaQ7vleNJLkS1OgRhqxiHwFj1B4rHVwbxKvUoarGb4xl6VB0pewlh18/V e6O1zialnlL/RFO7pQXD/PzuO9nbpxECcTSJdLz5nSv5SSx099eMFfyjt7n13tDW6KcR pNPSBY99Wx+yxRBFWgUIP37dvgkhcH5369rO3O7ZszsFdX49aCRwq4FxlRj84y+K/X7b 7A9Q== X-Gm-Message-State: ABy/qLaC3S/83duHY7sVjABnoaNQd+MGEqmRvUlwuie5K32uYlFRDw2+ XZWPTeYQ6lD8n4PCkobuabJ5vq/hrMzEPWaCGfADJR63lObxkZNpxxBN48GUotgwdxgxEpwoSAB cLso1CzHq9vKP6hKNdjild8D6Zg== X-Received: by 2002:a81:5256:0:b0:577:296:af5d with SMTP id g83-20020a815256000000b005770296af5dmr7772626ywb.0.1688504630736; 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 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230629205040.665834-4-axelrasmussen@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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