From nobody Mon Mar 31 11:16:15 2025 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 4ZR7qN3ySxz5rsNl; Mon, 31 Mar 2025 11:16:16 +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 4ZR7qM6JD4z3SST; Mon, 31 Mar 2025 11:16:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743419775; 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=spnyCiPvkAH1Om8lr/6lENMMXAA5EySyYqJ11e+m7eE=; b=IUxbBIAUUFcZChoHeVvXPft2bCBiBep9/dEASqJ82Q9wxn77N7fp+6JFOV627vRMVB0EL7 m8ugmLK/9pA1YDJYUX5XOKVMuTdpO5eKOJxKfm6ntWnV4/biMfQHzaPKsiRRPJZYEywS1a AmcKsDxxRaq30lDuz0KJNbdAeExhX1X0d7s5FNCNVaamsXDZtq8W3gBoOVVWxfqmQVZFcf 0GCxMBDVaWdPl+HBRV3c41ypW7gcOdS9UlCIPH4ALJwF+khT7BTa1RULKyMRKcZ5vI1eWN NgZMk4POZYiipIpcOznrTvtVzfbkdrIln8QMEflo/3QXjiKCqc6UJyB9Axujfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743419775; a=rsa-sha256; cv=none; b=Ac1+mUeEPUbLgw7/kxfAsIqm1mV3b/f/ZXjubxWPQjBaFxJNYOQ+glA0F8Z6nQo6Ag1n/h tDZSbNylihPR2rVYdZSINf/k/E5IGpsA0zzHhNam+lMPoKLxW8/uc3L81x/BffuiplHuBN skj+EbzQCg3HPUmNNC885fu3b5A6gh7yy5Yf7tKakuLiCFiN+aDp9SC4spcZrS2ncsKSVA mJOqgaiXD2EwyeibMnPpY1PlnB+JfuUARXXMRs1K+6VZ9LFU6798Kp46wiJ1dphflIohll CrllFFXQzq2hmwv6RXcCbbWOSjy7wD+kReZLG370vJWVmI5Mm014IVJlzjAz1Q== 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=1743419775; 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=spnyCiPvkAH1Om8lr/6lENMMXAA5EySyYqJ11e+m7eE=; b=fZXVwL6Q1Tzpfr+GeXf8+HAGWv2/2+1x0CGH/+sYv4aRAhmojwT3siLfPQY03sEqEnbQDB YQVVJsGxEdGkb2UDcUrK7Ho1cv8j8MQk33X32i5gmSBxKqLqFEFIQSKmbf9tFjs0lLumAM 4nxosby/DOlTh2bbAWnx8C405lySjvSrHD6VgJ6mOGWreZ1Yhj4d7yqNz83M0aYJLRydCy U5PdCm+Z6btO5WWAjnfmvXa4Q9EYbYjqxLlRY8CZnsBrb3rUZczxjJ00HR6lXk8bxlmF/n IVrIBobmONUomfnrRixo1kRMJdM2c5L0l5bdY7ST/59vGMTsHQ9Hq7mE5dn1Xg== 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 4ZR7qM5vnhzk6m; Mon, 31 Mar 2025 11:16:15 +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 52VBGFw4023079; Mon, 31 Mar 2025 11:16:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VBGFao023076; Mon, 31 Mar 2025 11:16:15 GMT (envelope-from git) Date: Mon, 31 Mar 2025 11:16:15 GMT Message-Id: <202503311116.52VBGFao023076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 54a3920dc9b3 - main - hyperv/storvsc: Avoid conditional asserts in storvsc_xferbuf_prepare() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 54a3920dc9b3b5a47cdaaa3132b4fcf1c448a737 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=54a3920dc9b3b5a47cdaaa3132b4fcf1c448a737 commit 54a3920dc9b3b5a47cdaaa3132b4fcf1c448a737 Author: Mark Johnston AuthorDate: 2025-03-31 10:45:55 +0000 Commit: Mark Johnston CommitDate: 2025-03-31 11:15:45 +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 --- 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 cc3e7262e8d7..29a88e76a579 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); }