From patchwork Fri Mar 20 20:40:58 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 59840 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 148804C318BC for ; Fri, 20 Mar 2026 20:41:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 148804C318BC Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=GKfoz6a6 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 358474C31818 for ; Fri, 20 Mar 2026 20:41:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 358474C31818 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 358474C31818 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774039265; cv=none; b=urCxOoWjksN5USEOE5r2cHIPPzfTqTIqHtfcoi+6PqYeNlJhvoHivsfvcplPBLwVOhLtj5x9vJ7qNLdGRB93wePN3KZfyV5NXyTAWxFExVsG3LJPnnhLbCJwPmY1XJfHw4QVrNLau/+Yb7+2gcf5hzRwC9EHwk0vMos/wAE9y4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774039265; c=relaxed/simple; bh=S8cKyuLam0ts4JxCnMV574BDyNbgb5ah7v1v+5M48Tg=; h=DKIM-Signature:From:To:Subject:Message-ID:Date:MIME-Version; b=ab9OEdveNIlU2bWyuReEIwyxnCUyP6cA2AZRwVIuXybQYW7lDxymTMTAPYoT0mlLzyNCtb1t+a5zHAXrcf/sxLfUmTDT+HbLi77ZENz+aBA2HQM6aRTjOf1d+obyhjkHDDMKSsYKKv3iRZL2GuTyn3LU8cH6HkbqVlnaBUlB9Ew= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 358474C31818 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774039264; 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=lxglIGGVzhze5/szmWhmv+qO4i2X0Nv5PkUrAWhrH6E=; b=GKfoz6a6Hp2TZmHYTvXyssKTg9HHLA5cmfyfbxh2E9O6fTJbsXRUDUXl2IcdE5KFSYQe7S y7uuZgbXoGw98q2Bx9bYeHel/JLZTCO7x/8JAyxYsPeua8gw9lG+Sby3ty1AcqbXYzvNm8 mzT1F0p1InQoHHd5eDWwsseZ9tw6qLQ= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-282-pxUEezrGOA6xceFoXsQGWw-1; Fri, 20 Mar 2026 16:41:03 -0400 X-MC-Unique: pxUEezrGOA6xceFoXsQGWw-1 X-Mimecast-MFC-AGG-ID: pxUEezrGOA6xceFoXsQGWw_1774039262 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 92A6B1800365 for ; Fri, 20 Mar 2026 20:41:02 +0000 (UTC) Received: from fweimer-oldenburg.csb.redhat.com (unknown [10.45.224.63]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D041E180035F for ; Fri, 20 Mar 2026 20:41:01 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v2 00/23] NSS, nscd updates (for group merging and more) Message-ID: X-From-Line: 05e0a557343d05d4406b3776e13af4b1147b1541 Mon Sep 17 00:00:00 2001 Date: Fri, 20 Mar 2026 21:40:58 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9DvPRIgA12Xa_oFIommevmXTgY3wjOLT5WWK6ha8aCU_1774039262 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_HOSTKARMA_W, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_NONE, TXREP, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org This is an enhanced rework of my previous series: RFC: Towards deprecating the ERANGE protocol for NSS The new version covers passwd and group. It should have a proper software TM for the shared nscd mapping for those two nscd databases, following the same approach that we use in _dl_find_object. The existing nscd test is enhanced with checks that the shared cache actually works, by examining the statistics counters. In the nscd client code, I switched the ad-hoc read-write lock to a the real one from (still under the __libc_rwlock_* alias). This simplifies the code quite a bit and removes a few corner cases where the old code was busy-waiting. The reworked group merging code is still included, that part has not changed. One thing that is annoying is the GLIBC_2.1.2 compatibility version that we need for the *_r functions. I had not noticed the need for that before. This is quite a blob of extra code per *_r function, so I think we should generate that, but perhaps not with the preprocessor. Thanks, Florian Florian Weimer (23): support: Update support_format_* NSS formatting routines for null pointers nscd: Extract dbtype and struct statdata types to separate headers nscd: Enhance tst-nscd-basic with query counters nss: Add negative lookup test nscd: Use a real read-write lock for the client mapping nscd: Re-flow and sort Makefile nss: Add __nss_generic_copy and __nss_generic_dup functions nscd: Fix data races in client retry counters (bug 33654) Add nscd: Use uint8_t instead of bitfield in struct hashentry nscd: Add for nscd client usage nscd: Rewrite __nscd_cache_search using nscd: Introduce __nscd_read_from_socket client function nscd: Consistant snapshot with client function __nscd_read_from_cache nscd: Add __nscd_generic_get for generic lookup nscd: Convert group client to __nscd_generic_get nscd: Convert passwd client to __nscd_generic_get Extract from ldconfig nss: Low-level functionality for merging group lists nss: Convert passwd database to new NSS framework nss: Convert group database to new NSS framework nscd: Remove most of the rebuilds of existing libc functions nss: Remove old group merge code elf/Makefile | 4 +- elf/cache.c | 28 +- elf/cachestrings.c | 149 ++++ elf/{stringtable.h => cachestrings.h} | 40 +- elf/stringtable.c | 209 ----- elf/stringtable_free.c | 33 - elf/{tst-stringtable.c => tst-cachestrings.c} | 128 +-- include/parse_buffer.h | 213 +++++ include/set-freeres.h | 11 +- include/stringtable-skeleton.h | 129 +++ include/stringtable.h | 55 ++ malloc/set-freeres.c | 22 +- misc/Makefile | 3 + misc/fnv1a.c | 32 + misc/stringtable_add.c | 128 +++ misc/stringtable_free.c | 44 + nscd/Makefile | 46 +- nscd/cache.c | 41 +- nscd/concurrent_buffer.h | 197 +++++ nscd/getgrgid_r.c | 34 - nscd/getgrnam_r.c | 33 - nscd/getpwnam_r.c | 30 - nscd/getsrvbynm_r.c | 29 - nscd/getsrvbypt_r.c | 29 - nscd/grpcache.c | 4 +- nscd/mem.c | 7 +- nscd/nscd-client.h | 157 ++-- nscd/nscd-dbtype.h | 35 + nscd/nscd-statdata.h | 99 +++ nscd/nscd.h | 18 +- nscd/nscd_getai.c | 48 +- nscd/nscd_getgr_r.c | 286 +------ nscd/nscd_gethst_r.c | 95 +-- nscd/nscd_getpw_r.c | 199 +---- nscd/nscd_getserv_r.c | 62 +- nscd/nscd_helper.c | 793 +++++++++++++++--- nscd/nscd_initgroups.c | 37 +- nscd/nscd_netgroup.c | 82 +- nscd/nscd_proto.h | 17 +- nscd/nscd_stat.c | 73 +- nscd/pwdcache.c | 4 +- nscd/servicescache.c | 4 +- nscd/tst-nscd-basic.c | 58 ++ nss/Makefile | 25 +- nss/getXXbyYY_r.c | 118 +-- nss/getaddrinfo.c | 19 +- nss/getgrgid.c | 14 +- nss/getgrgid_r.c | 36 +- nss/getgrnam.c | 14 +- nss/getgrnam_r.c | 40 +- nss/getnetgrent_r.c | 15 +- nss/getpwnam.c | 14 +- nss/getpwnam_r.c | 33 +- nss/getpwuid.c | 14 +- nss/getpwuid_r.c | 33 +- nss/grp-merge.c | 200 ----- nss/initgroups.c | 10 +- nss/nss-lookups.def | 28 + nss/nss_database.c | 23 +- nss/nss_generic.h | 146 ++++ nss/nss_generic_copy.c | 120 +++ nss/nss_generic_dup.c | 125 +++ nss/nss_generic_get.c | 61 ++ nss/nss_generic_get_r.c | 45 + nss/nss_generic_lookup.c | 51 ++ nss/nss_generic_next.c | 60 ++ nss/nss_generic_nscd.c | 29 + nss/{grp-merge.h => nss_generic_storage.h} | 26 +- nss/nss_getX.c | 53 ++ nss/nss_getX_r.c | 45 + nss/nss_getXinfo.c | 77 ++ nss/nss_getgrXinfo.c | 176 ++++ nss/nss_group_members.c | 80 ++ nss/nss_group_members.h | 61 ++ nss/nss_module.c | 8 +- nss/nsswitch.c | 5 - nss/nsswitch.h | 20 +- nss/tst-nss-does-not-exist.cc | 210 +++++ nss/tst-nss-test4.c | 12 +- nss/tst-nss_generic_copy.c | 241 ++++++ nss/tst-nss_generic_dup.c | 231 +++++ nss/tst-nss_group_members.c | 77 ++ support/Makefile | 1 + support/nscd_test.h | 4 + support/support_format_group.c | 7 +- support/support_format_hostent.c | 31 +- support/support_format_netent.c | 9 +- support/support_format_protoent.c | 11 +- support/support_format_rpcent.c | 8 +- support/support_format_servent.c | 9 +- support/support_format_sgrp.c | 16 +- support/support_nscd.c | 33 + .../support_stringtable.c | 20 +- 93 files changed, 4474 insertions(+), 2015 deletions(-) create mode 100644 elf/cachestrings.c rename elf/{stringtable.h => cachestrings.h} (53%) delete mode 100644 elf/stringtable.c delete mode 100644 elf/stringtable_free.c rename elf/{tst-stringtable.c => tst-cachestrings.c} (54%) create mode 100644 include/parse_buffer.h create mode 100644 include/stringtable-skeleton.h create mode 100644 include/stringtable.h create mode 100644 misc/fnv1a.c create mode 100644 misc/stringtable_add.c create mode 100644 misc/stringtable_free.c create mode 100644 nscd/concurrent_buffer.h delete mode 100644 nscd/getgrgid_r.c delete mode 100644 nscd/getgrnam_r.c delete mode 100644 nscd/getpwnam_r.c delete mode 100644 nscd/getsrvbynm_r.c delete mode 100644 nscd/getsrvbypt_r.c create mode 100644 nscd/nscd-dbtype.h create mode 100644 nscd/nscd-statdata.h delete mode 100644 nss/grp-merge.c create mode 100644 nss/nss-lookups.def create mode 100644 nss/nss_generic.h create mode 100644 nss/nss_generic_copy.c create mode 100644 nss/nss_generic_dup.c create mode 100644 nss/nss_generic_get.c create mode 100644 nss/nss_generic_get_r.c create mode 100644 nss/nss_generic_lookup.c create mode 100644 nss/nss_generic_next.c create mode 100644 nss/nss_generic_nscd.c rename nss/{grp-merge.h => nss_generic_storage.h} (55%) create mode 100644 nss/nss_getX.c create mode 100644 nss/nss_getX_r.c create mode 100644 nss/nss_getXinfo.c create mode 100644 nss/nss_getgrXinfo.c create mode 100644 nss/nss_group_members.c create mode 100644 nss/nss_group_members.h create mode 100644 nss/tst-nss-does-not-exist.cc create mode 100644 nss/tst-nss_generic_copy.c create mode 100644 nss/tst-nss_generic_dup.c create mode 100644 nss/tst-nss_group_members.c rename nscd/getpwuid_r.c => support/support_stringtable.c (64%) base-commit: 19781c22211c6db827eefc240cb6724b5512fc6b