From owner-svn-src-stable-12@freebsd.org Fri Apr 24 13:24:21 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4BAD62B4277; Fri, 24 Apr 2020 13:24:21 +0000 (UTC) (envelope-from markj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 497vyr6xnCz4LBk; Fri, 24 Apr 2020 13:24:20 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CFB111E916; Fri, 24 Apr 2020 13:24:20 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03ODOKHl076359; Fri, 24 Apr 2020 13:24:20 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03ODOKZR076356; Fri, 24 Apr 2020 13:24:20 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202004241324.03ODOKZR076356@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 24 Apr 2020 13:24:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r360255 - in stable/12/sys: kern sys X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/12/sys: kern sys X-SVN-Commit-Revision: 360255 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 13:24:21 -0000 Author: markj Date: Fri Apr 24 13:24:19 2020 New Revision: 360255 URL: https://svnweb.freebsd.org/changeset/base/360255 Log: MFC r359779: sbappendcontrol() needs to avoid clearing M_NOTREADY on data mbufs. Modified: stable/12/sys/kern/uipc_sockbuf.c stable/12/sys/kern/uipc_usrreq.c stable/12/sys/sys/sockbuf.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/kern/uipc_sockbuf.c ============================================================================== --- stable/12/sys/kern/uipc_sockbuf.c Fri Apr 24 13:23:16 2020 (r360254) +++ stable/12/sys/kern/uipc_sockbuf.c Fri Apr 24 13:24:19 2020 (r360255) @@ -957,11 +957,11 @@ sbappendaddr(struct sockbuf *sb, const struct sockaddr void sbappendcontrol_locked(struct sockbuf *sb, struct mbuf *m0, - struct mbuf *control) + struct mbuf *control, int flags) { struct mbuf *m, *mlast; - m_clrprotoflags(m0); + sbm_clrprotoflags(m0, flags); m_last(control)->m_next = m0; SBLASTRECORDCHK(sb); @@ -979,11 +979,12 @@ sbappendcontrol_locked(struct sockbuf *sb, struct mbuf } void -sbappendcontrol(struct sockbuf *sb, struct mbuf *m0, struct mbuf *control) +sbappendcontrol(struct sockbuf *sb, struct mbuf *m0, struct mbuf *control, + int flags) { SOCKBUF_LOCK(sb); - sbappendcontrol_locked(sb, m0, control); + sbappendcontrol_locked(sb, m0, control, flags); SOCKBUF_UNLOCK(sb); } Modified: stable/12/sys/kern/uipc_usrreq.c ============================================================================== --- stable/12/sys/kern/uipc_usrreq.c Fri Apr 24 13:23:16 2020 (r360254) +++ stable/12/sys/kern/uipc_usrreq.c Fri Apr 24 13:24:19 2020 (r360255) @@ -1193,7 +1193,7 @@ uipc_send(struct socket *so, int flags, struct mbuf *m case SOCK_STREAM: if (control != NULL) { sbappendcontrol_locked(&so2->so_rcv, m, - control); + control, flags); control = NULL; } else sbappend_locked(&so2->so_rcv, m, flags); Modified: stable/12/sys/sys/sockbuf.h ============================================================================== --- stable/12/sys/sys/sockbuf.h Fri Apr 24 13:23:16 2020 (r360254) +++ stable/12/sys/sys/sockbuf.h Fri Apr 24 13:24:19 2020 (r360255) @@ -140,9 +140,9 @@ int sbappendaddr_locked(struct sockbuf *sb, const stru int sbappendaddr_nospacecheck_locked(struct sockbuf *sb, const struct sockaddr *asa, struct mbuf *m0, struct mbuf *control); void sbappendcontrol(struct sockbuf *sb, struct mbuf *m0, - struct mbuf *control); + struct mbuf *control, int flags); void sbappendcontrol_locked(struct sockbuf *sb, struct mbuf *m0, - struct mbuf *control); + struct mbuf *control, int flags); void sbappendrecord(struct sockbuf *sb, struct mbuf *m0); void sbappendrecord_locked(struct sockbuf *sb, struct mbuf *m0); void sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n);