From nobody Wed Sep 7 15:17:39 2022 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 4MN5Tv4h8Dz4bQlF; Wed, 7 Sep 2022 15:17:39 +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 4MN5Tv496Dz3mLR; Wed, 7 Sep 2022 15:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563859; 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=ZWeti3yyCXx2jAE8zB1DZG7APPCRIWSdIIkid0nQnwI=; b=ueahMSA9x7fQmEoXig8eL+883kSfR+WxviUVHqZXm9wgdLfO6Qrr6OFaxfnDK4pYi9TTST XiCCFvGw4Mh604BQHfQRlZmCC2FMkXdUvQ8xgq22g6P62g2zhaXIJ2wq4fHJOrhhIdRZXq 8SzW9riAJILLc6/936mF4fpJlIbQBpb+otk/X/qaKHSU5xr7CKSkQWdrqAU7Caj+0jiWkz wLfXBrvaGVWeor3K/O7aHBHcZuKFHUQsH+mP1WxjpFKroa0Hd3l+ikigAHYK4wJM90q3y2 qSPI5PCBzo1+kd3jHNQFo4EmJn8zEIlFnfOd36Axnfy8SOlUFSNCpqJDWNI1Zg== 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 4MN5Tv3BbSzZ05; Wed, 7 Sep 2022 15:17:39 +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 287FHdR6030600; Wed, 7 Sep 2022 15:17:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287FHdns030599; Wed, 7 Sep 2022 15:17:39 GMT (envelope-from git) Date: Wed, 7 Sep 2022 15:17:39 GMT Message-Id: <202209071517.287FHdns030599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 0af5a0cd2788 - main - Hyper-V: storvsc: relax a kassert check 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0af5a0cd2788efce9f444f4f781357d317bb0bb1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563859; 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=ZWeti3yyCXx2jAE8zB1DZG7APPCRIWSdIIkid0nQnwI=; b=VU+RA9QJ7YOMdnNwlY7Z8jCj+GmqMT+iSRG3q8FozUtEyVeUEiTDMSHnTG8mt6Xts8PTrX TdWJ4dnCSuAB5NXysBxDXUsDzj8jX1RK36T9mS9roJTS6128q+FhbFt1fNMWI6Ozw9fen6 r54kV7VmTAGKVJw9tNr0h38KsGhVPUwp1iJz73/OYp3bmptaufA358yKTtDdeVBG66R1o+ oV+O38OowCdouynNDC6Hx9RAVl0wex9xUFaDZEWrMvjamhQvKHY6GdoyjuymcKCciqXTkv T8qK2cyXqVHUjANtQ5KyxyU0k99Ht421d45GkC3UKR+Tid5EoYcfGVn+4xKKlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662563859; a=rsa-sha256; cv=none; b=whUsgsP2oYy963XvgXMvxr5SSUW+N0/hqWdlvXs1gXGMd8jBydscern7mgTvrYOrWmKKg0 5YRgx3uRchlxMarT1Z+LZVFg7loueDoSTSOK7pklMzJpzPSaXVkpfqSb7Z+gGZBbifvfEF YdXdv+Z31qCRJ6fEFgl2IyywYNxisFcfXwCwbqnxJpm8ge30huL6MekumHXgFrsn7HpBdr 1jMm5gmsKziH+8LMUb5te5wFQ/yPMgaNrpOjpff582V71DissP9hsSczsLdMBEID2PVIMC OZNu+u0yjCXtZSgAIcRnhV/rjKKgzDCZBB5uD+I6MTnXg2ZwGzjftR/kgjqwtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=0af5a0cd2788efce9f444f4f781357d317bb0bb1 commit 0af5a0cd2788efce9f444f4f781357d317bb0bb1 Author: Wei Hu AuthorDate: 2022-09-07 15:06:54 +0000 Commit: Wei Hu CommitDate: 2022-09-07 15:06:54 +0000 Hyper-V: storvsc: relax a kassert check On ARM64 this kassert check could cause unnecessary panic. Sponsored by: Microsoft --- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c | 5 ++++- 1 file changed, 4 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 4c9869887db6..d12d6a5982f6 100644 --- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -1831,13 +1831,16 @@ storvsc_xferbuf_prepare(void *arg, bus_dma_segment_t *segs, int nsegs, int error for (i = 0; i < nsegs; i++) { #ifdef INVARIANTS if (nsegs > 1) { +#if defined(__amd64__) if (i == 0) { KASSERT((segs[i].ds_addr & PAGE_MASK) + segs[i].ds_len == PAGE_SIZE, ("invalid 1st page, ofs 0x%jx, len %zu", (uintmax_t)segs[i].ds_addr, segs[i].ds_len)); - } else if (i == nsegs - 1) { + } else +#endif + if (i == nsegs - 1) { KASSERT((segs[i].ds_addr & PAGE_MASK) == 0, ("invalid last page, ofs 0x%jx", (uintmax_t)segs[i].ds_addr));