Skip to contentSkip to conversation

distcc says: (dcc_pump_sendfile) ERROR: sendfile returned 0? can't cope (bisected)

regression? Dan Williams 3 participants 8 messages May 7, 2008 – May 10, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Tom, Jens,

My build system started reporting these error messages recently. Reverting commit c3270e577c18b3d0e984c3371493205a4807db9d on top of 2.6.26-rc1 gets things working for me again.

--
Dan

#1 lore raw
Quoted 5 lines · Dan Williams

Hi Tom, Jens,

My build system started reporting these error messages recently. Reverting commit c3270e577c18b3d0e984c3371493205a4807db9d on top of 2.6.26-rc1 gets things working for me again.

Irk, that patch did scare me a bit (hence I asked Tom to double check as wel :-). I'll take a look in the morning, all test boxes are off at this point in time.

Signature · 1 line
Jens Axboe
#2 lore raw
Quoted 11 lines · Jens Axboe
Quoted 5 lines · Dan Williams

Hi Tom, Jens,

My build system started reporting these error messages recently. Reverting commit c3270e577c18b3d0e984c3371493205a4807db9d on top of 2.6.26-rc1 gets things working for me again.

Irk, that patch did scare me a bit (hence I asked Tom to double check as wel :-). I'll take a look in the morning, all test boxes are off at this point in time.

I did, and it still looks ok to me, but obviously it's not, so I'll have to do some more digging.

The only thing I can think of right now that might be a possible cause would be in splice_direct_to_actor(), if we had an incomplete transfer, the sd->pos returned and assigned would have the value set by the failed actor(). Maybe something like the following would take care of that case, but I haven't had a chance to test it yet - will do that tomorrow night...

Tom

