From owner-svn-src-head@freebsd.org Sat Jun 6 18:56:25 2020 Return-Path: Delivered-To: svn-src-head@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 EF13E33B7D5 for ; Sat, 6 Jun 2020 18:56:25 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49fTJ90yCHz4c8r for ; Sat, 6 Jun 2020 18:56:24 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb2f.google.com with SMTP id s1so2241915ybo.7 for ; Sat, 06 Jun 2020 11:56:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=y+e5zv37cTRalzwk3A13dRwiPgW4T4X3WB1nJjzFBhs=; b=koYLuqhkEmXChVFEtOHw5iAk0C5C4qpQI6/4c3DaUXSQLAN/ZqsH2sD6B+vxMoVQ3f xPt+XLljHggzVIGQxqgb4lrq4ua+s1cBHXbZSCrjDd/5KWjQSFZCUkPut/J7BqRuyjjl JOHvIDBMP3soCPEt0uB5m+lCyXvlMzZkpqjjQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=y+e5zv37cTRalzwk3A13dRwiPgW4T4X3WB1nJjzFBhs=; b=cI1FCJGy8HaZBcK5YRfELbGTVgVtVHe9oq0uWctxySYd6dXxTKJ/q7Z8L8+ZY7z8DJ W+PrQbGnyw/qnrzGKVc1eCYeInTLKVTOUA4DCmE1zeR6ejXLKi1B+3ENzAdFzF5gc/WQ UrRagRtFvdNpm7E0Pu9UpSYDv0Nk21qqh8uODupdrcfGqctBOf3qPxmW7Tk8aoWPu3ng MBAkNHu64JSilU3eXD6EQtt+ld84x6ig5dbs88zgJZHE2ti+46pCHn3bebBkuPGVqzmD OxKfYnmUL2CPPJXm4LzR9vPgMfK6XXfh8A8A97IhuRWeDn8z2w+AXlHjxoi7oQaiUq4T pdHg== X-Gm-Message-State: AOAM5322xVbG1Cw70P7AaQvQW6R/dd8LG4qad7nLlxF9ALpJvXiYZMM4 ss5/0MZhzuWeTEDsFJAKvxI6F7VWrV+wOkx4/JnsHl5W X-Google-Smtp-Source: ABdhPJz+vYW4dO7Wa30gMgHTJwctopr5WFuWw2vFoB6BldCetQaSFl/j0YYHgYBo6sFomHAqVBwGvFjfXHPBSvNSLRU= X-Received: by 2002:a25:ba49:: with SMTP id z9mr23866776ybj.391.1591469783901; Sat, 06 Jun 2020 11:56:23 -0700 (PDT) MIME-Version: 1.0 References: <202006061820.056IK9Fa079753@repo.freebsd.org> In-Reply-To: <202006061820.056IK9Fa079753@repo.freebsd.org> From: Kevin Bowling Date: Sat, 6 Jun 2020 11:56:11 -0700 Message-ID: Subject: Re: svn commit: r361872 - head/sys/netinet To: Michael Tuexen Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49fTJ90yCHz4c8r X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none (invalid DKIM record) header.d=kev009.com header.s=google header.b=koYLuqhk; dmarc=none; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2607:f8b0:4864:20::b2f as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com X-Spamd-Result: default: False [-2.51 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.04)[-1.039]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; NEURAL_HAM_LONG(-0.99)[-0.993]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[kev009.com]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[kev009.com:~]; NEURAL_HAM_SHORT(-0.18)[-0.180]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::b2f:from]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2020 18:56:26 -0000 Out of curiosity what is panda? On Sat, Jun 6, 2020 at 11:20 AM Michael Tuexen wrote: > > Author: tuexen > Date: Sat Jun 6 18:20:09 2020 > New Revision: 361872 > URL: https://svnweb.freebsd.org/changeset/base/361872 > > Log: > Non-functional changes due to cleanup (upstream removing of Panda support) > of the code > > MFC after: 1 week > > Modified: > head/sys/netinet/sctp_constants.h > head/sys/netinet/sctp_indata.c > head/sys/netinet/sctp_os.h > head/sys/netinet/sctp_output.c > head/sys/netinet/sctp_pcb.c > head/sys/netinet/sctp_usrreq.c > > Modified: head/sys/netinet/sctp_constants.h > ============================================================================== > --- head/sys/netinet/sctp_constants.h Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_constants.h Sat Jun 6 18:20:09 2020 (r361872) > @@ -576,7 +576,6 @@ __FBSDID("$FreeBSD$"); > */ > #define SCTP_ASOC_MAX_CHUNKS_ON_QUEUE 512 > > - > /* > * Basically the minimum amount of time before I do a early FR. Making this > * value to low will cause duplicate retransmissions. > @@ -756,9 +755,8 @@ __FBSDID("$FreeBSD$"); > #define SCTP_FROM_SCTP_ASCONF 0x80000000 > #define SCTP_FROM_SCTP_OUTPUT 0x90000000 > #define SCTP_FROM_SCTP_PEELOFF 0xa0000000 > -#define SCTP_FROM_SCTP_PANDA 0xb0000000 > -#define SCTP_FROM_SCTP_SYSCTL 0xc0000000 > -#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xd0000000 > +#define SCTP_FROM_SCTP_SYSCTL 0xb0000000 > +#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xc0000000 > > /* Location ID's */ > #define SCTP_LOC_1 0x00000001 > > Modified: head/sys/netinet/sctp_indata.c > ============================================================================== > --- head/sys/netinet/sctp_indata.c Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_indata.c Sat Jun 6 18:20:09 2020 (r361872) > @@ -2721,8 +2721,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o > * cluster... i.e. it is a small packet sent in and yet the driver > * underneath allocated a full cluster for it. If so we must copy it > * to a smaller mbuf and free up the cluster mbuf. This will help > - * with cluster starvation. Note for __Panda__ we don't do this > - * since it has clusters all the way down to 64 bytes. > + * with cluster starvation. > */ > if (SCTP_BUF_LEN(m) < (long)MLEN && SCTP_BUF_NEXT(m) == NULL) { > /* we only handle mbufs that are singletons.. not chains */ > > Modified: head/sys/netinet/sctp_os.h > ============================================================================== > --- head/sys/netinet/sctp_os.h Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_os.h Sat Jun 6 18:20:09 2020 (r361872) > @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); > > > > - > /* All os's must implement this address gatherer. If > * no VRF's exist, then vrf 0 is the only one and all > * addresses and ifn's live here. > > Modified: head/sys/netinet/sctp_output.c > ============================================================================== > --- head/sys/netinet/sctp_output.c Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_output.c Sat Jun 6 18:20:09 2020 (r361872) > @@ -6475,8 +6475,7 @@ error_out: > appendchain = clonechain; > } else { > if (!copy_by_ref && > - (sizeofcpy <= (int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + MHLEN))) > - ) { > + (sizeofcpy <= (int)((((SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) - 1) * MLEN) + MHLEN)))) { > /* Its not in a cluster */ > if (*endofchain == NULL) { > /* lets get a mbuf cluster */ > @@ -13526,12 +13525,6 @@ skip_preblock: > error = sctp_msg_append(stcb, net, top, srcv, 0); > top = NULL; > if (sinfo_flags & SCTP_EOF) { > - /* > - * This should only happen for Panda for the mbuf > - * send case, which does NOT yet support EEOR mode. > - * Thus, we can just set this flag to do the proper > - * EOF handling. > - */ > got_all_of_the_send = 1; > } > } > > Modified: head/sys/netinet/sctp_pcb.c > ============================================================================== > --- head/sys/netinet/sctp_pcb.c Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_pcb.c Sat Jun 6 18:20:09 2020 (r361872) > @@ -749,8 +749,7 @@ sctp_del_addr_from_vrf(uint32_t vrf_id, struct sockadd > > /*- > * The name has priority over the ifn_index > - * if its given. We do this especially for > - * panda who might recycle indexes fast. > + * if its given. > */ > if (if_name) { > if (strncmp(if_name, sctp_ifap->ifn_p->ifn_name, SCTP_IFNAMSIZ) == 0) { > @@ -3157,8 +3156,7 @@ continue_anyway: > } else { > /* > * Note for BSD we hit here always other O/S's will > - * pass things in via the sctp_ifap argument > - * (Panda). > + * pass things in via the sctp_ifap argument. > */ > ifa = sctp_find_ifa_by_addr(&store.sa, > vrf_id, SCTP_ADDR_NOT_LOCKED); > @@ -4302,11 +4300,7 @@ sctp_aloc_assoc(struct sctp_inpcb *inp, struct sockadd > * If you have not performed a bind, then we need to do the > * ephemeral bind for you. > */ > - if ((err = sctp_inpcb_bind(inp->sctp_socket, > - (struct sockaddr *)NULL, > - (struct sctp_ifa *)NULL, > - p > - ))) { > + if ((err = sctp_inpcb_bind(inp->sctp_socket, NULL, NULL, p))) { > /* bind error, probably perm */ > *error = err; > return (NULL); > @@ -4674,7 +4668,6 @@ sctp_clean_up_stream(struct sctp_tcb *stcb, struct sct > } > } > } > - > > /*- > * Free the association after un-hashing the remote port. This > > Modified: head/sys/netinet/sctp_usrreq.c > ============================================================================== > --- head/sys/netinet/sctp_usrreq.c Sat Jun 6 17:48:55 2020 (r361871) > +++ head/sys/netinet/sctp_usrreq.c Sat Jun 6 18:20:09 2020 (r361872) > @@ -71,7 +71,7 @@ sctp_init(void) > SCTP_BASE_SYSCTL(sctp_max_chunks_on_queue) = (nmbclusters / 8); > /* > * Allow a user to take no more than 1/2 the number of clusters or > - * the SB_MAX whichever is smaller for the send window. > + * the SB_MAX, whichever is smaller, for the send window. > */ > sb_max_adj = (u_long)((u_quad_t)(SB_MAX) * MCLBYTES / (MSIZE + MCLBYTES)); > SCTP_BASE_SYSCTL(sctp_sendspace) = min(sb_max_adj, > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"