[Midnightbsd-cvs] src [9974] trunk/sys/geom/concat: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 26 11:27:28 EDT 2018
Revision: 9974
http://svnweb.midnightbsd.org/src/?rev=9974
Author: laffer1
Date: 2018-05-26 11:27:27 -0400 (Sat, 26 May 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/sys/geom/concat/g_concat.c
trunk/sys/geom/concat/g_concat.h
Modified: trunk/sys/geom/concat/g_concat.c
===================================================================
--- trunk/sys/geom/concat/g_concat.c 2018-05-26 15:26:55 UTC (rev 9973)
+++ trunk/sys/geom/concat/g_concat.c 2018-05-26 15:27:27 UTC (rev 9974)
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.29.2.2 2010/10/25 08:23:38 mav Exp $");
+__FBSDID("$FreeBSD: stable/10/sys/geom/concat/g_concat.c 306765 2016-10-06 15:36:13Z mav $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,10 +131,9 @@
}
if (sc->sc_provider != NULL) {
- sc->sc_provider->flags |= G_PF_WITHER;
G_CONCAT_DEBUG(0, "Device %s deactivated.",
sc->sc_provider->name);
- g_orphan_provider(sc->sc_provider, ENXIO);
+ g_wither_provider(sc->sc_provider, ENXIO);
sc->sc_provider = NULL;
}
@@ -240,6 +239,27 @@
}
static void
+g_concat_done(struct bio *bp)
+{
+ struct g_concat_softc *sc;
+ struct bio *pbp;
+
+ pbp = bp->bio_parent;
+ sc = pbp->bio_to->geom->softc;
+ mtx_lock(&sc->sc_lock);
+ if (pbp->bio_error == 0)
+ pbp->bio_error = bp->bio_error;
+ pbp->bio_completed += bp->bio_completed;
+ pbp->bio_inbed++;
+ if (pbp->bio_children == pbp->bio_inbed) {
+ mtx_unlock(&sc->sc_lock);
+ g_io_deliver(pbp, pbp->bio_error);
+ } else
+ mtx_unlock(&sc->sc_lock);
+ g_destroy_bio(bp);
+}
+
+static void
g_concat_flush(struct g_concat_softc *sc, struct bio *bp)
{
struct bio_queue_head queue;
@@ -251,11 +271,8 @@
for (no = 0; no < sc->sc_ndisks; no++) {
cbp = g_clone_bio(bp);
if (cbp == NULL) {
- for (cbp = bioq_first(&queue); cbp != NULL;
- cbp = bioq_first(&queue)) {
- bioq_remove(&queue, cbp);
+ while ((cbp = bioq_takefirst(&queue)) != NULL)
g_destroy_bio(cbp);
- }
if (bp->bio_error == 0)
bp->bio_error = ENOMEM;
g_io_deliver(bp, bp->bio_error);
@@ -262,12 +279,11 @@
return;
}
bioq_insert_tail(&queue, cbp);
- cbp->bio_done = g_std_done;
+ cbp->bio_done = g_concat_done;
cbp->bio_caller1 = sc->sc_disks[no].d_consumer;
cbp->bio_to = sc->sc_disks[no].d_consumer->provider;
}
- for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) {
- bioq_remove(&queue, cbp);
+ while ((cbp = bioq_takefirst(&queue)) != NULL) {
G_CONCAT_LOGREQ(cbp, "Sending request.");
cp = cbp->bio_caller1;
cbp->bio_caller1 = NULL;
@@ -321,7 +337,10 @@
offset = bp->bio_offset;
length = bp->bio_length;
- addr = bp->bio_data;
+ if ((bp->bio_flags & BIO_UNMAPPED) != 0)
+ addr = NULL;
+ else
+ addr = bp->bio_data;
end = offset + length;
bioq_init(&queue);
@@ -339,11 +358,8 @@
cbp = g_clone_bio(bp);
if (cbp == NULL) {
- for (cbp = bioq_first(&queue); cbp != NULL;
- cbp = bioq_first(&queue)) {
- bioq_remove(&queue, cbp);
+ while ((cbp = bioq_takefirst(&queue)) != NULL)
g_destroy_bio(cbp);
- }
if (bp->bio_error == 0)
bp->bio_error = ENOMEM;
g_io_deliver(bp, bp->bio_error);
@@ -353,11 +369,21 @@
/*
* Fill in the component buf structure.
*/
- cbp->bio_done = g_std_done;
+ if (len == bp->bio_length)
+ cbp->bio_done = g_std_done;
+ else
+ cbp->bio_done = g_concat_done;
cbp->bio_offset = off;
- cbp->bio_data = addr;
+ cbp->bio_length = len;
+ if ((bp->bio_flags & BIO_UNMAPPED) != 0) {
+ cbp->bio_ma_offset += (uintptr_t)addr;
+ cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE;
+ cbp->bio_ma_offset %= PAGE_SIZE;
+ cbp->bio_ma_n = round_page(cbp->bio_ma_offset +
+ cbp->bio_length) / PAGE_SIZE;
+ } else
+ cbp->bio_data = addr;
addr += len;
- cbp->bio_length = len;
cbp->bio_to = disk->d_consumer->provider;
cbp->bio_caller1 = disk;
@@ -367,8 +393,7 @@
KASSERT(length == 0,
("Length is still greater than 0 (class=%s, name=%s).",
bp->bio_to->geom->class->name, bp->bio_to->geom->name));
- for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) {
- bioq_remove(&queue, cbp);
+ while ((cbp = bioq_takefirst(&queue)) != NULL) {
G_CONCAT_LOGREQ(cbp, "Sending request.");
disk = cbp->bio_caller1;
cbp->bio_caller1 = NULL;
@@ -380,7 +405,7 @@
g_concat_check_and_run(struct g_concat_softc *sc)
{
struct g_concat_disk *disk;
- struct g_provider *pp;
+ struct g_provider *dp, *pp;
u_int no, sectorsize = 0;
off_t start;
@@ -389,20 +414,27 @@
return;
pp = g_new_providerf(sc->sc_geom, "concat/%s", sc->sc_name);
+ pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE |
+ G_PF_ACCEPT_UNMAPPED;
start = 0;
for (no = 0; no < sc->sc_ndisks; no++) {
disk = &sc->sc_disks[no];
+ dp = disk->d_consumer->provider;
disk->d_start = start;
- disk->d_end = disk->d_start +
- disk->d_consumer->provider->mediasize;
+ disk->d_end = disk->d_start + dp->mediasize;
if (sc->sc_type == G_CONCAT_TYPE_AUTOMATIC)
- disk->d_end -= disk->d_consumer->provider->sectorsize;
+ disk->d_end -= dp->sectorsize;
start = disk->d_end;
if (no == 0)
- sectorsize = disk->d_consumer->provider->sectorsize;
- else {
- sectorsize = lcm(sectorsize,
- disk->d_consumer->provider->sectorsize);
+ sectorsize = dp->sectorsize;
+ else
+ sectorsize = lcm(sectorsize, dp->sectorsize);
+
+ /* A provider underneath us doesn't support unmapped */
+ if ((dp->flags & G_PF_ACCEPT_UNMAPPED) == 0) {
+ G_CONCAT_DEBUG(1, "Cancelling unmapped "
+ "because of %s.", dp->name);
+ pp->flags &= ~G_PF_ACCEPT_UNMAPPED;
}
}
pp->sectorsize = sectorsize;
@@ -469,6 +501,7 @@
fcp = LIST_FIRST(&gp->consumer);
cp = g_new_consumer(gp);
+ cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
error = g_attach(cp, pp);
if (error != 0) {
g_destroy_consumer(cp);
@@ -558,6 +591,7 @@
for (no = 0; no < sc->sc_ndisks; no++)
sc->sc_disks[no].d_consumer = NULL;
sc->sc_type = type;
+ mtx_init(&sc->sc_lock, "gconcat lock", NULL, MTX_DEF);
gp->softc = sc;
sc->sc_geom = gp;
@@ -606,6 +640,7 @@
KASSERT(sc->sc_provider == NULL, ("Provider still exists? (device=%s)",
gp->name));
free(sc->sc_disks, M_CONCAT);
+ mtx_destroy(&sc->sc_lock);
free(sc, M_CONCAT);
G_CONCAT_DEBUG(0, "Device %s destroyed.", gp->name);
Modified: trunk/sys/geom/concat/g_concat.h
===================================================================
--- trunk/sys/geom/concat/g_concat.h 2018-05-26 15:26:55 UTC (rev 9973)
+++ trunk/sys/geom/concat/g_concat.h 2018-05-26 15:27:27 UTC (rev 9974)
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/geom/concat/g_concat.h,v 1.12 2006/02/01 12:05:59 pjd Exp $
+ * $FreeBSD: stable/10/sys/geom/concat/g_concat.h 260385 2014-01-07 01:32:23Z scottl $
*/
#ifndef _G_CONCAT_H_
@@ -84,6 +84,7 @@
struct g_concat_disk *sc_disks;
uint16_t sc_ndisks;
+ struct mtx sc_lock;
};
#define sc_name sc_geom->name
#endif /* _KERNEL */
More information about the Midnightbsd-cvs
mailing list