From patchwork Wed May 17 20:23:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 95537 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp36184vqo; Wed, 17 May 2023 13:32:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ypSMKCF+6IsyoprYKXcqe5XQIELBdOnEdgEdhBAsXOnIwkEJk2i2R8r2rE0bIThuEGpCU X-Received: by 2002:a17:902:ea01:b0:1ad:e2b6:d2a0 with SMTP id s1-20020a170902ea0100b001ade2b6d2a0mr4375392plg.11.1684355534638; Wed, 17 May 2023 13:32:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684355534; cv=none; d=google.com; s=arc-20160816; b=pS1iMtb9DOU6Y2I/pKMRwKKv3W7j1Im9gYd0lmYN2ZtKTKlfyB34q7XshRi4+OBetD 6l945f6IVPgzsnPmh2Bej/tyWlG7oRkh74DOPj2w2BQXBQDgbA1uVKWSVIcvmoVqNRuQ zW2Sc3dbYvUV6zX99VwfUxkhTrIDrvqnJVCvyt6EFGfQVMTwakEJD2aRiLTx2q9GWap1 v25jWFOEwiXj2yJHrGbyxwRolVNZ20t5jkE7zwEmo6Lp3SGBwXdKKCpD/NXXcYY2UBOX unI6B7etP3p7Q3ufBRxFi1WN10X9xlx86LsHDTjgghcIBl9UNdWnGAUQhlzeRfqly2aV LqFw== 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:dkim-signature; bh=z8b/gdHfbMR9n3CTZrdGsS7WsnfQ3HKxrfRKolBbmOs=; b=EMPtH7REZNqgLkusts+xYf8Ap+wX9ZsfOcTsg6dk90gbAEdebA7h/7WjqxCb+P0BtE vLqytXVkvJmkBDv0gOwZ2333Hx3AwP65sctFH5+CitJ8w/KY+5xEfilCmXLrKvRk/Ff8 27Yw9PqCDn+a3vhZF4iivIlPiO5yYdNA+ULEe4F+gNNMWWBIgb/XcApiZQVlPygGMUV6 bKN4icjjjzBZ+agDNjQ5Qud6iBPCRfMDnQdp9H1QRmjovrYVYV/f25jQ3WNbVDnUcD4A jT4HOW1xGduN7QUl/ULKJB0yZXTZiw1eZYTe/gklWc19QBFEZHkcNcovJQN5GEOozEKm RS9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="RS/yL6l/"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m12-20020a633f0c000000b00528a60ab393si21662381pga.314.2023.05.17.13.32.02; Wed, 17 May 2023 13:32:14 -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=@kernel.org header.s=k20201202 header.b="RS/yL6l/"; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229696AbjEQUYB (ORCPT + 99 others); Wed, 17 May 2023 16:24:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbjEQUYA (ORCPT ); Wed, 17 May 2023 16:24:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D21D47AA9 for ; Wed, 17 May 2023 13:23:59 -0700 (PDT) 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 6630564B09 for ; Wed, 17 May 2023 20:23:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 958E6C433EF; Wed, 17 May 2023 20:23:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684355038; bh=M1muL6P9balayQTirNwNw7ozwMwB4GRF5EDrvyljyDw=; h=From:To:Cc:Subject:Date:From; b=RS/yL6l/vCWKXEPfvT+pPNWM5hgDu9e51+o6EU6T+haO2y02zgKBySeHRS9htKr2J 5XTwCb4gdfKu7wRPGdeIcbbg4Y0TfD47pzLPt0LnFVDte3Da0vw5/ejCm238U/VKnC l/HK9uVCjFTgzSiANETHWbM6F8aOjcGiIcwM1znLlMxqNqmqt5u2YhjF8E9tWFd8ur o6P4D5jD4R0xzQp3OLes5YqA3NMx/NRt4n+5SzaRtfqRKScGjSqvK1xCAKoblwYO5R aKZmlX4ZfNTPfsxMiqRzucpzLAh+EGQQDqn1+vqcZIMN9wDMvb2xYbfGIlPh2qOfHP H632CwXXX0iKQ== From: Arnd Bergmann To: Marc Zyngier , Oliver Upton , Catalin Marinas , Will Deacon , Shaoqin Huang , Ricardo Koller , Gavin Shan Cc: Arnd Bergmann , James Morse , Suzuki K Poulose , Zenghui Yu , Cornelia Huck , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: kvm: avoid overflow in integer division Date: Wed, 17 May 2023 22:23:39 +0200 Message-Id: <20230517202352.793673-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766174789116509142?= X-GMAIL-MSGID: =?utf-8?q?1766174789116509142?= From: Arnd Bergmann The newly added kvm_mmu_split_nr_page_tables() function uses DIV_ROUND_DOWN_ULL() to divide 64-bit addresses, but this requires a 32-bit divisior, and PUD_SIZE may exceed that when 64KB pages are used: arch/arm64/kvm/mmu.c: In function 'kvm_mmu_split_nr_page_tables': include/linux/math.h:42:64: error: conversion from 'long unsigned int' to 'u32' {aka 'unsigned int'} changes value from '68719476736' to '0' [-Werror=overflow] 42 | DIV_ROUND_DOWN_ULL((unsigned long long)(ll) + (d) - 1, (d)) | ^~~ include/linux/math.h:39:47: note: in definition of macro 'DIV_ROUND_DOWN_ULL' 39 | #define DIV_ROUND_DOWN_ULL(ll, d) div_u64(ll, d) | ^ arch/arm64/kvm/mmu.c:95:22: note: in expansion of macro 'DIV_ROUND_UP_ULL' 95 | n += DIV_ROUND_UP_ULL(range, PUD_SIZE); | ^~~~~~~~~~~~~~~~ Since this code is only used on 64-bit targets, DIV_ROUND_UP() can deal with this more easily, as it already takes 64-bit arguments. Fixes: e7bf7a490c68 ("KVM: arm64: Split huge pages when dirty logging is enabled") Signed-off-by: Arnd Bergmann --- arch/arm64/kvm/mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 3386bd28d267..6db9ef288ec3 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -92,8 +92,8 @@ static int kvm_mmu_split_nr_page_tables(u64 range) int n = 0; if (KVM_PGTABLE_MIN_BLOCK_LEVEL < 2) - n += DIV_ROUND_UP_ULL(range, PUD_SIZE); - n += DIV_ROUND_UP_ULL(range, PMD_SIZE); + n += DIV_ROUND_UP(range, PUD_SIZE); + n += DIV_ROUND_UP(range, PMD_SIZE); return n; }