From nobody Mon Feb 9 06:33:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1649765936199118.6488361741358; Tue, 12 Apr 2022 05:18:56 -0700 (PDT) Received: from localhost ([::1]:52700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neFTz-0002sj-8i for importer@patchew.org; Tue, 12 Apr 2022 08:18:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neFP0-0004ua-OP for qemu-devel@nongnu.org; Tue, 12 Apr 2022 08:13:46 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neFOz-0001ND-9D for qemu-devel@nongnu.org; Tue, 12 Apr 2022 08:13:46 -0400 Received: by mail-wm1-x32b.google.com with SMTP id h126-20020a1c2184000000b0038eb17fb7d6so1643932wmh.2 for ; Tue, 12 Apr 2022 05:13:44 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id m18-20020a05600c4f5200b0038e8f9d7b57sm2355805wmq.42.2022.04.12.05.13.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 05:13:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R4ZvnlIoUjZtjWvuejYgl9KVhXxnZ5y5G5J4vXB5mhQ=; b=CFRvgWU9UkjVsh5IrvLkokMJUCEh5GySXizZ19ezm0Bp2dZKss1FBCzK5nWjFvWl8K KfhKEjg0fzFdmdA2zm65UvxsnseKhxLnCj8m80zQ/F51jwg9NsBJxhj71dvPh/eLxbpx 8hWVwKRnvj7LEIF4dL5pcGHLxHokt7GVXU+cWAdn42JAlB6G3RYt7Pw9hk06PPo0mp4s 7vXxoQ5t8T9WRnv0ylofH540UudUz886moTqpSDvlsOrs8u4gfIWvQdJVl/0f80hVWiU SHGPnsTWxo/T4OtXj7AH5v5kRnYrZmY/OsOfa3kE5AnMR2qR2yP3Jxyv7Xuc3XvlSi/0 VRKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=R4ZvnlIoUjZtjWvuejYgl9KVhXxnZ5y5G5J4vXB5mhQ=; b=HZVHw71RN4hr7O5UL8qKq/QNoo7eHEseiwexrEecaGEbwP2U8X35JTeHSIfZRctRT9 8/He+JY9ldWCgw2RSjHQyG+oek8csXWEMBF+1SiKad7GrBHVrCHp9PRKAGlo45kCgP6G OOq/dJlcdErsybBwAvhYkNrlhPiR1+fY6kwDXR88uhdolD179kZKNWv5aCaOHEZe5898 CtkfOYg3fQajVw2p5aVkV5n8fU6ofapHjZtzNVGiJzxA/5hm3dYBSsOnuIvUK4BBBLso hs7RC5e1kDTJV+XV3yYX4aU8Ki/680TkZ1MdtukG4PSCay9FfqDLnfnYWWlxZBMgmZkN A0cw== X-Gm-Message-State: AOAM531Q3RMEIYWaj5scNVIXeqcElF9HU0DMJYdGfC2R8qpTLiTBW9YU A9waFVHyt1ZmJ3JeDXGoSQbTNFOphRC4/g== X-Google-Smtp-Source: ABdhPJykZxB/2X1x1TexGzGZ0YHZy4dBSEuvep3Al7GTIM7j+oWKvsid4LUmjZIFa64OP+QaPOFzng== X-Received: by 2002:a05:600c:1c93:b0:38e:c558:10db with SMTP id k19-20020a05600c1c9300b0038ec55810dbmr3764410wms.121.1649765623864; Tue, 12 Apr 2022 05:13:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [RFC PATCH 1/4] net: slirp: introduce a wrapper struct for QemuTimer Date: Tue, 12 Apr 2022 14:13:34 +0200 Message-Id: <20220412121337.207203-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412121337.207203-1-pbonzini@redhat.com> References: <20220412121337.207203-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: samuel.thibault@ens-lyon.org, thuth@redhat.com, dbuono@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1649765937728100001 Content-Type: text/plain; charset="utf-8" This struct will be extended in the next few patches to support the new slirp_handle_timer() call. For that we need to store an additional "int" for each SLIRP timer, in addition to the cb_opaque. Signed-off-by: Paolo Bonzini Reviewed-by: Samuel Thibault --- net/slirp.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index bc5e9e4f77..f1e25d741f 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -184,23 +184,32 @@ static int64_t net_slirp_clock_get_ns(void *opaque) return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); } =20 +struct SlirpTimer { + QEMUTimer timer; +} + static void *net_slirp_timer_new(SlirpTimerCb cb, void *cb_opaque, void *opaque) { - return timer_new_full(NULL, QEMU_CLOCK_VIRTUAL, - SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, - cb, cb_opaque); + SlirpTimer *t =3D g_new(SlirpTimer, 1); + timer_init_full(&t->timer, NULL, QEMU_CLOCK_VIRTUAL, + SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, + cb, cb_opaque); + return t; } =20 static void net_slirp_timer_free(void *timer, void *opaque) { - timer_free(timer); + SlirpTimer *t =3D timer; + timer_del(&t->timer); + g_free(t); } =20 static void net_slirp_timer_mod(void *timer, int64_t expire_timer, void *opaque) { - timer_mod(timer, expire_timer); + SlirpTimer *t =3D timer; + timer_mod(&t->timer, expire_timer); } =20 static void net_slirp_register_poll_fd(int fd, void *opaque) --=20 2.35.1 From nobody Mon Feb 9 06:33:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1649766224065402.7153318951856; Tue, 12 Apr 2022 05:23:44 -0700 (PDT) Received: from localhost ([::1]:58214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neFYd-0006mb-2l for importer@patchew.org; Tue, 12 Apr 2022 08:23:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neFP2-0004wU-CQ for qemu-devel@nongnu.org; Tue, 12 Apr 2022 08:13:48 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:40813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neFP0-0001Nc-TB for qemu-devel@nongnu.org; Tue, 12 Apr 2022 08:13:48 -0400 Received: by mail-wr1-x436.google.com with SMTP id e8so11030995wra.7 for ; Tue, 12 Apr 2022 05:13:46 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id m18-20020a05600c4f5200b0038e8f9d7b57sm2355805wmq.42.2022.04.12.05.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 05:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TX8UXi4eFSnFUV2u4zCo4HCe7iBVlFy/t8He5jdXGC4=; b=blBtkvCSTRWnAnpmbWZ5+L+xqJxWHO3NRHux7Ym2aFOB5QP5JalkQm5397XBXt5U1/ 2vjf1PB2DJVPeDP5gbSSFcnYIQjDolKIwFA6yLVBMUWp5+NNXoe/0yfUvZE4peH9+gyb v4PDzveTRAG3BHlIxi7ZIFlJjhRMH6qLOd7VOaNmH4yCBdojlA4Amm1k0Vi3+BCj39RU +CDwzJyPnxLJwulLSZfcLf1oxu7giIt2aDBAiMDcCF56qyyChhnEJpQJXhY/2VjmvF4g w0CUjAG31gJ3LDeuykuzI/Idp1lLX3jdanl0c+dydak/PNfkY/V8ywq0pJ9i2GZSHkpp n7Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TX8UXi4eFSnFUV2u4zCo4HCe7iBVlFy/t8He5jdXGC4=; b=LDIzN474AXhEJ0B/VLka595zoZ3LpbkFN6Qk8W6qH3f/vUsi/8BpYUNFQyOEypGhch f1i0er+2HHPMLzWYKayYwKQUXn0qkLChzyGF+RO9P4iUHGU8T+XkIO96ngzWctY03IJ4 FOBek43pGBSzaJGNqPTnRnwM2cFtX3ayyzLho3IARpc50cFqcJWlD8verVTUoM/taGsf pUz64SymTzV8NRfPFXOc/umABeN0hnE+NbleLWTvNR/KKmKP9cSKD63o5w9+OKlUjgHV KMuxsssis0RWJx/7tQkdYmFbwDHznjKCqg5e8ph0g2TiyBrkNVgsVfnU4gDkmpvWEkar M1DQ== X-Gm-Message-State: AOAM531qSTS8RejHXfFvIYzQe4m5jFrBaJKPr/f24zkm7yvTzMq2xRbx FwWTFJs5cbnQAa/iW5vRKp23YZ06IVfvfw== X-Google-Smtp-Source: ABdhPJwAKRVL0SpmkwcjoNExmOHuTlGV//wbPQQMr9e2abNHFtEhClp1KyZuEesEitKZr+Q7mAbAog== X-Received: by 2002:a5d:558e:0:b0:206:f7e:4634 with SMTP id i14-20020a5d558e000000b002060f7e4634mr29030890wrv.662.1649765625171; Tue, 12 Apr 2022 05:13:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [RFC PATCH 2/4] net: slirp: switch to slirp_new Date: Tue, 12 Apr 2022 14:13:35 +0200 Message-Id: <20220412121337.207203-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412121337.207203-1-pbonzini@redhat.com> References: <20220412121337.207203-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: samuel.thibault@ens-lyon.org, thuth@redhat.com, dbuono@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1649766225518100003 Content-Type: text/plain; charset="utf-8" Replace slirp_init with slirp_new, so that a more recent cfg.version can be specified. Signed-off-by: Paolo Bonzini --- net/slirp.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/net/slirp.c b/net/slirp.c index f1e25d741f..b3a92d6e38 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -389,6 +389,7 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, #if defined(CONFIG_SMBD_COMMAND) struct in_addr smbsrv =3D { .s_addr =3D 0 }; #endif + SlirpConfig cfg =3D { 0 }; NetClientState *nc; SlirpState *s; char buf[20]; @@ -577,12 +578,26 @@ static int net_slirp_init(NetClientState *peer, const= char *model, =20 s =3D DO_UPCAST(SlirpState, nc, nc); =20 - s->slirp =3D slirp_init(restricted, ipv4, net, mask, host, - ipv6, ip6_prefix, vprefix6_len, ip6_host, - vhostname, tftp_server_name, - tftp_export, bootfile, dhcp, - dns, ip6_dns, dnssearch, vdomainname, - &slirp_cb, s); + cfg.version =3D 3; + cfg.restricted =3D restricted; + cfg.in_enabled =3D ipv4; + cfg.vnetwork =3D net; + cfg.vnetmask =3D mask; + cfg.vhost =3D host; + cfg.in6_enabled =3D ipv6; + cfg.vprefix_addr6 =3D ip6_prefix; + cfg.vprefix_len =3D vprefix6_len; + cfg.vhost6 =3D ip6_host; + cfg.vhostname =3D vhostname; + cfg.tftp_server_name =3D tftp_server_name; + cfg.tftp_path =3D tftp_export; + cfg.bootfile =3D bootfile; + cfg.vdhcp_start =3D dhcp; + cfg.vnameserver =3D dns; + cfg.vnameserver6 =3D ip6_dns; + cfg.vdnssearch =3D dnssearch; + cfg.vdomainname =3D vdomainname; + s->slirp =3D slirp_new(&cfg, &slirp_cb, s); QTAILQ_INSERT_TAIL(&slirp_stacks, s, entry); =20 /* --=20 2.35.1 From nobody Mon Feb 9 06:33:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1649766078894511.95534673031705; Tue, 12 Apr 2022 05:21:18 -0700 (PDT) Received: from localhost ([::1]:54576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neFWH-00049A-5K for importer@patchew.org; Tue, 12 Apr 2022 08:21:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neFP3-0004yp-7w for qemu-devel@nongnu.org; Tue, 12 Apr 2022 08:13:53 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:41709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neFP1-0001Nn-ON for qemu-devel@nongnu.org; Tue, 12 Apr 2022 08:13:48 -0400 Received: by mail-wm1-x332.google.com with SMTP id o20-20020a05600c511400b0038ebbbb2ad8so1509754wms.0 for ; Tue, 12 Apr 2022 05:13:47 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id m18-20020a05600c4f5200b0038e8f9d7b57sm2355805wmq.42.2022.04.12.05.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 05:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZpbfXhhFu37+qhfFpaMUS+AAe9dGLE6sTDUGZufIQeE=; b=VVSn0aDM9WfAPWM0GAm6wG6qNcl7BX3yb6QekoLePaEcJQDz5T+i/7G8V4iSjYArrV +yuZUN+uTtB+0Y7tAmNzA5iJUdc4trFD6oGrgPdnAb9/ewd5l7QiCrQgobFu4w/oUPtT Okmoa5CsBkMDEDUYWu6RinR4WCbYcsV6eXzmfNPe6whvfxDehrYnoeLcY/ZRhIQEFOjE Xf3PoSDwPVKFav0ihF5/A8fLhs10evRcT7Mh2hcaolm5Rd32TWZsg7k74bDMDuwTM61C ZfykLu3q2VxX+sBh+lRNpAZv27tAzeaRwnIzoqwtXJinIn1daZ6eukVe6v0R2Zk9K3Z9 3Qsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZpbfXhhFu37+qhfFpaMUS+AAe9dGLE6sTDUGZufIQeE=; b=gS4ByxFoj908KyD/ADSYifxvGGRx7sEQSV/vqibvIDbpf6sqfiqR1khcLFlDmDFrGD lYpRmsMJ+gtx4ARayCw5NXMrdwLHrYQISlvzA4YAg1liwv+oskp0/MfBg/elmUVSfKZo czodbgu1A6PA1eD5qvEQXoSznygWDwfCao6W60BAfREiefBDaN9A6O1XGTgKENjWdSdW WtYDTHtY9AqNSxtgX/B59vKEIuNCstMUgYDA020Yzy2ms4+apjNXnDpCBpFeBMHcLWJJ olalmhhvj44Wtwaom6PtKeQcypaHgjrCrf4rEt5NWqssuck+HpQYhNLy1U4G4HM6bSi5 eJBQ== X-Gm-Message-State: AOAM531p99PVQrRXeuxwSfKXyc4HhgH3g5lTGWx5Lf5lKkDpzJYVb9o8 2btOI7BBPx/Pij5TGSbut6tqcuNtZ8EJpA== X-Google-Smtp-Source: ABdhPJzHwrHzCYj+o4vQb3+wTOpM8OX8mHLfOF5NH2ehm2n3NVLgDaBwehjb/wlccG4wx+siNT7GTA== X-Received: by 2002:a1c:3587:0:b0:381:50ff:cbd with SMTP id c129-20020a1c3587000000b0038150ff0cbdmr3859899wma.140.1649765626470; Tue, 12 Apr 2022 05:13:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [RFC PATCH 3/4] net: slirp: add support for CFI-friendly timer API Date: Tue, 12 Apr 2022 14:13:36 +0200 Message-Id: <20220412121337.207203-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412121337.207203-1-pbonzini@redhat.com> References: <20220412121337.207203-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: samuel.thibault@ens-lyon.org, thuth@redhat.com, dbuono@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1649766081307100001 Content-Type: text/plain; charset="utf-8" libslirp 4.7 introduces a CFI-friendly version of the .timer_new callback. The new callback replaces the function pointer with an enum; invoking the callback is done with a new function slirp_handle_timer. Support the new API so that CFI can be made compatible with using a system libslirp. Signed-off-by: Paolo Bonzini Reviewed-by: Samuel Thibault --- net/slirp.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/net/slirp.c b/net/slirp.c index b3a92d6e38..57af42299d 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -184,10 +184,43 @@ static int64_t net_slirp_clock_get_ns(void *opaque) return qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); } =20 +typedef struct SlirpTimer SlirpTimer; struct SlirpTimer { QEMUTimer timer; +#if SLIRP_CHECK_VERSION(4,7,0) + Slirp *slirp; + SlirpTimerId id; + void *cb_opaque; +#endif +}; + +#if SLIRP_CHECK_VERSION(4,7,0) +static void net_slirp_init_completed(Slirp *slirp, void *opaque) +{ + SlirpState *s =3D opaque; + s->slirp =3D slirp; } =20 +static void net_slirp_timer_cb(void *opaque) +{ + SlirpTimer *t =3D opaque; + slirp_handle_timer(t->slirp, t->id, t->cb_opaque); +} + +static void *net_slirp_timer_new_opaque(SlirpTimerId id, + void *cb_opaque, void *opaque) +{ + SlirpState *s =3D opaque; + SlirpTimer *t =3D g_new(SlirpTimer, 1); + t->slirp =3D s->slirp; + t->id =3D id; + t->cb_opaque =3D cb_opaque; + timer_init_full(&t->timer, NULL, QEMU_CLOCK_VIRTUAL, + SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, + net_slirp_timer_cb, t); + return t; +} +#else static void *net_slirp_timer_new(SlirpTimerCb cb, void *cb_opaque, void *opaque) { @@ -197,6 +230,7 @@ static void *net_slirp_timer_new(SlirpTimerCb cb, cb, cb_opaque); return t; } +#endif =20 static void net_slirp_timer_free(void *timer, void *opaque) { @@ -231,7 +265,12 @@ static const SlirpCb slirp_cb =3D { .send_packet =3D net_slirp_send_packet, .guest_error =3D net_slirp_guest_error, .clock_get_ns =3D net_slirp_clock_get_ns, +#if SLIRP_CHECK_VERSION(4,7,0) + .init_completed =3D net_slirp_init_completed, + .timer_new_opaque =3D net_slirp_timer_new_opaque, +#else .timer_new =3D net_slirp_timer_new, +#endif .timer_free =3D net_slirp_timer_free, .timer_mod =3D net_slirp_timer_mod, .register_poll_fd =3D net_slirp_register_poll_fd, @@ -578,7 +617,7 @@ static int net_slirp_init(NetClientState *peer, const c= har *model, =20 s =3D DO_UPCAST(SlirpState, nc, nc); =20 - cfg.version =3D 3; + cfg.version =3D SLIRP_CHECK_VERSION(4,7,0) ? 4 : 3; cfg.restricted =3D restricted; cfg.in_enabled =3D ipv4; cfg.vnetwork =3D net; --=20 2.35.1 From nobody Mon Feb 9 06:33:34 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1649766398383941.9712251920649; Tue, 12 Apr 2022 05:26:38 -0700 (PDT) Received: from localhost ([::1]:33854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1neFbQ-00015S-Q7 for importer@patchew.org; Tue, 12 Apr 2022 08:26:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1neFP5-0004yy-25 for qemu-devel@nongnu.org; Tue, 12 Apr 2022 08:13:53 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:38559) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1neFP3-0001O0-Jy for qemu-devel@nongnu.org; Tue, 12 Apr 2022 08:13:50 -0400 Received: by mail-wm1-x333.google.com with SMTP id r133-20020a1c448b000000b0038ccb70e239so1628686wma.3 for ; Tue, 12 Apr 2022 05:13:49 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id m18-20020a05600c4f5200b0038e8f9d7b57sm2355805wmq.42.2022.04.12.05.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 05:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eJqQuScG9BOoUAHQIhydVm0PsVJlLCM2jTqJMbpcmTE=; b=FqJmA749Y/i3+BaNBdTHAaub7gPC6zsrkvwCznP0RwSqzAgE26YBMSLfljyxhEa1Bg 9jseW+gOPhamu+3schVwkhcK8W0MND5s88FjwMKbUvV2wNa60qznwCldCwcpL84+aRm2 buCfUfSRV9Nhx74kEKAToCmfjYP4ThY/xQFoV/ioBlQfn3fPscmvuYG5+jvMJFV23ioh 7iWM0T+lsLzjB8pLbNVmJESl5TKiia4SxSu6SK8CByWewLKFhGvIaTwYJWBi4zM+1U/g CfbevxjrMpRFmyL+R44eCDh21SUA4MjoIKKApx19o9LoO9uj6qKlLLD6pFaGS4KT1Pcp 2wHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eJqQuScG9BOoUAHQIhydVm0PsVJlLCM2jTqJMbpcmTE=; b=BBXtwSoK1pA1P/7IqZBh5O0/ZX7eV7nBU6aqAi5MSPAPCG+sQ41lJ3KJlPGwpyLo3v RUxx3otXKfwyDzzrbFs679md/brsYJNoCLma0kcyhqiPOhiyxUe0fmQOuMS4NIfDBwTe hV6z1DhD0ByX5/S5pcyp1qkR0zFh3osH81eVZJjGeEauHt4e6FpR8bRqwk9LFQ7Z49Yy DR0HGK1EMZs8R4337gcjSdVGnSxwB/oq0qCoQZDOnqBLk1NJm8ingOgwQ38r9JRYfd2y yZyNxWV+PI47Fj/9DjDEi2lmO1V2BJe9qA483zhbe76mFFmjhNtMver/3NwS6dwx3Grz 5jQg== X-Gm-Message-State: AOAM530rSOhyKmyKNrNRA72N1+3cg+zcyFmTxwffPBUuk/RKNa/jQ8VP 1qW+KPN4/vmd4CCGZs0U1zSOS8S5DpOEAg== X-Google-Smtp-Source: ABdhPJz6N4N37IwHu/pPnxjkSHZjO0bN/BnWzGlk1tdCDeW3wig2oX5B1tiQfsPD2qLbUxAUdEudmA== X-Received: by 2002:a05:600c:3c8d:b0:38e:4bc6:abde with SMTP id bg13-20020a05600c3c8d00b0038e4bc6abdemr3741286wmb.13.1649765628187; Tue, 12 Apr 2022 05:13:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [RFC PATCH 4/4] net: slirp: allow CFI with libslirp >= 4.7 Date: Tue, 12 Apr 2022 14:13:37 +0200 Message-Id: <20220412121337.207203-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412121337.207203-1-pbonzini@redhat.com> References: <20220412121337.207203-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: samuel.thibault@ens-lyon.org, thuth@redhat.com, dbuono@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1649766399415100001 Content-Type: text/plain; charset="utf-8" slirp 4.7 introduces a new CFI-friendly timer callback that does not pass function pointers within libslirp as callbacks for timers. Check the version number and, if it is new enough, allow using CFI even with a system libslirp. Signed-off-by: Paolo Bonzini Reviewed-by: Samuel Thibault --- meson.build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index 861de93c4f..92a83580a3 100644 --- a/meson.build +++ b/meson.build @@ -2485,21 +2485,21 @@ if have_system slirp =3D declare_dependency(link_with: libslirp, dependencies: slirp_deps, include_directories: slirp_inc) + else + # slirp <4.7 is incompatible with CFI support in QEMU. This is because + # it passes function pointers within libslirp as callbacks for timers. + # When using a system-wide shared libslirp, the type information for t= he + # callback is missing and the timer call produces a false positive wit= h CFI. + # + # Now that slirp_opt has been defined, check if the selected slirp is = compatible + # with control-flow integrity. + if get_option('cfi') and slirp.found() and slirp.version().version_com= pare('<4.7') + error('Control-Flow Integrity is not compatible with system-wide sli= rp.' \ + + ' Please configure with --enable-slirp=3Dgit or upgrade to = libslirp 4.7') + endif endif endif =20 -# For CFI, we need to compile slirp as a static library together with qemu. -# This is because we register slirp functions as callbacks for QEMU Timers. -# When using a system-wide shared libslirp, the type information for the -# callback is missing and the timer call produces a false positive with CF= I. -# -# Now that slirp_opt has been defined, check if the selected slirp is comp= atible -# with control-flow integrity. -if get_option('cfi') and slirp_opt =3D=3D 'system' - error('Control-Flow Integrity is not compatible with system-wide slirp.'= \ - + ' Please configure with --enable-slirp=3Dgit') -endif - fdt =3D not_found if have_system fdt_opt =3D get_option('fdt') --=20 2.35.1