From nobody Thu Mar 2 18:18:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PSK9N2vh7z3w6RQ; Thu, 2 Mar 2023 18:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSK9N1rqhz3MYC; Thu, 2 Mar 2023 18:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68Fbye1BzDMK7OKkzv0nmAdaV8VmMKxC216fdvBEdhg=; b=dT60a9PLsmYaNxqavIV5V8B9DI0j35J91JR/MLRMa+3hw1NEVJiSg14Dl/WoMfsjTNabac lUY8PGCbVINduTLkYVKLftkRtJrEnZUetJwKof9GYxzD/QfQtfijIDWtJSwpc484cKpMv/ ZtFlWz4oFjovvUpS7tTaMczC5IcpVHoNgyodlyg5UcAZSdZdtHdnFvtMCebZlIRF9+bK56 yY9D9kvs7IuAwtPhKM7zZcHvdFbmh6vXbccDwCFWQ5E5mCtYFnWpIenFbS4gxYmJJw5x9e Wu2kRteFpT1U67dRfRgyvGQxspCLeiX6T5mgnq5MsHLKi14xkdpacHwZ76MCPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68Fbye1BzDMK7OKkzv0nmAdaV8VmMKxC216fdvBEdhg=; b=yfNo8+OTsTXtz78DC8pajF730HKjz5yShhYFIrnerRb4/eTIbxiVvoL/QpGQhzTY/KyNtw K29rd3KCOYyhNoT+tpEYQwOhAB6mpGETTpIjBKNB4fd78S+myO0pT9jJBnVLrruniNp7MF f0TtokVBVLTwOvDsDEK4Rv9ekfao9v500JizTL2+UbuUYDo4PuRLUWvif61dzMEKp6fD9f TtOULE0prRpEZql3g51jHtWsWrwQv6kACV0I2ile7iu2lZfSK8HtPUSWqWLvStitFVrC8F axaNTRKBii1hmutpEeTSJK+ud6yK8UY5V2yCXhGbGBFiJYf7DltymYy33F8BPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781112; a=rsa-sha256; cv=none; b=Nc0CUtvWLfLjGOiEWbywL+FbaRBGlBITZFwYj3/NJdQVSwU4YBUAh9C513syPEkIdryejO 6M1tcJIsyPQVp55junT+3pBL7jD2JD8dgPHTNr6OuXVUqJNHQNpn3Im00Lc0Xb35HlD8NZ B+NV+Leq4bk8Qj5pwtXg2h8PPYH1bcMGliBltbFTRsFdc0knrOdw3Zsn/BZDxP09dH5mNr zKN9imCLaWa1GsAUbrV1XF8p6fqr+0NGlTtT9Ay82GYiegzFI9iJK8RTuC/LgqmYBFMOxz dqISNlGK2g59h+VAZGs6L8+8QbjAu6fZjlDz/c+Al6VtKD7Q1/i2p00VYUNgfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PSK9N0wH6zR9L; Thu, 2 Mar 2023 18:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 322IIWLQ035411; Thu, 2 Mar 2023 18:18:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IIWLN035410; Thu, 2 Mar 2023 18:18:32 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:18:32 GMT Message-Id: <202303021818.322IIWLN035410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 35b4acad2f1f - main - kboot: Use MIN instead of min List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35b4acad2f1f7ba87eb9e0c7276ef8eef55b4a9c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=35b4acad2f1f7ba87eb9e0c7276ef8eef55b4a9c commit 35b4acad2f1f7ba87eb9e0c7276ef8eef55b4a9c Author: Warner Losh AuthorDate: 2023-03-02 17:56:44 +0000 Commit: Warner Losh CommitDate: 2023-03-02 18:12:10 +0000 kboot: Use MIN instead of min MIN works for any type, while min() is only for integers. So we were rounding down to 0 since that's the size of 4GB truncated to an int. Sponsored by: Netflix --- stand/kboot/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stand/kboot/main.c b/stand/kboot/main.c index e01507323bad..849ad46add6c 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -344,10 +344,11 @@ get_phys_buffer(vm_offset_t dest, const size_t len, void **buf) /* how much space does this segment have */ sz = space_avail(dest); /* Clip to 45% of available memory (need 2 copies) */ - sz = min(sz, rounddown2(mem_avail * 45 / 100, SEGALIGN)); + sz = MIN(sz, rounddown2(mem_avail * 45 / 100, SEGALIGN)); + printf("limit to 45%% of mem_avail %zd\n", sz); /* And only use 95% of what we can allocate */ - sz = min(sz, rounddown2( - (commit_limit - committed_as) * 95 / 100, SEGALIGN)); + sz = MIN(sz, + rounddown2((commit_limit - committed_as) * 95 / 100, SEGALIGN)); printf("Allocating %zd MB for first segment\n", sz >> 20); }