Page MenuHomeFreeBSD
Differential D18837

Implement shmat(2) flag SHM_REMAP.
ClosedPublic
Actions

Authored by kib on Jan 14 2019, 8:24 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 12, 3:55 AM
Unknown Object (File)
Mar 5 2025, 10:27 PM
Unknown Object (File)
Mar 3 2025, 11:12 AM
Unknown Object (File)
Mar 3 2025, 8:15 AM
Unknown Object (File)
Jan 23 2025, 5:54 PM
Unknown Object (File)
Jan 19 2025, 1:26 PM
Unknown Object (File)
Jan 18 2025, 3:54 PM
Unknown Object (File)
Jan 17 2025, 2:52 PM
View All 81 Files
Subscribers
imp
menyy_mellanox.com
slavash

Details

Reviewers
alc
markj
ngie
Group Reviewers
manpages
Commits
rS343082: Implement shmat(2) flag SHM_REMAP.
rS343081: Trim spaces at the end of lines.
Summary

Based on the description in Linux man page.

Sponsored by: Mellanox Technologies

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 21964

Event Timeline

kib created this revision.Jan 14 2019, 8:24 AM
Herald added a reviewer: ngie. · View Herald TranscriptJan 14 2019, 8:24 AM
Herald added a reviewer: manpages. · View Herald Transcript
Herald added a subscriber: imp. · View Herald Transcript
Harbormaster completed remote builds in B21948: Diff 52822.Jan 14 2019, 8:24 AM
kib updated this revision to Diff 52823.Jan 14 2019, 8:27 AM
kib edited the summary of this revision. (Show Details)

Bump man page date.

Harbormaster completed remote builds in B21949: Diff 52823.Jan 14 2019, 8:27 AM
markj added a comment.EditedJan 14 2019, 6:09 PM

This seems ok to me. I'm not sure about modifying the NetBSD tests, might be nice to wrap the changes with #ifdef SHM_REMAP if they are to be upstreamed.

Seems like in the future we could implement MAP_REMAP with find_space != VMFS_NO_SPACE to provide the semantics needed for Linux's mremap(2).

lib/libc/sys/shmat.2
84

"is specified and the passed"

86

"existing mappings"?

90

addresses -> address

I would also s/already has/contains/.

kib updated this revision to Diff 52848.Jan 15 2019, 3:55 AM

Fix grammar.
Wrap new test with #ifdef SHM_REMAP.
Document ENOMEM.

Harbormaster completed remote builds in B21964: Diff 52848.Jan 15 2019, 3:55 AM
ngie accepted this revision.Jan 15 2019, 8:17 AM

The test changes are ok. I figure I'll have to make a pass over the tree anyhow to find what all may have changed in the past year under contrib/netbsd-tests, so there's no time like the present-ish to do it.

contrib/netbsd-tests/kernel/t_sysv.c
864

Hmmm... 4160 is a curious number (this is copied from other tests, so the voodoo-ness comes from NetBSD).

This revision is now accepted and ready to land.Jan 15 2019, 8:17 AM
ngie added inline comments.Jan 15 2019, 8:19 AM
lib/libc/sys/shmat.2
86

.Dv NULL should be used instead of NULL here and elsewhere, since it's a constant.

markj accepted this revision.Jan 15 2019, 4:45 PM
markj added inline comments.
lib/libc/sys/shmat.2
127

"due to the amount of available space being smaller"

128

"pre-existing mappings are in the range"

Closed by commit rS343081: Trim spaces at the end of lines. (authored by kib). · Explain WhyJan 16 2019, 5:09 AM
This revision was automatically updated to reflect the committed changes.
kib reopened this revision.Jan 16 2019, 5:10 AM
This revision was not accepted when it landed; it landed in state Needs Review.Jan 16 2019, 5:16 AM
Closed by commit rS343082: Implement shmat(2) flag SHM_REMAP. (authored by kib). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
contrib/
netbsd-tests/
kernel/
66 lines
lib/
libc/
sys/
31 lines
sys/
kern/
10 lines
sys/
1 line
vm/
1 line
4 lines

Diff 52848

View Options

contrib/netbsd-tests/kernel/t_sysv.c

