From patchwork Tue Oct 23 18:25:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timofey Titovets X-Patchwork-Id: 10653473 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C27F613A9 for ; Tue, 23 Oct 2018 18:26:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2C122A312 for ; Tue, 23 Oct 2018 18:26:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A63352A2FB; Tue, 23 Oct 2018 18:26:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A92D2A311 for ; Tue, 23 Oct 2018 18:26:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728511AbeJXCu4 (ORCPT ); Tue, 23 Oct 2018 22:50:56 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39841 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728454AbeJXCu4 (ORCPT ); Tue, 23 Oct 2018 22:50:56 -0400 Received: by mail-wr1-f67.google.com with SMTP id r10-v6so1882652wrv.6 for ; Tue, 23 Oct 2018 11:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=juSqou92Oj6KHn9X1w5Z5XFkfnLalVstDj0XAX5DRwM=; b=KOb7K6LhClGd+kqwinPKr1pD/mjTkbw5eNsmQqL807GtKRZhWHnw1UM7Mg9JohoM3D MrVV0GRWUpD8gYdqZpFtA1Gin/P/4HGl0a1FXBY4PRTat+JbDcnhPOVjethwkRO4OL7C 3EYKv10yW3ootBE1SKPJNB2m/CxD7iHLo+OCA2weoNVnlilyITJ2v6wdknnuvT1XqTL9 361fimkDrt5XKXb9zplLe2f6+zbIcbIn6XyUaKmb+k9CrZRdPtcvZX1GojKtRE4BqJzd 25tzJv7yhm7PfwzWunrh8NyAGc7utnKkJGIwEOriuAS/qVbKLsIE85Vwly06q/knBawh IGJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=juSqou92Oj6KHn9X1w5Z5XFkfnLalVstDj0XAX5DRwM=; b=nM4lX2AGFBjDS8LnpRDMkND3agL2K2jSK5XmXFXPtfvF2MtKfLLtsYy+EkW18dEqs1 6GJD8fp0t928BVs+lDkcbH+DC8dexIuztJSs2MAfliGeKW3tAimyeVCjzN8eKxEXeZoT pPDPu0zO/TW54qkDVeUxxfA7lNNWlJ8cxYJfiGeFc1C/GeW9RMvYzXKqoBks3ZycwTZQ b/TOJknT0+T1KGdWsQolyAP+2iapnMmmJLcBv6FdXOW9kOOiJ5yrPNWkyVeZi0dkIDGV pnLvbHv1xbbl72yd8q0195Y8tcBXeT6FXvumkx7BKRuXLyNMyGrewQdBLZmgvow5nxon ZALg== X-Gm-Message-State: ABuFfoi4Ek1jcEvVxeUYcrxNgwqi0uKQ/mSxkIK0myLeSFwoYEZyJcaQ +y98S6LzT5MfaQ5hw1zDkew= X-Google-Smtp-Source: ACcGV63F4p4vHD8I4RnSJptrwed2aLyHVx++q6v99VaYo7GoYFUpb+y+QuteITE++u4L/Nov+iQshw== X-Received: by 2002:adf:b743:: with SMTP id n3-v6mr52407477wre.274.1540319184275; Tue, 23 Oct 2018 11:26:24 -0700 (PDT) Received: from TitovetsT.synesis.local ([86.57.155.118]) by smtp.gmail.com with ESMTPSA id x16-v6sm2442551wro.28.2018.10.23.11.26.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Oct 2018 11:26:23 -0700 (PDT) From: Timofey Titovets To: linux-mm@kvack.org Cc: Timofey Titovets , Andrea Arcangeli , kvm@vger.kernel.org, leesioh Subject: [PATCH RESEND V8 1/2] xxHash: create arch dependent 32/64-bit xxhash() Date: Tue, 23 Oct 2018 21:25:53 +0300 Message-Id: <20181023182554.23464-2-nefelim4ag@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181023182554.23464-1-nefelim4ag@gmail.com> References: <20181023182554.23464-1-nefelim4ag@gmail.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP xxh32() - fast on both 32/64-bit platforms xxh64() - fast only on 64-bit platform Create xxhash() which will pickup fastest version on compile time. As result depends on cpu word size, the main proporse of that - in memory hashing. Changes: v2: - Create that patch v3 -> v8: - Nothing, whole patchset version bump Signed-off-by: Timofey Titovets Reviewed-by: Pavel Tatashin Reviewed-by: Mike Rapoport CC: Andrea Arcangeli CC: linux-mm@kvack.org CC: kvm@vger.kernel.org CC: leesioh --- include/linux/xxhash.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/linux/xxhash.h b/include/linux/xxhash.h index 9e1f42cb57e9..52b073fea17f 100644 --- a/include/linux/xxhash.h +++ b/include/linux/xxhash.h @@ -107,6 +107,29 @@ uint32_t xxh32(const void *input, size_t length, uint32_t seed); */ uint64_t xxh64(const void *input, size_t length, uint64_t seed); +/** + * xxhash() - calculate wordsize hash of the input with a given seed + * @input: The data to hash. + * @length: The length of the data to hash. + * @seed: The seed can be used to alter the result predictably. + * + * If the hash does not need to be comparable between machines with + * different word sizes, this function will call whichever of xxh32() + * or xxh64() is faster. + * + * Return: wordsize hash of the data. + */ + +static inline unsigned long xxhash(const void *input, size_t length, + uint64_t seed) +{ +#if BITS_PER_LONG == 64 + return xxh64(input, length, seed); +#else + return xxh32(input, length, seed); +#endif +} + /*-**************************** * Streaming Hash Functions *****************************/ From patchwork Tue Oct 23 18:25:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timofey Titovets X-Patchwork-Id: 10653477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18D201709 for ; Tue, 23 Oct 2018 18:26:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09DB72A2B4 for ; Tue, 23 Oct 2018 18:26:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 082A32A30E; Tue, 23 Oct 2018 18:26:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8466F2A30C for ; Tue, 23 Oct 2018 18:26:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728454AbeJXCu6 (ORCPT ); Tue, 23 Oct 2018 22:50:58 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43973 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728480AbeJXCu5 (ORCPT ); Tue, 23 Oct 2018 22:50:57 -0400 Received: by mail-wr1-f66.google.com with SMTP id t10-v6so2762653wrn.10 for ; Tue, 23 Oct 2018 11:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XMhwUaYFX1Xwieq8R43xwhmhoXuGl8283OLe3DBZQS0=; b=hbAbuY6Kk89Gq3WyfTfPAvHD20SAJHHsyQ3qhy1xt8rNhN8jXScQApDRl7Y29xccGi On+m/FPEfXUkXpFqzBVUdlohdWDIiDJJxg+NrW2GKQUeH95uVufpXtcwBJyQMwIs/KJz aUXl/ZV6I4HMoOzqApZqTzscZdZWzow7+wgoHIop5+qR02cIqJ/7G6guzeSBhijeZORV 7Sae7MV3y6j9xy28OTClHAynP7gBbybETmXhIVCtNShDkRG+cs+yWq84mLq0m1F8zH4o 3lh8/Zz4lBQv5bN6UVZ8cgwU0Ffh6HCBMAeox8mjb3v3NkRaS8pDCH9ym5UN/4wE1opc 1IEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XMhwUaYFX1Xwieq8R43xwhmhoXuGl8283OLe3DBZQS0=; b=Tc/aNO/c26j9R4B4BFQjrsrLRDBaxkgygmucQetUX+qIwMTtryUso5yOBeNdC+sG8D bXq2SynhXy56jvhgafTqQHyMYDCE/Wuzc8+H0XrJ45Dk40THDXqFZEyiCqtAX9wV7fy4 ItQXtriTCIx6UFxNQwm3FdrA9OedHV0FEbI/tzuoJi8AERaqhlmsC6ziXp7PctSH8Juc 0ovBaVRjo8f+Hm2JXiXAzTQkB9gm/PC/JNgLEpMDmx3uU7NIX7E9qGKxHt+jbYjhE8AP HfDUjav3uNvjb4G9fz0UZabEk82mNA2erFJIepDbfg8yjvmsQa4d6omzF1Nl1ab/9bKY jt0A== X-Gm-Message-State: ABuFfohvEYKiUcjGgIjNmI2nE4DHYLo+6SG/2V5jOrLNa9y0vPpuc7oF n/SUlRx75Rywb5xjN41V4Cg= X-Google-Smtp-Source: ACcGV62VGw65izw26x41K2uzrWXeln7LOI0N5KoZPJq7+vF85lbd9RCTdpnoMiST73jIukT8EGYFuA== X-Received: by 2002:a5d:49c4:: with SMTP id t4-v6mr50957119wrs.116.1540319185318; Tue, 23 Oct 2018 11:26:25 -0700 (PDT) Received: from TitovetsT.synesis.local ([86.57.155.118]) by smtp.gmail.com with ESMTPSA id x16-v6sm2442551wro.28.2018.10.23.11.26.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Oct 2018 11:26:24 -0700 (PDT) From: Timofey Titovets To: linux-mm@kvack.org Cc: Timofey Titovets , leesioh , Andrea Arcangeli , kvm@vger.kernel.org Subject: [PATCH RESEND V8 2/2] ksm: replace jhash2 with xxhash Date: Tue, 23 Oct 2018 21:25:54 +0300 Message-Id: <20181023182554.23464-3-nefelim4ag@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181023182554.23464-1-nefelim4ag@gmail.com> References: <20181023182554.23464-1-nefelim4ag@gmail.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace jhash2 with xxhash. Perf numbers: Intel(R) Xeon(R) CPU E5-2420 v2 @ 2.20GHz ksm: crc32c hash() 12081 MB/s ksm: xxh64 hash() 8770 MB/s ksm: xxh32 hash() 4529 MB/s ksm: jhash2 hash() 1569 MB/s From Sioh Lee: crc32c_intel: 1084.10ns crc32c (no hardware acceleration): 7012.51ns xxhash32: 2227.75ns xxhash64: 1413.16ns jhash2: 5128.30ns As jhash2 always will be slower (for data size like PAGE_SIZE). Don't use it in ksm at all. Use only xxhash for now, because for using crc32c, cryptoapi must be initialized first - that require some tricky solution to work good in all situations. Thanks. Changes: v1 -> v2: - Move xxhash() to xxhash.h/c and separate patches v2 -> v3: - Move xxhash() xxhash.c -> xxhash.h - replace xxhash_t with 'unsigned long' - update kerneldoc above xxhash() v3 -> v4: - Merge xxhash/crc32 patches - Replace crc32 with crc32c (crc32 have same as jhash2 speed) - Add auto speed test and auto choice of fastest hash function v4 -> v5: - Pickup missed xxhash patch - Update code with compile time choicen xxhash - Add more macros to make code more readable - As now that only possible use xxhash or crc32c, on crc32c allocation error, skip speed test and fallback to xxhash - For workaround too early init problem (crc32c not avaliable), move zero_checksum init to first call of fastcall() - Don't alloc page for hash testing, use arch zero pages for that v5 -> v6: - Use libcrc32c instead of CRYPTO API, mainly for code/Kconfig deps Simplification - Add crc32c_available(): libcrc32c will BUG_ON on crc32c problems, so test crc32c avaliable by crc32c_available() - Simplify choice_fastest_hash() - Simplify fasthash() - struct rmap_item && stable_node have sizeof == 64 on x86_64, that makes them cache friendly. As we don't suffer from hash collisions, change hash type from unsigned long back to u32. - Fix kbuild robot warning, make all local functions static v6 -> v7: - Drop crc32c for now and use only xxhash in ksm. v7 -> v8: - Remove empty line changes Signed-off-by: Timofey Titovets Signed-off-by: leesioh Reviewed-by: Pavel Tatashin Reviewed-by: Mike Rapoport CC: Andrea Arcangeli CC: linux-mm@kvack.org CC: kvm@vger.kernel.org --- mm/Kconfig | 1 + mm/ksm.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/Kconfig b/mm/Kconfig index a550635ea5c3..b5f923081bce 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -297,6 +297,7 @@ config MMU_NOTIFIER config KSM bool "Enable KSM for page merging" depends on MMU + select XXHASH help Enable Kernel Samepage Merging: KSM periodically scans those areas of an application's address space that an app has advised may be diff --git a/mm/ksm.c b/mm/ksm.c index 5b0894b45ee5..1a088306ef81 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -1009,7 +1009,7 @@ static u32 calc_checksum(struct page *page) { u32 checksum; void *addr = kmap_atomic(page); - checksum = jhash2(addr, PAGE_SIZE / 4, 17); + checksum = xxhash(addr, PAGE_SIZE, 0); kunmap_atomic(addr); return checksum; }