Hi, Stéphane Glondu <glondu@debian.org> (14/05/2011): > After upgrading libc6 to 2.13-4 and adding > /usr/lib/libc/memcpy-syslog-preload.so to my /etc/ld.so.preload as > suggested by the NEWS file, lines like the following: > > > May 14 12:22:41 korell Xorg: source and destination overlap in memcpy() at ip 0x7f3d6dbfdc3c I followed up to another patch: http://lists.x.org/archives/xorg-devel/2011-May/022245.html Feel free to try it and report any issue or improvement; I'm attaching the patch for your convenience. Mraw, KiBi.
From 801048dc813fdb4890bd355231cb118d64776f39 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 16 May 2011 17:15:15 +0200
Subject: [PATCH v2] Try and get overlapping cases fixed.
The memcpy fast path implicitly assumes that the copy walks
left-to-right. That's not something memcpy guarantees, and newer glibc
on some processors will indeed break that assumption. Since we walk a
line at a time, check the source and destination against the width of
the blit to determine whether we can be sloppy enough to allow memcpy.
(Having done this, we can remove the check for !reverse as well.)
On an Intel Core i7-2630QM with an NVIDIA GeForce GTX 460M running in
NoAccel, the broken code and various fixes for -copywinwin{10,100,500}
gives (edited to fit in 80 columns):
1: Disable the fastpath entirely
2: Replace memcpy with memmove
3: This fix
4: The code before this fix
1 2 3 4 Operation
------ --------------- --------------- --------------- ------------
258000 269000 ( 1.04) 544000 ( 2.11) 552000 ( 2.14) Copy 10x10
21300 23000 ( 1.08) 43700 ( 2.05) 47100 ( 2.21) Copy 100x100
960 962 ( 1.00) 1990 ( 2.09) 1990 ( 2.07) Copy 500x500
So it's a modest performance hit, but correctness demands it, and it's
probably worth keeping the 2x speedup from having the fast path in the
first place.
Signed-off-by: Adam Jackson <ajax@redhat.com>
v2: Fix limit cases thanks to Soeren Sandmann, and apply a tiny
optimization by Walter Harms.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
---
fb/fbblt.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
Tested on amd64 on top of xorg-server's server-1.10-branch.
diff --git a/fb/fbblt.c b/fb/fbblt.c
index 38271c0..b6e7785 100644
--- a/fb/fbblt.c
+++ b/fb/fbblt.c
@@ -65,6 +65,7 @@ fbBlt (FbBits *srcLine,
int n, nmiddle;
Bool destInvarient;
int startbyte, endbyte;
+ int careful;
FbDeclareMergeRop ();
#ifdef FB_24BIT
@@ -76,7 +77,9 @@ fbBlt (FbBits *srcLine,
}
#endif
- if (alu == GXcopy && pm == FB_ALLONES && !reverse &&
+ careful = (width * (bpp / 8) > abs(srcLine-dstLine)) || (bpp % 8);
+
+ if (alu == GXcopy && pm == FB_ALLONES && !careful &&
!(srcX & 7) && !(dstX & 7) && !(width & 7)) {
int i;
CARD8 *src = (CARD8 *) srcLine;
--
1.7.5.1
Attachment:
signature.asc
Description: Digital signature