As per the answers to this question, there is a general consensus that when Moshiach comes, we will find out who belongs to what tribe, and the 12 tribes will revert to their original landholdings. We see here that the Levites will reclaim the cities of refuge. With a rebuilt Beit HaMikdash, the Cohanim and some Levites would presumably return to Temple service. So far so good.
What, though, happens to Chalalim? They are obviously possul for service in the Beit Hamikdash, and are not considered Levites such that they could be eligible for homes in the Cities of Refuge. Yet they do not belong to any tribe that has landholdings.
Similarly, we currently classify converts (or at least their children) as "Yisrael", but that will no longer be an option.
Are there any sources that speak of these two groups in the messianic era?