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 004E0C3ABC3 for ; Tue, 13 May 2025 12:12:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1DEC56B00CF; Tue, 13 May 2025 08:12:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 18C3C6B00D0; Tue, 13 May 2025 08:12:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 005AB6B00D1; Tue, 13 May 2025 08:12:34 -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 D1B066B00CF for ; Tue, 13 May 2025 08:12:34 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E0790160908 for ; Tue, 13 May 2025 12:12:34 +0000 (UTC) X-FDA: 83437772628.17.E4C7D6A Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf18.hostedemail.com (Postfix) with ESMTP id 17E941C0003 for ; Tue, 13 May 2025 12:12:32 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=eyGCBhJn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of 3LzcjaAgKCHIZQSacQdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jackmanb.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3LzcjaAgKCHIZQSacQdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jackmanb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747138353; 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=tqJ7N5MPCKIBPZ28ZuVfeZRrV5rqQYI+Sww0v7Ls2co=; b=avQbJPLG7r6uOwRdk2L4DMJkRxEd20uKYvIbEs52a0bu7Qx0OUJDOQ0+l3k4gBaynx6+Pb ZBvxLchjMixbOWgsM1p0MRV11tQjgF2h8gTdG33rLMqjayYvRzNeMCAJyxq4F/tS9ylaOV 5/HD5zkam3MaBZgazrB4jn/LJXrtxFE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747138353; a=rsa-sha256; cv=none; b=TXPhWV12iga3tWNQLW2idDsAYDu+bmXsabHi5HIwO3yQAGsYujZoXuFY9RvtIuaWpxph6M crafelDFlstQ7XQ3SYFpJaJkqvaNpEazqa+1tXW03jDFJwXLTSk7Tbo4ssEOGpWtWZOuX0 SpYwtMxU5uhaGSrLUgnNbFAiL2ajK4M= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=eyGCBhJn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf18.hostedemail.com: domain of 3LzcjaAgKCHIZQSacQdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jackmanb.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3LzcjaAgKCHIZQSacQdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jackmanb.bounces.google.com Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-3a0b9bbfa5dso1924657f8f.3 for ; Tue, 13 May 2025 05:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747138351; x=1747743151; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tqJ7N5MPCKIBPZ28ZuVfeZRrV5rqQYI+Sww0v7Ls2co=; b=eyGCBhJn/141iWnpS6nDUBG3H7StGLR977p3fnZY0xYBblt9nO3d9o312pHASHia4E vmh9HMRIAEM1rpymPJhtCeVDES4YFoD68Byl58LnO8RAzqO1+/56fWT6W557pSWU583m DkoP9TOEUAaAJnKvQ1cWaeoGbWvR/40VLrka+vDXxt31QUULUYY6RGyPqtAKerc1mbSd yGRsjGjqjCS3Ah1sw10tyoXRoZ1/JWDg4fY85HEwzrpa8MV1T5FLgO3xbXTs76hQMs2N /Dtf3meyTuxTXo3pYo3uP4aILT4reTBfsoq9+ODpi/wa2ZBpnDLlamhny9T3wG66Fwwm torQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747138351; x=1747743151; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tqJ7N5MPCKIBPZ28ZuVfeZRrV5rqQYI+Sww0v7Ls2co=; b=iKQHKZ2OohrH4okXPGeCyG1zWZG0n968t6aokS6NwN5l7SuIXgOVjrnmXStOf3QHat IAqTEcXtvSWgLl7oZwCYnzMjmOmWNv9MpOnwrLwreo+1KQwKLI6iumHMH2g1eVjkHu/z UQgNGSHYuC2oNocEdXTqGzDm5I8weyr9IapTBImq2ZFRrTm8xnmT9tYVzhZnnl1ogZrY sMM08ECIorYZxn5krH2cbIzHsSksWIq0MXJUb+Is9ymaUU1jZ/2c3vTfoEHN2mQPqYA9 y7Xi8PTVSZlO9OEMdQS4U5dFXpr37OuBZ+tATZwVNQT6gFcB4dmPFwplBAOis2olGsJl kV1w== X-Gm-Message-State: AOJu0YwpywKLy4oKirp6PKZtEwltkZI1UV/1mpr26bEeKTsrMhTMqpjP qW41OSslLuqxWqSPNpcIhlf7PrLQcyqELOuEObPQW0mgAqhqgdx2Ks6RbqEAZygDeu85omybCb6 JxZZ5xDM0qA== X-Google-Smtp-Source: AGHT+IG1OsKgvOvWxbxMpIyjNij9qpe7ZgQZFFjSE4GFLCMtcMJZvIlysSCvcCV8dJuwPiyPNy+cphTfNr8caQ== X-Received: from wmbdr13.prod.google.com ([2002:a05:600c:608d:b0:441:b607:4ec0]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:40e0:b0:3a2:3c51:7df0 with SMTP id ffacd0b85a97d-3a23c51810fmr3866676f8f.49.1747138351600; Tue, 13 May 2025 05:12:31 -0700 (PDT) Date: Tue, 13 May 2025 12:12:29 +0000 In-Reply-To: <20250510160335.1898-1-ujwal.kundur@gmail.com> Mime-Version: 1.0 References: <20250501163827.2598-1-ujwal.kundur@gmail.com> <20250510160335.1898-1-ujwal.kundur@gmail.com> X-Mailer: aerc 0.20.0 Message-ID: Subject: Re: [PATCH v3 1/1] selftests/mm/uffd: Refactor non-composite global vars into struct From: Brendan Jackman To: Ujwal Kundur , , , Cc: , , Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: kb7tn8bfaw1xjgfns4z15imeohdq3nof X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 17E941C0003 X-HE-Tag: 1747138352-474034 X-HE-Meta: U2FsdGVkX1/vmNFwC2BJybwf7F4RwMr42Y7gOO223IeqbQWxs+yvZT2VlWSEZjJdhnDKi9P+mi1QBdMyo/voOGtic51rbY3KVtFpZiuE0WnfE+KJ23ebHQYeeXJ/reiB88U3PDQD4jgGxcfEetg0IdSdWmhVBT5bbw1gpbCdR+sypQgMLyJNk7fqbrOMjDiCNVWocO8s69vh54G2Q7o92kVkKBDneSvCeELI7tnZS+sHQXLiMYggJ5PR+sBWOPvmxTeVT/6Minpe7r9xsA7CEChNjT3oSVjMHZaY2AywItWPVop6FYdt0H0UXrzf8vWjldzL5upPbE9BBWqaitZ+uDEqaTP3J0q9xqADsCUGg0UnG+SqlHckDo/5b+tkYdB8a9C8hNbLkscQFnqejHfGp5rkVrkp3TdDkHQO87ilgmbOmJuyYofrNhYzs9uw2iLoGZDxjOcXIrcq6M3jLuxnVJ97C/6fJRnzCHI48MLlmpo9cpxdtY1EDAWQ0CCz/Fj25n12IaZFhnxOO9FMs0h0y/0Ha0Vktng3zzH6KWmIA3YPA8dj0r/s8PNz7VQ+K0hHXSrFpKj5AiegwIP58rlUeAHTpgvtf02gqcpN2SND5U+9y+FsY6eM+sYHg6xeL/Drdf69UDivh+A/zsUfwrCREl60lJNcFiQ2H8Unv/tMmLHXUVp4ZNm7pV27pKxn0uVxkfzjdwtPp/ShjkpXLgd3gXcDy5k9DNNHiNQ7lqMIe03tENyjycoinih5vBBrEh4mupl1zVKpzEw9lRBH7q9PaOifey5BbRG68yiALhGw3h6ZandCsgTE+axpxsOJym2WNA2I+ZQ5bJL6HBf2X60B/YEp4lp6g0kezvdTmCf6Hhs3BxhdGRXOv+kGTjVPuw2oao1ZVzMp5tTParR8Nmd7WDw83F+Dp8VruLlDMgbSjfKSMg/DziSZkKl56dh7fI4sODHhZATVWrpaA973MN1 LDKsprhw Yk7UiS4M3Pa/3MlKWj9YYzBZP+oWhYYUC0MklndG0PSOBjIxA+c+sQiSV2h51rzNtNHxYU1coj+NoRdFzRDa854OLaXSPY+v73KD6IACOEclLSBLijhqizYgDkUe7mKhGekJfPMZE4GgB5KIeUNztbQRMysVsK/anonELVmh+pgbMuq+Vs3DKTkqp0g4viIiHo0W7drxBYEDoZ9X2kKoIsM/UphzKrqhqDnoIOWThZHQNAi9aHf/fiRFC1w1S/zUFq2zPMYdW5TBglnuF6SMlxBTBTzkkL5z9DFJLh9Egk4INlOcIo1zJ9nNr5NgHgL3+i9pig7lMU84PsihWxxqcMcw7XFcLNYfRrOPeiwlBkhrEulObxwhCRocy3B7dB5Jnp8Hyj6qi9KGmAyiUIqXvoWXdbbqP+3m69GTz6zU5NUF/n7eG1MGL63s91r+jdvKAbpi8xm9IiPO8gkpUl1OeD9x+yhywwCBZGxhgNPuB+4hz0/iv1McUTa9+WlC0dWx4jMbwwXlEzf9+LWC5+abt2O2wngU3gCdiQDDfqahxizgmNPsdNveXA3ZCUHkryzLx9bXMzqul6kUL+JjqZhWhq2QcYKciWFUskj6fafpOAJjN5Zq52n1YdKnM8qMUDcTMUu96L7OW26WpZ0kmLYy2S9YinJ/1pG+j+uo95nQtw5DY4o/rq+f5vSg3lEVpHLBpkJXe7WEWg2zaytlWqgSeuJBmvdZ5cJCFQZzbB8EM0YTHsRU5AVUmVK7gBD7ISY37V57Ze5fbqjt8yrUdfmgtU5ahdOYHwoKW/UrCPtKbTDUugd/QyeEGFouwFA== 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: List-Subscribe: List-Unsubscribe: On Sat May 10, 2025 at 4:03 PM UTC, Ujwal Kundur wrote: > Refactor macros and non-composite global variable definitions into a > struct that is defined at the start of a test and is passed around > instead of relying on global vars. > > Signed-off-by: Ujwal Kundur Tested-by: Brendan Jackman --- > Changes since v2: > - redo patch on mm-new branch > Changes since v1: > - indentation fixes > - squash into single patch to assist bisections Thanks for this. > -static void retry_copy_page(int ufd, struct uffdio_copy *uffdio_copy, > - unsigned long offset) > +static void retry_copy_page(uffd_global_test_opts_t *gopts, struct uffdio_copy *uffdio_copy, > + unsigned long offset) > { > - uffd_test_ops->alias_mapping(&uffdio_copy->dst, > - uffdio_copy->len, > - offset); > - if (ioctl(ufd, UFFDIO_COPY, uffdio_copy)) { > + uffd_test_ops->alias_mapping(gopts, > + &uffdio_copy->dst, > + uffdio_copy->len, > + offset); Looks like your editor got a bit excited here :D There are a few other places where this happened too, e.g. the are_count() declaration and there's a pthread_create_call() that's quite messed up. Unfortunately I don't know of any tool that can find/fix these issues automatically without also messing up the whole file. Could you just do a visual skim and fix what you can spot? > static void sigalrm(int sig) > { > if (sig != SIGALRM) > abort(); > - test_uffdio_copy_eexist = true; > + // TODO: Set this without access to global vars > + // gopts->test_uffdio_copy_eexist = true; Did you mean to leave this like that? > @@ -1734,6 +1737,27 @@ int main(int argc, char *argv[]) > } > for (j = 0; j < n_mems; j++) { > mem_type = &mem_types[j]; > + > + // Initialize global test options Wrong comment style here > + uffd_global_test_opts_t gopts; > + > + gopts.map_shared = mem_type->shared; > + uffd_test_ops = mem_type->mem_ops; > + uffd_test_case_ops = test->test_case_ops; > + > + if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB)) > + gopts.page_size = default_huge_page_size(); > + else > + gopts.page_size = psize(); > + > + /* Ensure we have at least 2 pages */ > + gopts.nr_pages = MAX(UFFD_TEST_MEM_SIZE, gopts.page_size * 2) / gopts.page_size; > + /* TODO: remove this global var.. it's so ugly */ That's done :) > + gopts.nr_parallel = 1; > + > + /* Initialize test arguments */ (This comment seems like noise? I could be wrong, not a big deal). Thanks for these improvements. Bit of a hasty review and I'm not really qualified to comment on the test logic itself, but aside from that and my nits: Reviewed-by: Brendan Jackman