From nobody Tue Apr 15 02:25:34 2025 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 4Zc7L66d39z5sjVh; Tue, 15 Apr 2025 02:25:34 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zc7L63hW4z3LpQ; Tue, 15 Apr 2025 02:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744683934; 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=x/8GdiLQzUTDaPvaFK6ZS3aUz0Pbto4LAdpaOBQeUMM=; b=kgHpMm+7zoUMtIIZZetRYXcSEZNbnbwmcyOxydcnbdjczfzwmQ9N46MR+Hzie4E/nOIrL4 KormgcY01476LtXPwgGRlnSHhui88EDxJC61XgwkY3rBXWgQcOkgEy/Q+MYnDkUtwa/ily AZhyMPzrTjewtURat07KqGN/dkU9emzoKXtKQ6ShCZ4smw19bMw/pwC2W87dEyma2ZcRPh 3If6QOjikvusQDtAPfMxprgQSGRQNDgNIFQS1XR/Q099Taic3vMp5+3e/pTR3B+BFWbEOL 8m7AhqqWr1qpmHU7I8yZkkvJlKFvlcSiJtCB+gkTaGn4unTCcCA+CkkaAPbSpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744683934; a=rsa-sha256; cv=none; b=reGebzfldXxXMVOUJOwJXpLn2mDmbC4/EXpB6ePANFFjG1gR5PbH5oGsbvAtsiDB02bw7/ BXBh6gJU+VxYv/WQgfGaw8d97k3QpOS307UhB+WSVELVk7WlR7My8QTThtqJk86BIVQB1m TAh7NoBLVy2ga+ZufDHCh3HZbf6tBs1SeN5/KuTVYZS603JcUvhiTz0u25zanDTNpC1g8G r3wnJA9glErEY2t+7INKMkOJdan7++Lzj4O4W8HBSazcCjH7SA+zpf+LBZZ65RKItB9Kfx VWVK4MUuniKhkhGiPaKb4waYd7YMkPwSvavqJ/bQ62zvkjEx9Sy2h8s8IYek3A== 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=1744683934; 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=x/8GdiLQzUTDaPvaFK6ZS3aUz0Pbto4LAdpaOBQeUMM=; b=SvmIz8QF+KzNlUfU1ieHtMndOnN1MPceCjRyP3lQc/T7c34sBmDXZZkn7cGTa8qgLqv+S6 IhgkhO+P4iCSD8/EpZrp0TZD+eVeLVDL5ULcFxhjm6MwVW8hqLdnjH0Kh71lufDL/WrHx9 6mjnI5PNxJkOyaUY9/7piYyuTR14SK2D4Gn0CZltVqO52aRW/lnPtQbUYeyrENoNTC24I2 O3EEzdmKyhQkEoFqUqkr8OWz2KpJWxP3dIW7Vk7s7/0+OaFj8ebKweLXkj6FbMYkday1CO WaJ1CZPqd91103jXbEgljOt0VibRX8qbiNECyaxoVzzW/d2sHiezf+HN/9q/jQ== 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 4Zc7L635PwzJ2; Tue, 15 Apr 2025 02:25:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53F2PY84014514; Tue, 15 Apr 2025 02:25:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53F2PYrE014511; Tue, 15 Apr 2025 02:25:34 GMT (envelope-from git) Date: Tue, 15 Apr 2025 02:25:34 GMT Message-Id: <202504150225.53F2PYrE014511@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 07c5a2486cc6 - stable/14 - hyperv/storvsc: Fix busdma constraints 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07c5a2486cc6f8e64715b5d7c31ccfa02f9f3745 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=07c5a2486cc6f8e64715b5d7c31ccfa02f9f3745 commit 07c5a2486cc6f8e64715b5d7c31ccfa02f9f3745 Author: Mark Johnston AuthorDate: 2025-03-31 10:45:14 +0000 Commit: Mark Johnston CommitDate: 2025-04-15 02:25:24 +0000 hyperv/storvsc: Fix busdma constraints - The BUS_DMA_KEEP_PG_OFFSET flag is needed, since storvsc_xferbuf_prepare() assumes that only the first segment may have a non-zero offset, and that all following segments are page-sized and -aligned. - storvsc_xferbuf_prepare() handles 64-bit bus addresses, so avoid unneeded bouncing on i386. PR: 285681 Reported by: dim Tested by: dim, whu MFC after: 2 weeks (cherry picked from commit a319ba694538a38429115aaaf1d4b3946ea3a8b5) --- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index d7e7bd85ae29..076b436a2191 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -954,13 +954,18 @@ storvsc_init_requests(device_t dev) bus_get_dma_tag(dev), /* parent */ 1, /* alignment */ PAGE_SIZE, /* boundary */ +#if defined(__i386__) && defined(PAE) + BUS_SPACE_MAXADDR_48BIT, /* lowaddr */ + BUS_SPACE_MAXADDR_48BIT, /* highaddr */ +#else BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ +#endif NULL, NULL, /* filter, filterarg */ STORVSC_DATA_SIZE_MAX, /* maxsize */ STORVSC_DATA_SEGCNT_MAX, /* nsegments */ STORVSC_DATA_SEGSZ_MAX, /* maxsegsize */ - 0, /* flags */ + BUS_DMA_KEEP_PG_OFFSET, /* flags */ NULL, /* lockfunc */ NULL, /* lockfuncarg */ &sc->storvsc_req_dtag);