From patchwork Mon Aug 28 15:25:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 137045 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3418100vqm; Mon, 28 Aug 2023 08:51:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVG0AIGTeG6eAMEXWxv+txfU/xk0Y+FSx0Mzv29hBfOCNUOjv6pvJD/vo49a1RHlkIpbaR X-Received: by 2002:a05:6358:4188:b0:13a:6748:927d with SMTP id w8-20020a056358418800b0013a6748927dmr29921230rwc.0.1693237875826; Mon, 28 Aug 2023 08:51:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693237875; cv=none; d=google.com; s=arc-20160816; b=Qoi0b/htXhQ3PGoF0Y7Ifhg1yriAZxK7EisxMuPebBAYmJwwvhsMqjQ/M2a8hSexSD U+ROIPP1eTm6AMjJSYi6BCdMCVPanv/oG8Mh/6vkvR13EcuLB1yb8OzeetHHvINoJGwt lXDj/Mazo1fl390vDCu1/Nqa1BIvlpmr6u6/pOomF586cN7CdVPIlZciOqAWj4UHT3J5 u0n1bQYFWzkrv2mPCZp41n8SJ/yiPoOb/cUTjxUr8kU+bVXgH5dKkkHQ5zvLLyy/CQOW 5w4QCkCRUk2svk7LxJMwzNA0n8OY+G3mP2o8sbeBriMXF38pdiKSrJl+XbIFAEcW3ioC aAFg== 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 :message-id:date:subject:cc:to:from; bh=EGa8QYVIQVEdKpqzPNSFSp+Olb2xrFcSZLWhIdQN5Ow=; fh=OP+Vj/vkZghZ4CcfGFGLWcMilamnd/nfFy+yZOgJiRY=; b=ZGh75skFxbPuntWnuHmls8BzF2RiIz/DJiMy0Swxh0RF2JdOU6hwYb/bENp11CkGa8 4hxMM/v1EcrUhIqZ0fqB/DINf5rA08+La2Q6BB5gb55HHCLNv3+e4MMoMQjf/zNCLozk NXNoRm6fMcGLscqjnwwoKuZO6MlyS7f9r0/jpRO4MJQn0RuOxmvNk06ETeZpAXLwFZ/D 1jq1NZLTckgTrq4jZtp4Lj8hsjfh2Kalac8/iYY3BzW7u+fwiCI9QwsdNfZHGFRlZVYO gaxGNsj+u1/T2TilQ6iSsEOHBvW4m0h0/1cFTEZ1QpvKZhlnkNcWDibLlZX3jTi5E1/J bUzA== ARC-Authentication-Results: i=1; mx.google.com; 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 w71-20020a63824a000000b0056c0e3c77f8si7819287pgd.81.2023.08.28.08.50.53; Mon, 28 Aug 2023 08:51:15 -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; 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 S230299AbjH1P0N (ORCPT + 99 others); Mon, 28 Aug 2023 11:26:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230188AbjH1PZ4 (ORCPT ); Mon, 28 Aug 2023 11:25:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 659D6E0; Mon, 28 Aug 2023 08:25:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0502B6159F; Mon, 28 Aug 2023 15:25:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87380C433C7; Mon, 28 Aug 2023 15:25:49 +0000 (UTC) From: Huacai Chen To: Arnd Bergmann , Huacai Chen Cc: loongarch@lists.linux.dev, linux-arch@vger.kernel.org, Xuefeng Li , Guo Ren , Xuerui Wang , Jiaxun Yang , linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn, Huacai Chen , Jiantao Shan Subject: [PATCH] LoongArch: Remove shm_align_mask and use SHMLBA instead Date: Mon, 28 Aug 2023 23:25:40 +0800 Message-Id: <20230828152540.1194317-1-chenhuacai@loongson.cn> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: INBOX X-GMAIL-THRID: 1775488599237764209 X-GMAIL-MSGID: 1775488599237764209 Both shm_align_mask and SHMLBA want to avoid cache alias. But they are inconsistent: shm_align_mask is (PAGE_SIZE - 1) while SHMLBA is SZ_64K, but PAGE_SIZE is not always equal to SZ_64K. This may cause problems when shmat() twice. Fix this problem by removing shm_align_mask and using SHMLBA (SHMLBA - 1, strctly) instead. Reported-by: Jiantao Shan Signed-off-by: Huacai Chen --- arch/loongarch/mm/cache.c | 1 - arch/loongarch/mm/mmap.c | 12 ++++-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/loongarch/mm/cache.c b/arch/loongarch/mm/cache.c index 72685a48eaf0..6be04d36ca07 100644 --- a/arch/loongarch/mm/cache.c +++ b/arch/loongarch/mm/cache.c @@ -156,7 +156,6 @@ void cpu_cache_init(void) current_cpu_data.cache_leaves_present = leaf; current_cpu_data.options |= LOONGARCH_CPU_PREFETCH; - shm_align_mask = PAGE_SIZE - 1; } static const pgprot_t protection_map[16] = { diff --git a/arch/loongarch/mm/mmap.c b/arch/loongarch/mm/mmap.c index fbe1a4856fc4..c99c8015651a 100644 --- a/arch/loongarch/mm/mmap.c +++ b/arch/loongarch/mm/mmap.c @@ -8,12 +8,8 @@ #include #include -unsigned long shm_align_mask = PAGE_SIZE - 1; /* Sane caches */ -EXPORT_SYMBOL(shm_align_mask); - -#define COLOUR_ALIGN(addr, pgoff) \ - ((((addr) + shm_align_mask) & ~shm_align_mask) + \ - (((pgoff) << PAGE_SHIFT) & shm_align_mask)) +#define COLOUR_ALIGN(addr, pgoff) \ + ((((addr) + (SHMLBA - 1)) & ~(SHMLBA - 1)) + (((pgoff) << PAGE_SHIFT) & (SHMLBA - 1))) enum mmap_allocation_direction {UP, DOWN}; @@ -40,7 +36,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp, * cache aliasing constraints. */ if ((flags & MAP_SHARED) && - ((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask)) + ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) return -EINVAL; return addr; } @@ -63,7 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp, } info.length = len; - info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0; + info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0; info.align_offset = pgoff << PAGE_SHIFT; if (dir == DOWN) {