From patchwork Thu May 18 02:18:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 95619 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp189105vqo; Wed, 17 May 2023 19:24:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4sXPTkIlcTgAgljyjo13T0AWEpCEFWTiF83W/aRlSpkKoWbpZhZP3M/1BUEfJy71JswlEr X-Received: by 2002:a17:90a:ae14:b0:24d:f739:d62a with SMTP id t20-20020a17090aae1400b0024df739d62amr1021114pjq.23.1684376644803; Wed, 17 May 2023 19:24:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684376644; cv=none; d=google.com; s=arc-20160816; b=bQ6Gq0p0poNtauqBsaffPKtGwhjD0vKV1f6Nws8yuaDjqGCMWHn1Am+2UD7VcehCQK HYsaJG5xeZVBoRdksqfi53LgG+b1I01sgk7ryBCOaiXXqva0i7BZm3hzYnwa23t9DQtO RvKby9WPlYO5T5n7LoH1n7VPo6FF6qKuNqZI2QyAAwzuctNFL1AEWm6VsQTXye1jkIuE tDktywT46vkbQCx9xSU3ovep0oKqCW7XjNRe3GjkZLx4y7Xef9JMl7nhk8INVQ3I9K/r no6V8NH4Y1s3Y8uUdAmAEmm5cts1cqpTtdoDMUtVBYOybNS7hSgG9SVKBwDWMZwXCPvw IP9g== 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=sKe+AGy/Knc6S6d8Do5DN/gqM9Uy00SAbxH28Kp1LUQ=; b=aLTV96yIS207YUCTWIPEXVO2seJLD+dp8SoSeQypIe3yPh1A2V7sLbWwGdRIWU1iBy usFrA4A7SSbLGo+dnZjBqduQyaOFupK9YmA6+B/T4dDq099956NvwMHJ0q6ip7kwcYUo 2cyeTL+m3c2qbIz/UVk7M/kJWwgvLyWUoRpuuTI7BMp67ii+9WtkAwMp0vF8QTsxIlbm j3Veiw0GuJKFrvnXYT9KRloC10VK9WCfVN1LZ0uPzlXg4Kr1BP3hELmwADd5cNFLs/DA x7rkIR+g3eX9l5nPKpdy9JRYtKg+2ufRpBwQqNxTCpZczIYzGpM2zjrRlYL5y5JZfVAH Jdaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=gpiRUjEC; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h11-20020a65480b000000b00513162c223csi267260pgs.470.2023.05.17.19.23.51; Wed, 17 May 2023 19:24:04 -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=@joelfernandes.org header.s=google header.b=gpiRUjEC; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229881AbjERCTA (ORCPT + 99 others); Wed, 17 May 2023 22:19:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229824AbjERCSr (ORCPT ); Wed, 17 May 2023 22:18:47 -0400 Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 024DC210C for ; Wed, 17 May 2023 19:18:46 -0700 (PDT) Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-6238daae378so2863126d6.1 for ; Wed, 17 May 2023 19:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684376325; x=1686968325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sKe+AGy/Knc6S6d8Do5DN/gqM9Uy00SAbxH28Kp1LUQ=; b=gpiRUjEC25YrRlvGt299DCLZarxkVMlPppBRMeGjpsXJgixg9Mf1V9AuFtBCGh5WIO zYyRiKyN25sNF/Dcpz8SONWOiUN5ginUd3c7nz+IsRYtc1emCT1YYGJXOzWz7hQjxiRf eGy+COuTrQdS11tlfAZg8TDkFkoBJhCtLoMlI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684376325; x=1686968325; 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=sKe+AGy/Knc6S6d8Do5DN/gqM9Uy00SAbxH28Kp1LUQ=; b=jQIgLyjHPpSrl5Tu3QGr45g54zHi6eRFo3/EPi+Q4AFCNeQ/VgndEoU1lkL8kY9/8i CgHqcgoDcsoKjhrjMaLC+srrSQoY2kuPXIl2cSsCskVuit6U8GbqQtqnHF7tmz8YRP2m Yl07dFMBvVM47d/8R1MoSfISHp8xZ82MvKmmxzJNZo0e3kM5k6C7nyo6vu5PYgVuve6Y FuZogMVhqAi9N1YyMMg4SyAs9sHzhCTH64xe9XTQ665N6+/CNMP90R/d9lw8SS/QDilF 3OOOKUP9XQsmYkAXxCEamxpcMRgXC8HI2bBX8C8Vk1hFa9+4lWLwQ3JW4bpZZubMSpqo B6bA== X-Gm-Message-State: AC+VfDya4FtcQk93KGKmb3cEJ1yipYlZhjJQH+4vjZtbOec9xucMGGol 88Yrq8ZOZYvGIdZnG9evtzlGFXnOaOC5TqdFoz4= X-Received: by 2002:a05:6214:2349:b0:5e8:3496:e641 with SMTP id hu9-20020a056214234900b005e83496e641mr2657341qvb.13.1684376324809; Wed, 17 May 2023 19:18:44 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id j13-20020a05620a000d00b007577ccf566asm85082qki.93.2023.05.17.19.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 19:18:44 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" Subject: [PATCH RFC 1/4] mm/mremap: Optimize the start addresses in move_page_tables() Date: Thu, 18 May 2023 02:18:22 +0000 Message-ID: <20230518021825.712742-2-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230518021825.712742-1-joel@joelfernandes.org> References: <20230518021825.712742-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1766196924524644260?= X-GMAIL-MSGID: =?utf-8?q?1766196924524644260?= Recently, we see reports [1] of a warning that triggers due to move_page_tables() doing a downward and overlapping move on a mutually-aligned offset within a PMD. By mutual alignment, I mean the source and destination addresses of the mremap are at the same offset within a PMD. This mutual alignment along with the fact that the move is downward is sufficient to cause a warning related to having an allocated PMD that does not have PTEs in it. This warning will only trigger when there is mutual alignment in the move operation. A solution, as suggested by Linus Torvalds [2], is to initiate the copy process at the PMD level whenever such alignment is present. Implementing this approach will not only prevent the warning from being triggered, but it will also optimize the operation as this method should enhance the speed of the copy process whenever there's a possibility to start copying at the PMD level. Some more points: a. The optimization can be done only when both the source and destination of the mremap do not have anything mapped below it up to a PMD boundary. I add support to detect that. b. #1 is not a problem for the call to move_page_tables() from exec.c as nothing is expected to be mapped below the source/destination. However, for non-overlapping mutually aligned moves as triggered by mremap(2), I added support for checking such cases. c. I currently only optimize for PMD moves, in the future I/we can build on this work and do PUD moves as well if there is a need for this. But I want to take it one step at a time. [1] https://lore.kernel.org/all/ZB2GTBD%2FLWTrkOiO@dhcp22.suse.cz/ [2] https://lore.kernel.org/all/CAHk-=whd7msp8reJPfeGNyt0LiySMT0egExx3TVZSX3Ok6X=9g@mail.gmail.com/ Signed-off-by: Joel Fernandes (Google) --- mm/mremap.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/mm/mremap.c b/mm/mremap.c index 411a85682b58..d7ee3b20e170 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -478,6 +478,51 @@ static bool move_pgt_entry(enum pgt_entry entry, struct vm_area_struct *vma, return moved; } +/* + * A helper to check if a previous mapping exists. Required for + * move_page_tables() and realign_addr() to determine if a previous mapping + * exists before we can do realignment optimizations. + */ +static bool check_addr_in_prev(struct vm_area_struct *vma, unsigned long addr, + unsigned long mask) +{ + int addr_masked = addr & mask; + struct vm_area_struct *prev = NULL, *cur = NULL; + + /* If the masked address is within vma, there is no prev mapping of concern. */ + if (vma->vm_start <= addr_masked) + return false; + + /* + * Attempt to find vma before prev that contains the address. + * On any issue, assume the address is within a previous mapping. + * @mmap write lock is held here, so the lookup is safe. + */ + cur = find_vma_prev(vma->vm_mm, vma->vm_start, &prev); + if (!cur || cur != vma || !prev) + return true; + + /* The masked address fell within a previous mapping. */ + if (prev->vm_end > addr_masked) + return true; + + return false; +} + +/* Opportunistically realign to specified boundary for faster copy. */ +static void realign_addr(unsigned long *old_addr, struct vm_area_struct *old_vma, + unsigned long *new_addr, struct vm_area_struct *new_vma, + unsigned long mask) +{ + if ((*old_addr & ~mask) && + (*old_addr & ~mask) == (*new_addr & ~mask) && + !check_addr_in_prev(old_vma, *old_addr, mask) && + !check_addr_in_prev(new_vma, *new_addr, mask)) { + *old_addr = *old_addr & mask; + *new_addr = *new_addr & mask; + } +} + unsigned long move_page_tables(struct vm_area_struct *vma, unsigned long old_addr, struct vm_area_struct *new_vma, unsigned long new_addr, unsigned long len, @@ -493,6 +538,10 @@ unsigned long move_page_tables(struct vm_area_struct *vma, old_end = old_addr + len; + /* If possible, realign addresses to PMD boundary for faster copy. */ + if (len >= PMD_SIZE) + realign_addr(&old_addr, vma, &new_addr, new_vma, PMD_MASK); + if (is_vm_hugetlb_page(vma)) return move_hugetlb_page_tables(vma, new_vma, old_addr, new_addr, len); From patchwork Thu May 18 02:18:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 95620 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp189222vqo; Wed, 17 May 2023 19:24:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6BCArkMeqbcd6WUz2jqn1Ij7QvzDBKTY1lL26pQROb5QXIC+s+Mf+rfEm8O0BGmXfWis80 X-Received: by 2002:a17:903:32cc:b0:1a9:581b:fbb1 with SMTP id i12-20020a17090332cc00b001a9581bfbb1mr570154plr.32.1684376669304; Wed, 17 May 2023 19:24:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684376669; cv=none; d=google.com; s=arc-20160816; b=tmcEs7r6QUJFJimtKuhYes8rDHEy+XMeB7cRX1HDZPYSG5nZpbJvhh8U/l7TSeHD9y MykbB44vfYmcg599202RvvLC+ZQqGoC2CzgKcJ8xZQWH/ft3opBKBRyLEUzgPr/IPtj0 V7qUFejxFkkNNgpp+mgJDuzCh4UepX4XdZRUg2kBzkbSwXHcXS3GuoCyiHfoKYU6Lit4 MF3eUYz9suVCWPvHAyz6t/XaxjOlbwhbhkvq24rxbeuFve+PF9jDCVpBMRMAn9eagGjb bljb6vJWqC1FP0YRqJZBvDQb8QHlHUQdiDjJwES3MFvZqBMIi2NHljKiETrbwc88k6+d yWXQ== 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=RjDDJEmMByrSrRAzAnrYD81CTFNgsqIfOqapJ9IGu5M=; b=HEyvyo4BJRZTDZc0nTY+2DOtSBFtZV8L4hu6rm8hDVhaJw+gmt3peGNovdXw1F/21i aCphxTnARhioc5UZZxHw0lzdzTYTXiwGJdPmfEMXTr3GCR5XEe+CUHAD/Wyv/pzDVuNv zYoJWW0ymjFmBNwwKMxPz0Z+HLiFIe6yoCdeZH6lH78bI6/D2xSlZZ3EyRE3klqnAPMy 4SD0WO4AZujMfBTMTEkjj0jn1DVN+EmnoLw2YPZhvD5xXiJdUi6LYiPgsS7wSlcvv6C8 lxo5a8FySXPG82EumPvMAe8tPjbcTPCowen2BaSW8vbN4jxN4TXAj/eYpa0hrEurqjkI FDYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=mQQrGh4h; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t9-20020a170902e84900b001aadb1147e4si133686plg.456.2023.05.17.19.24.14; Wed, 17 May 2023 19:24:29 -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=@joelfernandes.org header.s=google header.b=mQQrGh4h; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229901AbjERCTF (ORCPT + 99 others); Wed, 17 May 2023 22:19:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229851AbjERCSs (ORCPT ); Wed, 17 May 2023 22:18:48 -0400 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63FAA210C for ; Wed, 17 May 2023 19:18:47 -0700 (PDT) Received: by mail-qt1-x82f.google.com with SMTP id d75a77b69052e-3f52009f79dso3739871cf.1 for ; Wed, 17 May 2023 19:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684376326; x=1686968326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RjDDJEmMByrSrRAzAnrYD81CTFNgsqIfOqapJ9IGu5M=; b=mQQrGh4h/KNWIK2PoMB6Pztwf3cVCXmBMz0qqgOhBsvYUoYmvpqwqduJIzlAMMC7YK ZrUS/hiBuG72PkbcadbIrnygdqpWVUoSGwOt1fIX6LFaYv2ZtLweuzoryGI5e/lbAEvj QAZwZXY/iYOPxIXmup+iJ05KpzCFPd+H+MV7k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684376326; x=1686968326; 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=RjDDJEmMByrSrRAzAnrYD81CTFNgsqIfOqapJ9IGu5M=; b=Q/S1KR0foY6LzmuZjYDbtMUopnF9s0nhgASiCTYbTDub1bxXqkieaK2RucSC7ofZLk 6LFTklhpxd9B2mCUC+PqP9Ey6UQ1m42JIsXBmVCpcZHkcZ1yhZtLzyseDQ7eza3Vfu2u EgKe/bRJ2JcvNhziXnUaK4TM1F8M3alB2bpNGKvyVxgKAN4lM05Lt3Uo69nFEgbX3IGU loPxhgVkMNwuZDsF3Wy1xsDayUAwlGmDHknJl86u5qCK2fxgwJYOSesmwd/Il5uWZT9e gku0AQtgHw1DvU0lyTvGgGIAWOSi1/645fwDeShHWXkQTmQCPRpLZbKDLoWITwy1bsLJ qcIg== X-Gm-Message-State: AC+VfDxpU3uThaMKlrog+pkByD0g80ySWbCkf9LShPFIF5KNgP2mcg72 ZpUUeIymaPg6K5eYIT6Hbi8w/MV4bAudSNFM8aE= X-Received: by 2002:ac8:588f:0:b0:3f5:2fa4:43bd with SMTP id t15-20020ac8588f000000b003f52fa443bdmr3399132qta.3.1684376325860; Wed, 17 May 2023 19:18:45 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id j13-20020a05620a000d00b007577ccf566asm85082qki.93.2023.05.17.19.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 19:18:45 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" Subject: [PATCH RFC 2/4] selftests: mm: Fix failure case when new remap region was not found Date: Thu, 18 May 2023 02:18:23 +0000 Message-ID: <20230518021825.712742-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230518021825.712742-1-joel@joelfernandes.org> References: <20230518021825.712742-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1766196950654792634?= X-GMAIL-MSGID: =?utf-8?q?1766196950654792634?= When a valid remap region could not be found, the source mapping is not cleaned up. Fix the goto statement such that the clean up happens. Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 5c3773de9f0f..6822d657f589 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -316,7 +316,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (addr + c.dest_alignment < addr) { ksft_print_msg("Couldn't find a valid region to remap to\n"); ret = -1; - goto out; + goto clean_up_src; } addr += c.dest_alignment; } From patchwork Thu May 18 02:18:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 95621 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp190067vqo; Wed, 17 May 2023 19:26:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5H3U5q/PpJbO0M5UWVm6ElaBB1C+Oe/84JMr+ZxH9MSgJdQRNS0gv6FZSIgF6WmHCp1Bv/ X-Received: by 2002:a05:6a00:856:b0:640:e12a:3a20 with SMTP id q22-20020a056a00085600b00640e12a3a20mr2202487pfk.1.1684376802701; Wed, 17 May 2023 19:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684376802; cv=none; d=google.com; s=arc-20160816; b=i3mEY59D7TFZBYFKK/Gp3/NijJCtQ4c4REJcTJ8UL+0DvFJbUQM21clzIXyudIbYjE 17SGdF1/QVNatkMt2l7V8dQnlD0QvWO+vsMAxRgmoBR6NWny1XgVWw8pG5BAWapQSR/g 8BIQW07I2jzVB1nGxrkXvoc0/80SBmUSVHWKdrrQQsDeNOzEGXzPtqvE25fnY1t4763S 5GxLDrcjtJ/xdYXP49esV07b3xtVW9+OeiCvMWs4RNMfjJ+eqT7h+mUUQQtJNNzVpK2r ubGU+Xxn+dV4stl5S+q5gM8OXIz3q6HtVhJ8AdgFfEpagkFKvsZyl9uwbsSiOP2aLlke xWxw== 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=O+pMaJ78vDhX/WJumeumdh2Ew8rPwZqh+d939UbVmCI=; b=QLsvJyUE/ZinQSUSUnCh/307Jn7fdkyqqaJXViuGx95wp3OyQr1kEuyV+LZonJi6qP SB5bOUJR5nueyGd3Kpf19x5dVUo/9m/iwHlHiqPMp3H0OSLdHnIjuaU5ZI3pWqa+EkbW mbWdSMiyFCq5LNhpBb0rE5e0hCLnM8m6MqsQXNWuHhuMwZe4UcQEUGmWVXqAjieaO57+ A2j/e0DJTyzcueJM68auRe0+2U9VjQOFHMQHs2QxW1ntJQ6uVvCAkQ9yT8S2RTn4kZcA 0yNwZ228r12fd2PcoFITIQkBAiRhaO+DyQ5FFzQHKEeSxRn5bsV1iihCqbydJ3iTG4GD APKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=laThT9Km; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w188-20020a6230c5000000b006455a24291dsi458998pfw.368.2023.05.17.19.26.28; Wed, 17 May 2023 19:26:42 -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=@joelfernandes.org header.s=google header.b=laThT9Km; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229620AbjERCTL (ORCPT + 99 others); Wed, 17 May 2023 22:19:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbjERCSs (ORCPT ); Wed, 17 May 2023 22:18:48 -0400 Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3B82213B for ; Wed, 17 May 2023 19:18:47 -0700 (PDT) Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-75773a7bd66so169714185a.1 for ; Wed, 17 May 2023 19:18:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684376326; x=1686968326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O+pMaJ78vDhX/WJumeumdh2Ew8rPwZqh+d939UbVmCI=; b=laThT9KmuWwvZ+2Yoy5xsTan07ApYzz/BleFpSz8wK9Si/Q7ltWEJAFVbUqtOZ4D6L TMd2/Y9xWpgxsYsAa9xV49mMbN1y6fwgjT/pKe1dU8Islleu93aNaPSMOLxKyhX/jNrJ 4p5p9XM83q3qupRwXWj+wCh1LxpyNLzARQFWk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684376326; x=1686968326; 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=O+pMaJ78vDhX/WJumeumdh2Ew8rPwZqh+d939UbVmCI=; b=K3OeF0vr2oLnSIO/gnKDUC7NTKrph7kaq0jaXLhwwqz8nAYDsjsD1wqfKdX1rPM5mD IYohXIuGKJkjTmBfs86x+MCNOkmO0mI9N3Cj8qbSpr5pyzIlulgewWfobr7N8dRm5+MR jNj8I32lncFBnS0vf5UL6dfb98LHOuYA47TARJj+V0bhdjkwoKd3PphT1g1xFKlwfcEZ EBXE2BsfdRGsY6J9HjUvhgVUjxl7ZyFNnTB9e+rlQeGRjN3dkjiB7+YYjfk3Zy9V74f4 IZE0s8h/0R3uebEF7OBQcanf1cLdlhbu/xt418xN9lA2GB6XYLgomj7WJmwMF8jUvUmx J6JA== X-Gm-Message-State: AC+VfDy4Jtao9CZfeuIwvM6RZ+evQbn63mADOuchhAVfmReJwqdUdNIg MnuABAt7/UNyWh4R4Ep4g35LiIClvjtfMj5epxQ= X-Received: by 2002:ac8:59cf:0:b0:3f5:315f:5c19 with SMTP id f15-20020ac859cf000000b003f5315f5c19mr3147223qtf.62.1684376326582; Wed, 17 May 2023 19:18:46 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id j13-20020a05620a000d00b007577ccf566asm85082qki.93.2023.05.17.19.18.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 19:18:46 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" Subject: [PATCH RFC 3/4] selftests: mm: Add a test for mutually aligned moves > PMD size Date: Thu, 18 May 2023 02:18:24 +0000 Message-ID: <20230518021825.712742-4-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230518021825.712742-1-joel@joelfernandes.org> References: <20230518021825.712742-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1766197089996520441?= X-GMAIL-MSGID: =?utf-8?q?1766197089996520441?= This patch adds a test case to check if a PMD-alignment optimization successfully happens. I add support to make sure there is some room before the source mapping, otherwise the optimization to trigger PMD-aligned move will be disabled as the kernel will detect that a mapping before the source exists and such optimization becomes impossible. Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6822d657f589..6304eb0947a3 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -44,6 +44,7 @@ enum { _1MB = 1ULL << 20, _2MB = 2ULL << 20, _4MB = 4ULL << 20, + _5MB = 5ULL << 20, _1GB = 1ULL << 30, _2GB = 2ULL << 30, PMD = _2MB, @@ -235,6 +236,11 @@ static void *get_source_mapping(struct config c) unsigned long long mmap_min_addr; mmap_min_addr = get_mmap_min_addr(); + /* + * For some tests, we need to not have any mappings below the + * source mapping. Add some headroom to mmap_min_addr for this. + */ + mmap_min_addr += 10 * _4MB; retry: addr += c.src_alignment; @@ -434,7 +440,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 13 +#define MAX_TEST 14 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -500,6 +506,10 @@ int main(int argc, char **argv) test_cases[12] = MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCCESS, "2GB mremap - Source PUD-aligned, Destination PUD-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /* From patchwork Thu May 18 02:18:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 95617 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp188861vqo; Wed, 17 May 2023 19:23:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4o3yxVtn3gNRohZl6m7kRJs/CgJ/4/MMTUU+2v/O9f9QjI7t9/01pZR4zwcv1sGfuO5umG X-Received: by 2002:aa7:8884:0:b0:643:7fcf:836d with SMTP id z4-20020aa78884000000b006437fcf836dmr2540355pfe.25.1684376608791; Wed, 17 May 2023 19:23:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684376608; cv=none; d=google.com; s=arc-20160816; b=LOuuHj7m43Xm6U3YeNaVOJh2bDsku5NIgBLK5TJxq+vZafIXCod8jVm+S1Ryus2AEo GMghDZKy7rA3vNB8mPt5+szLK1oZVMuWQ401RIqIK4B2Enp5Lu4pXJIQPxtEkPDOl0S0 zy2G65DlbzTRFXLVVXoGFft8EgjLCJOCt5oleEa5QPdurZW6QagGcuuzsk2xuYzwwOzE 0ZwUoHpEs7vZ+A/wyv6RKBBB8ct1G9kEiZV/cAtPJu6GBZglxrXZtmp/l6W3c12XWNP1 KCAqOhHuRWxVWcAOekrI9Kwp6C25A3B+/o2DNpminuHYb7r0y3AjioDTyxf/8KJmK/UQ DD0g== 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=tGuemAvtIS/ALPtC/Ke2yJXoSr37KqjSOh21F52Z0b4=; b=vV3OSov/T8ESYggTFqGEb+r//sqLNB8ZMsKVn3XHWNO+xh4hAKY9lm1gERGkFIfBIc WoeZD++h/GixljhdGegE+1dqIWe8SHs47d2ETx0+efb65vzO7nJpWYuVKbeL8fO/0TrE FvlFZ6TfP8ZLwuDt6xX1uKDOuzUYRIsug6Lzk+q2gMUBRUpJ87yuZL1YxvDxdlcMNJgP 9JaL2aeWCSSDyG150ml0NZjGSg/EPUxpWfyboUDeFWI7FGQN2z/XV6M21RZVD2+dzDOw R+4fag1qRvAQOhMdn3YbTe2Id5B3z5kXLQzJbwS2VXqwTrKdZUXCopExaTpkW2LaGPBc Pgbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=XjEWVFgj; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e185-20020a6369c2000000b005302f8236ecsi237377pgc.817.2023.05.17.19.23.13; Wed, 17 May 2023 19:23:28 -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=@joelfernandes.org header.s=google header.b=XjEWVFgj; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229789AbjERCTN (ORCPT + 99 others); Wed, 17 May 2023 22:19:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229875AbjERCSy (ORCPT ); Wed, 17 May 2023 22:18:54 -0400 Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A35DE26B1 for ; Wed, 17 May 2023 19:18:48 -0700 (PDT) Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-7576516c81fso155721985a.1 for ; Wed, 17 May 2023 19:18:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; t=1684376327; x=1686968327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tGuemAvtIS/ALPtC/Ke2yJXoSr37KqjSOh21F52Z0b4=; b=XjEWVFgjHhBSgx+JzMuzHzMuMMrg6ZCjBCCAdXf//YzfKBHsPOaTSvveyrxyVc63mB OszLdP5qzb0tPw+Ax1TNz+UB1DuNFET/RCjILS/7u5bCzvBBR1KOj19dWdhgLKcgBzef NYJtJv4KZejE9EsPY58w3IzlHS7ZNhsiLoXuY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684376327; x=1686968327; 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=tGuemAvtIS/ALPtC/Ke2yJXoSr37KqjSOh21F52Z0b4=; b=P/BRLGB/geuPaXTI/edfVPIn+Vcvj9Z1nRpc7dNufByLG/3p5LO2Oyr/O0A+EOp3wy mK/9hxMVDmKY26vlV6tubxS/9Wlj2lfkbN8yA5ER+UAT+VVyLB8P5QL1fxy7Wr0W6skq Et/M+iZKCkt1LjeHGxObUv33arn1w+YrBU8xHWkB/Mbl1RrFur1DA4rp4B2YbQwVFOBm jkRSeoN6VjPhhc92zQ3mDYeb4cyCWUiuXnYT7a1HUwS6FOrjrD8D4M+vmuWDV3bsV8j8 ovXzHTAXnCTya/OaQtbr4gmmg/c69qZm0Uhg1zCg4cPZ6DZ3XSBzXD8DmMvZYuxd4TGn dglA== X-Gm-Message-State: AC+VfDzGTDhe1KKDsB6CCu1y7LV9WMniDndlSOGCm4V4U41zf9ggMTl+ mGbOblhhx0wZP82Xd+fNyc6JyXN36mZ0ZxIqdTY= X-Received: by 2002:a05:622a:1d0:b0:3ef:366b:5afa with SMTP id t16-20020a05622a01d000b003ef366b5afamr3403956qtw.54.1684376327485; Wed, 17 May 2023 19:18:47 -0700 (PDT) Received: from joelboxx.c.googlers.com.com (129.239.188.35.bc.googleusercontent.com. [35.188.239.129]) by smtp.gmail.com with ESMTPSA id j13-20020a05620a000d00b007577ccf566asm85082qki.93.2023.05.17.19.18.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 19:18:46 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Shuah Khan , Vlastimil Babka , Michal Hocko , Linus Torvalds , Lorenzo Stoakes , Kirill A Shutemov , "Liam R. Howlett" , "Paul E. McKenney" Subject: [PATCH RFC 4/4] selftests: mm: Add a test for remapping to area immediately after existing mapping Date: Thu, 18 May 2023 02:18:25 +0000 Message-ID: <20230518021825.712742-5-joel@joelfernandes.org> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <20230518021825.712742-1-joel@joelfernandes.org> References: <20230518021825.712742-1-joel@joelfernandes.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1766196887082645528?= X-GMAIL-MSGID: =?utf-8?q?1766196887082645528?= This patch adds support for verifying that we correctly handle the situation where something is already mapped before the destination of the remap. Any realignment of destination address and PMD-copy will destroy that existing mapping. In such cases, we need to avoid doing the optimization. To test this, we map an area called the preamble before the remap region. Then we verify after the mremap operation that this region did not get corrupted. Putting some prints in the kernel, I verified that we optimize correctly in different situations: Optimize when there is alignment and no previous mapping (this is tested by previous patch). check_addr_in_prev(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 check_addr_in_prev(new_vma->vm_start=2f00000, new_addr=2f00000, mask=-2097152): 0 === Starting move_page_tables === Doing PUD move for 2800000 -> 2e00000 of extent=200000 <-- Optimization Doing PUD move for 2a00000 -> 3000000 of extent=200000 Doing PUD move for 2c00000 -> 3200000 of extent=200000 Don't optimize when there is alignment but there is previous mapping (this is tested by this patch). Notice that check_addr_in_prev() returns 1 for the destination mapping as we detected there is something there. check_addr_in_prev(old_vma->vm_start=2900000, old_addr=2900000, mask=-2097152): 0 check_addr_in_prev(new_vma->vm_start=5700000, new_addr=5700000, mask=-2097152): 1 === Starting move_page_tables === Doing move_ptes for 2900000 -> 5700000 of extent=100000 <-- Unoptimized Doing PUD move for 2a00000 -> 5800000 of extent=200000 Doing PUD move for 2c00000 -> 5a00000 of extent=200000 Signed-off-by: Joel Fernandes (Google) --- tools/testing/selftests/mm/mremap_test.c | 57 +++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c index 6304eb0947a3..d7366074e2a8 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -29,6 +29,7 @@ struct config { unsigned long long dest_alignment; unsigned long long region_size; int overlapping; + int dest_preamble_size; }; struct test { @@ -283,7 +284,7 @@ static void *get_source_mapping(struct config c) static long long remap_region(struct config c, unsigned int threshold_mb, char pattern_seed) { - void *addr, *src_addr, *dest_addr; + void *addr, *src_addr, *dest_addr, *dest_preamble_addr; unsigned long long i; struct timespec t_start = {0, 0}, t_end = {0, 0}; long long start_ns, end_ns, align_mask, ret, offset; @@ -300,7 +301,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, goto out; } - /* Set byte pattern */ + /* Set byte pattern for source block. */ srand(pattern_seed); for (i = 0; i < threshold; i++) memset((char *) src_addr + i, (char) rand(), 1); @@ -312,6 +313,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr = (void *) (((unsigned long long) src_addr + c.region_size + offset) & align_mask); + /* Remap after the destination block preamble. */ + addr += c.dest_preamble_size; + /* See comment in get_source_mapping() */ if (!((unsigned long long) addr & c.dest_alignment)) addr = (void *) ((unsigned long long) addr | c.dest_alignment); @@ -327,6 +331,24 @@ static long long remap_region(struct config c, unsigned int threshold_mb, addr += c.dest_alignment; } + if (c.dest_preamble_size) { + dest_preamble_addr = mmap((void *) addr - c.dest_preamble_size, c.dest_preamble_size, + PROT_READ | PROT_WRITE, + MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, + -1, 0); + if (dest_preamble_addr == MAP_FAILED) { + ksft_print_msg("Failed to map dest preamble region: %s\n", + strerror(errno)); + ret = -1; + goto clean_up_src; + } + + /* Set byte pattern for the dest preamble block. */ + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) + memset((char *) dest_preamble_addr + i, (char) rand(), 1); + } + clock_gettime(CLOCK_MONOTONIC, &t_start); dest_addr = mremap(src_addr, c.region_size, c.region_size, MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); @@ -335,7 +357,7 @@ static long long remap_region(struct config c, unsigned int threshold_mb, if (dest_addr == MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); ret = -1; - goto clean_up_src; + goto clean_up_dest_preamble; } /* Verify byte pattern after remapping */ @@ -353,6 +375,23 @@ static long long remap_region(struct config c, unsigned int threshold_mb, } } + /* Verify the dest preamble byte pattern after remapping */ + if (c.dest_preamble_size) { + srand(pattern_seed); + for (i = 0; i < c.dest_preamble_size; i++) { + char c = (char) rand(); + + if (((char *) dest_preamble_addr)[i] != c) { + ksft_print_msg("Preamble data after remap doesn't match at offset %d\n", + i); + ksft_print_msg("Expected: %#x\t Got: %#x\n", c & 0xff, + ((char *) dest_preamble_addr)[i] & 0xff); + ret = -1; + goto clean_up_dest; + } + } + } + start_ns = t_start.tv_sec * NS_PER_SEC + t_start.tv_nsec; end_ns = t_end.tv_sec * NS_PER_SEC + t_end.tv_nsec; ret = end_ns - start_ns; @@ -365,6 +404,9 @@ static long long remap_region(struct config c, unsigned int threshold_mb, */ clean_up_dest: munmap(dest_addr, c.region_size); +clean_up_dest_preamble: + if (c.dest_preamble_size && dest_preamble_addr) + munmap(dest_preamble_addr, c.dest_preamble_size); clean_up_src: munmap(src_addr, c.region_size); out: @@ -440,7 +482,7 @@ static int parse_args(int argc, char **argv, unsigned int *threshold_mb, return 0; } -#define MAX_TEST 14 +#define MAX_TEST 15 #define MAX_PERF_TEST 3 int main(int argc, char **argv) { @@ -449,7 +491,7 @@ int main(int argc, char **argv) unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD; unsigned int pattern_seed; int num_expand_tests = 2; - struct test test_cases[MAX_TEST]; + struct test test_cases[MAX_TEST] = {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; time_t t; @@ -510,6 +552,11 @@ int main(int argc, char **argv) test_cases[13] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + test_cases[14] = MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Preamble"); + test_cases[14].config.dest_preamble_size = 10 * _4MB; + perf_test_cases[0] = MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAPPING, EXPECT_SUCCESS, "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); /*