From patchwork Fri Mar 22 11:41:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 13599999 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B972AC47DD9 for ; Fri, 22 Mar 2024 11:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ygPfpmOMu4+1CwRxrdzN8AVxG5y3o3UIBm1QiTcnSZE=; b=2yGYiyI03cG6EG gFNdOHNdzk3sALQsX5HAHrmfx/xRP1qZJ+QwPrwqPAe4LX/uc2DHmW3Z/AKXgGlafQglJHFemUyTX FWVPLwXao6fQ8QIwy2OR0YMtGP5ZKgI7lswxjN0BSp7Sa/d2WnVNZQfgG5Yp5HAS8zuocERA3Hi/u 4QU+FELb5vEfHYIQUsGXqwq2GG0KErohqR+TruRiL40hgHdvcunNijBEGIBr8f88AXEvIVeNPsIXc PUWxFU/SUF3y3SqDYC6lMRPUPKQUhGH1F2S0+9ihzmvLOIt9Z/n2v9tAjzT/VEXIvscKCA8KGwC+K DE20JAXJOdJIoFNKoHOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rndHe-00000006zhT-012T; Fri, 22 Mar 2024 11:42:02 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rndHa-00000006zfH-1Cxy for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2024 11:41:59 +0000 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1e087973932so6639455ad.3 for ; Fri, 22 Mar 2024 04:41:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711107716; x=1711712516; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=F9OutCqVZAxLYLcVQMTLlVzNDJwVicrj2Kc/nVp36kc=; b=ZjdFaKgdnzSd8fhVk/5U8LBWYykd136bZaDVYGxexxw7GmSO6we2lz0ygFApw+CDuK v+FCqUs02j2kqNiAmPgwT/9IRIknAbdd1OnvaXRJVQwJ9oUqCTFu1ijWm98z1wk1SfAu 5E4FaWKYrdWPPUXWh2cXgPMVQ88JqIAGhscfCckIKLEmE/heE9tc5mpuqLAtSzaT4Ue5 r/p8WTbuPB/8dIhFzFiql7JoiytGraPuXe5kYMTsNpSe52orpbkIKS4h67OAmiFlshg6 OvwFzQbqMkwOyJECg3BHHQkLZ8gLwlRoLVMFgu2NwG/2gh2YLTcBuq43sWBO6+ip70pm XI6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711107716; x=1711712516; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=F9OutCqVZAxLYLcVQMTLlVzNDJwVicrj2Kc/nVp36kc=; b=pWEwb+ige4rjXpAMxs48zGo8LbPXUEjswiXsZeDTowA9qSa0J8C7pNcFxfPat16uQU aQ+YwUOv2Wg9TbKA4TNhN0AlGLI2Z8sXyjTAqkcqqsSnu9+/30ANQSUXPHjEKGcoihPt lTnAhfFyCnzL3HH8xMLwcoYUJ3FCYhCg74vE/dE13j/n7YkmdDyLZnw1Ltvhiir711w4 ZBnQaHdOMt44adcNROhqo4FAtFqu1M80ksk7bbPayt6VvJWPhQM4OZVnXSlhE2/HPFml 8H9fGH839JVJ1Zw2AjxafqkGj7dm/z5LWuQlDeEcY4fZMtxLsXH95SnzT99/UNRiSm8f 19kw== X-Forwarded-Encrypted: i=1; AJvYcCVErE2daxYOJQTiu87LMYRd84UAJ0xK3qIGFarkGEwR6FeHE3oHqlx/jMeP8/gHhGIHXKGxT6nQ6INzAQ/1bOeIEvoNHVUxTs43pvDvouqdnwZUSgc= X-Gm-Message-State: AOJu0YyuKglcxoS7++oCtDYIkBawmr/WnwGaOb5rq0F68KMmpeel99db mT339PSyw3u0uCTasZ5HJyGiFrcwTmlcN3f//8CQotJdd3UhAPas X-Google-Smtp-Source: AGHT+IECvbWHnvjqaHafErRwYVmEILP9NsOyshUhBo9Ba6zifkAAJRe8kjAppOJb1hnY/b/8WEIrCA== X-Received: by 2002:a17:902:bc47:b0:1dd:d40b:bd30 with SMTP id t7-20020a170902bc4700b001ddd40bbd30mr2247472plz.29.1711107716259; Fri, 22 Mar 2024 04:41:56 -0700 (PDT) Received: from localhost.localdomain ([2407:7000:8942:5500:aaa1:59ff:fe57:eb97]) by smtp.gmail.com with ESMTPSA id p14-20020a170902e74e00b001d92a58330csm1700209plf.145.2024.03.22.04.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 04:41:55 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, hughd@google.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org Cc: chrisl@kernel.org, mark.rutland@arm.com, ryan.roberts@arm.com, steven.price@arm.com, david@redhat.com, willy@infradead.org, Barry Song Subject: [PATCH 0/1] THP_SWAP support for ARM64 SoC with MTE Date: Sat, 23 Mar 2024 00:41:35 +1300 Message-Id: <20240322114136.61386-1-21cnbao@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240322_044158_364402_27A5F91A X-CRM114-Status: GOOD ( 15.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Barry Song The patch has been extracted from the larger folios swap-in series [1], incorporating some new modifications. Introducing THP_SWAP support for ARM64 SoCs with MTE is essential, particularly due to its significance for widely used ARM64 products in the market. Without this support, Ryan's mTHP swap-out without splitting series won't operate effectively on these SoCs. Therefore, it's imperative for this update to be implemented sooner rather than later. There are a couple of differences with the code in [1]: 1. minor code cleanup, Ryan 2. always pass the first swap entry of a folio to arch_swap_restore, Ryan [1] https://lore.kernel.org/linux-mm/20240304081348.197341-2-21cnbao@gmail.com/ Barry Song (1): arm64: mm: swap: support THP_SWAP on hardware with MTE arch/arm64/include/asm/pgtable.h | 19 ++------------ arch/arm64/mm/mteswap.c | 45 ++++++++++++++++++++++++++++++++ include/linux/huge_mm.h | 12 --------- include/linux/pgtable.h | 2 +- mm/internal.h | 14 ++++++++++ mm/memory.c | 2 +- mm/page_io.c | 2 +- mm/shmem.c | 2 +- mm/swap_slots.c | 2 +- mm/swapfile.c | 2 +- 10 files changed, 67 insertions(+), 35 deletions(-) Appendix I also have a small test program specifically designed for running MTE on a THP that I can share with those who are interested in this subject. /* * To be compiled with -march=armv8.5-a+memtag */ #include #include #include #include #include #include #include #include /* * From arch/arm64/include/uapi/asm/hwcap.h */ #define HWCAP2_MTE (1 << 18) /* * From arch/arm64/include/uapi/asm/mman.h */ #define PROT_MTE 0x20 /* * From include/uapi/linux/prctl.h */ #define PR_SET_TAGGED_ADDR_CTRL 55 #define PR_GET_TAGGED_ADDR_CTRL 56 # define PR_TAGGED_ADDR_ENABLE (1UL << 0) # define PR_MTE_TCF_SHIFT 1 # define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT) # define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT) # define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT) # define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT) # define PR_MTE_TAG_SHIFT 3 # define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) /* * Insert a random logical tag into the given pointer. */ #define insert_random_tag(ptr) ({ \ uint64_t __val; \ asm("irg %0, %1" : "=r" (__val) : "r" (ptr)); \ __val; \ }) /* * Set the allocation tag on the destination address. */ #define set_tag(tagged_addr) do { \ asm volatile("stg %0, [%0]" : : "r" (tagged_addr) : "memory"); \ } while (0) int main() { unsigned char *a, *p[512]; unsigned long page_sz = 4 * 1024UL; unsigned long mem_sz = 2 * 1024 * 1024UL; unsigned long hwcap2 = getauxval(AT_HWCAP2); int i; if (!(hwcap2 & HWCAP2_MTE)) return EXIT_FAILURE; if (prctl(PR_SET_TAGGED_ADDR_CTRL, PR_TAGGED_ADDR_ENABLE | PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC | (0xfffe << PR_MTE_TAG_SHIFT), 0, 0, 0)) { perror("prctl() failed"); return EXIT_FAILURE; } a = mmap(0, mem_sz * 2, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (a == MAP_FAILED) { perror("mmap() failed"); return EXIT_FAILURE; } /* make sure a is aligned with 2MiB THP */ a = (unsigned char *)(((unsigned long)a + mem_sz - 1) & ~(mem_sz - 1)); madvise(a, mem_sz, MADV_HUGEPAGE); memset(a, 0x11, mem_sz); if (mprotect(a, mem_sz, PROT_READ | PROT_WRITE | PROT_MTE)) { perror("mprotect() failed"); return EXIT_FAILURE; } printf("set tag for each 4KiB page\n"); for (i = 0; i < 512; i++) { p[i] = a + i * page_sz; p[i] = (unsigned char *)insert_random_tag(p[i]); set_tag(p[i]); p[i][0] = 0x33; } printf("swap-out the whole THP\n"); madvise(a, mem_sz, MADV_PAGEOUT); printf("swap-in each page of the original THP\n"); for (i = 0; i < 512; i++) { if (p[i][0] != 0x33) { printf("test fails, unmatched value after swap-in\n"); return EXIT_FAILURE; } } printf("we should get here\n"); for (i = 0; i < 512; i++) { printf("page :%d val: expect segment fault, is %02x\n", i, p[i][16]); } printf("we shouldn't get here\n"); return EXIT_FAILURE; }