From nobody Thu Jan 26 19:47:59 2023 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 4P2rpm3dCPz3bnKR; Thu, 26 Jan 2023 19:48:00 +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 4P2rpm2T3sz3DNx; Thu, 26 Jan 2023 19:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762480; 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=VxhrHodLK6t26BpYJKsX4sVs4bYKG2kp5VASfRYyYiQ=; b=wXkap0IQV8NZ6BK+Bo8FQEzng2VIJt/i0AFB7FJ3S62/9JddjvSVts9u0Re3Unqdk38TYv eXeKcgaNYW3h4Mu8xCjG62j3/Bqi3pFnw9TIefGt5B7CWWEJuFYhWMwq8+csWPbYTvkoec NAQ1ouBmhmN8rby2fIsaHtGzJ9jkEPz88jlqpZVHs7XaNOm1evSDtjH14aRPk5UY6u6QnF baCPfJDgrbm38/tHTA0vvpUb1XbR3jMmCTfkoAtmhcoAsSFIxH38aK3D9nK10FcbrNa9mv RAgR0HuXUpa0Aue0SCLF4b/f6JAVbfMppAIZwmgWD773IYxZEm+G1JZXw0i1KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762480; 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=VxhrHodLK6t26BpYJKsX4sVs4bYKG2kp5VASfRYyYiQ=; b=e7hycw2AlkUxUnu6ud9yN1tVLKAIQV62UdW4kMXkrZvm0gCvYHNMRbYV2fCqrbUHmuE/K+ AA54rw+4PKXwoiP2FucTrUo3VqXIaRV7iDw0X6S4N8o34RZCXXUo1Eet1taK5Ra9Ckoxkx dAC/QVss0OhM/FbA8kLp6TCZ6X+3X06uYu2wp9bccVgFEMZ7qlvHJaPGWLGvmclqNGfhLf 82MokrvaFpDze2L+jWy5ZjNJr/bs4o5PMOG6qiw6YdI/0StjitCHRHSIdWqNQ4tV7Es34P 7jyk5D+me1kXfUpffnwsVMmxJYsgdJNYhyR68qEWpkQgxE13kF5QNyqqW+cVkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674762480; a=rsa-sha256; cv=none; b=rLvuLhIZef7oyn29wH6XqZy5RlJTg9fBPbZnn45p0BHvdz+hzfPj2mdnoT/A29ufZBo37B EeWtXN5AThNqFuazsWwToi8gGEdg+10hyuBvpLRUN5oPMNtSnGugviVlCi6vLmaZhhJrv9 /X7OyqgpQbS8N/oQzyC0Z8cD5sBRNE3/mp91aSfG5Weobc7B6/rf3B3p6AVWWrrlj7SHcI xfcRyFccVgtydKcyyY7E22OnbFDZyE55GRfOdoO+IB03pt8T5a5WW5XluCasqlJZ4lxKUu vV7MMVi26Rtp47Du3WjQ0RTz+X51prw6S7G8HPtfndUs6cnvNKR7YAcf6/bVAA== 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 4P2rpm0jtmzhWf; Thu, 26 Jan 2023 19:48:00 +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 30QJm02W007374; Thu, 26 Jan 2023 19:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJlx9e007373; Thu, 26 Jan 2023 19:47:59 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:47:59 GMT Message-Id: <202301261947.30QJlx9e007373@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f233e95e8a5c - stable/13 - bhyve: Address signed/unsigned comparison warnings in the e1000 model 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f233e95e8a5cad5176758ac23665f00bcabe14d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f233e95e8a5cad5176758ac23665f00bcabe14d1 commit f233e95e8a5cad5176758ac23665f00bcabe14d1 Author: Mark Johnston AuthorDate: 2022-10-25 13:54:50 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:42:59 +0000 bhyve: Address signed/unsigned comparison warnings in the e1000 model No functional change intended. MFC after: 1 week (cherry picked from commit cea34d0705ccd3944cce1bed5b4ff31aad05d983) --- usr.sbin/bhyve/pci_e82545.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/usr.sbin/bhyve/pci_e82545.c b/usr.sbin/bhyve/pci_e82545.c index 1591136002f6..22127eb2208a 100644 --- a/usr.sbin/bhyve/pci_e82545.c +++ b/usr.sbin/bhyve/pci_e82545.c @@ -835,7 +835,8 @@ e82545_rx_callback(int fd __unused, enum ev_type type __unused, void *param) struct e82545_softc *sc = param; struct e1000_rx_desc *rxd; struct iovec vec[64]; - int left, len, lim, maxpktsz, maxpktdesc, bufsz, i, n, size; + ssize_t len; + int left, lim, maxpktsz, maxpktdesc, bufsz, i, n, size; uint32_t cause = 0; uint16_t *tp, tag, head; @@ -877,7 +878,7 @@ e82545_rx_callback(int fd __unused, enum ev_type type __unused, void *param) } len = netbe_recv(sc->esc_be, vec, maxpktdesc); if (len <= 0) { - DPRINTF("netbe_recv() returned %d", len); + DPRINTF("netbe_recv() returned %zd", len); goto done; } @@ -892,7 +893,7 @@ e82545_rx_callback(int fd __unused, enum ev_type type __unused, void *param) len += ETHER_CRC_LEN; n = (len + bufsz - 1) / bufsz; - DPRINTF("packet read %d bytes, %d segs, head %d", + DPRINTF("packet read %zd bytes, %d segs, head %d", len, n, head); /* Apply VLAN filter. */ @@ -929,7 +930,7 @@ e82545_rx_callback(int fd __unused, enum ev_type type __unused, void *param) E1000_RXD_STAT_EOP | E1000_RXD_STAT_DD; /* Schedule receive interrupts. */ - if (len <= sc->esc_RSRPD) { + if ((uint32_t)len <= sc->esc_RSRPD) { cause |= E1000_ICR_SRPD | E1000_ICR_RXT0; } else { /* XXX: RDRT and RADV timers should be here. */ @@ -976,7 +977,7 @@ e82545_buf_checksum(uint8_t *buf, int len) uint32_t sum = 0; /* Checksum all the pairs of bytes first... */ - for (i = 0; i < (len & ~1U); i += 2) + for (i = 0; i < (len & ~1); i += 2) sum += *((u_int16_t *)(buf + i)); /* @@ -991,9 +992,10 @@ e82545_buf_checksum(uint8_t *buf, int len) } static uint16_t -e82545_iov_checksum(struct iovec *iov, int iovcnt, int off, int len) +e82545_iov_checksum(struct iovec *iov, int iovcnt, unsigned int off, + unsigned int len) { - int now, odd; + unsigned int now, odd; uint32_t sum = 0, s; /* Skip completely unneeded vectors. */ @@ -1039,11 +1041,11 @@ static void e82545_transmit_checksum(struct iovec *iov, int iovcnt, struct ck_info *ck) { uint16_t cksum; - int cklen; + unsigned int cklen; DPRINTF("tx cksum: iovcnt/s/off/len %d/%d/%d/%d", iovcnt, ck->ck_start, ck->ck_off, ck->ck_len); - cklen = ck->ck_len ? ck->ck_len - ck->ck_start + 1 : INT_MAX; + cklen = ck->ck_len ? ck->ck_len - ck->ck_start + 1 : UINT_MAX; cksum = e82545_iov_checksum(iov, iovcnt, ck->ck_start, cklen); *(uint16_t *)((uint8_t *)iov[0].iov_base + ck->ck_off) = ~cksum; } @@ -1084,9 +1086,8 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, struct ck_info ckinfo[2]; struct iovec *iov; union e1000_tx_udesc *dsc; - int desc, dtype, len, ntype, iovcnt, tcp, tso; - int mss, paylen, seg, tiovcnt, left, now, nleft, nnow, pv, pvoff; - unsigned hdrlen, vlen, pktlen; + int desc, dtype, ntype, iovcnt, tcp, tso, paylen, seg, tiovcnt, pv; + unsigned hdrlen, vlen, pktlen, len, left, mss, now, nnow, nleft, pvoff; uint32_t tcpsum, tcpseq; uint16_t ipcs, tcpcs, ipid, ohead; bool invalid; @@ -1371,7 +1372,7 @@ e82545_transmit(struct e82545_softc *sc, uint16_t head, uint16_t tail, tcp = (sc->esc_txctx.cmd_and_length & E1000_TXD_CMD_TCP) != 0; mss = sc->esc_txctx.tcp_seg_setup.fields.mss; paylen = (sc->esc_txctx.cmd_and_length & 0x000fffff); - DPRINTF("tx %s segmentation offload %d+%d/%d bytes %d iovs", + DPRINTF("tx %s segmentation offload %d+%d/%u bytes %d iovs", tcp ? "TCP" : "UDP", hdrlen, paylen, mss, iovcnt); ipid = ntohs(*(uint16_t *)&hdr[ckinfo[0].ck_start + 4]); tcpseq = 0;