Paths

Table of Contentst

-
audio/
-
alsa-lib/
-
Makefile
2/2
distinfo
-
files/
2/2
patch-src_async.c
2/2
patch-src_conf_alsa.conf
-
patch-src_pcm_pcm__direct.c
-
patch-test_midifile.c
-
pkg-plist
-
alsa-plugins/
-
Makefile
-
distinfo
-
files/
-
patch-configure
-
patch-configure.ac
-
patch-usb__stream_pcm__usb__stream.c
-
alsa-utils/
-
Makefile
-
distinfo
-
files/
-
patch-aplay_formats.h
-
patch-speaker-test_samples_sample__map.csv
-
pkg-plist

Differential D34324

alsa-plugins to latest version
AbandonedPublic
Actions

Authored by rodrigo on Feb 20 2022, 7:23 PM.

Details

Reviewers

• hselasky

Summary

audio/alsa-lib: Update to version 1.2.6.1
Major changes:

v1.2.6.1: https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.6.1
    Configuration improvements
v1.2.6  : https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.6
    Multiple additions and fixes in
        Config, Control, PCM, RAWMidi, Topology, Use Case Manager APIs
        Configuration, Documentation, Dynamic Loader helpers
        External PCM Plugin SDK, External Rate Converter Plugin SDK
        Kernel Headers, Test/Example code
v1.2.5.1: https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.5.1
        Multiple fixes in
        Control, PCM, Timer, Use case manager APIs
        Configuration
v1.2.5  : https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.5
        Multiple fixes in
        Config, Control, Control Plugin, HWDEP, I/O, Mixer, PCM, RawMidi,
        Sequencer, Timer, Topology, Use Case Manager APIs
        Compilation files, Configuration, Documentation, Dynamic Loader helpers,
        I/O subsystem, Kernel Headers, Test/Example code, Utils
v1.2.4  : https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.4
v1.3.2  : https://github.com/alsa-project/alsa-lib/releases/tag/v1.3.2
v1.3.1  : https://github.com/alsa-project/alsa-lib/releases/tag/v1.3.1
v1.2.3  : https://github.com/alsa-project/alsa-lib/releases/tag/v1.2.3

audio/alsa-utils: Update to version 1.2.6

Major changes:

v1.2.6  : https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.6
    Multiple fixes and improvements
    ALSA Control (alsactl)
    ALSA RawMidi Utility (amidi)
    alsa-info.sh
    alsamixer
    alsatplg (topology)
    amixer
    aseqnet
v1.2.5.1: https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5.1
    Multiple fixes and improvements
    ALSA Control (alsactl)
    Audio Transfer utility
    alsatplg (topology)
    aplay/arecord
    aseqnet
v1.2.5  : https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.5
    Multiple fixes and improvements
    ALSA Control (alsactl)
    ALSA RawMidi Utility (amidi)
    Audio Transfer utility
    Speaker Test
    alsa-info.sh
    alsaconf
    alsaloop
    alsamixer
    alsatplg (topology)
    values
    alsaucm
    amixer
    aplay/arecord
    aseqnet
v1.2.4  : https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.4
v1.2.3  : https://github.com/alsa-project/alsa-utils/releases/tag/v1.2.3

audio/alsa-plugins: Update to version 1.2.6

Major changes:

v1.2.6 : https://github.com/alsa-project/alsa-plugins/releases/tag/v1.2.6
    rate-lav: Convert to libswresample
    A52 Output plugin
    Documentation
    Jack PCM plugin
    Rate Converter plugins
    USB stream plugin
    libavcodec's resampler
v1.2.5 : https://github.com/alsa-project/alsa-plugins/releases/tag/v1.2.5
    A52 Output plugin
    Automatic upmix / downmix plugins
    Jack PCM plugin
    OSS Mixer -> ALSA Control plugin
    PulseAudio -> ALSA plugin
    USB stream plugin

