220 lines
8 KiB
Diff
220 lines
8 KiB
Diff
From mboxrd@z Thu Jan 1 00:00:00 1970
|
|
Return-Path: <SRS0=xFJ7=DS=redhat.com=fweimer@sourceware.org>
|
|
Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124])
|
|
by sourceware.org (Postfix) with ESMTPS id 5D26B3858D28
|
|
for <libc-alpha@sourceware.org>; Tue, 1 Aug 2023 14:13:31 +0000 (GMT)
|
|
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5D26B3858D28
|
|
Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com
|
|
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com
|
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
|
|
s=mimecast20190719; t=1690899210;
|
|
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
|
|
to:to:cc:mime-version:mime-version:content-type:content-type;
|
|
bh=V+JHgiMkmVZokr9OzsvqE1BzYrJXvG5qaZBzgKJakQ4=;
|
|
b=VhrsRVYC3hPKEhEDGPIA+Q0nD8f+BrWTPkjE4XsI3pS/SeQoRIz4nRl+dFQGtr6xJrmzGb
|
|
8kgmy1w+kHlyRs9UhmBG6fwYlbk8qDVxf/D41VYhEI6WhMJolECPNVUmqcjSYcYb05Itdv
|
|
PV0aldwA6xUr3soWj4a3wcHoy9dgK44=
|
|
Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by
|
|
relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2,
|
|
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
|
|
us-mta-449-ZVR6yPn8M3CvvwxXwD9rXw-1; Tue, 01 Aug 2023 10:13:28 -0400
|
|
X-MC-Unique: ZVR6yPn8M3CvvwxXwD9rXw-1
|
|
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])
|
|
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
|
|
(No client certificate requested)
|
|
by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4FE4A1C03D8F
|
|
for <libc-alpha@sourceware.org>; Tue, 1 Aug 2023 14:13:28 +0000 (UTC)
|
|
Received: from oldenburg.str.redhat.com (unknown [10.2.16.12])
|
|
by smtp.corp.redhat.com (Postfix) with ESMTPS id D398B40C2063
|
|
for <libc-alpha@sourceware.org>; Tue, 1 Aug 2023 14:13:27 +0000 (UTC)
|
|
From: Florian Weimer <fweimer@redhat.com>
|
|
To: libc-alpha@sourceware.org
|
|
Subject: [PATCH] nscd: Do not rebuild getaddrinfo (bug 30709)
|
|
Date: Tue, 01 Aug 2023 16:13:26 +0200
|
|
Message-ID: <87sf924zqx.fsf@oldenburg.str.redhat.com>
|
|
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
|
|
MIME-Version: 1.0
|
|
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1
|
|
X-Mimecast-Spam-Score: 0
|
|
X-Mimecast-Originator: redhat.com
|
|
Content-Type: text/plain
|
|
X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
|
|
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
|
|
List-Id: <libc-alpha.sourceware.org>
|
|
|
|
The nscd daemon caches hosts data from NSS modules verbatim, without
|
|
filtering protocol families or sorting them (otherwise separate caches
|
|
would be needed for certain ai_flags combinations). The cache
|
|
implementation is complete separate from the getaddrinfo code. This
|
|
means that rebuilding getaddrinfo is not needed. The only function
|
|
actually used is __bump_nl_timestamp from check_pf.c, and this change
|
|
moves it into nscd/connections.c.
|
|
|
|
Tested on x86_64-linux-gnu with -fexceptions, built with
|
|
build-many-glibcs.py. I also backported this patch into a distribution
|
|
that still supports nscd and verified manually that caching still works.
|
|
|
|
---
|
|
include/ifaddrs.h | 4 ---
|
|
inet/check_pf.c | 9 -------
|
|
nscd/Makefile | 2 +-
|
|
nscd/connections.c | 11 +++++++++
|
|
nscd/gai.c | 50 --------------------------------------
|
|
sysdeps/unix/sysv/linux/check_pf.c | 17 +------------
|
|
6 files changed, 13 insertions(+), 80 deletions(-)
|
|
|
|
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
|
|
index 416118f1b3..19a3afb19f 100644
|
|
--- a/include/ifaddrs.h
|
|
+++ b/include/ifaddrs.h
|
|
@@ -34,9 +34,5 @@ extern void __check_native (uint32_t a1_index, int *a1_native,
|
|
uint32_t a2_index, int *a2_native)
|
|
attribute_hidden;
|
|
|
|
-#if IS_IN (nscd)
|
|
-extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
|
|
-#endif
|
|
-
|
|
# endif /* !_ISOMAC */
|
|
#endif /* ifaddrs.h */
|
|
diff --git a/inet/check_pf.c b/inet/check_pf.c
|
|
index 5310c99121..6d1475920f 100644
|
|
--- a/inet/check_pf.c
|
|
+++ b/inet/check_pf.c
|
|
@@ -60,12 +60,3 @@ __free_in6ai (struct in6addrinfo *in6ai)
|
|
{
|
|
/* Nothing to do. */
|
|
}
|
|
-
|
|
-
|
|
-#if IS_IN (nscd)
|
|
-uint32_t
|
|
-__bump_nl_timestamp (void)
|
|
-{
|
|
- return 0;
|
|
-}
|
|
-#endif
|
|
diff --git a/nscd/Makefile b/nscd/Makefile
|
|
index 2a0489f4cf..16b6460ee9 100644
|
|
--- a/nscd/Makefile
|
|
+++ b/nscd/Makefile
|
|
@@ -35,7 +35,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
|
|
getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm3_r \
|
|
getsrvbynm_r getsrvbypt_r servicescache \
|
|
dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
|
|
- xmalloc xstrdup aicache initgrcache gai res_hconf \
|
|
+ xmalloc xstrdup aicache initgrcache res_hconf \
|
|
netgroupcache cachedumper
|
|
|
|
ifeq ($(build-nscd)$(have-thread-library),yesyes)
|
|
diff --git a/nscd/connections.c b/nscd/connections.c
|
|
index a405a44a9b..15693e5090 100644
|
|
--- a/nscd/connections.c
|
|
+++ b/nscd/connections.c
|
|
@@ -256,6 +256,17 @@ int inotify_fd = -1;
|
|
#ifdef HAVE_NETLINK
|
|
/* Descriptor for netlink status updates. */
|
|
static int nl_status_fd = -1;
|
|
+
|
|
+static uint32_t
|
|
+__bump_nl_timestamp (void)
|
|
+{
|
|
+ static uint32_t nl_timestamp;
|
|
+
|
|
+ if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
|
|
+ atomic_fetch_add_relaxed (&nl_timestamp, 1);
|
|
+
|
|
+ return nl_timestamp;
|
|
+}
|
|
#endif
|
|
|
|
/* Number of times clients had to wait. */
|
|
diff --git a/nscd/gai.c b/nscd/gai.c
|
|
deleted file mode 100644
|
|
index e29f3fe583..0000000000
|
|
--- a/nscd/gai.c
|
|
+++ /dev/null
|
|
@@ -1,50 +0,0 @@
|
|
-/* Copyright (C) 2004-2023 Free Software Foundation, Inc.
|
|
- This file is part of the GNU C Library.
|
|
-
|
|
- This program is free software; you can redistribute it and/or modify
|
|
- it under the terms of the GNU General Public License as published
|
|
- by the Free Software Foundation; version 2 of the License, or
|
|
- (at your option) any later version.
|
|
-
|
|
- This program is distributed in the hope that it will be useful,
|
|
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
- GNU General Public License for more details.
|
|
-
|
|
- You should have received a copy of the GNU General Public License
|
|
- along with this program; if not, see <https://www.gnu.org/licenses/>. */
|
|
-
|
|
-#include <alloca.h>
|
|
-#include <sys/stat.h>
|
|
-
|
|
-/* This file uses the getaddrinfo code but it compiles it without NSCD
|
|
- support. We just need a few symbol renames. */
|
|
-#define __ioctl ioctl
|
|
-#define __getsockname getsockname
|
|
-#define __socket socket
|
|
-#define __recvmsg recvmsg
|
|
-#define __bind bind
|
|
-#define __sendto sendto
|
|
-#define __strchrnul strchrnul
|
|
-#define __getline getline
|
|
-#define __qsort_r qsort_r
|
|
-/* nscd uses 1MB or 2MB thread stacks. */
|
|
-#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
|
|
-#define __getifaddrs getifaddrs
|
|
-#define __freeifaddrs freeifaddrs
|
|
-#undef __fstat64
|
|
-#define __fstat64 fstat64
|
|
-#undef __stat64
|
|
-#define __stat64 stat64
|
|
-
|
|
-/* We are nscd, so we don't want to be talking to ourselves. */
|
|
-#undef USE_NSCD
|
|
-
|
|
-#include <getaddrinfo.c>
|
|
-
|
|
-/* Support code. */
|
|
-#include <check_pf.c>
|
|
-#include <check_native.c>
|
|
-
|
|
-/* Some variables normally defined in libc. */
|
|
-nss_action_list __nss_hosts_database attribute_hidden;
|
|
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
|
|
index 2b0b8b6368..3aa6a00348 100644
|
|
--- a/sysdeps/unix/sysv/linux/check_pf.c
|
|
+++ b/sysdeps/unix/sysv/linux/check_pf.c
|
|
@@ -66,25 +66,10 @@ static struct cached_data *cache;
|
|
__libc_lock_define_initialized (static, lock);
|
|
|
|
|
|
-#if IS_IN (nscd)
|
|
-static uint32_t nl_timestamp;
|
|
-
|
|
-uint32_t
|
|
-__bump_nl_timestamp (void)
|
|
-{
|
|
- if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
|
|
- atomic_fetch_add_relaxed (&nl_timestamp, 1);
|
|
-
|
|
- return nl_timestamp;
|
|
-}
|
|
-#endif
|
|
-
|
|
static inline uint32_t
|
|
get_nl_timestamp (void)
|
|
{
|
|
-#if IS_IN (nscd)
|
|
- return nl_timestamp;
|
|
-#elif defined USE_NSCD
|
|
+#if defined USE_NSCD
|
|
return __nscd_get_nl_timestamp ();
|
|
#else
|
|
return 0;
|
|
|
|
|