fs/splice.c +4 -2
index 633f58e..1bb3f34 100644
@@ -986,7 +986,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 
 	while (len) {
 		size_t read_len;
-		loff_t pos = sd->pos;
+		loff_t pos = sd->pos, prev_pos = pos;
 
 		ret = do_splice_to(in, &pos, pipe, len, flags);
 		if (unlikely(ret <= 0))
@@ -1001,8 +1001,10 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 		 * could get stuck data in the internal pipe:
 		 */
 		ret = actor(pipe, sd);
-		if (unlikely(ret <= 0))
+		if (unlikely(ret <= 0)) {
+			sd->pos = prev_pos;
 			goto out_release;
+		}
 
 		bytes += ret;
 		len -= ret;
#3 lore raw
Quoted 16 lines · Tom Zanussi
Quoted 11 lines · Jens Axboe
Quoted 5 lines · Dan Williams

Hi Tom, Jens,

My build system started reporting these error messages recently. Reverting commit c3270e577c18b3d0e984c3371493205a4807db9d on top of 2.6.26-rc1 gets things working for me again.

Irk, that patch did scare me a bit (hence I asked Tom to double check as wel :-). I'll take a look in the morning, all test boxes are off at this point in time.

I did, and it still looks ok to me, but obviously it's not, so I'll have to do some more digging.

Quoted 7 lines

The only thing I can think of right now that might be a possible cause would be in splice_direct_to_actor(), if we had an incomplete transfer, the sd->pos returned and assigned would have the value set by the failed actor(). Maybe something like the following would take care of that case, but I haven't had a chance to test it yet - will do that tomorrow night...

Looks like I was on the right track - can you try this patch out instead? It makes sure sd.pos is updated correctly if the transfer was incomplete or failed. I ran some kernel compiles using distcc while running blktrace in sendfile mode and didn't see any problems with either.

Tom

fs/splice.c +7 -3
index 633f58e..3bd95a7 100644
@@ -986,7 +986,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 
 	while (len) {
 		size_t read_len;
-		loff_t pos = sd->pos;
+		loff_t pos = sd->pos, prev_pos = pos;
 
 		ret = do_splice_to(in, &pos, pipe, len, flags);
 		if (unlikely(ret <= 0))
@@ -1001,15 +1001,19 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 		 * could get stuck data in the internal pipe:
 		 */
 		ret = actor(pipe, sd);
-		if (unlikely(ret <= 0))
+		if (unlikely(ret <= 0)) {
+			sd->pos = prev_pos;
 			goto out_release;
+		}
 
 		bytes += ret;
 		len -= ret;
 		sd->pos = pos;
 
-		if (ret < read_len)
+		if (ret < read_len) {
+			sd->pos = prev_pos + ret;
 			goto out_release;
+		}
 	}
 
 done:
#4 lore raw
Quoted 26 lines · Tom Zanussi
Quoted 16 lines · Tom Zanussi
Quoted 11 lines · Jens Axboe
Quoted 5 lines · Dan Williams

Hi Tom, Jens,

My build system started reporting these error messages recently. Reverting commit c3270e577c18b3d0e984c3371493205a4807db9d on top of 2.6.26-rc1 gets things working for me again.

Irk, that patch did scare me a bit (hence I asked Tom to double check as wel :-). I'll take a look in the morning, all test boxes are off at this point in time.

I did, and it still looks ok to me, but obviously it's not, so I'll have to do some more digging.

Quoted 7 lines

The only thing I can think of right now that might be a possible cause would be in splice_direct_to_actor(), if we had an incomplete transfer, the sd->pos returned and assigned would have the value set by the failed actor(). Maybe something like the following would take care of that case, but I haven't had a chance to test it yet - will do that tomorrow night...

Quoted 5 lines

Looks like I was on the right track - can you try this patch out instead? It makes sure sd.pos is updated correctly if the transfer was incomplete or failed. I ran some kernel compiles using distcc while running blktrace in sendfile mode and didn't see any problems with either.

Dan, can I talk you into re-trying current git with this patch applied? It's basically the (now) reverted broken bits plus the fix from Tom from this email.

fs/splice.c +8 -4
index 7815003..a048ad2 100644
@@ -983,7 +983,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 
 	while (len) {
 		size_t read_len;
-		loff_t pos = sd->pos;
+		loff_t pos = sd->pos, prev_pos = pos;
 
 		ret = do_splice_to(in, &pos, pipe, len, flags);
 		if (unlikely(ret <= 0))
@@ -998,15 +998,19 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
 		 * could get stuck data in the internal pipe:
 		 */
 		ret = actor(pipe, sd);
-		if (unlikely(ret <= 0))
+		if (unlikely(ret <= 0)) {
+			sd->pos = prev_pos;
 			goto out_release;
+		}
 
 		bytes += ret;
 		len -= ret;
 		sd->pos = pos;
 
-		if (ret < read_len)
+		if (ret < read_len) {
+			sd->pos = prev_pos + ret;
 			goto out_release;
+		}
 	}
 
 done:
@@ -1072,7 +1076,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out,
 
 	ret = splice_direct_to_actor(in, &sd, direct_splice_actor);
 	if (ret > 0)
-		*ppos += ret;
+		*ppos = sd.pos;
 
 	return ret;
 }
kernel/relay.c +1 -1
index bc24dcd..7de644c 100644
@@ -1191,7 +1191,7 @@ static ssize_t relay_file_splice_read(struct file *in,
 	ret = 0;
 	spliced = 0;
 
-	while (len) {
+	while (len && !spliced) {
 		ret = subbuf_splice_actor(in, ppos, pipe, len, flags, &nonpad_ret);
 		if (ret < 0)
 			break;
Signature · 1 line
Jens Axboe
author Tested-by
#5 lore raw
Quoted 4 lines · Jens Axboe

Dan, can I talk you into re-trying current git with this patch applied? It's basically the (now) reverted broken bits plus the fix from Tom from this email.

distcc appears to be happy.

#6 lore raw
Quoted 9 lines · Dan Williams
Quoted 4 lines · Jens Axboe

Dan, can I talk you into re-trying current git with this patch applied? It's basically the (now) reverted broken bits plus the fix from Tom from this email.

distcc appears to be happy.

Super, Tom I already committed this patch as coming from you. If you want a SOB added, let me know.

Signature · 1 line
Jens Axboe
#7 lore raw
Quoted 7 lines · Jens Axboe
Quoted 6 lines · Dan Williams
Quoted 4 lines · Jens Axboe

Dan, can I talk you into re-trying current git with this patch applied? It's basically the (now) reverted broken bits plus the fix from Tom from this email.

Quoted 7 lines
Quoted 3 lines

distcc appears to be happy.

Super, Tom I already committed this patch as coming from you. If you want a SOB added, let me know.

OK, great, thanks.