Test Plan

Tested with spotifyd using alsa backend

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 53961
Build 50851: arc lint + arc unit

Event Timeline

rodrigo created this revision.Feb 20 2022, 7:23 PM

Herald added a subscriber: mat. · View Herald TranscriptFeb 20 2022, 7:23 PM

rodrigo requested review of this revision.Feb 20 2022, 7:23 PM

Harbormaster completed remote builds in B44514: Diff 103007.Feb 20 2022, 7:23 PM

Fix patches format

Harbormaster completed remote builds in B44515: Diff 103008.Feb 20 2022, 7:43 PM

rodrigo retitled this revision from audio/alsa-lib: Update to version 1.2.6.1 to Update audio/alsa-lib audio/alsa-utils audio/alsa-plugins to latest version.Feb 20 2022, 7:46 PM

rodrigo edited the summary of this revision. (Show Details)

rodrigo edited the test plan for this revision. (Show Details)

Nice! Can we also switch to upstream release archives while at it?
https://www.alsa-project.org/wiki/Main_Page
Did you do a runtime test? Poudriere / exp-run?

In D34324#777270, @diizzy wrote:

Nice! Can we also switch to upstream release archives while at it?
https://www.alsa-project.org/wiki/Main_Page
Did you do a runtime test? Poudriere / exp-run?

I built everything on poudriere for 13.0-RELEASE on arm64 and its direct dependencies :
audio/hydrogen
audio/libopenshot-audio
audio/lingot
audio/linux-c7-alsa-plugins-oss
audio/linux-c7-alsa-plugins-pulseaudio
audio/linux-c7-alsa-utils
audio/sox
audio/spotifyd
audio/welle.io
audio/xmp
deskutils/cairo-dock-plugins
devel/electron13
editors/vscode
emulators/linux-c7
games/linux-steam-utils
games/stormbaancoureur
games/veloren
multimedia/gnome-mplayer
net-im/zoom
www/chromium
www/madsonic
www/qt5-webengine
www/qutebrowser

No exp-run performed yet, I create a PR262089 to request one.

MASTER_SITES switched from GH to alsa archives
Take maintenership for this ports

Harbormaster completed remote builds in B44521: Diff 103022.Feb 21 2022, 9:58 AM

Exp-run passed : https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=262089

I think we are now ready for landing ?

Looks good.

This revision is now accepted and ready to land.Mar 8 2022, 9:59 AM

danfe added a subscriber: danfe.Mar 8 2022, 12:04 PM

danfe added inline comments.

audio/alsa-lib/Makefile
12	Since you now switched back to normal distfiles (huge thanks for that), I think you can drop `autoreconf` here and below as they should be properly bootstrapped.
audio/alsa-plugins/Makefile
17	Same here. I suggest you review the commit which switched to GitHub and undo the collateral damage it did.
audio/alsa-utils/Makefile
17–18	Ditto.

Runtime is OK (works fine) in veloren, fishfight.

