From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF2C4231858 for ; Wed, 26 Nov 2025 21:10:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764191416; cv=none; b=NvQ6CyFEWC2Txq0sbFydjxNdfH4dlpeUmTEGwfB8nAbSokP3e2l2nv9p0kreVyfPUyleLRYDVOjafdXOv5Wl4Stb7pIktu0c69DHAxJg/+wr39n9XnO0BPK/mLwbzxSFV9h42GkYJA4uib7NCtZ7PxQcX20p1U6N0GVknzfN1RU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764191416; c=relaxed/simple; bh=HtpK1L3UXboDvtq/f4jhIG5+j1fYUEZGzG8GYBIQnpA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Qqf9WE9Xx0SALB5J+vLsvHHW2IlNVQU8K8Gn59v6Wl0Txq+DZs7+KKk8OCOU6YHOZI/xN6dUwbAvPYunaI/0hXPoGRuzY07ZDgzwy7KNzIFFp5fMU8s7Edk4u05VzOouGW5O/cr7JaN6+Q+de+qToEijsgrfCBrdgpX4OhFF2j8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b=lh5rkAS1; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=canonical.com header.i=@canonical.com header.b="lh5rkAS1" Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 6EEED3F452 for ; Wed, 26 Nov 2025 21:10:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20251003; t=1764191409; bh=etwvSuPkB6K0qsrfspA5D5Yf0GIH78UqvE+Q+LobWHQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=lh5rkAS1H9yxnKfoa+o7zo3uC3NEk8O+xPrvESZ4QWHmA+0ObFig+ferDM2MFI23X Y/U4KAgs0FaZvt4MGvlwv7RZl8eyPaaGAFn+FaY1nmosJb17WcXV+6IcOQ9Nt+kDBO YZdRucMhJ8lRC02rZKEHNZaSEJ5920OL2ivKeiZF5/DHeEnelgrtR0hTVX2WLIy1Wj xbuLYj0xgS/baEyZUshiu39oT0PSuk0SaqkCZn+lWS6d65qKzTtcQAksWXMcXNokvc 1g8aGLJAY9AexJLgC8b8VdDPdmaAtkN5EK4r4l+P7cOSziiAyN63eaLULjJUSC2Ltv usECuNb7k5Pvws908QB2H4UwyVFZTyzGCTaiqmOgmJYOdWx7VVj/Ecs8p9Xx2TK6su +7toshxC8qUCfC7pNA7xIPKVQYS0m2rUebJcTiQmMv9Pu98zs/iNeDzIA6H0GZtId9 rSjf0c+P+0epK7gcTGKftLrf5eNypsDE7ERJRENNcPNsW4QTp2rglo3jddQZDmbEHw QSkZAajJ+Ic7HbHjmge3r9h0bsPwhkH9Fk5S1v+OFeWWxbomAoXHtxA+CFJoBg3LLj azLG4b4/daUMrjsV1a5/i3Bg883mecMWnepJ32J9275uXXYc+zg3gffO4NLPRuAUo9 c19BbRxETezElO042Nci0djg= Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2954d676f9dso1355725ad.0 for ; Wed, 26 Nov 2025 13:10:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764191405; x=1764796205; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=etwvSuPkB6K0qsrfspA5D5Yf0GIH78UqvE+Q+LobWHQ=; b=xJVG3isk4U4HFk0jmYyAaev2DosaqHS8oW6IL5UAg7wE0B44yu2vJ7tNi0Nlg7zSxe uaGuxDVdoB9VRg5jnweR9EQ3A1fFZbcuGeD2goRgPXQses56CcW/81Bxh62mbufPH/Na OIaveb+KLFXF+3DjF30CenPusNR+IAgb8Sh7nO4+z+G3h9kJs8DotWBWRAdGPAmc/P49 ZW+sUMqxSkLGhXmQCcnGnaZRNkI033Cy6As7/SoWxZox/bT6OOzZXZbwGbZvKUw+VmXA ytB8tMTM3UexTf54Fno7a7OXgfJdi0W98Idb3mMQ+XVjiBwnybe/jcMWHUmZcHzKnmVO 4WeQ== X-Forwarded-Encrypted: i=1; AJvYcCVZ94mOz1b6zq2feKcHeaM8gLBx09T7PZinOEonCiVNheCBthCUoJeQeOH/jL2sfn4jAiDLf3J0CCdOsnY=@vger.kernel.org X-Gm-Message-State: AOJu0YyjgEVSkC863L/5MBhpSLeOxHKYtm6LgUuHiRufpjt3yPzSLbn1 c5QU0k6Ld5obdcfQLzWfTWaVXM965klL7tQW2nO0szhtB6jqhS5Csjb2o596aSdRLb+XouoJ7rZ Aaaok+JcPz4XQY9cH8su3Xy+XzQr62VGMEADn7HVU0U28MDbioz7jFKGN1L4TJqSw5i7mZOaGRH VCVgi/9A== X-Gm-Gg: ASbGncscjZ9TU5RV2lIt4zAuqeygt70a6IMWHzzhTTI/QsFxGAnz6hL6ZV3LgBJERoa jqBjvaFIM36H4iHlF86TYIKFGHYIWs5HdI6zkjjKfWxBzcf7MVSQsrko/WQ06jbKbZkLCZrnWdE H6+zKokStfN6KqwgujiW+YWPovhpgB85vtgEgbuXmPDN1lTjUWLimE5kvpmScf5FAShm08Psmdz jQ4WCl+u/MQ9KGGEqXuDbhYg73WkoGMfP/FAOyhBWYYgMnGIGNQNnTZBP0ImxEGUXpBMeKcatFM B7JkM0Q6p8K6RF24YyvlVUXOIxsStOttp/AQe/CHmbW2ldaOAMGrvG4SW/V9n2vrGmYw2Nbktl7 wN0M1qsGjrmH6w3p6YPTj0q+W X-Received: by 2002:a17:902:f54a:b0:295:6427:87d4 with SMTP id d9443c01a7336-29bab1db61fmr85232955ad.50.1764191405236; Wed, 26 Nov 2025 13:10:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IEO9cEqjZUKFW7BJRLCbL8zz0v+bKZwgqGsvGz/h3CjwbNizKdrFpT89fEjElUoizqoEVJ9nA== X-Received: by 2002:a17:902:f54a:b0:295:6427:87d4 with SMTP id d9443c01a7336-29bab1db61fmr85232635ad.50.1764191404774; Wed, 26 Nov 2025 13:10:04 -0800 (PST) Received: from [192.168.192.85] ([50.47.129.42]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-29b5b26fc24sm209243355ad.67.2025.11.26.13.10.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Nov 2025 13:10:04 -0800 (PST) Message-ID: Date: Wed, 26 Nov 2025 13:10:03 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 0/2] apparmor unaligned memory fixes To: Helge Deller Cc: david laight , Helge Deller , John Paul Adrian Glaubitz , linux-kernel@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, linux-parisc@vger.kernel.org References: <20251126104444.29002552@pumpkin> <4034ad19-8e09-440c-a042-a66a488c048b@gmx.de> <20251126142201.27e23076@pumpkin> Content-Language: en-US From: John Johansen Autocrypt: addr=john.johansen@canonical.com; keydata= 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 lT9Q Organization: Canonical In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/26/25 12:15, Helge Deller wrote: > * John Johansen : >> On 11/26/25 07:12, Helge Deller wrote: >>> * david laight : >>>> On Wed, 26 Nov 2025 12:03:03 +0100 >>>> Helge Deller wrote: >>>> >>>>> On 11/26/25 11:44, david laight wrote: >>>> ... >>>>>>> diff --git a/security/apparmor/match.c b/security/apparmor/match.c >>>>>>> index 26e82ba879d44..3dcc342337aca 100644 >>>>>>> --- a/security/apparmor/match.c >>>>>>> +++ b/security/apparmor/match.c >>>>>>> @@ -71,10 +71,10 @@ static struct table_header *unpack_table(char *blob, size_t bsize) >>>>>>> u8, u8, byte_to_byte); >>>>>> >>>>>> Is that that just memcpy() ? >>>>> >>>>> No, it's memcpy() only on big-endian machines. >>>> >>>> You've misread the quoting... >>>> The 'data8' case that was only half there is a memcpy(). >>>> >>>>> On little-endian machines it converts from big-endian >>>>> 16/32-bit ints to little-endian 16/32-bit ints. >>>>> >>>>> But I see some potential for optimization here: >>>>> a) on big-endian machines just use memcpy() >>>> >>>> true >>>> >>>>> b) on little-endian machines use memcpy() to copy from possibly-unaligned >>>>> memory to then known-to-be-aligned destination. Then use a loop with >>>>> be32_to_cpu() instead of get_unaligned_xx() as it's faster. >>>> >>>> There is a function that does a loop byteswap of a buffer - no reason >>>> to re-invent it. >>> >>> I assumed there must be something, but I did not see it. Which one? >>> >>>> But I doubt it is always (if ever) faster to do a copy and then byteswap. >>>> The loop control and extra memory accesses kill performance. >>> >>> Yes, you are probably right. >>> >>>> Not that I've seen a fast get_unaligned() - I don't think gcc or clang >>>> generate optimal code - For LE I think it is something like: >>>> low = *(addr & ~3); >>>> high = *((addr + 3) & ~3); >>>> shift = (addr & 3) * 8; >>>> value = low << shift | high >> (32 - shift); >>>> Note that it is only 2 aligned memory reads - even for 64bit. >>> >>> Ok, then maybe we should keep it simple like this patch: >>> >>> [PATCH v2] apparmor: Optimize table creation from possibly unaligned memory >>> >>> Source blob may come from userspace and might be unaligned. >>> Try to optize the copying process by avoiding unaligned memory accesses. >>> >>> Signed-off-by: Helge Deller >>> >>> diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h >>> index 1fbe82f5021b..386da2023d50 100644 >>> --- a/security/apparmor/include/match.h >>> +++ b/security/apparmor/include/match.h >>> @@ -104,16 +104,20 @@ struct aa_dfa { >>> struct table_header *tables[YYTD_ID_TSIZE]; >>> }; >>> -#define byte_to_byte(X) (X) >>> +#define byte_to_byte(X) (*(X)) >>> #define UNPACK_ARRAY(TABLE, BLOB, LEN, TTYPE, BTYPE, NTOHX) \ >>> do { \ >>> typeof(LEN) __i; \ >>> TTYPE *__t = (TTYPE *) TABLE; \ >>> BTYPE *__b = (BTYPE *) BLOB; \ >>> - for (__i = 0; __i < LEN; __i++) { \ >>> - __t[__i] = NTOHX(__b[__i]); \ >>> - } \ >>> + BUILD_BUG_ON(sizeof(TTYPE) != sizeof(BTYPE)); \ >>> + if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN) || sizeof(BTYPE) == 1) \ >>> + memcpy(__t, __b, (LEN) * sizeof(BTYPE)); \ >>> + else /* copy & convert convert from big-endian */ \ >>> + for (__i = 0; __i < LEN; __i++) { \ >>> + __t[__i] = NTOHX(&__b[__i]); \ >>> + } \ >>> } while (0) >>> static inline size_t table_size(size_t len, size_t el_size) >>> diff --git a/security/apparmor/match.c b/security/apparmor/match.c >>> index c5a91600842a..13e2f6873329 100644 >>> --- a/security/apparmor/match.c >>> +++ b/security/apparmor/match.c >>> @@ -15,6 +15,7 @@ >>> #include >>> #include >>> #include >>> +#include >>> #include "include/lib.h" >>> #include "include/match.h" >>> @@ -70,10 +71,10 @@ static struct table_header *unpack_table(char *blob, size_t bsize) >>> u8, u8, byte_to_byte); >>> else if (th.td_flags == YYTD_DATA16) >>> UNPACK_ARRAY(table->td_data, blob, th.td_lolen, >>> - u16, __be16, be16_to_cpu); >>> + u16, __be16, get_unaligned_be16); >>> else if (th.td_flags == YYTD_DATA32) >>> UNPACK_ARRAY(table->td_data, blob, th.td_lolen, >>> - u32, __be32, be32_to_cpu); >>> + u32, __be32, get_unaligned_be32); >>> else >>> goto fail; >>> /* if table was vmalloced make sure the page tables are synced >> >> I think we can make one more tweak, in just not using UNPACK_ARRAY at all for the byte case >> ie. >> >> diff --git a/security/apparmor/match.c b/security/apparmor/match.c >> index 26e82ba879d44..389202560675c 100644 >> --- a/security/apparmor/match.c >> +++ b/security/apparmor/match.c >> @@ -67,8 +67,7 @@ static struct table_header *unpack_table(char *blob, size_t bsize) >> table->td_flags = th.td_flags; >> table->td_lolen = th.td_lolen; >> if (th.td_flags == YYTD_DATA8) >> - UNPACK_ARRAY(table->td_data, blob, th.td_lolen, >> - u8, u8, byte_to_byte); >> + memcp(table->td_data, blob, th.td_lolen); > > True. > Then byte_to_byte() can go away in match.h as well. > So, here is a (untested) v3: > and lightly tested now I will pull it into my tree > > [PATCH v3] apparmor: Optimize table creation from possibly unaligned memory > > Source blob may come from userspace and might be unaligned. > Try to optize the copying process by avoiding unaligned memory accesses. > > Signed-off-by: Helge Deller > Acked-by: John Johansen > diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h > index 1fbe82f5021b..19e72b3e8f49 100644 > --- a/security/apparmor/include/match.h > +++ b/security/apparmor/include/match.h > @@ -104,16 +104,18 @@ struct aa_dfa { > struct table_header *tables[YYTD_ID_TSIZE]; > }; > > -#define byte_to_byte(X) (X) > - > #define UNPACK_ARRAY(TABLE, BLOB, LEN, TTYPE, BTYPE, NTOHX) \ > do { \ > typeof(LEN) __i; \ > TTYPE *__t = (TTYPE *) TABLE; \ > BTYPE *__b = (BTYPE *) BLOB; \ > - for (__i = 0; __i < LEN; __i++) { \ > - __t[__i] = NTOHX(__b[__i]); \ > - } \ > + BUILD_BUG_ON(sizeof(TTYPE) != sizeof(BTYPE)); \ > + if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) \ > + memcpy(__t, __b, (LEN) * sizeof(BTYPE)); \ > + else /* copy & convert convert from big-endian */ \ > + for (__i = 0; __i < LEN; __i++) { \ > + __t[__i] = NTOHX(&__b[__i]); \ > + } \ > } while (0) > > static inline size_t table_size(size_t len, size_t el_size) > diff --git a/security/apparmor/match.c b/security/apparmor/match.c > index c5a91600842a..1e32c8ba14ae 100644 > --- a/security/apparmor/match.c > +++ b/security/apparmor/match.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > > #include "include/lib.h" > #include "include/match.h" > @@ -66,14 +67,13 @@ static struct table_header *unpack_table(char *blob, size_t bsize) > table->td_flags = th.td_flags; > table->td_lolen = th.td_lolen; > if (th.td_flags == YYTD_DATA8) > - UNPACK_ARRAY(table->td_data, blob, th.td_lolen, > - u8, u8, byte_to_byte); > + memcpy(table->td_data, blob, th.td_lolen); > else if (th.td_flags == YYTD_DATA16) > UNPACK_ARRAY(table->td_data, blob, th.td_lolen, > - u16, __be16, be16_to_cpu); > + u16, __be16, get_unaligned_be16); > else if (th.td_flags == YYTD_DATA32) > UNPACK_ARRAY(table->td_data, blob, th.td_lolen, > - u32, __be32, be32_to_cpu); > + u32, __be32, get_unaligned_be32); > else > goto fail; > /* if table was vmalloced make sure the page tables are synced