Show First 20 Lines • Show All 2,339 Lines • ▼ Show 20 Lines
} }
int int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end) rman_res_t start, rman_res_t end)
{ {
struct pcib_softc *sc; struct pcib_softc *sc;
struct pcib_window *w; struct pcib_window *w;
rman_res_t wmask;
int error; int error;
sc = device_get_softc(bus); sc = device_get_softc(bus);
/* /*
* If the resource wasn't sub-allocated from one of our region * If the resource wasn't sub-allocated from one of our region
* managers then just pass the request up. * managers then just pass the request up.
*/ */
Show All 14 Lines KASSERT(w != NULL,
("%s: no window for resource (%#jx-%#jx) type %d", ("%s: no window for resource (%#jx-%#jx) type %d",
__func__, rman_get_start(r), rman_get_end(r), type)); __func__, rman_get_start(r), rman_get_end(r), type));
/* /*
* If our window isn't big enough to grow the sub-allocation * If our window isn't big enough to grow the sub-allocation
* then we need to expand the window. * then we need to expand the window.
*/ */
if (start < w->base || end > w->limit) { if (start < w->base || end > w->limit) {
error = pcib_expand_window(sc, w, type, start, end); wmask = ((rman_res_t)1 << w->step) - 1;
error = pcib_expand_window(sc, w, type,
MIN(start & ~wmask, w->base),
MAX(end | wmask, w->limit));
if (error != 0) if (error != 0)
return (error); return (error);
if (bootverbose)
device_printf(sc->dev,
"grew %s window to %#jx-%#jx\n",
w->name, (uintmax_t)w->base,
(uintmax_t)w->limit);
pcib_write_windows(sc, w->mask);
} }
} }
return (rman_adjust_resource(r, start, end)); return (rman_adjust_resource(r, start, end));
} }
int int
pcib_release_resource(device_t dev, device_t child, int type, int rid, pcib_release_resource(device_t dev, device_t child, int type, int rid,
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines
View Options

lib/libc/sys/shmat.2

Show First 20 Lines • Show All 2,339 Lines • ▼ Show 20 Lines
} }
int int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end) rman_res_t start, rman_res_t end)
{ {
struct pcib_softc *sc; struct pcib_softc *sc;
struct pcib_window *w; struct pcib_window *w;
rman_res_t wmask;
int error; int error;
sc = device_get_softc(bus); sc = device_get_softc(bus);
/* /*
* If the resource wasn't sub-allocated from one of our region * If the resource wasn't sub-allocated from one of our region
* managers then just pass the request up. * managers then just pass the request up.
*/ */
Show All 14 Lines KASSERT(w != NULL,
("%s: no window for resource (%#jx-%#jx) type %d", ("%s: no window for resource (%#jx-%#jx) type %d",
__func__, rman_get_start(r), rman_get_end(r), type)); __func__, rman_get_start(r), rman_get_end(r), type));
/* /*
* If our window isn't big enough to grow the sub-allocation * If our window isn't big enough to grow the sub-allocation
* then we need to expand the window. * then we need to expand the window.
*/ */
if (start < w->base || end > w->limit) { if (start < w->base || end > w->limit) {
error = pcib_expand_window(sc, w, type, start, end); wmask = ((rman_res_t)1 << w->step) - 1;
error = pcib_expand_window(sc, w, type,
MIN(start & ~wmask, w->base),
MAX(end | wmask, w->limit));
if (error != 0) if (error != 0)
return (error); return (error);
if (bootverbose)
device_printf(sc->dev,
"grew %s window to %#jx-%#jx\n",
w->name, (uintmax_t)w->base,
(uintmax_t)w->limit);
pcib_write_windows(sc, w->mask);
} }
} }
return (rman_adjust_resource(r, start, end)); return (rman_adjust_resource(r, start, end));
} }
int int
pcib_release_resource(device_t dev, device_t child, int type, int rid, pcib_release_resource(device_t dev, device_t child, int type, int rid,
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines
View Options

sys/kern/sysv_shm.c

Show First 20 Lines • Show All 2,339 Lines • ▼ Show 20 Lines
} }
int int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end) rman_res_t start, rman_res_t end)
{ {
struct pcib_softc *sc; struct pcib_softc *sc;
struct pcib_window *w; struct pcib_window *w;
rman_res_t wmask;
int error; int error;
sc = device_get_softc(bus); sc = device_get_softc(bus);
/* /*
* If the resource wasn't sub-allocated from one of our region * If the resource wasn't sub-allocated from one of our region
* managers then just pass the request up. * managers then just pass the request up.
*/ */
Show All 14 Lines KASSERT(w != NULL,
("%s: no window for resource (%#jx-%#jx) type %d", ("%s: no window for resource (%#jx-%#jx) type %d",
__func__, rman_get_start(r), rman_get_end(r), type)); __func__, rman_get_start(r), rman_get_end(r), type));
/* /*
* If our window isn't big enough to grow the sub-allocation * If our window isn't big enough to grow the sub-allocation
* then we need to expand the window. * then we need to expand the window.
*/ */
if (start < w->base || end > w->limit) { if (start < w->base || end > w->limit) {
error = pcib_expand_window(sc, w, type, start, end); wmask = ((rman_res_t)1 << w->step) - 1;
error = pcib_expand_window(sc, w, type,
MIN(start & ~wmask, w->base),
MAX(end | wmask, w->limit));
if (error != 0) if (error != 0)
return (error); return (error);
if (bootverbose)
device_printf(sc->dev,
"grew %s window to %#jx-%#jx\n",
w->name, (uintmax_t)w->base,
(uintmax_t)w->limit);
pcib_write_windows(sc, w->mask);
} }
} }
return (rman_adjust_resource(r, start, end)); return (rman_adjust_resource(r, start, end));
} }
int int
pcib_release_resource(device_t dev, device_t child, int type, int rid, pcib_release_resource(device_t dev, device_t child, int type, int rid,
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines
View Options

sys/sys/shm.h

Show First 20 Lines • Show All 2,339 Lines • ▼ Show 20 Lines
} }
int int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end) rman_res_t start, rman_res_t end)
{ {
struct pcib_softc *sc; struct pcib_softc *sc;
struct pcib_window *w; struct pcib_window *w;
rman_res_t wmask;
int error; int error;
sc = device_get_softc(bus); sc = device_get_softc(bus);
/* /*
* If the resource wasn't sub-allocated from one of our region * If the resource wasn't sub-allocated from one of our region
* managers then just pass the request up. * managers then just pass the request up.
*/ */
Show All 14 Lines KASSERT(w != NULL,
("%s: no window for resource (%#jx-%#jx) type %d", ("%s: no window for resource (%#jx-%#jx) type %d",
__func__, rman_get_start(r), rman_get_end(r), type)); __func__, rman_get_start(r), rman_get_end(r), type));
/* /*
* If our window isn't big enough to grow the sub-allocation * If our window isn't big enough to grow the sub-allocation
* then we need to expand the window. * then we need to expand the window.
*/ */
if (start < w->base || end > w->limit) { if (start < w->base || end > w->limit) {
error = pcib_expand_window(sc, w, type, start, end); wmask = ((rman_res_t)1 << w->step) - 1;
error = pcib_expand_window(sc, w, type,
MIN(start & ~wmask, w->base),
MAX(end | wmask, w->limit));
if (error != 0) if (error != 0)
return (error); return (error);
if (bootverbose)
device_printf(sc->dev,
"grew %s window to %#jx-%#jx\n",
w->name, (uintmax_t)w->base,
(uintmax_t)w->limit);
pcib_write_windows(sc, w->mask);
} }
} }
return (rman_adjust_resource(r, start, end)); return (rman_adjust_resource(r, start, end));
} }
int int
pcib_release_resource(device_t dev, device_t child, int type, int rid, pcib_release_resource(device_t dev, device_t child, int type, int rid,
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines
View Options

sys/vm/vm_map.h

Show First 20 Lines • Show All 2,339 Lines • ▼ Show 20 Lines
} }
int int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end) rman_res_t start, rman_res_t end)
{ {
struct pcib_softc *sc; struct pcib_softc *sc;
struct pcib_window *w; struct pcib_window *w;
rman_res_t wmask;
int error; int error;
sc = device_get_softc(bus); sc = device_get_softc(bus);
/* /*
* If the resource wasn't sub-allocated from one of our region * If the resource wasn't sub-allocated from one of our region
* managers then just pass the request up. * managers then just pass the request up.
*/ */
Show All 14 Lines KASSERT(w != NULL,
("%s: no window for resource (%#jx-%#jx) type %d", ("%s: no window for resource (%#jx-%#jx) type %d",
__func__, rman_get_start(r), rman_get_end(r), type)); __func__, rman_get_start(r), rman_get_end(r), type));
/* /*
* If our window isn't big enough to grow the sub-allocation * If our window isn't big enough to grow the sub-allocation
* then we need to expand the window. * then we need to expand the window.
*/ */
if (start < w->base || end > w->limit) { if (start < w->base || end > w->limit) {
error = pcib_expand_window(sc, w, type, start, end); wmask = ((rman_res_t)1 << w->step) - 1;
error = pcib_expand_window(sc, w, type,
MIN(start & ~wmask, w->base),
MAX(end | wmask, w->limit));
if (error != 0) if (error != 0)
return (error); return (error);
if (bootverbose)
device_printf(sc->dev,
"grew %s window to %#jx-%#jx\n",
w->name, (uintmax_t)w->base,
(uintmax_t)w->limit);
pcib_write_windows(sc, w->mask);
} }
} }
return (rman_adjust_resource(r, start, end)); return (rman_adjust_resource(r, start, end));
} }
int int
pcib_release_resource(device_t dev, device_t child, int type, int rid, pcib_release_resource(device_t dev, device_t child, int type, int rid,
▲ Show 20 Lines • Show All 605 Lines • Show Last 20 Lines
View Options

sys/vm/vm_map.c

Loading...