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 5F5A5C433EF for ; Fri, 25 Feb 2022 03:43:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237127AbiBYDnc (ORCPT ); Thu, 24 Feb 2022 22:43:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237119AbiBYDn3 (ORCPT ); Thu, 24 Feb 2022 22:43:29 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A2E61986C2 for ; Thu, 24 Feb 2022 19:42:58 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EA24861704 for ; Fri, 25 Feb 2022 03:42:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F67BC340E9; Fri, 25 Feb 2022 03:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1645760577; bh=szJqU+NFUQP2YK6JOgjKTa1LNFDJsh9UhhS500OApkE=; h=Date:To:From:Subject:From; b=GFDMnAT8NfOWMrAQTI2jJIht1ZowDz2tJQQh3XJDJI6xKhH5W2VvLbUgW+NjB0G6x LD3gLR0ZUy1bDUAF/hGQcOzmA9DLk92MUdZrUVXTNJoRUHz3QlWv71/Qpnonx/GBtF ljxjm5qiDZxUkN+g10oapTnzNc2hnXzlCbi3HVgw= Date: Thu, 24 Feb 2022 19:42:56 -0800 To: mm-commits@vger.kernel.org, shuah@kernel.org, rppt@linux.ibm.com, mpe@ellerman.id.au, aneesh.kumar@linux.ibm.com, rppt@kernel.org, akpm@linux-foundation.org From: Andrew Morton Subject: [wrecked] selftest-vm-add-helpers-to-detect-page_size-and-page_shift.patch removed from -mm tree Message-Id: <20220225034257.4F67BC340E9@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: selftest/vm: add helpers to detect PAGE_SIZE and PAGE_SHIFT has been removed from the -mm tree. Its filename was selftest-vm-add-helpers-to-detect-page_size-and-page_shift.patch This patch was dropped because other changes were merged, which wrecked this patch ------------------------------------------------------ From: Mike Rapoport Subject: selftest/vm: add helpers to detect PAGE_SIZE and PAGE_SHIFT PAGE_SIZE is not 4096 in many configurations, particularly ppc64 uses 64K pages in majority of cases. Add helpers to detect PAGE_SIZE and PAGE_SHIFT dynamically. Without this tests are broken w.r.t reading /proc/self/pagemap if (pread(pagemap_fd, ent, sizeof(ent), (uintptr_t)ptr >> (PAGE_SHIFT - 3)) != sizeof(ent)) err(2, "read pagemap"); Link: https://lkml.kernel.org/r/20220217083537.374160-2-aneesh.kumar@linux.ibm.com Signed-off-by: Mike Rapoport Signed-off-by: Aneesh Kumar K.V Cc: Shuah Khan Cc: Michael Ellerman Signed-off-by: Andrew Morton --- tools/testing/selftests/vm/gup_test.c | 3 +- tools/testing/selftests/vm/util.h | 27 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) --- a/tools/testing/selftests/vm/gup_test.c~selftest-vm-add-helpers-to-detect-page_size-and-page_shift +++ a/tools/testing/selftests/vm/gup_test.c @@ -10,8 +10,9 @@ #include #include "../../../../mm/gup_test.h" +#include "util.h" + #define MB (1UL << 20) -#define PAGE_SIZE sysconf(_SC_PAGESIZE) /* Just the flags we need, copied from mm.h: */ #define FOLL_WRITE 0x01 /* check pte is writable */ --- a/tools/testing/selftests/vm/util.h~selftest-vm-add-helpers-to-detect-page_size-and-page_shift +++ a/tools/testing/selftests/vm/util.h @@ -6,11 +6,32 @@ #include #include #include +#include /* ffsl() */ +#include /* _SC_PAGESIZE */ -#define PAGE_SHIFT 12 -#define HPAGE_SHIFT 21 +static unsigned int __page_size; +static unsigned int __page_shift; -#define PAGE_SIZE (1 << PAGE_SHIFT) +static inline unsigned int page_size(void) +{ + if (!__page_size) + __page_size = sysconf(_SC_PAGESIZE); + return __page_size; +} + +static inline unsigned int page_shift(void) +{ + if (!__page_shift) + __page_shift = (ffsl(page_size()) - 1); + return __page_shift; +} + +#define PAGE_SHIFT (page_shift()) +#define PAGE_SIZE (page_size()) +/* + * On ppc64 this will only work with radix 2M hugepage size + */ +#define HPAGE_SHIFT 21 #define HPAGE_SIZE (1 << HPAGE_SHIFT) #define PAGEMAP_PRESENT(ent) (((ent) & (1ull << 63)) != 0) _ Patches currently in -mm which might be from rppt@kernel.org are