Skip to contentSkip to conversation

bitkeeper comments

DISCUSSION Albert Cahalan 9 participants 18 messages Sep 1, 2003

lore
Share & tools
lore
#0 lore raw

This just got into BitKeeper, about 10 hours ago:

Quoted 11 lines

[PATCH] x86-64 update

Make everything compile and boot again.

The earlier third party ioport.c changes unfortunately didn't even compile, fix that too.

- Update defconfig
- Some minor cleanup
- Introduce physid_t for APIC masks (fixes UP kernels)
- Finish ioport.c merge and fix compilation

Several days ago, I mailed Andi Kleen a build log which showed that ioport.c builds perfectly well on x86-64. The whole 2.6.0-test4 kernel does in fact, as downloaded from kernel.org. Andi Kleen agreed...

...and now this comment gets submitted to Linus, ending up in BitKeeper. I'd like this changed. I realize that it may be a rather difficult thing to change at this point, but it is clearly wrong.

#1 lore raw
Quoted 19 lines · Albert Cahalan

This just got into BitKeeper, about 10 hours ago:

Quoted 11 lines

[PATCH] x86-64 update

Make everything compile and boot again.

The earlier third party ioport.c changes unfortunately didn't even compile, fix that too.

- Update defconfig
- Some minor cleanup
- Introduce physid_t for APIC masks (fixes UP kernels)
- Finish ioport.c merge and fix compilation

Several days ago, I mailed Andi Kleen a build log which showed that ioport.c builds perfectly well on x86-64. The whole 2.6.0-test4 kernel does in fact, as downloaded from kernel.org. Andi Kleen agreed...

Quoted 4 lines

...and now this comment gets submitted to Linus, ending up in BitKeeper. I'd like this changed. I realize that it may be a rather difficult thing to change at this point, but it is clearly wrong.

If you want the comments changed I can do that on bkbits.net and anyone who grabs the update from there will get the new comments. If you want the patch gone out of BK anyone can do that with a cset -x.

Signature · 2 lines
---
Larry McVoy              lm at bitmover.com          http://www.bitmover.com/lm
#2 lore raw
Quoted 20 lines · Larry McVoy
Quoted 19 lines · Albert Cahalan

This just got into BitKeeper, about 10 hours ago:

Quoted 11 lines

[PATCH] x86-64 update

Make everything compile and boot again.

The earlier third party ioport.c changes unfortunately didn't even compile, fix that too.

- Update defconfig
- Some minor cleanup
- Introduce physid_t for APIC masks (fixes UP kernels)
- Finish ioport.c merge and fix compilation

Several days ago, I mailed Andi Kleen a build log which showed that ioport.c builds perfectly well on x86-64. The whole 2.6.0-test4 kernel does in fact, as downloaded from kernel.org. Andi Kleen agreed...

Quoted 8 lines
Quoted 4 lines

...and now this comment gets submitted to Linus, ending up in BitKeeper. I'd like this changed. I realize that it may be a rather difficult thing to change at this point, but it is clearly wrong.

If you want the comments changed I can do that on bkbits.net and anyone who grabs the update from there will get the new comments. If you want the patch gone out of BK anyone can do that with a cset -x.

The code itself is OK I guess; the physid_t changes may well be important, although they could be redone.

It's the comment that bugs me, specifically:

"Make everything compile and boot again."
"The earlier third party ioport.c changes unfortunately didn't even compile, fix that too."
"Finish ioport.c merge and fix compilation"