audio/alsa-lib/Makefile
12	If you're reverting 5e05ddcf5f09 maybe drop `USES=autoreconf`
audio/alsa-plugins/Makefile
17	If you're reverting a4ab68d2ffd1 maybe drop `USES=autoreconf` and replace files/patch-configure.ac with files/patch-configure
audio/alsa-utils/Makefile
17–18	If you're reverting f305cf6bd080 maybe drop `USES=autoreconf` and replace files/patch-.am with files/patch-.in
audio/alsa-utils/files/patch-amidi_amidi.c
11 ↗	(On Diff #103022)	Linuxulator implements `CLOCK_MONOTONIC_RAW` via `CLOCK_MONOTONIC_FAST`. See 8c2602f30f59 + e37db348c1f7

jbeich added inline comments.Mar 8 2022, 12:36 PM

audio/alsa-plugins/files/patch-usb__stream_pcm__usb__stream.c
1	Why remove still valid reference?

remove autoreconf and use patched configure instead
reintruduce droped refernce from audio/alsa-plugins patch, sorry for that.

This revision now requires review to proceed.Mar 25 2022, 10:13 AM

Harbormaster completed remote builds in B44889: Diff 104184.Mar 25 2022, 10:13 AM

Looks good. What applications have you tested?

This revision is now accepted and ready to land.Mar 25 2022, 10:20 AM

In D34324#785452, @hselasky wrote:

Looks good. What applications have you tested?

mostly spotifyd using the alsa backend

In D34324#785455, @rodrigo wrote:

In D34324#785452, @hselasky wrote:

Looks good. What applications have you tested?

mostly spotifyd using the alsa backend

Also some of the alsa-utils tools such aplay

Also test: musescore, chromium (need to enable ALSA and recompile :-) and aplay and arec.

If all those work, I think this patch is good to go.

In D34324#785605, @hselasky wrote:

Also test: musescore, chromium (need to enable ALSA and recompile :-) and aplay and arec.

If all those work, I think this patch is good to go.

Here I probably some guidance from you.

I built chromium with only the ALSA backend enable, see bellow the pkg info output.
The sound work by default, how can I ensure I'm really using the correct backend.
I try to play with alsamixer and I have control on the sound volume, is that a valid evidence ?

chromium-100.0.4896.127
Name           : chromium
Version        : 100.0.4896.127
Installed on   : Thu Apr 28 16:05:15 2022 CEST
Origin         : www/chromium
Architecture   : FreeBSD:13:amd64
Prefix         : /usr/local
Categories     : www
Licenses       : BSD3CLAUSE, LGPL21, MPL11
Maintainer     : chromium@FreeBSD.org
WWW            : https://www.chromium.org/Home
Comment        : Google web browser based on WebKit
Options        :
	ALSA           : on
	CODECS         : on
	CUPS           : on
	DEBUG          : off
	DRIVER         : on
	HEIMDAL        : off
	HEIMDAL_BASE   : off
	KERBEROS       : on
	LTO            : off
	MIT            : off
	PULSEAUDIO     : off
	SNDIO          : off
	TEST           : off
Shared Libs required:
	libexpat.so.1
	libxslt.so.1
	libjpeg.so.8
	libopus.so.0
	libFLAC.so.8
	libXtst.so.6
	libatk-1.0.so.0
	libdrm.so.2
	libcups.so.2
	libiconv.so.2
	libplc4.so
	libatspi.so.0
	libasound.so.2
	libwebpmux.so.3
	libnss3.so
	libnssutil3.so
	libgbm.so.1
	libXrender.so.1
	libglib-2.0.so.0
	libharfbuzz.so.0
	libintl.so.8
	libXrandr.so.2
	libsnappy.so.1
	libsmime3.so
	libXi.so.6
	libpci.so.3
	libpangocairo-1.0.so.0
	libxshmfence.so.1
	libatk-bridge-2.0.so.0
	libXext.so.6
	libpango-1.0.so.0
	libwayland-client.so.0
	libcairo.so.2
	libxml2.so.2
	libwebp.so.7
	libxkbcommon.so.0
	libgmodule-2.0.so.0
	libXcomposite.so.1
	libxcb.so.1
	libopenh264.so.6
	libgio-2.0.so.0
	libXfixes.so.3
	libwebpdemux.so.2
	libnspr4.so
	libharfbuzz-subset.so.0
	libgobject-2.0.so.0
	libX11.so.6
	libplds4.so
	libGL.so.1
	libdbus-1.so.3
	libXdamage.so.1
	libpng16.so.16
	libfontconfig.so.1
	libgthread-2.0.so.0
Shared Libs provided:
	libEGL.so
	libGLESv2.so
	libvulkan.so.1
	libVkICD_mock_icd.so
	libvk_swiftshader.so
Annotations    :
	FreeBSD_version: 1300139
	build_timestamp: 2022-04-27T14:20:41+0000
	built_by       : poudriere-git-3.3.99.20211130
	cpe            : cpe:2.3:a:google:chrome:100.0.4896.127:::::freebsd13:x64
Flat size      : 313MiB
Description    :
Chromium is an open-source browser project that aims to build a safer,
faster, and more stable way for all users to experience the web.

The Chromium website contains design documents, architecture overviews,
testing information, and more to help you learn to build and work with
the Chromium source code.

WWW: https://www.chromium.org/Home

Upate alsa-lib 1.2.10
Upate alsa-plugin 1.2.10
Upate alsa-utils 1.2.7.1

This revision now requires review to proceed.Oct 13 2023, 2:12 PM

Harbormaster completed remote builds in B53961: Diff 128714.Oct 13 2023, 2:12 PM

audio/alsa-lib: Update to version 1.2.10
audio/alsa-utils: Update to version 1.2.10
audio/alsa-plugins: Update to version 1.2.7.1

Harbormaster completed remote builds in B53962: Diff 128716.Oct 13 2023, 2:25 PM

rodrigo abandoned this revision.Oct 22 2023, 3:13 PM

Revision Contents
Changeset List

Path

Size

audio/

alsa-lib/

Makefile

14 lines

distinfo

6 lines

files/

patch-src_async.c

patch-src_conf_alsa.conf

12 lines

patch-src_pcm_pcm__direct.c

patch-test_midifile.c

pkg-plist

4 lines

alsa-plugins/

Makefile

16 lines

distinfo

8 lines

files/

patch-configure

219 lines

patch-configure.ac

17 lines

patch-usb__stream_pcm__usb__stream.c

65 lines

alsa-utils/

Makefile

17 lines

distinfo

6 lines

files/

patch-aplay_formats.h

patch-speaker-test_samples_sample__map.csv

pkg-plist

10 lines

Diff 128714

View Options

audio/alsa-lib/Makefile

Show First 20 Lines • Show All 727 Lines • ▼ Show 20 Lines	if (IN_LOOPBACK(ntohl(ip->ip_dst.s_addr)) \|\|
IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {		IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {
if ((ifp->if_flags & IFF_LOOPBACK) == 0) {		if ((ifp->if_flags & IFF_LOOPBACK) == 0) {
IPSTAT_INC(ips_badaddr);		IPSTAT_INC(ips_badaddr);
error = EADDRNOTAVAIL;		error = EADDRNOTAVAIL;
goto bad;		goto bad;
}		}
}		}

m->m_pkthdr.csum_flags \|= CSUM_IP;		/* Ensure the packet data is mapped if the interface requires it. */
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {		if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
m = mb_unmapped_to_ext(m);		m = mb_unmapped_to_ext(m);
if (m == NULL) {		if (m == NULL) {
IPSTAT_INC(ips_odropped);		IPSTAT_INC(ips_odropped);
error = ENOBUFS;		error = ENOBUFS;
goto bad;		goto bad;
}		}
		}

		m->m_pkthdr.csum_flags \|= CSUM_IP;
		if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {
in_delayed_cksum(m);		in_delayed_cksum(m);
m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;		m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
} else if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
jhbUnsubmitted Done Inline Actions This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload disabled as we will not fall through to the else. I think the IFCAP_MEXTPG check now needs to just be its own check. If it makes the checksum calculations more optimal we should perhaps do it before doing the checksums. jhb: This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload…
markjAuthorUnsubmitted Done Inline Actions Oops, thanks. I realized this when writing the patch but forgot to actually do something about it. :( I guess m_apply() is a bit cheaper for non-extpg mbufs, so it makes some sense to do that first. markj: Oops, thanks. I realized this when writing the patch but forgot to actually do something about…
m = mb_unmapped_to_ext(m);
if (m == NULL) {
IPSTAT_INC(ips_odropped);
error = ENOBUFS;
goto bad;
}		}
}
#if defined(SCTP) \|\| defined(SCTP_SUPPORT)		#if defined(SCTP) \|\| defined(SCTP_SUPPORT)
if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {		if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {
sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));		sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));
m->m_pkthdr.csum_flags &= ~CSUM_SCTP;		m->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}		}
#endif		#endif

