Page MenuHomeFreeBSD
Differential D29578

rc: make ctld depend on NETWORKING
ClosedPublic
Actions

Authored by trasz on Apr 4 2021, 9:59 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 25, 7:42 AM
Unknown Object (File)
Mon, Mar 17, 4:46 PM
Unknown Object (File)
Mar 16 2025, 8:00 AM
Unknown Object (File)
Mar 5 2025, 5:56 AM
Unknown Object (File)
Mar 5 2025, 3:17 AM
Unknown Object (File)
Mar 4 2025, 8:49 PM
Unknown Object (File)
Feb 24 2025, 12:15 PM
Unknown Object (File)
Jan 28 2025, 3:12 AM
View All 83 Files
Subscribers
imp

Details

Reviewers
mav
Commits
rG015351de04e3: rc: make ctld depend on NETWORKING
Summary

This fixes a problem where ctld would refuse to start on boot
with an IP address to listen on configured in ctl.conf(5).
It also fixes a problem where ctld would fail to start with
some network interfaces requiring a sysctl.conf(5) tweak to
configure them, eg to switch them from InfiniBand to IP mode.

PR: 232397
Reported By: Mahmoud Al-Qudsi <mqudsi at neosmart.net>
Submitted By: Jeremy Faulkner <gldisater at gmail.com>

Diff Detail

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

Revision Contents
Changeset List

PathSize
libexec/
rc/
rc.d/
2 lines

Diff 86819

View Options

libexec/rc/rc.d/ctld

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Lines
#include "opt_vm.h" #include "opt_vm.h"
#include <sys/param.h> #include <sys/param.h>
#include <sys/bio.h> #include <sys/bio.h>
#include <sys/blist.h> #include <sys/blist.h>
#include <sys/buf.h> #include <sys/buf.h>
#include <sys/conf.h> #include <sys/conf.h>
#include <sys/disk.h> #include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/eventhandler.h> #include <sys/eventhandler.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
#include <sys/lock.h> #include <sys/lock.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/namei.h> #include <sys/namei.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/pctrie.h> #include <sys/pctrie.h>
▲ Show 20 Lines • Show All 2,203 Lines • ▼ Show 20 Linesswaponsomething(struct vnode *vp, void *id, u_long nblks,
sp->sw_nblks = nblks; sp->sw_nblks = nblks;
sp->sw_used = 0; sp->sw_used = 0;
sp->sw_strategy = strategy; sp->sw_strategy = strategy;
sp->sw_close = close; sp->sw_close = close;
sp->sw_flags = flags; sp->sw_flags = flags;
sp->sw_blist = blist_create(nblks, M_WAITOK); sp->sw_blist = blist_create(nblks, M_WAITOK);
/* /*
* Do not free the first two block in order to avoid overwriting * Do not free the first blocks in order to avoid overwriting
* any bsd label at the front of the partition * any bsd label at the front of the partition
*/ */
blist_free(sp->sw_blist, 2, nblks - 2); blist_free(sp->sw_blist, howmany(BBSIZE, PAGE_SIZE),
nblks - howmany(BBSIZE, PAGE_SIZE));
alcUnsubmitted
Not Done
Inline Actions

Consider the possibility that PAGE_SIZE is greater than BBSIZE. (We still barely support one architecture, sparc64, where they are equal.) I think that howmany(BBSIZE, PAGE_SIZE) will "do the right thing."

alc: Consider the possibility that PAGE_SIZE is greater than BBSIZE. (We still barely support one…
dvbase = 0; dvbase = 0;
mtx_lock(&sw_dev_mtx); mtx_lock(&sw_dev_mtx);
TAILQ_FOREACH(tsp, &swtailq, sw_list) { TAILQ_FOREACH(tsp, &swtailq, sw_list) {
if (tsp->sw_end >= dvbase) { if (tsp->sw_end >= dvbase) {
/* /*
* We put one uncovered page between the devices * We put one uncovered page between the devices
* in order to definitively prevent any cross-device * in order to definitively prevent any cross-device
* I/O requests * I/O requests
*/ */
dvbase = tsp->sw_end + 1; dvbase = tsp->sw_end + 1;
} }
} }
sp->sw_first = dvbase; sp->sw_first = dvbase;
sp->sw_end = dvbase + nblks; sp->sw_end = dvbase + nblks;
TAILQ_INSERT_TAIL(&swtailq, sp, sw_list); TAILQ_INSERT_TAIL(&swtailq, sp, sw_list);
nswapdev++; nswapdev++;
swap_pager_avail += nblks - 2; swap_pager_avail += nblks - howmany(BBSIZE, PAGE_SIZE);
alcUnsubmitted
Not Done
Inline Actions

This should also use howmany(BBSIZE, PAGE_SIZE).

alc: This should also use howmany(BBSIZE, PAGE_SIZE).
swap_total += nblks; swap_total += nblks;
swapon_check_swzone(); swapon_check_swzone();
swp_sizecheck(); swp_sizecheck();
mtx_unlock(&sw_dev_mtx); mtx_unlock(&sw_dev_mtx);
EVENTHANDLER_INVOKE(swapon, sp); EVENTHANDLER_INVOKE(swapon, sp);
} }
/* /*
▲ Show 20 Lines • Show All 661 Lines • Show Last 20 Lines