From nobody Sun May 12 15:58:01 2024 X-Original-To: dev-commits-src-branches@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 4VcnMY2yb1z5KGCq; Sun, 12 May 2024 15:58:01 +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 4VcnMY2S6Wz4P48; Sun, 12 May 2024 15:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715529481; 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=xKPgjYIF3IeWPqFix3O6lG4cLcbb0+dhyAG9X7G3MYE=; b=MrglLDHMI2cKzAHFLbTMstHN9qfskxfOV7yBYP2AkYe0ezqm1stqFbaoSXGccbr8XRL6sF IaaqSJ45sjdOS/4KK+dEuj068cIGKhCrP1mKapoJpkvSMv/phpkSqzklznK3gxqsb1HXfd OfufRucQXUgapyyB/DSAz+eRUdlBjFK+LNyc/PHQL9CX30dA+neYKaAbHtYo139Spnareo Afl7U7OTjYhBJmGpk3oXYBxgcYmzQoih9vreSvrLEmi5yccSrn4Ay+JiPjyRNrKG2MfniO F7XKC+Firc5TLP2dtkyHlVHgtG72aEdxzZjNPRez9dABcVeaS7prgu4/ZSJrgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715529481; a=rsa-sha256; cv=none; b=HaZfKPP0nfXiThXwvJE6ZCNvEEER66K2ZDZIeS4tWqqcMy6t+gmzXloQsRBhRMRN0xJWZV VaP50qE1A3LUcOESs7yQDaRviJMoGXCNDQVYssqiuXC3/IgIuaHQgx1loeNizp8e+r0m3P DR3OCYAUbkjZ+Sq6KT6qRF+xfQYIQPIS8KjPSOuw4ZMaMVkNfrQGxPJALcpXS1LEuBuMBw GFo6hddnCgz0BIeq/fNTMFeKOWL/BEPVgRrI0Oiitn59lAyADeTc+DOHxkqmLIdy6QKz97 ZbMw86HtIyUAcJk9C/fU98/WsFvL+ktlywoKPRytQIjpiIRsW1Pz5G5tpFV9pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715529481; 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=xKPgjYIF3IeWPqFix3O6lG4cLcbb0+dhyAG9X7G3MYE=; b=aL5sKYc46crSaY2u0+DQp5FKX2n2R/aas0S2u38oq5Dj754DMH/H6s/kuu1ql3oBN8CkgT qVB0Xtn7u7rrxynYbBUG20ss9j2MKTxzeCqtDZ59aE6SP+A7wTOyL582ZdlbsPpQYwxU78 fNDYhJoicGdgtvrlKwqenVfVzaDe8bu7eCDBVZDc4EdnwAZO43eJbNj+HfeI2RMPvQYv2f O+HgN9kD85u+iyvfwekl76ZKuETTucAOOiCeaQ50R9jmMlgX7CQqxzIRK+mA+Ox29Os6Tx OPGTOLC7BoRIsyLRnNgKr+BIGAMmDvYQ+OYKrRxdITv7L3YH8STYXwr8C2AQ0g== 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 4VcnMY22ywz19CZ; Sun, 12 May 2024 15:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44CFw1vc007855; Sun, 12 May 2024 15:58:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44CFw1Vs007852; Sun, 12 May 2024 15:58:01 GMT (envelope-from git) Date: Sun, 12 May 2024 15:58:01 GMT Message-Id: <202405121558.44CFw1Vs007852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tijl Coosemans Subject: git: e6cdeb9d9187 - releng/14.1 - linuxkpi: Fix set_memory_* List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: e6cdeb9d91875773a64ef61b5a9dcfb0ded90799 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=e6cdeb9d91875773a64ef61b5a9dcfb0ded90799 commit e6cdeb9d91875773a64ef61b5a9dcfb0ded90799 Author: Tijl Coosemans AuthorDate: 2024-05-03 13:27:29 +0000 Commit: Tijl Coosemans CommitDate: 2024-05-12 15:55:14 +0000 linuxkpi: Fix set_memory_* set_memory_* is currently implemented using PHYS_TO_DMAP but not all architectures have a DMAP. Looking at how this function is used the given address isn't physical but virtual so the PHYS_TO_DMAP call can simply be removed. Also cast numpages before shifting it to avoid overflow. Reviewed by: kib, markj Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D45057 (cherry picked from commit 7206f7c619912bdd4d54dd539824733eae50c3a9) (cherry picked from commit 147ea7d4092f4b08411724bd501283a281ffa34e) --- sys/compat/linuxkpi/common/include/asm/set_memory.h | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/set_memory.h b/sys/compat/linuxkpi/common/include/asm/set_memory.h index 69f659001c60..1019aaf264a0 100644 --- a/sys/compat/linuxkpi/common/include/asm/set_memory.h +++ b/sys/compat/linuxkpi/common/include/asm/set_memory.h @@ -34,26 +34,20 @@ static inline int set_memory_uc(unsigned long addr, int numpages) { - vm_offset_t va; vm_size_t len; - va = PHYS_TO_DMAP(addr); - len = numpages << PAGE_SHIFT; - - return (-pmap_change_attr(va, len, VM_MEMATTR_UNCACHEABLE)); + len = (vm_size_t)numpages << PAGE_SHIFT; + return (-pmap_change_attr(addr, len, VM_MEMATTR_UNCACHEABLE)); } static inline int set_memory_wc(unsigned long addr, int numpages) { #ifdef VM_MEMATTR_WRITE_COMBINING - vm_offset_t va; vm_size_t len; - va = PHYS_TO_DMAP(addr); - len = numpages << PAGE_SHIFT; - - return (-pmap_change_attr(va, len, VM_MEMATTR_WRITE_COMBINING)); + len = (vm_size_t)numpages << PAGE_SHIFT; + return (-pmap_change_attr(addr, len, VM_MEMATTR_WRITE_COMBINING)); #else return (set_memory_uc(addr, numpages)); #endif @@ -62,13 +56,10 @@ set_memory_wc(unsigned long addr, int numpages) static inline int set_memory_wb(unsigned long addr, int numpages) { - vm_offset_t va; vm_size_t len; - va = PHYS_TO_DMAP(addr); - len = numpages << PAGE_SHIFT; - - return (-pmap_change_attr(va, len, VM_MEMATTR_WRITE_BACK)); + len = (vm_size_t)numpages << PAGE_SHIFT; + return (-pmap_change_attr(addr, len, VM_MEMATTR_WRITE_BACK)); } static inline int