/*		/*
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	ip_fragment(struct ip ip, struct mbuf *m_frag, int mtu,
if (len < 8)		if (len < 8)
return EMSGSIZE;		return EMSGSIZE;

/*		/*
* If the interface will not calculate checksums on		* If the interface will not calculate checksums on
* fragmented packets, then do it here.		* fragmented packets, then do it here.
*/		*/
if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {		if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
m0 = mb_unmapped_to_ext(m0);
if (m0 == NULL) {
error = ENOBUFS;
IPSTAT_INC(ips_odropped);
goto done;
}
in_delayed_cksum(m0);		in_delayed_cksum(m0);
m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;		m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
}		}
#if defined(SCTP) \|\| defined(SCTP_SUPPORT)		#if defined(SCTP) \|\| defined(SCTP_SUPPORT)
if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {		if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {
sctp_delayed_cksum(m0, hlen);		sctp_delayed_cksum(m0, hlen);
m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;		m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}		}
▲ Show 20 Lines • Show All 703 Lines • Show Last 20 Lines

View Options

audio/alsa-lib/distinfo

Show First 20 Lines • Show All 727 Lines • ▼ Show 20 Lines	if (IN_LOOPBACK(ntohl(ip->ip_dst.s_addr)) \|\|
IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {		IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {
if ((ifp->if_flags & IFF_LOOPBACK) == 0) {		if ((ifp->if_flags & IFF_LOOPBACK) == 0) {
IPSTAT_INC(ips_badaddr);		IPSTAT_INC(ips_badaddr);
error = EADDRNOTAVAIL;		error = EADDRNOTAVAIL;
goto bad;		goto bad;
}		}
}		}

m->m_pkthdr.csum_flags \|= CSUM_IP;		/* Ensure the packet data is mapped if the interface requires it. */
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {		if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
m = mb_unmapped_to_ext(m);		m = mb_unmapped_to_ext(m);
if (m == NULL) {		if (m == NULL) {
IPSTAT_INC(ips_odropped);		IPSTAT_INC(ips_odropped);
error = ENOBUFS;		error = ENOBUFS;
goto bad;		goto bad;
}		}
		}

		m->m_pkthdr.csum_flags \|= CSUM_IP;
		if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {
in_delayed_cksum(m);		in_delayed_cksum(m);
m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;		m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
} else if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
jhbUnsubmitted Done Inline Actions This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload disabled as we will not fall through to the else. I think the IFCAP_MEXTPG check now needs to just be its own check. If it makes the checksum calculations more optimal we should perhaps do it before doing the checksums. jhb: This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload…
markjAuthorUnsubmitted Done Inline Actions Oops, thanks. I realized this when writing the patch but forgot to actually do something about it. :( I guess m_apply() is a bit cheaper for non-extpg mbufs, so it makes some sense to do that first. markj: Oops, thanks. I realized this when writing the patch but forgot to actually do something about…
m = mb_unmapped_to_ext(m);
if (m == NULL) {
IPSTAT_INC(ips_odropped);
error = ENOBUFS;
goto bad;
}		}
}
#if defined(SCTP) \|\| defined(SCTP_SUPPORT)		#if defined(SCTP) \|\| defined(SCTP_SUPPORT)
if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {		if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {
sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));		sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));
m->m_pkthdr.csum_flags &= ~CSUM_SCTP;		m->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}		}
#endif		#endif