(BTW, there's a bit more beyond the end of what I quoted)

I'm OK with whatever ensures that somebody looking back through the BitKeeper logs isn't going to come to the conclusion that I broke something.

Um, not everybody will grab updates from bkbits.net, right? Pardon me for being clueless about BitKeeper, but is there some command Andi or Linus could run?

#3 lore raw
Quoted 7 lines · Albert Cahalan

I'm OK with whatever ensures that somebody looking back through the BitKeeper logs isn't going to come to the conclusion that I broke something.

Um, not everybody will grab updates from bkbits.net, right? Pardon me for being clueless about BitKeeper, but is there some command Andi or Linus could run?

Unfortunately the checkin comments themselves are not revision controlled. You have to run a command on each repository that needs to be fixed, if you send me the desired comments I'll post the command. Then if Linus or Marcelo says do it I'll do it on bkbits.net. That should be good enough, the logs there are what people tend to browse.

Signature · 2 lines
---
Larry McVoy              lm at bitmover.com          http://www.bitmover.com/lm
#4 lore raw
Quoted 5 lines · Larry McVoy

Unfortunately the checkin comments themselves are not revision controlled. You have to run a command on each repository that needs to be fixed, if you send me the desired comments I'll post the command. Then if Linus or Marcelo says do it I'll do it on bkbits.net. That should be good enough, the logs there are what people tend to browse.

WTF? Andi probably had a reason to put this in. If Albert feels pissed of he should shred his repo instead of doing stupid censorship crap.

#5 lore raw
Quoted 9 lines · Christoph Hellwig
Quoted 5 lines · Larry McVoy

Unfortunately the checkin comments themselves are not revision controlled. You have to run a command on each repository that needs to be fixed, if you send me the desired comments I'll post the command. Then if Linus or Marcelo says do it I'll do it on bkbits.net. That should be good enough, the logs there are what people tend to browse.

WTF? Andi probably had a reason to put this in. If Albert feels pissed of he should shred his repo instead of doing stupid censorship crap.

Hey, I'm not in the middle of this because I don't understand who is right and it's not my place to make that call. I said "if Linus or Marcelo says do it" specifically for the case that there is some hanky panky going on. On the other hand, it's perfectly possible that the wrong comment got stuck in there and if that's the case why shouldn't it get fixed?

Signature · 2 lines
---
Larry McVoy              lm at bitmover.com          http://www.bitmover.com/lm
#6 lore raw
Quoted 2 lines · Larry McVoy

Hey, I'm not in the middle of this because I don't understand who is right and it's not my place to make that call.

I doesn't matter who's actually right. If Andi was wrong Albert can demand a apology from him or sue him or whater (not that his name is actually mentioned in the message).

But we're not going to retroactively censor commit messages.

#7 lore raw
Quoted 9 lines · Christoph Hellwig
Quoted 2 lines · Larry McVoy

Hey, I'm not in the middle of this because I don't understand who is right and it's not my place to make that call.

I doesn't matter who's actually right. If Andi was wrong Albert can demand a apology from him or sue him or whater (not that his name is actually mentioned in the message).

But we're not going to retroactively censor commit messages.

I'm confused, I thought Linus/Marcelo/Andrew were the tree maintainers. As long as they are they get to make the call, not you (or me or whoever).

Signature · 2 lines
---
Larry McVoy              lm at bitmover.com          http://www.bitmover.com/lm
#8 lore raw
Quoted 5 lines · Larry McVoy
Quoted 4 lines · Christoph Hellwig
Quoted 2 lines · Larry McVoy

Hey, I'm not in the middle of this because I don't understand who is right and it's not my place to make that call.

Quoted 8 lines
Quoted 5 lines

I doesn't matter who's actually right. If Andi was wrong Albert can demand a apology from him or sue him or whater (not that his name is actually mentioned in the message).

But we're not going to retroactively censor commit messages.

I'm confused, I thought Linus/Marcelo/Andrew were the tree maintainers. As long as they are they get to make the call, not you (or me or whoever).

Retroactively changing a commit message may be a dangerous precedent. While there may be legitimate reasons (E.g. plain wrong comments or `actually this part was not written by x but by y'), one day The Evil Empire may claim we changed the evidence of who did what.

Putting comments under revision control is another option, but may be too deep-involving...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#9 lore raw
In reply to Christoph Hellwig
Quoted 7 lines · Christoph Hellwig
Quoted 2 lines · Larry McVoy

Hey, I'm not in the middle of this because I don't understand who is right and it's not my place to make that call.

I doesn't matter who's actually right. If Andi was wrong Albert can demand a apology from him or sue him or whater (not that his name is actually mentioned in the message).

I was wrong in this case, although I partly blame Albert because he sneaked in x86-64 patches behind my back directly to Linus, which caused merging problems and resulted in this comment.

-Andi

#10 lore raw
In reply to Christoph Hellwig
Quoted 2 lines · Christoph Hellwig

But we're not going to retroactively censor commit messages.

Actually, I do that all the time. In fact, it was I who asked Larry to add the "bk comment" command in to make it easy to do so.

The thing is, it's hard to do after the message has already gone out into the public - but I fix up peoples email commentary by hand both in the email and often later after it has hit my BK tree too. I try to fix obvious typos, and just generally make the things more readable.

And if the comment was wrong, then it should be fixed. Not because of any "censorship", but because it's misleading if the comment says it fixes something it doesn't fix - and that might make people overlook the _real_ thing the change does.

Linus

#11 lore raw
Quoted 13 lines · Linus Torvalds
Quoted 2 lines · Christoph Hellwig

But we're not going to retroactively censor commit messages.

Actually, I do that all the time. In fact, it was I who asked Larry to add the "bk comment" command in to make it easy to do so.

The thing is, it's hard to do after the message has already gone out into the public - but I fix up peoples email commentary by hand both in the email and often later after it has hit my BK tree too. I try to fix obvious typos, and just generally make the things more readable.

Quoted 4 lines

And if the comment was wrong, then it should be fixed. Not because of any "censorship", but because it's misleading if the comment says it fixes something it doesn't fix - and that might make people overlook the _real_ thing the change does.

There is an important difference.

If I send you a mail saying "X" and you change it to say "Y" and put "Y" in the source tree, fine. It was a mail between us, noone except you and me will know. If I think it's wrong, maybe I can make you submit "X" to the source tree instead, with an explanation.

Everything that was ever publicly visible, stays publicly visible, even with the the revised comments, thanks to the revision history.

But changing the source tree revision history retroactively, that's bad. It defies the purpose of revision control itself.

The source tree is a public record. People will remember "this said 'Y' I'm sure, but now it says 'X', why is that?" - and noone can answer. History forgotten.

It's your call, but I can certainly see why some feel bad about this.

After all, we wouldn't want to edit the e-mail archives to remove all
trace of what happened, either, would we? ;)

Cheers,

Signature · 6 lines
................................................................
:   [email protected]   : And I see the elder races,         :
:.........................: putrid forms of man                :
:   Jakob Østergaard      : See him rise and claim the earth,  :
:        OZ9ABN           : his downfall is at hand.           :
:.........................:............{Konkhra}...............:
#12 lore raw
Quoted 10 lines · Jakob Oestergaard

There is an important difference.

If I send you a mail saying "X" and you change it to say "Y" and put "Y" in the source tree, fine. It was a mail between us, noone except you and me will know. If I think it's wrong, maybe I can make you submit "X" to the source tree instead, with an explanation.

Everything that was ever publicly visible, stays publicly visible, even with the the revised comments, thanks to the revision history.

Quoted 6 lines

But changing the source tree revision history retroactively, that's bad. It defies the purpose of revision control itself.

The source tree is a public record. People will remember "this said 'Y' I'm sure, but now it says 'X', why is that?" - and noone can answer. History forgotten.

Yupp, that's what I meant. I certainly don't want a thought police on my source trees.

#13 lore raw
Quoted 14 lines · Christoph Hellwig
Quoted 13 lines · Jakob Oestergaard

There is an important difference.

If I send you a mail saying "X" and you change it to say "Y" and put "Y" in the source tree, fine. It was a mail between us, noone except you and me will know. If I think it's wrong, maybe I can make you submit "X" to the source tree instead, with an explanation.

Everything that was ever publicly visible, stays publicly visible, even with the the revised comments, thanks to the revision history.

But changing the source tree revision history retroactively, that's bad. It defies the purpose of revision control itself.

Quoted 6 lines
Quoted 3 lines

The source tree is a public record. People will remember "this said 'Y' I'm sure, but now it says 'X', why is that?" - and noone can answer. History forgotten.

Yupp, that's what I meant. I certainly don't want a thought police on my source trees.

Trivial w/ the current BK because the comments aren't versioned. Just have someone be elected as the archiver and have them have a cron job which pulls bkbits.net every 20 minutes or so. Then if the comments are ever changed your archive will have the originals.

Signature · 2 lines
---
Larry McVoy              lm at bitmover.com          http://www.bitmover.com/lm
#14 lore raw
In reply to Larry McVoy
Quoted 5 lines · Larry McVoy

Hey, I'm not in the middle of this because I don't understand who is right and it's not my place to make that call. I said "if Linus or Marcelo says do it" specifically for the case that there is some hanky panky going on. On the other hand, it's perfectly possible that the wrong comment got stuck in there and if that's the case why shouldn't it get fixed?

Presumably in the abstract "if you care" case you can generate this change globally by excluding that changeset and all after, then reapplying it with a different comment then reapplying all that follow ?

#15 lore raw
Quoted 10 lines · Alan Cox
Quoted 5 lines · Larry McVoy

Hey, I'm not in the middle of this because I don't understand who is right and it's not my place to make that call. I said "if Linus or Marcelo says do it" specifically for the case that there is some hanky panky going on. On the other hand, it's perfectly possible that the wrong comment got stuck in there and if that's the case why shouldn't it get fixed?

Presumably in the abstract "if you care" case you can generate this change globally by excluding that changeset and all after, then reapplying it with a different comment then reapplying all that follow ?

Yup, that would work just fine. Anyone can do this.

Signature · 2 lines
---
Larry McVoy              lm at bitmover.com          http://www.bitmover.com/lm
#16 lore raw

Bug in linux-2.6.0-test4 ?

In reply to Larry McVoy

Hi all

I have an annoying problem with a network server (TCP sockets)

On some stress situation, LowMemory goes close to 0, and the whole machine freezes.

When the sockets receive a lot of data, and the server is busy, the TCP stack just can use too many buffers (in LowMem).

TCP stack uses "size-4096" buffers to store the datas, even if only one byte is coming from the network.

I tried to change /proc/sys/net/ipv4/tcp_mem, without results.

# echo "1000 10000 15000" >/proc/sys/net/ipv4/tcp_mem

You can reproduce the problem with the test program attached.

# gcc -o crash crash.c
# ulimit -n 20000
# ./crash listen  8888 &
# ./crash call 127.0.0.1:8888 &

grep "size-4096 " /proc/slabinfo
size-4096 40015 40015 4096 1 1 : tunables 24 12 0 : slabdata
40015 40015 0

(thats is 160 Mo, far more than the limit given in /proc/sys/net/ipv4/tcp_mem)

grep TCP /proc/net/sockstat
TCP: inuse 39996 orphan 0 tw 0 alloc 39997 mem 79986

What is the unit of 'mem' field ? Unless it is 2Ko, the numbers are wrong.

How may I ask the kernel NOT to use more than 'X Mo' to store TCP messages
?

Thanks

Eric Dumazet

/*
* Program to freeze a linux box, by using all the LOWMEM
* A bug on the tcp stack may be the reason
* Use at your own risk !!
*/

/* Principles :
A listener accepts incoming tcp sockets, write 40 bytes, and does nothing
with them (no reading)
A writer establish TCP sockets, sends some data (40 bytes), no more
reading/writing
*/
#include <stdio.h>

# include <sys/socket.h>
# include <netinet/tcp.h>
# include <arpa/inet.h>
# include <netdb.h>
# include <unistd.h>
# include <string.h>

/*
* Usage :
* crash listen port
* crash call IP:port
*/
void usage(int code)
{
fprintf(stderr, "Usages :\n") ;
fprintf(stderr, " crash listen port\n") ;
fprintf(stderr, " crash call IP:port\n") ;
exit(code) ;
}
const char some_data[40] = "some data.... just some data" ;

void do_listener(const char *string)
{
int port = atoi(string) ;
struct sockaddr_in host, from ;
int fdlisten ;
unsigned int total ;
socklen_t fromlen ;
memset(&host,0, sizeof(host));
host.sin_family = AF_INET;
host.sin_port = htons(port);
fdlisten = socket(AF_INET, SOCK_STREAM, 0) ;

  if (bind(fdlisten, (struct sockaddr *)&host, sizeof(host)) == -1) {
        perror("bind") ;
        return ;
        }
listen(fdlisten, 10) ;
for (total=0;;total++) {
        int nfd ;
        fromlen = sizeof(from) ;
        nfd = accept(fdlisten, (struct sockaddr *)&from, &fromlen) ;
        if (nfd == -1) break ;
        write(nfd, some_data, sizeof(some_data)) ;
        }

printf("total=%u\n", total) ;
pause() ;
}

void do_caller(const char *string)
{
union {
int i ;

   char c[4] ;
        } u ;

struct sockaddr_in dest;
int a1, a2, a3, a4, port ;
unsigned int total ;
sscanf(string, "%d.%d.%d.%d:%d", &a1, &a2, &a3, &a4, &port) ; u.c[0] = a1 ; u.c[1] = a2 ; u.c[2] = a3 ; u.c[3] = a4 ;

for (total=0;;total++) {
    int fd ;
        memset(&dest, 0, sizeof(dest)) ;
        dest.sin_family = AF_INET ;
        dest.sin_port = htons(port) ;
        dest.sin_addr.s_addr = u.i ;
    fd = socket(AF_INET, SOCK_STREAM, 0) ;
        if (fd == -1) break ;
        if (connect(fd, (struct sockaddr *)&dest, sizeof(dest)) == -1) {
                perror("connect") ;
                break ;
                }
        write(fd, some_data, sizeof(some_data)) ;
        }

printf("total=%u\n", total) ;
pause() ;
}

int main(int argc, char *argv[])
{
int listener ;
int caller ;

if (argc != 3) {
        usage(1);
        }
listener = !strcmp(argv[1], "listen") ;
caller = !strcmp(argv[1], "call") ;
if (listener) {
        do_listener(argv[2]) ;
        }
else if (caller) {
        do_caller(argv[2]) ;
        }

else usage(2) ;
return 0 ;
} /********************************************************************/

/*
* Program to freeze a linux box, by using all the LOWMEM
* A bug on the tcp stack may be the reason
* Use at your own risk !!
*/

/* Principles :
A listener accepts incoming tcp sockets, write 40 bytes, and does nothing with them (no reading) A writer establish TCP sockets, sends some data (40 bytes), no more reading/writing
*/
#include <stdio.h>

# include <sys/socket.h>
# include <netinet/tcp.h>
# include <arpa/inet.h>
# include <netdb.h>
# include <unistd.h>
# include <string.h>

/*
* Usage :
* crash listen port
* crash call IP:port
*/
void usage(int code)
{
fprintf(stderr, "Usages :\n") ;
fprintf(stderr, " crash listen port\n") ;
fprintf(stderr, " crash call IP:port\n") ;
exit(code) ;
}
const char some_data[40] = "some data.... just some data" ;

void do_listener(const char *string)
{
int port = atoi(string) ;
struct sockaddr_in host, from ;
int fdlisten ;
unsigned int total ;
socklen_t fromlen ;
memset(&host,0, sizeof(host));
host.sin_family = AF_INET;
host.sin_port = htons(port);
fdlisten = socket(AF_INET, SOCK_STREAM, 0) ;

  if (bind(fdlisten, (struct sockaddr *)&host, sizeof(host)) == -1) {
	perror("bind") ;
	return ;
	}
listen(fdlisten, 10) ;
for (total=0;;total++) {
	int nfd ;
	fromlen = sizeof(from) ;
	nfd = accept(fdlisten, (struct sockaddr *)&from, &fromlen) ;
	if (nfd == -1) break ;
	write(nfd, some_data, sizeof(some_data)) ;
	}

printf("total=%u\n", total) ;
pause() ;
}

void do_caller(const char *string)
{
union {
int i ;

   char c[4] ;
	} u ;

struct sockaddr_in dest;
int a1, a2, a3, a4, port ;
unsigned int total ;
sscanf(string, "%d.%d.%d.%d:%d", &a1, &a2, &a3, &a4, &port) ; u.c[0] = a1 ; u.c[1] = a2 ; u.c[2] = a3 ; u.c[3] = a4 ;

for (total=0;;total++) {
    int fd ;
	memset(&dest, 0, sizeof(dest)) ;
	dest.sin_family = AF_INET ;
   	dest.sin_port = htons(port) ;
   	dest.sin_addr.s_addr = u.i ;
    fd = socket(AF_INET, SOCK_STREAM, 0) ;
	if (fd == -1) break ;
	if (connect(fd, (struct sockaddr *)&dest, sizeof(dest)) == -1) {
		perror("connect") ;
		break ;
		}
	write(fd, some_data, sizeof(some_data)) ;
	}

printf("total=%u\n", total) ;
pause() ;
}

int main(int argc, char *argv[])
{
int listener ;
int caller ;

if (argc != 3) {
	usage(1);
	}
listener = !strcmp(argv[1], "listen") ;
caller = !strcmp(argv[1], "call") ;
if (listener) {
	do_listener(argv[2]) ;
	}
else if (caller) {
	do_caller(argv[2]) ;
	}

else usage(2) ;
return 0 ;
} /********************************************************************/

#17 lore raw
In reply to Larry McVoy
Quoted 9 lines · Larry McVoy
Quoted 7 lines · Albert Cahalan

I'm OK with whatever ensures that somebody looking back through the BitKeeper logs isn't going to come to the conclusion that I broke something.

Um, not everybody will grab updates from bkbits.net, right? Pardon me for being clueless about BitKeeper, but is there some command Andi or Linus could run?

Quoted 5 lines

Unfortunately the checkin comments themselves are not revision controlled. You have to run a command on each repository that needs to be fixed, if you send me the desired comments I'll post the command. Then if Linus or Marcelo says do it I'll do it on bkbits.net. That should be good enough, the logs there are what people tend to browse.

============ as a patch =============

new 2003-09-01 14:05:18.000000000 -0400 renamed from old 2003-09-01 14:04:46.000000000 -0400 +0 -4
@@ -2,13 +2,9 @@
 
 Make everything compile and boot again.
 
-The earlier third party ioport.c changes unfortunately didn't even
-compile, fix that too.
-
  - Update defconfig
  - Some minor cleanup
  - Introduce physid_t for APIC masks (fixes UP kernels)
- - Finish ioport.c merge and fix compilation
  - Add bandaid for CardBus bridges and broken BIOS (Vojtech)
  - Add bandaid for unsynchronized TSCs  (Vojtech)
  - Fix ffs(0) return value (fixes XFS) 

=========== old content ============
[PATCH] x86-64 update

Make everything compile and boot again.

The earlier third party ioport.c changes unfortunately didn't even compile, fix that too.

- Update defconfig
- Some minor cleanup
- Introduce physid_t for APIC masks (fixes UP kernels)
- Finish ioport.c merge and fix compilation
- Add bandaid for CardBus bridges and broken BIOS (Vojtech)
- Add bandaid for unsynchronized TSCs (Vojtech)
- Fix ffs(0) return value (fixes XFS)
- Fix compilation with software suspend

=========== new content ============
[PATCH] x86-64 update

Make everything compile and boot again.

- Update defconfig
- Some minor cleanup
- Introduce physid_t for APIC masks (fixes UP kernels)
- Add bandaid for CardBus bridges and broken BIOS (Vojtech)
- Add bandaid for unsynchronized TSCs (Vojtech)
- Fix ffs(0) return value (fixes XFS)
- Fix compilation with software suspend