From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Wilco Dijkstra <Wilco.Dijkstra@arm.com>
Subject: [PATCH 3/7] nscd: Remove _STRING_ARCH_unaligned usage
Date: Mon, 13 Feb 2023 10:55:54 -0300 [thread overview]
Message-ID: <20230213135558.3328727-4-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20230213135558.3328727-1-adhemerval.zanella@linaro.org>
It only adds a small overhead for unaligned inputs (which should not
be common) and unify the code.
Checked on x86_64-linux-gnu and i686-linux-gnu.
---
nscd/nscd_gethst_r.c | 2 --
nscd/nscd_getserv_r.c | 2 --
nscd/nscd_helper.c | 6 ------
3 files changed, 10 deletions(-)
diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
index 7950ed695c..153194ad04 100644
--- a/nscd/nscd_gethst_r.c
+++ b/nscd/nscd_gethst_r.c
@@ -185,7 +185,6 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
goto out;
}
-#if !_STRING_ARCH_unaligned
/* The aliases_len array in the mapped database might very
well be unaligned. We will access it word-wise so on
platforms which do not tolerate unaligned accesses we
@@ -199,7 +198,6 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
hst_resp.h_aliases_cnt
* sizeof (uint32_t));
}
-#endif
if (type != GETHOSTBYADDR && type != GETHOSTBYNAME)
{
if (hst_resp.h_length == INADDRSZ)
diff --git a/nscd/nscd_getserv_r.c b/nscd/nscd_getserv_r.c
index 752ae1115e..0ee83ff88c 100644
--- a/nscd/nscd_getserv_r.c
+++ b/nscd/nscd_getserv_r.c
@@ -140,7 +140,6 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto,
> recend, 0))
goto out;
-#if !_STRING_ARCH_unaligned
/* The aliases_len array in the mapped database might very
well be unaligned. We will access it word-wise so on
platforms which do not tolerate unaligned accesses we
@@ -170,7 +169,6 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto,
serv_resp.s_aliases_cnt
* sizeof (uint32_t));
}
-#endif
}
}
diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index fdd555ea66..6a498b363c 100644
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -465,7 +465,6 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen,
struct hashentry *here = (struct hashentry *) (mapped->data + work);
ref_t here_key, here_packet;
-#if !_STRING_ARCH_unaligned
/* Although during garbage collection when moving struct hashentry
records around we first copy from old to new location and then
adjust pointer from previous hashentry to it, there is no barrier
@@ -474,7 +473,6 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen,
application. */
if ((uintptr_t) here & (__alignof__ (*here) - 1))
return NULL;
-#endif
if (type == here->type
&& keylen == here->len
@@ -487,10 +485,8 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen,
struct datahead *dh
= (struct datahead *) (mapped->data + here_packet);
-#if !_STRING_ARCH_unaligned
if ((uintptr_t) dh & (__alignof__ (*dh) - 1))
return NULL;
-#endif
/* See whether we must ignore the entry or whether something
is wrong because garbage collection is in progress. */
@@ -511,11 +507,9 @@ __nscd_cache_search (request_type type, const char *key, size_t keylen,
struct hashentry *trailelem;
trailelem = (struct hashentry *) (mapped->data + trail);
-#if !_STRING_ARCH_unaligned
/* We have to redo the checks. Maybe the data changed. */
if ((uintptr_t) trailelem & (__alignof__ (*trailelem) - 1))
return NULL;
-#endif
if (trail + MINIMUM_HASHENTRY_SIZE > datasize)
return NULL;
--
2.34.1
next prev parent reply other threads:[~2023-02-13 13:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 13:55 [PATCH 0/7] Remove _STRING_ARCH_unaligned Adhemerval Zanella
2023-02-13 13:55 ` [PATCH 1/7] crypto: Remove _STRING_ARCH_unaligned usage Adhemerval Zanella
2023-02-15 17:55 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 2/7] stdlib: Simplify getenv Adhemerval Zanella
2023-02-15 17:50 ` Wilco Dijkstra
2023-02-16 13:49 ` Adhemerval Zanella Netto
2023-02-16 14:02 ` Andreas Schwab
2023-02-16 18:02 ` Wilco Dijkstra
2023-02-16 18:38 ` Adhemerval Zanella Netto
2023-02-16 18:47 ` Wilco Dijkstra
2023-02-16 19:29 ` Adhemerval Zanella Netto
2023-02-17 17:13 ` Wilco Dijkstra
2023-02-13 13:55 ` Adhemerval Zanella [this message]
2023-02-15 17:59 ` [PATCH 3/7] nscd: Remove _STRING_ARCH_unaligned usage Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 4/7] resolv: " Adhemerval Zanella
2023-02-15 18:04 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 5/7] iconv: Remove _STRING_ARCH_unaligned usage for get/set macros Adhemerval Zanella
2023-02-13 14:05 ` Andreas Schwab
2023-02-15 18:34 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 6/7] iconv: Remove _STRING_ARCH_unaligned usage Adhemerval Zanella
2023-02-15 19:02 ` Wilco Dijkstra
2023-02-13 13:55 ` [PATCH 7/7] string: Remove string_private.h Adhemerval Zanella
2023-02-15 19:04 ` Wilco Dijkstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230213135558.3328727-4-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=Wilco.Dijkstra@arm.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).