/*		/*
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	ip_fragment(struct ip ip, struct mbuf *m_frag, int mtu,
if (len < 8)		if (len < 8)
return EMSGSIZE;		return EMSGSIZE;

/*		/*
* If the interface will not calculate checksums on		* If the interface will not calculate checksums on
* fragmented packets, then do it here.		* fragmented packets, then do it here.
*/		*/
if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {		if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
m0 = mb_unmapped_to_ext(m0);
if (m0 == NULL) {
error = ENOBUFS;
IPSTAT_INC(ips_odropped);
goto done;
}
in_delayed_cksum(m0);		in_delayed_cksum(m0);
m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;		m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
}		}
#if defined(SCTP) \|\| defined(SCTP_SUPPORT)		#if defined(SCTP) \|\| defined(SCTP_SUPPORT)
if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {		if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {
sctp_delayed_cksum(m0, hlen);		sctp_delayed_cksum(m0, hlen);
m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;		m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}		}
▲ Show 20 Lines • Show All 703 Lines • Show Last 20 Lines

View Options

audio/alsa-lib/files/patch-src_async.c

Show First 20 Lines • Show All 727 Lines • ▼ Show 20 Lines	if (IN_LOOPBACK(ntohl(ip->ip_dst.s_addr)) \|\|
IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {		IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {
if ((ifp->if_flags & IFF_LOOPBACK) == 0) {		if ((ifp->if_flags & IFF_LOOPBACK) == 0) {
IPSTAT_INC(ips_badaddr);		IPSTAT_INC(ips_badaddr);
error = EADDRNOTAVAIL;		error = EADDRNOTAVAIL;
goto bad;		goto bad;
}		}
}		}

m->m_pkthdr.csum_flags \|= CSUM_IP;		/* Ensure the packet data is mapped if the interface requires it. */
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {		if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
m = mb_unmapped_to_ext(m);		m = mb_unmapped_to_ext(m);
if (m == NULL) {		if (m == NULL) {
IPSTAT_INC(ips_odropped);		IPSTAT_INC(ips_odropped);
error = ENOBUFS;		error = ENOBUFS;
goto bad;		goto bad;
}		}
		}

		m->m_pkthdr.csum_flags \|= CSUM_IP;
		if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {
in_delayed_cksum(m);		in_delayed_cksum(m);
m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;		m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
} else if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
jhbUnsubmitted Done Inline Actions This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload disabled as we will not fall through to the else. I think the IFCAP_MEXTPG check now needs to just be its own check. If it makes the checksum calculations more optimal we should perhaps do it before doing the checksums. jhb: This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload…
markjAuthorUnsubmitted Done Inline Actions Oops, thanks. I realized this when writing the patch but forgot to actually do something about it. :( I guess m_apply() is a bit cheaper for non-extpg mbufs, so it makes some sense to do that first. markj: Oops, thanks. I realized this when writing the patch but forgot to actually do something about…
m = mb_unmapped_to_ext(m);
if (m == NULL) {
IPSTAT_INC(ips_odropped);
error = ENOBUFS;
goto bad;
}		}
}
#if defined(SCTP) \|\| defined(SCTP_SUPPORT)		#if defined(SCTP) \|\| defined(SCTP_SUPPORT)
if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {		if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {
sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));		sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));
m->m_pkthdr.csum_flags &= ~CSUM_SCTP;		m->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}		}
#endif		#endif

