Page MenuHomeFreeBSD
Differential D29772

ipfw: do not use sleepable malloc in callout context.
ClosedPublic
Actions

Authored by ae on Apr 15 2021, 12:35 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 26, 1:37 AM
Unknown Object (File)
Wed, Mar 26, 12:32 AM
Unknown Object (File)
Feb 27 2025, 8:28 PM
Unknown Object (File)
Feb 25 2025, 11:13 AM
Unknown Object (File)
Feb 5 2025, 5:06 AM
Unknown Object (File)
Feb 4 2025, 12:05 PM
Unknown Object (File)
Jan 27 2025, 12:32 AM
Unknown Object (File)
Jan 25 2025, 7:18 PM
View All Files
Subscribers
freebsd_igalic.co
imp
ish_amail.plala.or.jp
melifaro

Details

Reviewers
melifaro
kevans
Group Reviewers
network
Commits
rG5ebfa80f7543: ipfw: do not use sleepable malloc in callout context.
rG29246f2cb0c5: ipfw: do not use sleepable malloc in callout context.
rG9bacbf1ae243: ipfw: do not use sleepable malloc in callout context.
Summary

Use malloc(M_NOWAIT) when hash growing is called from callout.

PR: 255041

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 38591
Build 35480: arc lint + arc unit

Event Timeline

ae created this revision.Apr 15 2021, 12:35 PM
ae held this revision as a draft.
Herald added subscribers: melifaro, imp. · View Herald TranscriptApr 15 2021, 12:35 PM
Harbormaster completed remote builds in B38590: Diff 87481.Apr 15 2021, 12:35 PM
ae published this revision for review.Apr 15 2021, 12:37 PM
ae edited the summary of this revision. (Show Details)
ae added reviewers: network, melifaro, kevans.
ae updated this revision to Diff 87482.Apr 15 2021, 12:40 PM
  • Fix copy/paste bug.
Harbormaster completed remote builds in B38591: Diff 87482.Apr 15 2021, 12:40 PM
kevans accepted this revision.Apr 15 2021, 1:08 PM
This revision is now accepted and ready to land.Apr 15 2021, 1:08 PM
kevans added a comment.Apr 15 2021, 1:08 PM

Thanks!

ish_amail.plala.or.jp added a subscriber: ish_amail.plala.or.jp.Apr 15 2021, 2:55 PM

Thank you for this patch.
I'm applied this patch to 3a248c844 and it works fine.

Closed by commit rG9bacbf1ae243: ipfw: do not use sleepable malloc in callout context. (authored by ae). · Explain WhyApr 16 2021, 7:25 AM
This revision was automatically updated to reflect the committed changes.
ae added a commit: rG9bacbf1ae243: ipfw: do not use sleepable malloc in callout context..
freebsd_igalic.co added a subscriber: freebsd_igalic.co.Apr 16 2021, 7:44 AM
freebsd_igalic.co added inline comments.
sys/netpfil/ipfw/ip_fw_dynamic.c
3224

why is it okay to wait here

ae added inline comments.Apr 16 2021, 8:23 AM
sys/netpfil/ipfw/ip_fw_dynamic.c
3224

It is initialization code, it is called from userland when you are doing kldload, user can wait.

ae added a commit: rG29246f2cb0c5: ipfw: do not use sleepable malloc in callout context..Apr 28 2021, 10:06 AM
ae added a commit: rG5ebfa80f7543: ipfw: do not use sleepable malloc in callout context..

Revision Contents
Changeset List

PathSize
sys/
netpfil/
ipfw/
68 lines

Diff 87482

View Options

sys/netpfil/ipfw/ip_fw_dynamic.c

Context not available.
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 8, 2010 .Dd February 11, 2016
.Dt MAILER.CONF 5 .Dt MAILER.CONF 5
.Os .Os
.Sh NAME .Sh NAME
Context not available.
sendmail /usr/local/bin/mini_sendmail -srelayhost sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed .Ed
.Pp
This example shows the use of
.Xr dma 8
in place of
wblockUnsubmitted
Not Done
Inline Actions

This is probably better like the comment, "instead of". I suspect that is more common and easier for translators.
...Ah, I see that the other examples use "in place of". Well, no time like the present to break with tradition.

wblock: This is probably better like the comment, "instead of". I suspect that is more common and…
wblockUnsubmitted
Not Done
Inline Actions

"in favor of" usually means the second thing is better than/preferred to/replacing the first. It is kind of confusing here.

Sometimes difficulty in simplifying a sentence means that it is trying to say to much or working too hard to get there.
What about changing this to be more direct than the original man page wording, like so:

This example shows how to use
.Xr dma 8
as a replacement for
.Xr sendmail 8 :

That could be even simpler:

Using
.Xr dma 8
to replace
.Xr sendmail 8 :
wblock: "in favor of" usually means the second thing is better than/preferred to/replacing the first.
.Xr sendmail 8 :
.Bd -literal -offset indent
# Execute dma instead of sendmail
sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
rmail /usr/libexec/dma
.Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr mail 1 , .Xr mail 1 ,
.Xr mailq 1 , .Xr mailq 1 ,
Context not available.