From patchwork Thu Mar 30 16:07:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 77292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1250653vqo; Thu, 30 Mar 2023 09:22:41 -0700 (PDT) X-Google-Smtp-Source: AKy350Y+5WFI2KWhxOJa3FtywN5KUIvoCMRMhxup+SV4JPhqrtOtQ6CujymymzhsrsmfmH2cIZkF X-Received: by 2002:a17:90a:1a05:b0:23d:5485:b80e with SMTP id 5-20020a17090a1a0500b0023d5485b80emr26386480pjk.6.1680193360880; Thu, 30 Mar 2023 09:22:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680193360; cv=none; d=google.com; s=arc-20160816; b=jOFU66hgMJd9eqB0hBGAzDX4s1B64E5BMFvimkMsWKH8UbvtErVsvdufY8OzGPxNIq QmiFbgvIQNGfzqBBm6E5xForUdmZBtI0AUyp6aWkNzPiD7NJjgFprMLacUOgJ3on47Rg PP6YbvpOn5z0cnGvn95v5kaQDE2ktABdeLLC3QKYVnUO+56foIki4W6m4CCWA9LdXp0b WZxWpjzyII1RN6rEcTipLG9vsCBnAoO/+PwKlUXZ+rcRgKhbxpXki33vG6Kr1nT/OdI9 HfwpSRxuQ2mnEL7AnFdY72SJmV1pSD7qhsx07qHx0jX+VOzS+VMHVvr4f/Njs/4AB8hd SpKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ASfRfnQJTCdEglytu7DR/J7BYjWDsPlfNboYF8myg6I=; b=RfhhWk3VzAXDagpY62p8nGCD/pabXAkikDD2DMuf9IIt44k0C6TytaGyh+WcaxHZOV k8Waz8bMvETspp0otGo2Ezf2AFMIuXHL3txoxE2B8qqqKf79CTGuUYRH/dlNRkXbZ8LK KaJIgtRxRMVvtD3mWCYegZsy2lD0cuJLhltBQJ1ysRp1r/Un6Uvd1+PdpU79OhjB/7oT ZshtwnewvlcR4X2wY97bnBCiFEXzPH+vn6ZagDdBcfiZZZMxwTcq1+S4NiUzrQvQ/xTE jCi/egx8OCSlulzkhZ5xbYAUv7FqYnb0WzjW0vqw1hTPpAtqHm63mGjZPuFeyp+D9mSj Mw0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PGXCY5M6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x11-20020a17090aca0b00b00233c5363cdcsi1586911pjt.142.2023.03.30.09.22.24; Thu, 30 Mar 2023 09:22:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PGXCY5M6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232885AbjC3QIT (ORCPT + 99 others); Thu, 30 Mar 2023 12:08:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231566AbjC3QIE (ORCPT ); Thu, 30 Mar 2023 12:08:04 -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 4BE9B9EE0 for ; Thu, 30 Mar 2023 09:07:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680192439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ASfRfnQJTCdEglytu7DR/J7BYjWDsPlfNboYF8myg6I=; b=PGXCY5M6uUnCD/BeXnzDKcl0fDTXAAjNvz52OAHFA4JAQBOYz2lwPuz0jLLzGovVCwHUsB MQcphRsgYLkY7vASdD6xpV4wnrT69B1ACQ8rvfQfU8iTzW4zrQ6EK1iVlHm7CmkBCkuh2j +mEx+xs0JF1mSucFjSBE5K09ZQEG7rM= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-259-wGpkg7j2OGm4_IpG_jxung-1; Thu, 30 Mar 2023 12:07:18 -0400 X-MC-Unique: wGpkg7j2OGm4_IpG_jxung-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-746bae78af3so60157885a.1 for ; Thu, 30 Mar 2023 09:07:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680192437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ASfRfnQJTCdEglytu7DR/J7BYjWDsPlfNboYF8myg6I=; b=gE7BtTKQsYzebb4aHofOTIkNAODIp1rEKlkU9bWqFL71eErsxiz9euOrdsUYQZnLJk 5LEPZXtSJWRReyeuwc2l/tb9gJ88R7xJrgspCDP9jn4VE9gF03gYXVJJZCJ+AHu1lWBa c6awuLq7QreM0X+KSZziG0fzewgb2mP+OV54y8GiTx4X6H98h4e948Pd4D6D1kFCwlyf xyb+vTBH4c5ngzcADwLbguK/Asiy0Kck5Xaci3i8xZa/eGmBnBdJxKxYUdsBpzXH43f8 lOgDdMpZB+zzmYzKuRe9YRysTcdmT2GJICFvIcOFo9f9kryGFaUA45Hz7xeaJD/7lyXx l9gA== X-Gm-Message-State: AAQBX9d+dfRbaFXc7NQVsbW/3Xz/CiOd4CjHrelp1yTR2UctiRsU+EEp 7TqA4AmqbAaNH0DGBYXalGflDij6uRjqGzJyC1XqiIEoAJbZlxWOutI5LaVxN7nq4442VBG213t 8dOtA+a+WPFZpZOlg2+57odZ2Z0m9VXMh X-Received: by 2002:a05:622a:1802:b0:3e2:4280:bc58 with SMTP id t2-20020a05622a180200b003e24280bc58mr4246277qtc.3.1680192437027; Thu, 30 Mar 2023 09:07:17 -0700 (PDT) X-Received: by 2002:a05:622a:1802:b0:3e2:4280:bc58 with SMTP id t2-20020a05622a180200b003e24280bc58mr4246240qtc.3.1680192436773; Thu, 30 Mar 2023 09:07:16 -0700 (PDT) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-40-70-52-229-124.dsl.bell.ca. [70.52.229.124]) by smtp.gmail.com with ESMTPSA id s80-20020a37a953000000b00741a984943fsm11749352qke.40.2023.03.30.09.07.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 09:07:15 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Andrew Morton , Andrea Arcangeli , peterx@redhat.com, Axel Rasmussen , Mike Kravetz , Leonardo Bras Soares Passos , Mike Rapoport , Nadav Amit Subject: [PATCH 10/29] selftests/mm: Test UFFDIO_ZEROPAGE only when !hugetlb Date: Thu, 30 Mar 2023 12:07:14 -0400 Message-Id: <20230330160714.3106999-1-peterx@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230330155707.3106228-1-peterx@redhat.com> References: <20230330155707.3106228-1-peterx@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761810433412766043?= X-GMAIL-MSGID: =?utf-8?q?1761810433412766043?= Make the check as simple as "test_type == TEST_HUGETLB" because that's the only mem that doesn't support ZEROPAGE. Signed-off-by: Peter Xu --- tools/testing/selftests/mm/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/userfaultfd.c b/tools/testing/selftests/mm/userfaultfd.c index 795fbc4d84f8..d724f1c78847 100644 --- a/tools/testing/selftests/mm/userfaultfd.c +++ b/tools/testing/selftests/mm/userfaultfd.c @@ -1118,7 +1118,7 @@ static int __uffdio_zeropage(int ufd, unsigned long offset, bool retry) { struct uffdio_zeropage uffdio_zeropage; int ret; - bool has_zeropage = get_expected_ioctls(0) & (1 << _UFFDIO_ZEROPAGE); + bool has_zeropage = !(test_type == TEST_HUGETLB); __s64 res; if (offset >= nr_pages * page_size)