/*		/*
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	ip_fragment(struct ip ip, struct mbuf *m_frag, int mtu,
if (len < 8)		if (len < 8)
return EMSGSIZE;		return EMSGSIZE;

/*		/*
* If the interface will not calculate checksums on		* If the interface will not calculate checksums on
* fragmented packets, then do it here.		* fragmented packets, then do it here.
*/		*/
if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {		if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
m0 = mb_unmapped_to_ext(m0);
if (m0 == NULL) {
error = ENOBUFS;
IPSTAT_INC(ips_odropped);
goto done;
}
in_delayed_cksum(m0);		in_delayed_cksum(m0);
m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;		m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
}		}
#if defined(SCTP) \|\| defined(SCTP_SUPPORT)		#if defined(SCTP) \|\| defined(SCTP_SUPPORT)
if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {		if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {
sctp_delayed_cksum(m0, hlen);		sctp_delayed_cksum(m0, hlen);
m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;		m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}		}
▲ Show 20 Lines • Show All 703 Lines • Show Last 20 Lines

View Options

audio/alsa-lib/files/patch-src_conf_alsa.conf

Show First 20 Lines • Show All 727 Lines • ▼ Show 20 Lines	if (IN_LOOPBACK(ntohl(ip->ip_dst.s_addr)) \|\|
IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {		IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {
if ((ifp->if_flags & IFF_LOOPBACK) == 0) {		if ((ifp->if_flags & IFF_LOOPBACK) == 0) {
IPSTAT_INC(ips_badaddr);		IPSTAT_INC(ips_badaddr);
error = EADDRNOTAVAIL;		error = EADDRNOTAVAIL;
goto bad;		goto bad;
}		}
}		}

m->m_pkthdr.csum_flags \|= CSUM_IP;		/* Ensure the packet data is mapped if the interface requires it. */
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {		if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
m = mb_unmapped_to_ext(m);		m = mb_unmapped_to_ext(m);
if (m == NULL) {		if (m == NULL) {
IPSTAT_INC(ips_odropped);		IPSTAT_INC(ips_odropped);
error = ENOBUFS;		error = ENOBUFS;
goto bad;		goto bad;
}		}
		}

		m->m_pkthdr.csum_flags \|= CSUM_IP;
		if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {
in_delayed_cksum(m);		in_delayed_cksum(m);
m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;		m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
} else if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
jhbUnsubmitted Done Inline Actions This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload disabled as we will not fall through to the else. I think the IFCAP_MEXTPG check now needs to just be its own check. If it makes the checksum calculations more optimal we should perhaps do it before doing the checksums. jhb: This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload…
markjAuthorUnsubmitted Done Inline Actions Oops, thanks. I realized this when writing the patch but forgot to actually do something about it. :( I guess m_apply() is a bit cheaper for non-extpg mbufs, so it makes some sense to do that first. markj: Oops, thanks. I realized this when writing the patch but forgot to actually do something about…
m = mb_unmapped_to_ext(m);
if (m == NULL) {
IPSTAT_INC(ips_odropped);
error = ENOBUFS;
goto bad;
}		}
}
#if defined(SCTP) \|\| defined(SCTP_SUPPORT)		#if defined(SCTP) \|\| defined(SCTP_SUPPORT)
if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {		if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {
sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));		sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));
m->m_pkthdr.csum_flags &= ~CSUM_SCTP;		m->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}		}
#endif		#endif

/*		/*
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Lines	ip_fragment(struct ip ip, struct mbuf *m_frag, int mtu,
if (len < 8)		if (len < 8)
return EMSGSIZE;		return EMSGSIZE;

/*		/*
* If the interface will not calculate checksums on		* If the interface will not calculate checksums on
* fragmented packets, then do it here.		* fragmented packets, then do it here.
*/		*/
if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {		if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
m0 = mb_unmapped_to_ext(m0);
if (m0 == NULL) {
error = ENOBUFS;
IPSTAT_INC(ips_odropped);
goto done;
}
in_delayed_cksum(m0);		in_delayed_cksum(m0);
m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;		m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
}		}
#if defined(SCTP) \|\| defined(SCTP_SUPPORT)		#if defined(SCTP) \|\| defined(SCTP_SUPPORT)
if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {		if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {
sctp_delayed_cksum(m0, hlen);		sctp_delayed_cksum(m0, hlen);
m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;		m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}		}
▲ Show 20 Lines • Show All 703 Lines • Show Last 20 Lines