From nobody Tue Apr 15 02:25:35 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 4Zc7L76WkFz5sjdv; Tue, 15 Apr 2025 02:25:35 +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 4Zc7L744Wlz3M1R; Tue, 15 Apr 2025 02:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744683935; 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=vB+FmXs6zulT0RqSGYDk9d2KB8qTAzRL/icXTytzJrc=; b=xv8n1RFXXSYUmuxWsM4wjV1hY2f4YbPune/Eum0ggmIf6VRI/pmtkHACPEIM6gJkgFdt3v iMo2P9KfP5qAXpzud+7QsXMft00ENBM3dCN1dcrP5gqZkDUU8TZn3bWd/YMuRUpT2qsOpD kZ7qRY6LwqA2d5fJAOKyWqXsD/MOedcZ7BOFjuhsUL0ReVMv5wg4zqsoL/DX8FGHYRpqKv nBxGhW+IZio8ly/sd9R9ZoQowRZFl//V/LxYn9dNhm4yyiTSsisQqJaETDvb3jf9QHncA2 VCFmeQdcg/STFlz+97GGQJw7qKF18r0sZsjAaIV5gI+cx+uGNu9XcOSv6xfgNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744683935; a=rsa-sha256; cv=none; b=a0ePO57xPTqbQKef2drAWTy5VhFMQnfaZJZKBQRzK8B3YeVNI8wuFcJEdvH7A5dAoThRVB wz8sKRp7ACQ+/9OLN4XL/AzQWpiPeb7a3FZjobzioWvQEpKS7ZZ1h2GN1FI5Pk/7NeWJbP hrgiwT8bojj7SJ+K2n/gdJWG/3E8O0fqPHGRUmQDwzx3sc5fyZaK3cTV9X9HR9Z+pWL6D+ 8FbMtg8n+fxmSwqxj8eCbn21OXkm+vU44/gMuxhtNCqdVIkK5Fmj7kOP8voHGiKRHI3QXn HZUXhtR5vsC0gASmdGB0skYXWwQcgVYrfzr10LkUtA67MXvL9IQR+46k4GcYRQ== 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=1744683935; 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=vB+FmXs6zulT0RqSGYDk9d2KB8qTAzRL/icXTytzJrc=; b=ANYyIMK8MLNpKI/NiewDFVVBC+NZnAvK11ZGb2Md9425fBZDrnk845ee9jCCOGvNuZ9F3b VpsqqkKXQYgPuXgjZWgWOUJz7ViOeNkVVECxVx1Zyue2F0b/NLsUJFXhEkNXn0vod6GfNc Q5UZ8lhbi+lKhqmLaCG6eLBFeun6YYlmqx+iiruOLEGcFW8SDWjrE8N+hwvmz9X2mKi/CS TlI4ASDrX8Mn+PQLv7UNjdTggHcM/EHwKVZDMEVJmosBSr18N4yqBnvulJ7OCAJ9qHtMdw jXr32Exma7sql1C9BoKpf3B4OZsMVqszsmv45VgCTtqlTM46QUENrcoDcO7b7g== 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 4Zc7L73fLHz69; Tue, 15 Apr 2025 02:25:35 +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 53F2PZId014559; Tue, 15 Apr 2025 02:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53F2PZAO014556; Tue, 15 Apr 2025 02:25:35 GMT (envelope-from git) Date: Tue, 15 Apr 2025 02:25:35 GMT Message-Id: <202504150225.53F2PZAO014556@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: e6a3962d7dd7 - stable/14 - hyperv/storvsc: Avoid conditional asserts in storvsc_xferbuf_prepare() 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: e6a3962d7dd7f302c094d5cea68a3d63a1b67eb6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e6a3962d7dd7f302c094d5cea68a3d63a1b67eb6 commit e6a3962d7dd7f302c094d5cea68a3d63a1b67eb6 Author: Mark Johnston AuthorDate: 2025-03-31 10:45:55 +0000 Commit: Mark Johnston CommitDate: 2025-04-15 02:25:24 +0000 hyperv/storvsc: Avoid conditional asserts in storvsc_xferbuf_prepare() whu@ cannot reproduce the assertion failure which led to these ifdefs being added in the first place, and since they appear wrong, i.e., the assertions ought to apply to all platforms, let's remove them. This reverts commits 0af5a0cd2788efce9f444f4f781357d317bb0bb1 and 6f7b1310b6fe36f9bb653d3e97bc257adced3a2b. PR: 285681 Tested by: whu MFC after: 2 weeks (cherry picked from commit 54a3920dc9b3b5a47cdaaa3132b4fcf1c448a737) --- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c index 076b436a2191..70a5f414d986 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -1833,7 +1833,6 @@ storvsc_xferbuf_prepare(void *arg, bus_dma_segment_t *segs, int nsegs, int error for (i = 0; i < nsegs; i++) { #ifdef INVARIANTS -#if !defined(__aarch64__) if (nsegs > 1) { if (i == 0) { KASSERT((segs[i].ds_addr & PAGE_MASK) + @@ -1853,7 +1852,6 @@ storvsc_xferbuf_prepare(void *arg, bus_dma_segment_t *segs, int nsegs, int error segs[i].ds_len)); } } -#endif #endif prplist->gpa_page[i] = atop(segs[i].ds_addr); }